From e08148041f4487d364d2701f9107c2ccff620132 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 18:21:51 +0200 Subject: [PATCH 001/229] nixos/systemd-boot: Add consoleMode option --- .../systemd-boot/systemd-boot-builder.py | 1 + .../boot/loader/systemd-boot/systemd-boot.nix | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 3333569c36b..1dc888c5822 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -43,6 +43,7 @@ def write_loader_conf(profile, generation): f.write("default nixos-generation-%d\n" % (generation)) if not @editor@: f.write("editor 0"); + f.write("console-mode @consoleMode@\n"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") def profile_path(profile, generation, name): diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index a5a88a99be8..feed863efd6 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -22,6 +22,8 @@ let editor = if cfg.editor then "True" else "False"; + inherit (cfg) consoleMode; + inherit (efi) efiSysMountPoint canTouchEfiVariables; }; in { @@ -52,6 +54,38 @@ in { compatibility. ''; }; + + consoleMode = mkOption { + default = "keep"; + + type = types.enum [ "0" "1" "2" "auto" "max" "keep" ]; + + description = '' + The resolution of the console. The following values are valid: + + + + + "0": Standard UEFI 80x25 mode + + + "1": 80x50 mode, not supported by all devices + + + "2": The first non-standard mode provided by the device firmware, if any + + + "auto": Pick a suitable mode automatically using heuristics + + + "max": Pick the highest-numbered available mode + + + "keep": Keep the mode selected by firmware (the default) + + + ''; + }; }; config = mkIf cfg.enable { From c84e66810998af0798076cef9734af51fc2f7c26 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Thu, 12 Jul 2018 17:26:31 +0300 Subject: [PATCH 002/229] nixos/lightdm-gtk-greeter: svg icon support --- .../services/x11/display-managers/lightdm-greeters/gtk.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 2a71d233860..984811971dc 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -23,7 +23,7 @@ let makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ --prefix PATH : "${pkgs.glibc.bin}/bin" \ - --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ + --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ --set GTK_EXE_PREFIX "${theme}" \ --set GTK_DATA_PREFIX "${theme}" \ From 656a7abd351cb157f40e9dc765e5e8b7a1127c0b Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Sat, 14 Jul 2018 19:43:43 +0100 Subject: [PATCH 003/229] fix libgpg-error build on armv7 --- pkgs/development/libraries/libgpg-error/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 2fcf6701ab8..ccac20c9077 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -34,6 +34,8 @@ in stdenv.mkDerivation (rec { postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure + '' + lib.optionalString (stdenv.hostPlatform.isArm && stdenv.buildPlatform != stdenv.hostPlatform ) '' + ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h '' + lib.optionalString stdenv.hostPlatform.isMusl '' ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h ''; From fbcc4daff7652ad630e7bb0d6ae71467aa2609e3 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 21 Jul 2018 22:32:20 +0200 Subject: [PATCH 004/229] mpd: add nfs and smb support --- pkgs/servers/mpd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 35637e7f73a..d22beac6e9d 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -26,6 +26,8 @@ , clientSupport ? true, mpd_clientlib , opusSupport ? true, libopus , soundcloudSupport ? true, yajl +, nfsSupport ? true, libnfs +, smbSupport ? true, smbclient }: assert avahiSupport -> avahi != null && dbus != null; @@ -81,7 +83,9 @@ in stdenv.mkDerivation rec { ++ opt icuSupport icu ++ opt clientSupport mpd_clientlib ++ opt opusSupport libopus - ++ opt soundcloudSupport yajl; + ++ opt soundcloudSupport yajl + ++ opt nfsSupport libnfs + ++ opt smbSupport smbclient; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -116,6 +120,8 @@ in stdenv.mkDerivation rec { (mkFlag clientSupport "libmpdclient") (mkFlag opusSupport "opus") (mkFlag soundcloudSupport "soundcloud") + (mkFlag nfsSupport "libnfs") + (mkFlag smbSupport "smbclient") "--enable-debug" "--with-zeroconf=avahi" ] From 0186ec73291fd009c05294126cc097fb757ec509 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 22 Jul 2018 18:07:29 +0300 Subject: [PATCH 005/229] pakcs: 1.14.0 -> 2.0.2 --- .../compilers/pakcs/adjust-buildsystem.patch | 21 --- .../compilers/pakcs/case-insensitive.patch | 19 -- .../compilers/pakcs/curry-base.nix | 16 ++ .../compilers/pakcs/curry-frontend.nix | 24 +++ pkgs/development/compilers/pakcs/default.nix | 163 ++++++------------ 5 files changed, 88 insertions(+), 155 deletions(-) delete mode 100644 pkgs/development/compilers/pakcs/adjust-buildsystem.patch delete mode 100644 pkgs/development/compilers/pakcs/case-insensitive.patch create mode 100644 pkgs/development/compilers/pakcs/curry-base.nix create mode 100644 pkgs/development/compilers/pakcs/curry-frontend.nix diff --git a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch deleted file mode 100644 index 2d1f92af81d..00000000000 --- a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur pakcs-1.11.4-upstream/scripts/pakcs.sh pakcs-1.11.4/scripts/pakcs.sh ---- pakcs-1.11.4-upstream/scripts/pakcs.sh 2014-10-24 05:06:07.000000000 -0430 -+++ pakcs-1.11.4/scripts/pakcs.sh 2015-01-05 16:26:15.697982791 -0430 -@@ -16,7 +16,7 @@ - # use readline wrapper rlwrap if it is installed and we have tty as stdin: - USERLWRAP=no - if tty -s ; then -- RLWRAP=`which rlwrap` -+ RLWRAP=`type -P rlwrap` - if [ -x "$RLWRAP" ] ; then - USERLWRAP=yes - fi -@@ -29,7 +29,7 @@ - done - - if [ $USERLWRAP = yes ] ; then -- exec rlwrap -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"} -+ exec rlwrap -a -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"} - else - exec "$REPL" ${1+"$@"} - fi diff --git a/pkgs/development/compilers/pakcs/case-insensitive.patch b/pkgs/development/compilers/pakcs/case-insensitive.patch deleted file mode 100644 index e46558c2520..00000000000 --- a/pkgs/development/compilers/pakcs/case-insensitive.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- www/Makefile.orig 2016-10-10 21:04:36.000000000 +0300 -+++ pakcs-1.14.0/www/Makefile 2016-10-10 21:07:56.000000000 +0300 -@@ -6,7 +6,7 @@ all: submitform Registry - submitform: SubmitForm.curry $(LIBDIR)/HtmlCgi.curry \ - $(LIBDIR)/NamedSocket.curry $(LIBDIR)/CPNS.curry - $(REPL) $(REPL_OPTS) :load SubmitForm :save :q -- mv SubmitForm submitform -+ mv SubmitForm submitform.orig && mv submitform.orig submitform - - Registry: Registry.curry $(LIBDIR)/HtmlCgi.curry - $(REPL) $(REPL_OPTS) :load Registry :save :q ---- currytools/erd2curry/Makefile.orig 2016-10-10 21:13:49.000000000 +0300 -+++ pakcs-1.14.0/currytools/erd2curry/Makefile 2016-10-10 21:21:14.000000000 +0300 -@@ -32,4 +32,4 @@ uninstall: clean - erd2curry: $(DEPS) - # create saved state for top-level function "main": - $(REPL) $(REPL_OPTS) :load ERD2Curry :save "main \"$(CURDIR)\"" :q -- mv ERD2Curry $@ -+ mv ERD2Curry $@.orig && mv $@.orig $@ diff --git a/pkgs/development/compilers/pakcs/curry-base.nix b/pkgs/development/compilers/pakcs/curry-base.nix new file mode 100644 index 00000000000..2d98699d283 --- /dev/null +++ b/pkgs/development/compilers/pakcs/curry-base.nix @@ -0,0 +1,16 @@ +{ mkDerivation, base, Cabal, containers, directory, extra, filepath +, mtl, parsec, pretty, stdenv, time, transformers +}: +mkDerivation { + pname = "curry-base"; + version = "1.0.0"; + src = ./.; + libraryHaskellDepends = [ + base containers directory extra filepath mtl parsec pretty time + transformers + ]; + testHaskellDepends = [ base Cabal filepath mtl ]; + homepage = "http://curry-language.org"; + description = "Functions for manipulating Curry programs"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/pakcs/curry-frontend.nix b/pkgs/development/compilers/pakcs/curry-frontend.nix new file mode 100644 index 00000000000..d94bef9ec7f --- /dev/null +++ b/pkgs/development/compilers/pakcs/curry-frontend.nix @@ -0,0 +1,24 @@ +{ mkDerivation, base, Cabal, containers, curry-base, directory +, extra, filepath, mtl, network-uri, pretty, process, set-extra +, stdenv, transformers +}: +mkDerivation { + pname = "curry-frontend"; + version = "1.0.2"; + src = ./.; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers curry-base directory extra filepath mtl network-uri + pretty process set-extra transformers + ]; + executableHaskellDepends = [ + base containers curry-base directory extra filepath mtl network-uri + pretty process set-extra transformers + ]; + testHaskellDepends = [ base Cabal curry-base filepath ]; + homepage = "http://curry-language.org"; + description = "Compile the functional logic language Curry to several intermediate formats"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 60388265348..52639667745 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -1,139 +1,72 @@ -{ stdenv, fetchurl, swiProlog, haskellPackages -, glibcLocales, makeWrapper, rlwrap, tk, which }: +{ stdenv, fetchurl, makeWrapper +, haskellPackages, haskell +, which, swiProlog, rlwrap, tk +, curl, git, unzip, gnutar, coreutils, sqlite }: let - fname = "pakcs-1.14.0"; + name = "pakcs-2.0.2"; - fsrc = fetchurl { - url = "https://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; - sha256 = "1651ssh4ql79x8asd7kp4yis2n5rhn3lml4s26y03b0cgbfhs78s"; + src = fetchurl { + url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz"; + sha256 = "0fdzw2zz5vs6z20jn6a8jfvpr6dp7fs1rr01cy0xjnzg2mgmn42a"; }; - swiPrologLocked = stdenv.lib.overrideDerivation swiProlog (oldAttrs: rec { - version = "6.6.6"; - name = "swi-prolog-${version}"; - src = fetchurl { - url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "0vcrfskm2hyhv30lxr6v261myb815jc3bgmcn1lgsc9g9qkvp04z"; + curry-frontend = (haskellPackages.override { + overrides = self: super: { + curry-base = haskell.lib.overrideCabal (super.callPackage ./curry-base.nix {}) (drv: { + inherit src; + postUnpack = "sourceRoot+=/frontend/curry-base"; + }); + curry-frontend = haskell.lib.overrideCabal (super.callPackage ./curry-frontend.nix {}) (drv: { + inherit src; + postUnpack = "sourceRoot+=/frontend/curry-frontend"; + }); }; - }); + }).curry-frontend; +in stdenv.mkDerivation { + inherit name src; -in -stdenv.mkDerivation rec { + buildInputs = [ swiProlog ]; + nativeBuildInputs = [ which makeWrapper ]; - name = fname; - - curryBase = haskellPackages.callPackage ( - { mkDerivation, base, Cabal, containers, directory, either - , filepath, mtl, pretty, syb, time - }: - mkDerivation { - pname = "curry-base"; - version = "0.4.1"; - src = fsrc; - libraryHaskellDepends = [ - base containers directory either filepath mtl pretty syb time - ]; - testHaskellDepends = [ base Cabal filepath mtl ]; - homepage = http://curry-language.org; - description = "Functions for manipulating Curry programs"; - license = "unknown"; - - postUnpack = '' - mv ${name} ${name}.orig - ln -s ${name}.orig/frontend/curry-base ${name} - ''; - doCheck = false; - } - ) {}; - - curryFront = haskellPackages.callPackage ( - { mkDerivation, base, Cabal, containers, directory - , filepath, mtl, network-uri, process, syb, transformers - }: - mkDerivation { - pname = "curry-frontend"; - version = "0.4.1"; - src = fsrc; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers curryBase directory filepath mtl network-uri - process syb transformers - ]; - executableHaskellDepends = [ - base containers curryBase directory filepath mtl network-uri - process syb transformers - ]; - testHaskellDepends = [ base Cabal curryBase filepath ]; - homepage = http://curry-language.org; - description = "Compile the functional logic language Curry to several intermediate formats"; - license = "unknown"; - - postUnpack = '' - mv ${name} ${name}.orig - ln -s ${name}.orig/frontend/curry-frontend ${name} - ''; - doCheck = false; - } - ) {}; - - src = fsrc; - - buildInputs = [ swiPrologLocked makeWrapper glibcLocales rlwrap tk which ]; - - patches = [ - ./adjust-buildsystem.patch - ./case-insensitive.patch + makeFlags = [ + "CURRYFRONTEND=${curry-frontend}/bin/curry-frontend" + "DISTPKGINSTALL=yes" + # Not needed, just to make script pass + "CURRYTOOLSDIR=0" + "CURRYLIBSDIR=0" ]; - configurePhase = '' - # Phony HOME. - mkdir phony-home - export HOME=$(pwd)/phony-home + preConfigure = '' + # Since we can't expand $out in `makeFlags` + #makeFlags="$makeFlags PAKCSINSTALLDIR=$out/pakcs" - # SWI Prolog - sed -i 's@SWIPROLOG=@SWIPROLOG='${swiPrologLocked}/bin/swipl'@' scripts/pakcsinitrc.sh + substituteInPlace currytools/cpm/src/CPM/Repository.curry \ + --replace "/bin/rm" "rm" ''; + # cypm new: EXISTENCE ERROR: source_sink + # "/tmp/nix-build-pakcs-2.0.2.drv-0/pakcs-2.0.2/currytools/cpm/templates/LICENSE" + # does not exist buildPhase = '' - # Some comments in files are in UTF-8, so include the locale needed by GHC runtime. - export LC_ALL=en_US.UTF-8 - - # PAKCS must be build in place due to embedded filesystem references placed by swi. - - # Prepare PAKCSHOME directory. - mkdir -p $out/pakcs/bin - - # Set up link to cymake, which has been built already. - ln -s ${curryFront}/bin/cymake $out/pakcs/bin/ - rm -r frontend - - # Prevent embedding the derivation build directory as temp. - export TEMP=/tmp - - # Copy to in place build location and run the build. + mkdir -p $out/pakcs cp -r * $out/pakcs - (cd $out/pakcs ; make) + (cd $out/pakcs ; make -j$NIX_BUILD_CORES $makeFlags) ''; installPhase = '' - # Install bin. - mkdir -p $out/bin - for b in $(ls $out/pakcs/bin) ; do - ln -s $out/pakcs/bin/$b $out/bin/ ; - done + ln -s $out/pakcs/bin $out - # Place emacs lisp files in expected locations. - mkdir -p $out/share/emacs/site-lisp/curry-pakcs - for e in "$out/pakcs/tools/emacs/"*.el ; do - cp $e $out/share/emacs/site-lisp/curry-pakcs/ ; - done + mkdir -p $out/share/emacs/site-lisp + ln -s $out/pakcs/tools/emacs $out/share/emacs/site-lisp/curry-pakcs - # Wrap for rlwrap and tk support. wrapProgram $out/pakcs/bin/pakcs \ --prefix PATH ":" "${rlwrap}/bin" \ - --prefix PATH ":" "${tk}/bin" \ + --prefix PATH ":" "${tk}/bin" + + # List of dependencies from currytools/cpm/src/CPM/Main.curry + wrapProgram $out/pakcs/bin/cypm \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl git unzip gnutar coreutils sqlite ]}" ''; meta = with stdenv.lib; { @@ -154,6 +87,6 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [ kkallio gnidorah ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 5c7cfbc0f11e360f50467b20a407c675c976d3a0 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Wed, 25 Jul 2018 16:32:42 +0800 Subject: [PATCH 006/229] allow postgresql cross compiling --- .../libraries/libossp-uuid/default.nix | 8 +++++++- .../libraries/libossp-uuid/shtool.patch | 11 +++++++++++ pkgs/servers/sql/postgresql/default.nix | 16 ++++++++++++---- 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/libossp-uuid/shtool.patch diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index ddfc2a5132c..4cd68f2f1b5 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, buildPackages}: let version = "1.6.2"; in @@ -12,6 +12,12 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + patches = [ ./shtool.patch ]; + + preConfigure = '' + export ac_cv_va_copy=yes + ''; + meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; description = "OSSP uuid ISO-C and C++ shared library"; diff --git a/pkgs/development/libraries/libossp-uuid/shtool.patch b/pkgs/development/libraries/libossp-uuid/shtool.patch new file mode 100644 index 00000000000..f0c7cc485f5 --- /dev/null +++ b/pkgs/development/libraries/libossp-uuid/shtool.patch @@ -0,0 +1,11 @@ +--- a/shtool 2008-07-05 05:43:08.000000000 +0800 ++++ b/shtool 2018-07-25 15:45:40.559587471 +0800 +@@ -1400,7 +1400,7 @@ + if [ ".$opt_t" = .yes ]; then + echo "strip $dsttmp" 1>&2 + fi +- strip $dsttmp || shtool_exit $? ++ $STRIP $dsttmp || shtool_exit $? + fi + if [ ".$opt_o" != . ]; then + if [ ".$opt_t" = .yes ]; then diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a727b60dd9d..e558e7ee5ae 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, symlinkJoin }: let @@ -14,8 +14,15 @@ let outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ + combinedLibXML2 = symlinkJoin { + name = "libxml2-combined"; + paths = [ libxml2 libxml2.dev ]; + }; + + nativeBuildInputs = [ combinedLibXML2 ]; + buildInputs = - [ zlib readline openssl libxml2 makeWrapper ] + [ zlib readline openssl makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; @@ -28,8 +35,9 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" ] - ++ lib.optional (stdenv.isDarwin) "--with-uuid=e2fs" - ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; + ++ lib.optional stdenv.isDarwin "--with-uuid=e2fs" + ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid" + ++ lib.optional stdenv.isCross "--with-system-tzdata=${tzdata}"; patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) From 707ef5bdbe6a9c303a31b4d8d1cb9067bbf40556 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Wed, 25 Jul 2018 18:07:33 +0800 Subject: [PATCH 007/229] remove redundent dependency on libossp-uuid --- pkgs/development/libraries/libossp-uuid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 4cd68f2f1b5..fc727f39238 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, buildPackages}: +{stdenv, fetchurl}: let version = "1.6.2"; in From 29af6a608038bc126bd47ed21b48b95c3811fdd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 21 Jul 2018 21:10:01 +0000 Subject: [PATCH 008/229] nixos-generate-config: detect extlinux bootloader --- nixos/modules/installer/tools/nixos-generate-config.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 16556691240..b543ca1509c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -536,6 +536,13 @@ if ($showHardwareConfig) { # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; +EOF + } elsif (-e "/boot/extlinux") { + $bootLoaderConfig = < Date: Fri, 27 Jul 2018 14:12:25 +0800 Subject: [PATCH 009/229] point to the right libxml2 header folder --- pkgs/servers/sql/postgresql/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e558e7ee5ae..81eb2f29ef9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -14,21 +14,17 @@ let outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ - combinedLibXML2 = symlinkJoin { - name = "libxml2-combined"; - paths = [ libxml2 libxml2.dev ]; - }; - - nativeBuildInputs = [ combinedLibXML2 ]; - buildInputs = - [ zlib readline openssl makeWrapper ] + [ zlib readline openssl makeWrapper libxml2 ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; makeFlags = [ "world" ]; + preConfigure = '' + export CFLAGS="$CFLAGS -I${libxml2.dev}/include/libxml2" + ''; configureFlags = [ "--with-openssl" "--with-libxml" From a998a49ee4f2f0461a93e9c9524654b845a8139e Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Fri, 27 Jul 2018 14:19:05 +0800 Subject: [PATCH 010/229] reduce diffs due to reordering --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 81eb2f29ef9..69d01bb718e 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, symlinkJoin }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata }: let @@ -15,7 +15,7 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl makeWrapper libxml2 ] + [ zlib readline openssl libxml2 makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; From f154854f52c5ba3ecbb68e00dd12abc6b40e03c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Fri, 27 Jul 2018 18:03:29 +0300 Subject: [PATCH 011/229] nodejs: 10.6.0 -> 10.7.0 --- pkgs/development/web/nodejs/v10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 979b64ae23b..d3746f123d3 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "10.6.0"; - sha256 = "13vyzh53j2c4mv3q3yb0hkdpl1mag5705k7kmb8nmcvdhcm78q0r"; + version = "10.7.0"; + sha256 = "0qp93ddbnvadimj11wnznwhkq8vq1f7q259iq8siy5b7r936kvil"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; } From 894705161c2f100e98ef5661dae51cf60da9c0c4 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Sun, 29 Jul 2018 21:21:46 +0800 Subject: [PATCH 012/229] use NIX_CFLAGS_COMPILE --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 69d01bb718e..bbb5a5a1774 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -23,7 +23,7 @@ let makeFlags = [ "world" ]; preConfigure = '' - export CFLAGS="$CFLAGS -I${libxml2.dev}/include/libxml2" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2" ''; configureFlags = [ "--with-openssl" From e8682cafd6106ff33a589fc644fa5294a86b14c0 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Mon, 30 Jul 2018 11:54:57 +0800 Subject: [PATCH 013/229] always build against tzdata --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index bbb5a5a1774..a81e2fb2c8f 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -30,10 +30,10 @@ let "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" + "--with-system-tzdata=${tzdata}" ] ++ lib.optional stdenv.isDarwin "--with-uuid=e2fs" - ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid" - ++ lib.optional stdenv.isCross "--with-system-tzdata=${tzdata}"; + ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) From c0ca3e36d61f53c80ae5683ecc139689720cb3ac Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Mon, 30 Jul 2018 15:47:10 +0800 Subject: [PATCH 014/229] be explicit on choice of uuid library --- pkgs/servers/sql/postgresql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a81e2fb2c8f..fafb5bfeb92 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -31,9 +31,9 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}" - ] - ++ lib.optional stdenv.isDarwin "--with-uuid=e2fs" - ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid"; + ] ++ ( + if stdenv.isDarwin then [ "--with-uuid=e2fs" ] else [ "--with-ossp-uuid" ] + ); patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) From 003055a670470f678e376be7f9b9051fb242ec0f Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Tue, 31 Jul 2018 11:23:17 +0800 Subject: [PATCH 015/229] pass NIX_CFLAGS_COMPILE through mkDerivation instead --- pkgs/servers/sql/postgresql/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index fafb5bfeb92..f4aabb971a6 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -22,9 +22,8 @@ let makeFlags = [ "world" ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2" - ''; + NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + configureFlags = [ "--with-openssl" "--with-libxml" From a8c6489fd47027efe21932650e0a69cb4b46a887 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 May 2018 02:31:18 +0200 Subject: [PATCH 016/229] nixos/services.xserver.displayManager: move X sessions to a subdirectory Previously, the mkDesktops function produced a flat package containing session files in the top level. As a preparation for introduction of Wayland sessions, the files will now be placed to $out/share/xsessions. --- nixos/modules/services/x11/display-managers/default.nix | 4 ++-- nixos/modules/services/x11/display-managers/gdm.nix | 2 +- nixos/modules/services/x11/display-managers/lightdm.nix | 2 +- nixos/modules/services/x11/display-managers/sddm.nix | 2 +- nixos/modules/services/x11/display-managers/slim.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 43ed21c95fe..7685d8fa4ce 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -186,9 +186,9 @@ let allowSubstitutes = false; } '' - mkdir -p "$out" + mkdir -p "$out/share/xsessions" ${concatMapStrings (n: '' - cat - > "$out/${n}.desktop" << EODESKTOP + cat - > "$out/share/xsessions/${n}.desktop" << EODESKTOP [Desktop Entry] Version=1.0 Type=XSession diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 8b08c01ea0d..a20a5fa0749 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -109,7 +109,7 @@ in environment = { GDM_X_SERVER_EXTRA_ARGS = toString (filter (arg: arg != "-terminate") cfg.xserverArgs); - GDM_SESSIONS_DIR = "${cfg.session.desktops}"; + GDM_SESSIONS_DIR = "${cfg.session.desktops}/share/xsessions"; # Find the mouse XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons"; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 54d4520a0c8..387e528095e 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -45,7 +45,7 @@ let greeter-user = ${config.users.users.lightdm.name} greeters-directory = ${cfg.greeter.package} ''} - sessions-directory = ${dmcfg.session.desktops} + sessions-directory = ${dmcfg.session.desktops}/share/xsessions [Seat:*] xserver-command = ${xserverWrapper} diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 426b899586f..c6a150e3170 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -50,7 +50,7 @@ let ServerPath=${xserverWrapper} XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr SessionCommand=${dmcfg.session.script} - SessionDir=${dmcfg.session.desktops} + SessionDir=${dmcfg.session.desktops}/share/xsessions XauthPath=${pkgs.xorg.xauth}/bin/xauth DisplayCommand=${Xsetup} DisplayStopCommand=${Xstop} diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index f645a5c2f07..395b5165fe4 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -13,7 +13,7 @@ let xauth_path ${dmcfg.xauthBin} default_xserver ${dmcfg.xserverBin} xserver_arguments ${toString dmcfg.xserverArgs} - sessiondir ${dmcfg.session.desktops} + sessiondir ${dmcfg.session.desktops}/share/xsessions login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.script} "%session" halt_cmd ${config.systemd.package}/sbin/shutdown -h now reboot_cmd ${config.systemd.package}/sbin/shutdown -r now From 83fc9a98258036b7554efaa3177f85a8797dd403 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Jul 2018 01:11:26 +0200 Subject: [PATCH 017/229] nixos/display-manager.default: add extraSessionFilePackages option --- .../services/x11/display-managers/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 7685d8fa4ce..ef8dda52609 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -199,6 +199,10 @@ let Comment= EODESKTOP '') names} + + ${concatMapStrings (pkg: '' + ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions + '') cfg.displayManager.extraSessionFilePackages} ''; in @@ -245,6 +249,14 @@ in ''; }; + extraSessionFilePackages = mkOption { + type = types.listOf types.package; + default = []; + description = '' + A list of packages containing xsession files to be passed to the display manager. + ''; + }; + session = mkOption { default = []; example = literalExample From cc6d77c83fb3a382250fe11204eec0167bef092b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Jul 2018 01:34:53 +0200 Subject: [PATCH 018/229] gnome3.gdm: add upstream xsession --- nixos/modules/services/x11/display-managers/gdm.nix | 2 ++ pkgs/desktops/gnome-3/core/gdm/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index a20a5fa0749..cda818c4abe 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -173,6 +173,8 @@ in ${optionalString cfg.gdm.debug "Enable=true"} ''; + environment.etc."gdm/Xsession".source = "${pkgs.gnome3.gdm}/etc/gdm/Xsession"; + # GDM LFS PAM modules, adapted somehow to NixOS security.pam.services = { gdm-launch-environment.text = '' diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 5ceba1a7719..24eff547fe9 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-plymouth=yes" + "--enable-gdm-xsession" "--with-initial-vt=7" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; From 0e1c01451fdc8f076ae99bb36c12e5107abf7c4e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 22 Jul 2018 23:32:12 +0200 Subject: [PATCH 019/229] nixos/gnome3: rely on xdg autostart for xdg-user-dirs --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 9fb8f44b242..08a7af59116 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -161,9 +161,6 @@ in { # Find the mouse export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons - # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ - ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update - ${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} & waitPID=$! ''; @@ -175,7 +172,9 @@ in { "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath - ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages); + ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ + pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + ]; # Use the correct gnome3 packageSet networking.networkmanager.basePackages = From f63d94eba340c05cd241c478deb518204514fce8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Jul 2018 04:11:03 +0200 Subject: [PATCH 020/229] gnome3.gpaste: hard-code paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GPaste GNOME Shell extension uses GPaste library generated via introspection. Previously, we added the gpaste package to services.xserver.desktopManager.gnome3.sessionPath option, which added its typelib directory to GI_TYPELIB_PATH environment variable globally, in order for GNOME Shell to be able to find it. This is not very Nix-y, though, so we have decided to patch the code to append the path to the GI repository search path. Additionally, the code relies on GPaste’s GSettings schemas, so we had to hard-code the paths to them as well. We ignored the GNOME Shell’s schemas, since they will already be available for the extension inside GNOME Shell program. --- .../services/desktops/gnome3/gpaste.nix | 1 - pkgs/desktops/gnome-3/misc/gpaste/default.nix | 16 ++++++ .../gnome-3/misc/gpaste/fix-paths.patch | 55 +++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch diff --git a/nixos/modules/services/desktops/gnome3/gpaste.nix b/nixos/modules/services/desktops/gnome3/gpaste.nix index 5a8258775e0..512aac35a17 100644 --- a/nixos/modules/services/desktops/gnome3/gpaste.nix +++ b/nixos/modules/services/desktops/gnome3/gpaste.nix @@ -21,7 +21,6 @@ with lib; config = mkIf config.services.gnome3.gpaste.enable { environment.systemPackages = [ pkgs.gnome3.gpaste ]; services.dbus.packages = [ pkgs.gnome3.gpaste ]; - services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ]; systemd.packages = [ pkgs.gnome3.gpaste ]; }; } diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index a0182057873..add6addaec0 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -10,6 +10,22 @@ stdenv.mkDerivation rec { sha256 = "1zfx73qpw976hyzp5k569lywsq2b6dbnnzf2cvhjvn3mvkw8pin2"; }; + patches = [ + ./fix-paths.patch + ]; + + # TODO: switch to substituteAll with placeholder + # https://github.com/NixOS/nix/issues/1846 + # https://github.com/NixOS/nixpkgs/pull/37693 + postPatch = '' + substituteInPlace src/gnome-shell/extension.js \ + --subst-var-by typelibPath "$out/lib/girepository-1.0" + substituteInPlace src/gnome-shell/prefs.js \ + --subst-var-by typelibPath "$out/lib/girepository-1.0" + substituteInPlace src/libgpaste/settings/gpaste-settings.c \ + --subst-var-by gschemasCompiled "$out/share/gsettings-schemas/${name}/glib-2.0/schemas" + ''; + nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; buildInputs = [ glib gjs mutter gnome3.adwaita-icon-theme gtk3 gnome3.gnome-control-center dbus diff --git a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch b/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch new file mode 100644 index 00000000000..ca6b9a5b22e --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch @@ -0,0 +1,55 @@ +--- a/src/gnome-shell/extension.js ++++ b/src/gnome-shell/extension.js +@@ -7,6 +7,8 @@ + + const Config = imports.misc.config; + ++imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); ++ + imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; + imports.gi.versions.GLib = '2.0'; + imports.gi.versions.GPaste = '1.0'; +--- a/src/gnome-shell/prefs.js ++++ b/src/gnome-shell/prefs.js +@@ -7,6 +7,8 @@ + + const Gettext = imports.gettext; + ++imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); ++ + const GPaste = imports.gi.GPaste; + + const ExtensionUtils = imports.misc.extensionUtils; +--- a/src/libgpaste/settings/gpaste-settings.c ++++ b/src/libgpaste/settings/gpaste-settings.c +@@ -22,6 +22,8 @@ + + typedef struct + { ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; + GSettings *settings; + GSettings *shell_settings; + +@@ -919,6 +921,8 @@ + { + g_signal_handler_disconnect (settings, priv->c_signals[C_CHANGED]); + g_clear_object (&priv->settings); ++ g_settings_schema_unref (priv->schema); ++ g_settings_schema_source_unref (priv->schema_source); + } + + if (shell_settings) +@@ -1000,7 +1004,11 @@ + g_paste_settings_init (GPasteSettings *self) + { + GPasteSettingsPrivate *priv = g_paste_settings_get_instance_private (self); +- GSettings *settings = priv->settings = g_settings_new (G_PASTE_SETTINGS_NAME); ++ ++ // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library ++ GSettingsSchemaSource *schema_source = priv->schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL); ++ priv->schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE); ++ GSettings *settings = priv->settings = g_settings_new_full (priv->schema, NULL, NULL); + + priv->history_name = NULL; + priv->launch_ui = NULL; From eb65e5ce56ab2f55ae5ee74d2fd883672a35ab42 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Jul 2018 04:53:54 +0200 Subject: [PATCH 021/229] nixos/gnome3: remove session path Global environment variables are not very Nix-y. --- .../services/x11/desktop-managers/gnome3.nix | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 08a7af59116..61a0c9e95d7 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -54,14 +54,6 @@ in { description = "Enable Gnome 3 desktop manager."; }; - sessionPath = mkOption { - default = []; - example = literalExample "[ pkgs.gnome3.gpaste ]"; - description = "Additional list of packages to be added to the session search path. - Useful for gnome shell extensions or gsettings-conditionated autostart."; - apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; - }; - extraGSettingsOverrides = mkOption { default = ""; type = types.lines; @@ -138,17 +130,6 @@ in { export XDG_MENU_PREFIX=gnome- - ${concatMapStrings (p: '' - if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} - fi - - if [ -d "${p}/lib/girepository-1.0" ]; then - export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib - fi - '') cfg.sessionPath} - # Override default mimeapps export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share @@ -171,7 +152,7 @@ in { environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; - environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath + environment.systemPackages = pkgs.gnome3.corePackages ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ]; From e6056c72d16d1326c5b9a8ab6c022d445054c1e9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Jul 2018 01:11:56 +0200 Subject: [PATCH 022/229] nixos/gnome3: use upstream session file Pass gnome-session to extraSessionFilePackages, remove unnecessary environment variables, move the rest out of old session option, and then drop the option. --- .../services/x11/desktop-managers/gnome3.nix | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 61a0c9e95d7..b1c7e5a7aac 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -118,36 +118,17 @@ in { fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; - services.xserver.desktopManager.session = singleton - { name = "gnome3"; - bgSupport = true; - start = '' - # Set GTK_DATA_PREFIX so that GTK+ can find the themes - export GTK_DATA_PREFIX=${config.system.path} + services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]; - # find theme engines - export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0 + # Override default mimeapps + environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; - export XDG_MENU_PREFIX=gnome- + # Override GSettings schemas + environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - # Override default mimeapps - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share - - # Override gsettings-desktop-schema - export NIX_GSETTINGS_OVERRIDES_DIR=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - - # Let nautilus find extensions - export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ - - # Find the mouse - export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons - - ${pkgs.gnome3.gnome-session}/bin/gnome-session ${optionalString cfg.debug "--debug"} & - waitPID=$! - ''; - }; - - services.xserver.updateDbusEnvironment = true; + # Let nautilus find extensions + # TODO: Create nautilus-with-extensions package + environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" From adbe4e1c68e6e8c8a37326cb41f8a03c1c7697e1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 Jul 2018 18:52:28 +0200 Subject: [PATCH 023/229] gnome3.gnome-session: use absolute paths TryExec needs absolute path too, otherwise the desktop file will be ignored unless gnome-session is in PATH, in which case, we would not need to patch Exec. --- .../gnome-3/core/gnome-session/default.nix | 15 +++++++++---- .../core/gnome-session/fix-paths.patch | 22 +++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 7b407aad506..1882f19bb22 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas +{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy }: @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq"; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + # FIXME: glib binaries shouldn't be in .dev! + gsettings = "${glib.dev}/bin/gsettings"; + dbusLaunch = "${dbus.lib}/bin/dbus-launch"; + }) + ]; + mesonFlags = [ "-Dsystemd=true" ]; nativeBuildInputs = [ @@ -29,15 +38,13 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - # FIXME: glib binaries shouldn't be in .dev! preFixup = '' for desktopFile in $(grep -rl "Exec=gnome-session" $out/share) do echo "Patching gnome-session path in: $desktopFile" - sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile + sed -i "s,Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile done wrapProgram "$out/bin/gnome-session" \ - --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\ diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch new file mode 100644 index 00000000000..3c56fd730e4 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch @@ -0,0 +1,22 @@ +--- a/gnome-session/gnome-session.in ++++ b/gnome-session/gnome-session.in +@@ -13,7 +13,7 @@ + fi + fi + +-SETTING=$(gsettings get org.gnome.system.locale region) ++SETTING=$(@gsettings@ get org.gnome.system.locale region) + REGION=${SETTING#\'} + REGION=${REGION%\'} + +--- a/gnome-session/main.c ++++ b/gnome-session/main.c +@@ -203,7 +203,7 @@ + } + new_argv[i + 2] = NULL; + +- if (!execvp ("dbus-launch", new_argv)) { ++ if (!execvp ("@dbusLaunch@", new_argv)) { + g_set_error (error, + G_SPAWN_ERROR, + G_SPAWN_ERROR_FAILED, From 9fad9fb8698fd13f52004b73788ba462906b6c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 24 Jul 2018 16:52:49 +0200 Subject: [PATCH 024/229] nixos/displayManager: Create a common environment wrapper for all dms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it easier to support a wider variety of .desktop session files. In particular this makes it possible to use both the «legacy» sessions and upstream session files. We separate `xsession` into two parts, `xsessionWrapper` and `xsession`. `xsessionWrapper` sets up the correct environment and then lauches the session's Exec command (from the .desktop file), falling back to launching the default window/desktopManager through the `xsession` script (required by at least some nixos tests). `xsession` then _only_ handles launching desktop-managers/window-managers defined through `services.xserver.desktopManager.session`. --- .../services/x11/display-managers/default.nix | 71 +++++++++---------- .../services/x11/display-managers/gdm.nix | 2 +- .../services/x11/display-managers/lightdm.nix | 2 +- .../services/x11/display-managers/sddm.nix | 2 +- .../services/x11/display-managers/slim.nix | 2 +- 5 files changed, 36 insertions(+), 43 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index ef8dda52609..72a567cc7ca 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -27,55 +27,26 @@ let Xft.hintstyle: hintslight ''; - # file provided by services.xserver.displayManager.session.script - xsession = wm: dm: pkgs.writeScript "xsession" + # file provided by services.xserver.displayManager.session.wrapper + xsessionWrapper = pkgs.writeScript "xsession-wrapper" '' #! ${pkgs.bash}/bin/bash - # Expected parameters: - # $1 = + - - # Actual parameters (FIXME): - # SDDM is calling this script like the following: - # $1 = /nix/store/xxx-xsession (= $0) - # $2 = + - # SLiM is using the following parameter: - # $1 = /nix/store/xxx-xsession + - # LightDM keeps the double quotes: - # $1 = /nix/store/xxx-xsession "+" - # The fake/auto display manager doesn't use any parameters and GDM is - # broken. - # If you want to "debug" this script don't print the parameters to stdout - # or stderr because this script will be executed multiple times and the - # output won't be visible in the log when the script is executed for the - # first time (e.g. append them to a file instead)! - - # All of the above cases are handled by the following hack (FIXME). - # Since this line is *very important* for *all display managers* it is - # very important to test changes to the following line with all display - # managers: - if [ "''${1:0:1}" = "/" ]; then eval exec "$1" "$2" ; fi - - # Now it should be safe to assume that the script was called with the - # expected parameters. + # Shared environment setup for graphical sessions. . /etc/profile cd "$HOME" - # The first argument of this script is the session type. - sessionType="$1" - if [ "$sessionType" = default ]; then sessionType=""; fi - ${optionalString cfg.startDbusSession '' if test -z "$DBUS_SESSION_BUS_ADDRESS"; then - exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$sessionType" + exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$@" fi ''} ${optionalString cfg.displayManager.job.logToJournal '' if [ -z "$_DID_SYSTEMD_CAT" ]; then export _DID_SYSTEMD_CAT=1 - exec ${config.systemd.package}/bin/systemd-cat -t xsession "$0" "$sessionType" + exec ${config.systemd.package}/bin/systemd-cat -t xsession "$0" "$@" fi ''} @@ -101,6 +72,7 @@ let ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS # Load X defaults. + # FIXME: Check XDG_SESSION_TYPE against x11 ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} if test -e ~/.Xresources; then ${xorg.xrdb}/bin/xrdb -merge ~/.Xresources @@ -132,12 +104,33 @@ let # Allow the user to setup a custom session type. if test -x ~/.xsession; then exec ~/.xsession - else - if test "$sessionType" = "custom"; then - sessionType="" # fall-thru if there is no ~/.xsession - fi fi + if test "$1"; then + # Run the supplied session command. Remove any double quotes with eval. + eval exec "$@" + else + # Fall back to the default window/desktopManager + exec ${cfg.displayManager.session.script} + fi + ''; + + # file provided by services.xserver.displayManager.session.script + xsession = wm: dm: pkgs.writeScript "xsession" + '' + #! ${pkgs.bash}/bin/bash + + # Legacy session script used to construct .desktop files from + # `services.xserver.displayManager.session` entries. Called from + # `sessionWrapper`. + + # Expected parameters: + # $1 = + + + # The first argument of this script is the session type. + sessionType="$1" + if [ "$sessionType" = default ]; then sessionType=""; fi + # The session type is "+", so # extract those (see: # http://wiki.bash-hackers.org/syntax/pe#substring_removal). @@ -194,7 +187,6 @@ let Type=XSession TryExec=${cfg.displayManager.session.script} Exec=${cfg.displayManager.session.script} "${n}" - X-GDM-BypassXsession=true Name=${n} Comment= EODESKTOP @@ -292,6 +284,7 @@ in (filter (w: d.name != "none" || w.name != "none") wm)); desktops = mkDesktops names; script = xsession wm dm; + wrapper = xsessionWrapper; }; }; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index cda818c4abe..78dc39f7f62 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -173,7 +173,7 @@ in ${optionalString cfg.gdm.debug "Enable=true"} ''; - environment.etc."gdm/Xsession".source = "${pkgs.gnome3.gdm}/etc/gdm/Xsession"; + environment.etc."gdm/Xsession".source = config.services.xserver.displayManager.session.wrapper; # GDM LFS PAM modules, adapted somehow to NixOS security.pam.services = { diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 387e528095e..9b5f51fb4cf 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -49,7 +49,7 @@ let [Seat:*] xserver-command = ${xserverWrapper} - session-wrapper = ${dmcfg.session.script} + session-wrapper = ${dmcfg.session.wrapper} ${optionalString cfg.greeter.enable '' greeter-session = ${cfg.greeter.name} ''} diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index c6a150e3170..1b347803932 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -49,7 +49,7 @@ let MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)} ServerPath=${xserverWrapper} XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr - SessionCommand=${dmcfg.session.script} + SessionCommand=${dmcfg.session.wrapper} SessionDir=${dmcfg.session.desktops}/share/xsessions XauthPath=${pkgs.xorg.xauth}/bin/xauth DisplayCommand=${Xsetup} diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 395b5165fe4..51ce5f4e243 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -14,7 +14,7 @@ let default_xserver ${dmcfg.xserverBin} xserver_arguments ${toString dmcfg.xserverArgs} sessiondir ${dmcfg.session.desktops}/share/xsessions - login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.script} "%session" + login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.wrapper} "%session" halt_cmd ${config.systemd.package}/sbin/shutdown -h now reboot_cmd ${config.systemd.package}/sbin/shutdown -r now logfile /dev/stderr From efa27d33cf321dda8917445c207c88a994c4f272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 28 Jul 2018 15:58:07 +0200 Subject: [PATCH 025/229] nixos/desktopManager: Only trace if the default session isn't found The default session might be found in `extraSessionFilePackages`, but it's not viable to detect at evaluation time, so emit a warning. In LightDM instead of checking `defaultSessionName` against `displayManager.session.names` we rely on the assertions in `desktopManager` and `windowMananger` and just check that there's at least one default set. The second assertion could never actually be triggered. --- .../services/x11/desktop-managers/default.nix | 12 ++++++------ .../services/x11/display-managers/lightdm.nix | 10 +--------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index f435e85f6b8..cce35aa28ba 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -96,13 +96,13 @@ in else if any (w: w.name == defaultDM) cfg.session.list then defaultDM else - throw '' - Default desktop manager (${defaultDM}) not found. - Probably you want to change - services.xserver.desktopManager.default = "${defaultDM}"; - to one of + builtins.trace '' + Default desktop manager (${defaultDM}) not found at evaluation time. + These are the known valid session names: ${concatMapStringsSep "\n " (w: "services.xserver.desktopManager.default = \"${w.name}\";") cfg.session.list} - ''; + It's also possible the default can be found in one of these packages: + ${concatMapStringsSep "\n " (p: p.name) config.services.xserver.displayManager.extraSessionFilePackages} + '' defaultDM; }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 9b5f51fb4cf..6be15d8cdf4 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -176,21 +176,13 @@ in LightDM auto-login requires services.xserver.displayManager.lightdm.autoLogin.user to be set ''; } - { assertion = cfg.autoLogin.enable -> elem defaultSessionName dmcfg.session.names; + { assertion = cfg.autoLogin.enable -> dmDefault != "none" || wmDefault != "none"; message = '' LightDM auto-login requires that services.xserver.desktopManager.default and services.xserver.windowMananger.default are set to valid values. The current default session: ${defaultSessionName} is not valid. ''; } - { assertion = hasDefaultUserSession -> elem defaultSessionName dmcfg.session.names; - message = '' - services.xserver.desktopManager.default and - services.xserver.windowMananger.default are not set to valid - values. The current default session: ${defaultSessionName} - is not valid. - ''; - } { assertion = !cfg.greeter.enable -> (cfg.autoLogin.enable && cfg.autoLogin.timeout == 0); message = '' LightDM can only run without greeter if automatic login is enabled and the timeout for it From e8e0edd95ce05d2317c18f9054e7b9ba4b76ec6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 28 Jul 2018 18:23:35 +0200 Subject: [PATCH 026/229] nixos/tests/gnome3: Explicitly set default desktopManager Sessions from `extraSessionFilePackages` isn't picked automatically as the default session. --- nixos/tests/gnome3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 3f51d04163a..af2404bf530 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -15,6 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.displayManager.lightdm.autoLogin.enable = true; services.xserver.displayManager.lightdm.autoLogin.user = "alice"; services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.default = "gnome"; virtualisation.memorySize = 1024; }; From ee34f2537a9e969ca0f4066db6a859ff210bebdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 31 Jul 2018 11:01:38 +0200 Subject: [PATCH 027/229] nixos/gnome3: Add back `sessionPath` Implement through `services.xserver.displayManager.sessionCommands`. --- .../services/desktops/gnome3/gpaste.nix | 1 + .../services/x11/desktop-managers/gnome3.nix | 26 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/desktops/gnome3/gpaste.nix b/nixos/modules/services/desktops/gnome3/gpaste.nix index 512aac35a17..5a8258775e0 100644 --- a/nixos/modules/services/desktops/gnome3/gpaste.nix +++ b/nixos/modules/services/desktops/gnome3/gpaste.nix @@ -21,6 +21,7 @@ with lib; config = mkIf config.services.gnome3.gpaste.enable { environment.systemPackages = [ pkgs.gnome3.gpaste ]; services.dbus.packages = [ pkgs.gnome3.gpaste ]; + services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ]; systemd.packages = [ pkgs.gnome3.gpaste ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index b1c7e5a7aac..f27d8886187 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -54,6 +54,14 @@ in { description = "Enable Gnome 3 desktop manager."; }; + sessionPath = mkOption { + default = []; + example = literalExample "[ pkgs.gnome3.gpaste ]"; + description = "Additional list of packages to be added to the session search path. + Useful for gnome shell extensions or gsettings-conditionated autostart."; + apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; + }; + extraGSettingsOverrides = mkOption { default = ""; type = types.lines; @@ -120,6 +128,22 @@ in { services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]; + services.xserver.displayManager.sessionCommands = '' + if test "$XDG_CURRENT_DESKTOP" = "GNOME"; then + ${concatMapStrings (p: '' + if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} + fi + + if [ -d "${p}/lib/girepository-1.0" ]; then + export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib + fi + '') cfg.sessionPath} + fi + ''; + + # Override default mimeapps environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; @@ -133,7 +157,7 @@ in { environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; - environment.systemPackages = pkgs.gnome3.corePackages + environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ]; From 9cd6342008a643005d705c7a79740c61635d4966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 31 Jul 2018 14:55:57 +0200 Subject: [PATCH 028/229] nixos/gnome3: Add back `debug` --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index f27d8886187..a8052649ae0 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -143,6 +143,7 @@ in { fi ''; + environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; # Override default mimeapps environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; From 62e665e1ec92252817bd99639f83daaeab4d3f9a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 1 Aug 2018 19:02:50 +0200 Subject: [PATCH 029/229] nixos/gnome3: warn against `sessionPath` --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index a8052649ae0..ee9b11928ae 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -57,8 +57,12 @@ in { sessionPath = mkOption { default = []; example = literalExample "[ pkgs.gnome3.gpaste ]"; - description = "Additional list of packages to be added to the session search path. - Useful for gnome shell extensions or gsettings-conditionated autostart."; + description = '' + Additional list of packages to be added to the session search path. + Useful for GNOME Shell extensions or GSettings-conditional autostart. + + Note that this should be a last resort; patching the package is preferred (see GPaste). + ''; apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; }; From 6f62bf31c197e1c736d31cd4b23f94c2caf7affb Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 26 Jul 2018 10:07:27 -0400 Subject: [PATCH 030/229] opencollada: include pcre.h (KhronosGroup/OpenCOLLADA#570) --- pkgs/development/libraries/opencollada/default.nix | 4 +++- pkgs/development/libraries/opencollada/pcre.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/opencollada/pcre.patch diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index a0a39980d45..0c852a09a05 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patchPhase = lib.optionalString stdenv.isDarwin '' + patchPhase = '' + patch -p1 < ${./pcre.patch} + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ --replace math.h cmath ''; diff --git a/pkgs/development/libraries/opencollada/pcre.patch b/pkgs/development/libraries/opencollada/pcre.patch new file mode 100644 index 00000000000..39408f5a61e --- /dev/null +++ b/pkgs/development/libraries/opencollada/pcre.patch @@ -0,0 +1,14 @@ +diff --git a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h +index 22f2598b..269c50ca 100644 +--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h ++++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h +@@ -13,8 +13,7 @@ + + #include "COLLADABUPrerequisites.h" + +-struct real_pcre; +-typedef struct real_pcre pcre; ++#include "pcre.h" + + + namespace COLLADABU From c431713f999f28c4a97f78a6655394fd24c3f532 Mon Sep 17 00:00:00 2001 From: Carlos D Date: Thu, 2 Aug 2018 18:36:57 +1000 Subject: [PATCH 031/229] tinyproxy: init at 1.8.4 --- pkgs/tools/networking/tinyproxy/default.nix | 53 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/tools/networking/tinyproxy/default.nix diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix new file mode 100644 index 00000000000..b4a2db8a970 --- /dev/null +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, automake, autoreconfHook, asciidoc, libxml2, libxslt }: + +stdenv.mkDerivation rec{ + name = "tinyproxy-${version}"; + version = "1.8.4"; + + src = fetchFromGitHub { + sha256 = "043mfqin5bsba9igm1lqbkp2spibk4j3niyjqc868cnzgx60709c"; + rev = "${version}"; + repo = "tinyproxy"; + owner = "tinyproxy"; + }; + + nativeBuildInputs = [ autoreconfHook asciidoc libxml2 libxslt ]; + + # -z flag is not supported in darwin + preAutoreconf = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure.ac --replace \ + 'LDFLAGS="-Wl,-z,defs $LDFLAGS"' \ + 'LDFLAGS="-Wl, $LDFLAGS"' + ''; + + # See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=154624 + postConfigure = '' + substituteInPlace docs/man5/Makefile --replace \ + "-f manpage" \ + "-f manpage \\ + -L" + substituteInPlace docs/man8/Makefile --replace \ + "-f manpage" \ + "-f manpage \\ + -L" + ''; + + configureFlags = [ + "--disable-debug" # Turn off debugging + "--enable-xtinyproxy" # Compile in support for the XTinyproxy header, which is sent to any web server in your domain. + "--enable-filter" # Allows Tinyproxy to filter out certain domains and URLs. + "--enable-upstream" # Enable support for proxying connections through another proxy server. + "--enable-transparent" # Allow Tinyproxy to be used as a transparent proxy daemon. + "--enable-reverse" # Enable reverse proxying. + ] ++ + # See: https://github.com/tinyproxy/tinyproxy/issues/1 + stdenv.lib.optional stdenv.isDarwin "--disable-regexcheck"; + + meta = with stdenv.lib; { + homepage = https://tinyproxy.github.io/; + description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.carlosdagos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ae3f49c443..10c87c5b95f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5448,6 +5448,8 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; + tio = callPackage ../tools/misc/tio { }; tldr = callPackage ../tools/misc/tldr { }; From 66939ec363b83bd25ead3cad4a100c4cfe513942 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 21 Mar 2018 20:16:45 +0000 Subject: [PATCH 032/229] xfce4-13: backport panel plugins from xfce4-12 --- pkgs/desktops/xfce/art/xfce4-icon-theme.nix | 4 ++-- .../xfce/panel-plugins/xfce4-embed-plugin.nix | 4 ++-- pkgs/desktops/xfce4-13/default.nix | 20 +++++++++++++++++++ pkgs/desktops/xfce4-13/xfburn/default.nix | 4 ++-- .../desktops/xfce4-13/xfce4-mixer/default.nix | 7 +------ 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index 3c7c425e379..a0f2ed00d0e 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: stdenv.mkDerivation rec { p_name = "xfce4-icon-theme"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk ]; + buildInputs = [ intltool gtk2 ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index 0d99c2053df..e6d1f6da26b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2 }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ]; + buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix index 13c1cb3ca69..4809cec839a 100644 --- a/pkgs/desktops/xfce4-13/default.nix +++ b/pkgs/desktops/xfce4-13/default.nix @@ -92,4 +92,24 @@ makeScope newScope (self: with self; { xfce4-xkb-plugin = callPackage ./xfce4-xkb-plugin { }; xfwm4 = callPackage ./xfwm4 { }; + + ## COMMON PARTS WITH XFCE 4.12 + + gtk-xfce-engine = callPackage ../xfce/core/gtk-xfce-engine.nix { withGtk3 = false; }; + + xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { }; + + xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { }; + + xfce4-embed-plugin = callPackage ../xfce/panel-plugins/xfce4-embed-plugin.nix { }; + + xfce4-hardware-monitor-plugin = callPackage ../xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix { }; + + ## THIRD PARTY PLIGINS + + xfce4-dockbarx-plugin = callPackage ../xfce/panel-plugins/xfce4-dockbarx-plugin.nix { }; + + xfce4-namebar-plugin = callPackage ../xfce/panel-plugins/xfce4-namebar-plugin.nix { }; + + xfce4-windowck-plugin = callPackage ../xfce/panel-plugins/xfce4-windowck-plugin.nix { }; }) diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-13/xfburn/default.nix index e5898687098..b8a61f6cf90 100644 --- a/pkgs/desktops/xfce4-13/xfburn/default.nix +++ b/pkgs/desktops/xfce4-13/xfburn/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }: +{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libisofs, libxfce4ui, libxslt }: mkXfceDerivation rec { category = "apps"; @@ -14,5 +14,5 @@ mkXfceDerivation rec { sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp"; nativeBuildInputs = [ libxslt ]; - buildInputs = [ exo gtk2 libburn libICE libisofs libSM libxfce4ui ]; + buildInputs = [ exo gtk2 libburn libisofs libxfce4ui ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix index 76cb22b5b5f..266b05199dd 100644 --- a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix @@ -1,5 +1,4 @@ -{ mkXfceDerivation, automakeAddFlags, dbus-glib, gst-plugins-base, gtk2 -, libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation rec { category = "apps"; @@ -17,11 +16,7 @@ mkXfceDerivation rec { buildInputs = [ dbus-glib - gst-plugins-base gtk2 - libICE - libSM - libunique libxfce4ui libxfce4util xfce4-panel From e6077f3afaec23de5388761e4ed7857603670894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 2 Aug 2018 13:17:59 +0200 Subject: [PATCH 033/229] graphql-cli: init at 2.16.5 --- pkgs/development/node-packages/node-env.nix | 4 +- .../node-packages/node-packages-v10.nix | 6 +- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 5575 +++++++++++------ .../node-packages/node-packages-v8.nix | 207 +- 5 files changed, 3924 insertions(+), 1869 deletions(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index eee72cb9613..720e0cc0850 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -56,7 +56,7 @@ let ) dependencies); # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }: + composePackage = { name, packageName, src, dependencies ? [], ... }@args: '' DIR=$(pwd) cd $TMPDIR @@ -176,7 +176,7 @@ let # dependencies in the package.json file to the versions that are actually # being used. - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }: + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: '' if [ -d "${packageName}" ] then diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index b06f05ddb3e..85008c96b14 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -213,10 +213,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.11.2"; + version = "2.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.11.2.tgz"; - sha1 = "fc7235c2ec82a6ede6caf47485a68a2c6fa2e1f5"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.12.2.tgz"; + sha1 = "1b575512ae27d767f4aaec14e94b18e0c70bcc7b"; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index c1c181a3d39..dd8d0818703 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -30,6 +30,7 @@ , "forever" , "git-run" , "git-standup" +, "graphql-cli" , "grunt-cli" , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } , "gulp" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 6d60ca9a783..0a3bccdffe7 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -4,6 +4,24 @@ let sources = { + "@babel/generator-7.0.0-beta.38" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.0.0-beta.38"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.38.tgz"; + sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; + }; + }; + "@babel/types-7.0.0-beta.38" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.0.0-beta.38"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.38.tgz"; + sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; + }; + }; "@cliqz-oss/firefox-client-0.3.1" = { name = "_at_cliqz-oss_slash_firefox-client"; packageName = "@cliqz-oss/firefox-client"; @@ -40,31 +58,418 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@ionic/cli-framework-0.1.3" = { + "@ionic/cli-framework-1.0.2" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "0.1.3"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.3.tgz"; - sha512 = "by5vosr5MXK5+yJMtRmBX9YjrcHTeelVLV5PsDv56zZR0aDMLP+1st5wvjKwAjlva660bIzx7yIax88hiV5KKA=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.2.tgz"; + sha512 = "YQ05O1H537yilPxReua/ge7u0nHmlp8kMBbDlUrnxU50HDdqKeUThMPnavqzbVHaEbWI4xJZcxR1cjjKVXqg+Q=="; }; }; - "@ionic/cli-utils-1.19.2" = { + "@ionic/cli-utils-2.0.3" = { name = "_at_ionic_slash_cli-utils"; packageName = "@ionic/cli-utils"; - version = "1.19.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.2.tgz"; - sha512 = "nTbF273k1tcr6CPL5ARZ10VbXMNwRuW5svg42JFBEfxdbbVyvIUep+m4ibqBoDCRAFoDi28b4GeFkC5wyyDqQA=="; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.0.3.tgz"; + sha512 = "E0YIkKusnQ0XuuGQ8aPBV3NN3e4suG+7U/gMlpoiGGVMAd1zb9rwbxsQU4/S0kfLOrdTbMzB7wTd/ko0l6hHyA=="; }; }; - "@ionic/discover-0.4.0" = { + "@ionic/discover-1.0.2" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "0.4.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.4.0.tgz"; - sha512 = "TYls2aGguED/lFLRYP09Q275yQuVJ4PnN1K1lxq3bG3gFP99Txn4UZRaVuYGeezH1A3y2rbdBHjRZBMiUnVvOg=="; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.2.tgz"; + sha512 = "U2oQPgsZlVuYXvlWO0uSuxs2g0YZ3gmYqkHwbThJaX6AO6UgASQrnLDQ0KXw+If7la2MYWVolFWq+fZFyMvT5Q=="; + }; + }; + "@kbrandwijk/swagger-to-graphql-2.4.3" = { + name = "_at_kbrandwijk_slash_swagger-to-graphql"; + packageName = "@kbrandwijk/swagger-to-graphql"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@kbrandwijk/swagger-to-graphql/-/swagger-to-graphql-2.4.3.tgz"; + sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; + }; + }; + "@lerna/add-3.0.0-rc.0" = { + name = "_at_lerna_slash_add"; + packageName = "@lerna/add"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/add/-/add-3.0.0-rc.0.tgz"; + sha512 = "PZ/dn4UlA/7sd848LHE2TLXIkOzLDk8Uw/Gz6OwXfxXpng/w6mXcyjaScniT3HzLbzw5fP150+im5mL6BQv9JQ=="; + }; + }; + "@lerna/batch-packages-3.0.0-rc.0" = { + name = "_at_lerna_slash_batch-packages"; + packageName = "@lerna/batch-packages"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/batch-packages/-/batch-packages-3.0.0-rc.0.tgz"; + sha512 = "2FZs545THLHSWZ96xKT5wWFOdIt1UIKnc+Z2IIXCgmhT//fcqEcHFSgq42VxgoELgE4rM7jE2s6wgMatiJwRGg=="; + }; + }; + "@lerna/bootstrap-3.0.0-rc.0" = { + name = "_at_lerna_slash_bootstrap"; + packageName = "@lerna/bootstrap"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.0.0-rc.0.tgz"; + sha512 = "69mXMWjXA8R6ldDmSntFIIZTNAgEu1lOUP7DilL4OY55z01ln5fOtG/c65PQBm4mjm5ejh1kJVWiDT8MbCRslQ=="; + }; + }; + "@lerna/changed-3.0.0-rc.0" = { + name = "_at_lerna_slash_changed"; + packageName = "@lerna/changed"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.0.0-rc.0.tgz"; + sha512 = "DY2Id3Y1jifIdZ8uNymUijUgkVRFg64IUHMTb1sm0g/Nd+n++kLo9oqxRTUfuBkW3e1HTUuMkd3ZygU5UBtz6g=="; + }; + }; + "@lerna/child-process-3.0.0-rc.0" = { + name = "_at_lerna_slash_child-process"; + packageName = "@lerna/child-process"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.0.0-rc.0.tgz"; + sha512 = "5LhCU8isfJFj+5V5cJ+wcRR+VkNIbb3rSjm4VVclnD05ZfaY1HmfhBu3VjYt0SulhZKWJEnNBvjG88wgTay1vQ=="; + }; + }; + "@lerna/clean-3.0.0-rc.0" = { + name = "_at_lerna_slash_clean"; + packageName = "@lerna/clean"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.0.0-rc.0.tgz"; + sha512 = "rVlvO+bhfU/Q9D6bfg5GaLprKMD5rTRjJEqLONpESx/5Ed+NKgbYRiWafpQrB85m2r3c5dSGEPEc2q2rNG3EPg=="; + }; + }; + "@lerna/cli-3.0.0-rc.0" = { + name = "_at_lerna_slash_cli"; + packageName = "@lerna/cli"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.0.0-rc.0.tgz"; + sha512 = "MUOrP8BiwjayPZAS3Nww1nlB6j02N4FmJK/f2PhJPMDsXMqm3mn5jBTBvlKbLQZJ/VDro8JbRGUUxCuCQEE+cQ=="; + }; + }; + "@lerna/collect-updates-3.0.0-rc.0" = { + name = "_at_lerna_slash_collect-updates"; + packageName = "@lerna/collect-updates"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.0.0-rc.0.tgz"; + sha512 = "G1BgTIWc6rSsuMLsgpT+xvrQrSN/a0kC+KqMZ9CbCoImtj0AKvrAm3TeFOsYU9JHBUYfe1HWMIIhUSD4VhXmeg=="; + }; + }; + "@lerna/command-3.0.0-rc.0" = { + name = "_at_lerna_slash_command"; + packageName = "@lerna/command"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/command/-/command-3.0.0-rc.0.tgz"; + sha512 = "YzQKhQGSaqhnj/UbygmIneQDuhsTGu9rBqbX84Qs8RhKMMAPWurg+k6sCIihHgBz17tknxEvch/SefMNQxqzAA=="; + }; + }; + "@lerna/conventional-commits-3.0.0-rc.0" = { + name = "_at_lerna_slash_conventional-commits"; + packageName = "@lerna/conventional-commits"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.0.0-rc.0.tgz"; + sha512 = "J5RC+pd7kHP8EfqzvZqaXW253IoShdlzl1Jrw17KqPDAfL5CoZoUwxgZv4ur3kSSv+jHZGQeuAcg93OsBgkzPw=="; + }; + }; + "@lerna/create-3.0.0-rc.0" = { + name = "_at_lerna_slash_create"; + packageName = "@lerna/create"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/create/-/create-3.0.0-rc.0.tgz"; + sha512 = "6GLI+MEKANCAVnuA9pYQX1k+XyyPEBdoPAiSK4lnW2w4E2KSQZxdkI1+9QLv6S2oTrnlrFSxGmqgmmijaZfCGg=="; + }; + }; + "@lerna/create-symlink-3.0.0-rc.0" = { + name = "_at_lerna_slash_create-symlink"; + packageName = "@lerna/create-symlink"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.0.0-rc.0.tgz"; + sha512 = "wz/C7DB5chTidAOc9+edeg65nJLG1PNO9J/jlAUZOY4G3EPGihLroabIlvbjB5SJ8QKS88ftX+f1pzFZ+nYOdQ=="; + }; + }; + "@lerna/diff-3.0.0-rc.0" = { + name = "_at_lerna_slash_diff"; + packageName = "@lerna/diff"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.0.0-rc.0.tgz"; + sha512 = "fXeB10qaFeBMucorkV6Q/bJiWayZgGizVsPkuGN1izENd4DBsTxUyh2a6Y3lY5GzCZ33wmuVDe2HdRVHtfrzaQ=="; + }; + }; + "@lerna/exec-3.0.0-rc.0" = { + name = "_at_lerna_slash_exec"; + packageName = "@lerna/exec"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.0.0-rc.0.tgz"; + sha512 = "DYU00HAAoreqNQmLV0+gfH4mXIJKbd1rbrMvQbnfCTZ3nWYiORXQwvwCYbGgmsMarSaJ/T3eTPP6LvsVt7y1aw=="; + }; + }; + "@lerna/filter-options-3.0.0-rc.0" = { + name = "_at_lerna_slash_filter-options"; + packageName = "@lerna/filter-options"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.0.0-rc.0.tgz"; + sha512 = "aqyb0GWEnQgu7eXHpVSpZLedVd3PrI5WK/CfzDlHGqUT8PCJTo9q2562gmEdeCWWfeSvXbezGm0djTC6RwHV1A=="; + }; + }; + "@lerna/filter-packages-3.0.0-rc.0" = { + name = "_at_lerna_slash_filter-packages"; + packageName = "@lerna/filter-packages"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.0.0-rc.0.tgz"; + sha512 = "ZVObVh8Nk5d6XS/RAJEdu56KbpqvwJrKruoYnDPFeno/Q6/G1Oi8S/W2NmfEXMBSPaVpYecbGfM4Xu5dLzipNA=="; + }; + }; + "@lerna/get-npm-exec-opts-3.0.0-rc.0" = { + name = "_at_lerna_slash_get-npm-exec-opts"; + packageName = "@lerna/get-npm-exec-opts"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.0.0-rc.0.tgz"; + sha512 = "n5Oe1LPzyMKGAdYVVDimpuVsWexTCaLlJq9RqXphoijRh5DAB/Mhaw9//5vGrv770m/QNMSceF99SZLI9gyh4g=="; + }; + }; + "@lerna/global-options-3.0.0-rc.0" = { + name = "_at_lerna_slash_global-options"; + packageName = "@lerna/global-options"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.0.0-rc.0.tgz"; + sha512 = "Sy8KE1cAcGwjxOxiJOHjTxJecLcJhAeQym4Ge3WP1Jnz5mq03o9mb37X0Hmjpv1W9OblbXVxHdmbyC3hxMEHIA=="; + }; + }; + "@lerna/import-3.0.0-rc.0" = { + name = "_at_lerna_slash_import"; + packageName = "@lerna/import"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/import/-/import-3.0.0-rc.0.tgz"; + sha512 = "ZRrusuAScKg29jRrurEi/qJbpol5RWY98nBhOmq08pibVz8cwS1QzyTwQhxaZECHYrKpL/qdLNigKsNi4+jyYw=="; + }; + }; + "@lerna/init-3.0.0-rc.0" = { + name = "_at_lerna_slash_init"; + packageName = "@lerna/init"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/init/-/init-3.0.0-rc.0.tgz"; + sha512 = "/G4gy5QDNsxVXTEo59YRilcW7hnob31GVPc3omy9AZq8HZYCpj/tAw39mEds7S1wPCx0aotRj+NDf178zj11Mw=="; + }; + }; + "@lerna/link-3.0.0-rc.0" = { + name = "_at_lerna_slash_link"; + packageName = "@lerna/link"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/link/-/link-3.0.0-rc.0.tgz"; + sha512 = "Al57Ib56/ojGQ3hcln+DhS5IGWqLv8EElrAmSp0c3t/Ie48VOv9AusQR9nDRIGEn73APu/EG0ILdbylfQBzaKg=="; + }; + }; + "@lerna/list-3.0.0-rc.0" = { + name = "_at_lerna_slash_list"; + packageName = "@lerna/list"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/list/-/list-3.0.0-rc.0.tgz"; + sha512 = "uQuFeRHhF6ALohRkVY6VxpCyeCHHTEqzt0SNvacTAA+gJX/hadtEYS883KOzmmcFibL4UtljQbdfj+DjrLKfUQ=="; + }; + }; + "@lerna/npm-conf-3.0.0-rc.0" = { + name = "_at_lerna_slash_npm-conf"; + packageName = "@lerna/npm-conf"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.0.0-rc.0.tgz"; + sha512 = "zdd/c83UTDGHci1MrW61olXh04cqRvwkA1SZgXYiLo7A87yHlBYwVOu1d7Rl0J6lHG7++8X2odWqzYZkFfeVFA=="; + }; + }; + "@lerna/npm-dist-tag-3.0.0-rc.0" = { + name = "_at_lerna_slash_npm-dist-tag"; + packageName = "@lerna/npm-dist-tag"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.0.0-rc.0.tgz"; + sha512 = "Xa5mPmSIsi0N4pNNSBpKeghQ7XskKCVK+pawEvgKAYHph/J9PIfrddVJUU8o3nk2qkqeqikypoS++bwMdVr8Ew=="; + }; + }; + "@lerna/npm-install-3.0.0-rc.0" = { + name = "_at_lerna_slash_npm-install"; + packageName = "@lerna/npm-install"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.0.0-rc.0.tgz"; + sha512 = "QWvgQ0osTf7e87hc1kKXDcbWPXVCqGUiVnTpjX22+CEiJjUMStWEp4MjLieObgFVLyTtanOZp8VpRqBsPE0HRQ=="; + }; + }; + "@lerna/npm-publish-3.0.0-rc.0" = { + name = "_at_lerna_slash_npm-publish"; + packageName = "@lerna/npm-publish"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.0.0-rc.0.tgz"; + sha512 = "rP8epG0SsHzqYw9xvwVX6YyAAwPYJAYZvMNxJvyi8fp5KdnD2sTeV/JOrWbQD/RxBxR2WGJxelVRL617KWZMOA=="; + }; + }; + "@lerna/npm-run-script-3.0.0-rc.0" = { + name = "_at_lerna_slash_npm-run-script"; + packageName = "@lerna/npm-run-script"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.0.0-rc.0.tgz"; + sha512 = "Hm6KLPpeIyRIdc9MntmaAhuboUyw75DJLJ1MTaLwq/RwZ2kKHYk1Hi/R7yjj8LOyD7A25BTYX0Pd1gHd1lsFVw=="; + }; + }; + "@lerna/output-3.0.0-rc.0" = { + name = "_at_lerna_slash_output"; + packageName = "@lerna/output"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/output/-/output-3.0.0-rc.0.tgz"; + sha512 = "zZmQ94nVUfe1CvexarDnrb/Mqt81OcZNuOCvcKFHJiNkr5VSIn2GJuUwtTaVUtoh5uXdJCJvm696Ptsep10BWw=="; + }; + }; + "@lerna/package-3.0.0-rc.0" = { + name = "_at_lerna_slash_package"; + packageName = "@lerna/package"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/package/-/package-3.0.0-rc.0.tgz"; + sha512 = "4EUnBc04IxganMamjnEfagajLya3nPKfqlorGc5VLoGh5akOZmrCF9qiqB90nYzrJoMt+5QB1lxYD8bxikX0qg=="; + }; + }; + "@lerna/package-graph-3.0.0-rc.0" = { + name = "_at_lerna_slash_package-graph"; + packageName = "@lerna/package-graph"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.0.0-rc.0.tgz"; + sha512 = "E2MlL0CwDzcDTLPpMhg9+TESRAD/wYLtEu+Mj1R4OZbF2jlSXSZok1g3LW/gzulVd5oq9q+qBdY3SX5b9PCsGQ=="; + }; + }; + "@lerna/project-3.0.0-rc.0" = { + name = "_at_lerna_slash_project"; + packageName = "@lerna/project"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/project/-/project-3.0.0-rc.0.tgz"; + sha512 = "lNego7jYd24jIDGLTcy1mrESEopCblVaZztKhJJntSZdqWZ/tnExjIITfS55CnZyKAXwPVIus6YRfOc24tvuaA=="; + }; + }; + "@lerna/prompt-3.0.0-rc.0" = { + name = "_at_lerna_slash_prompt"; + packageName = "@lerna/prompt"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.0.0-rc.0.tgz"; + sha512 = "4ABsGTq7/IMh3nX7LfRirJnXt50Yp/Lg837hb/Hp1OXFz1FoXLcbzoIx0QQYyk3q+Gnv2TwSK2M86xoUFIUXnw=="; + }; + }; + "@lerna/publish-3.0.0-rc.0" = { + name = "_at_lerna_slash_publish"; + packageName = "@lerna/publish"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.0.0-rc.0.tgz"; + sha512 = "bfjRtCzHAGSS5z8QOUw3UeLn4u5CpJTGUkk9y1PPbzdbMWmJhJnEjSw+TN2LaZFVGzQbE8dsLqR5TL149Y7P/Q=="; + }; + }; + "@lerna/resolve-symlink-3.0.0-rc.0" = { + name = "_at_lerna_slash_resolve-symlink"; + packageName = "@lerna/resolve-symlink"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.0.0-rc.0.tgz"; + sha512 = "EBRD/65aTCyZMqWzAM7Ac1zqtZBkTE5AHzzIViQaB5el3j7ThBzzWwYuiBNWibNGTMObLQMrp+65yCbew5H+aA=="; + }; + }; + "@lerna/rimraf-dir-3.0.0-rc.0" = { + name = "_at_lerna_slash_rimraf-dir"; + packageName = "@lerna/rimraf-dir"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.0.0-rc.0.tgz"; + sha512 = "aFPX1hMOBL+5AU5xI9SZ2xKTAlnk93+tIw1ZJGWMMc4dzxNs/sT3WeUUH4v1TOYzMqWM3AnLQza3O4OY/xb2hg=="; + }; + }; + "@lerna/run-3.0.0-rc.0" = { + name = "_at_lerna_slash_run"; + packageName = "@lerna/run"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/run/-/run-3.0.0-rc.0.tgz"; + sha512 = "biLKshDBwQ7n3XLihV5QvrlOBJ1isnRJC8xC8FeUbH3x1FRX15Ogg+8/GiGG7vaM6kdE4j0ebrW8HPUEh5L4cw=="; + }; + }; + "@lerna/run-lifecycle-3.0.0-rc.0" = { + name = "_at_lerna_slash_run-lifecycle"; + packageName = "@lerna/run-lifecycle"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.0.0-rc.0.tgz"; + sha512 = "/cofDJ5qzAgC99+VYxO602k1wBetv79NYOXUoju3R8xPrCXGJYoBN+/NhrPdj/CciZd9lSsx016M6FcScsaO1Q=="; + }; + }; + "@lerna/run-parallel-batches-3.0.0-rc.0" = { + name = "_at_lerna_slash_run-parallel-batches"; + packageName = "@lerna/run-parallel-batches"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0-rc.0.tgz"; + sha512 = "MpXiDRo02ZHazis3sDqzhmFuMxEEPKv+mmPpzLElkCDO4LHVZYvwa3ib3ezhWwt+FUFPP4u/8w2A4cFO2PbmVQ=="; + }; + }; + "@lerna/symlink-binary-3.0.0-rc.0" = { + name = "_at_lerna_slash_symlink-binary"; + packageName = "@lerna/symlink-binary"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.0.0-rc.0.tgz"; + sha512 = "aFmZmvjNApa7i4SCrq//j7kg7E6mO3U7dzE4J28biFen2Ey1fmxObf1jiv6b24T92D/WztiBGSSTXbFR41yAsw=="; + }; + }; + "@lerna/symlink-dependencies-3.0.0-rc.0" = { + name = "_at_lerna_slash_symlink-dependencies"; + packageName = "@lerna/symlink-dependencies"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.0.0-rc.0.tgz"; + sha512 = "dk7V95ToYw1nfn7ydkGQAn0RWyye9n05vPSCQzME+OP0nL7PcsSY+0umatsRP104VMX0yTmML129Zg5xpYDSAw=="; + }; + }; + "@lerna/validation-error-3.0.0-rc.0" = { + name = "_at_lerna_slash_validation-error"; + packageName = "@lerna/validation-error"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.0.0-rc.0.tgz"; + sha512 = "VuYvUC2DUjVq/DG7r52wWKmq1G0doGPB5eq7Uozi4QIIRWj2op1l6yCSogb3H2UKPn/5NrMOV4jztwQBnSJu0w=="; + }; + }; + "@lerna/write-log-file-3.0.0-rc.0" = { + name = "_at_lerna_slash_write-log-file"; + packageName = "@lerna/write-log-file"; + version = "3.0.0-rc.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.0.0-rc.0.tgz"; + sha512 = "LHQPRY/1eWyq7ly+4A412FT9uzGKHDSGHkLYVro8r6mToPB/6eHdntJFRGOYNzKM5eax6RgrzBImEhs3F9FWSQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -112,22 +517,310 @@ let sha512 = "lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug=="; }; }; - "@types/node-10.5.2" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "10.5.2"; + "@types/cross-spawn-6.0.0" = { + name = "_at_types_slash_cross-spawn"; + packageName = "@types/cross-spawn"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz"; - sha512 = "m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q=="; + url = "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.0.tgz"; + sha512 = "evp2ZGsFw9YKprDbg8ySgC9NA15g3YgiI8ANkGmKKvvi0P2aDGYLPxQIC5qfeKNUOe3TjABVGuah6omPRpIYhg=="; }; }; - "@types/node-8.10.21" = { + "@types/debug-0.0.30" = { + name = "_at_types_slash_debug"; + packageName = "@types/debug"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz"; + sha512 = "orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ=="; + }; + }; + "@types/events-1.2.0" = { + name = "_at_types_slash_events"; + packageName = "@types/events"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz"; + sha512 = "KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA=="; + }; + }; + "@types/glob-5.0.35" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "5.0.35"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-5.0.35.tgz"; + sha512 = "wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg=="; + }; + }; + "@types/inquirer-0.0.42" = { + name = "_at_types_slash_inquirer"; + packageName = "@types/inquirer"; + version = "0.0.42"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-0.0.42.tgz"; + sha512 = "flMaNWU2g9NrtZ4bIV+7SEY2W7OdWNNhmJ0rE1lWVxGrkp3TfFGMcFCxRIBmGWigI8e6n+2HqLjizTTfgcpHLg=="; + }; + }; + "@types/klaw-2.1.1" = { + name = "_at_types_slash_klaw"; + packageName = "@types/klaw"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/klaw/-/klaw-2.1.1.tgz"; + sha512 = "awiTDstwQfX6026T7oC01AoP7knJoM5IT1tgx9STIM4hQzNQlkW8keTxNC+/xxpMgP657ebHMTqrsQ4qtfSJKg=="; + }; + }; + "@types/lodash-4.14.115" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.115"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.115.tgz"; + sha512 = "9K/P4XMQxk61omAzQh3bbbFiqnG17eLcFysjlAYz0aPcYrVo8T+ujaCeIeY0Gpzux7x1YbxtEtLKB7ZWf79qdg=="; + }; + }; + "@types/make-dir-1.0.3" = { + name = "_at_types_slash_make-dir"; + packageName = "@types/make-dir"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/make-dir/-/make-dir-1.0.3.tgz"; + sha512 = "bFRvlvUdPwxj47K2yVh7OBL8Mu8h//5k/hQJkz0iAZAlxhnIDydFezGA96zehtnRfrZDuIyPd+RC2kmBGtcs0w=="; + }; + }; + "@types/minimatch-3.0.3" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + }; + }; + "@types/minimist-1.2.0" = { + name = "_at_types_slash_minimist"; + packageName = "@types/minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz"; + sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; + }; + }; + "@types/ncp-2.0.1" = { + name = "_at_types_slash_ncp"; + packageName = "@types/ncp"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.1.tgz"; + sha512 = "TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg=="; + }; + }; + "@types/node-10.5.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.21"; + version = "10.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.21.tgz"; - sha512 = "87XkD9qDXm8fIax+5y7drx84cXsu34ZZqfB7Cial3Q/2lxSoJ/+DRaWckkCbxP41wFSIrrb939VhzaNxj4eY1w=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.5.tgz"; + sha512 = "6Qnb1gXbp3g1JX9QVJj3A6ORzc9XCyhokxUKaoonHgNXcQhmk8adhotxfkeK8El9TnFeUuH72yI6jQ5nDJKS6w=="; + }; + }; + "@types/node-6.0.115" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "6.0.115"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-6.0.115.tgz"; + sha512 = "PWA07jqflLli+PAk7VaJn0MVdTw96egk5B1FxwocV/tcc3RamNGbza1ZgS0OGUsTuAYCFCboL+IlG2bPazV2Nw=="; + }; + }; + "@types/node-8.10.23" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.23.tgz"; + sha512 = "aEp5ZTLr4mYhR9S85cJ+sEYkcsgFY10N1Si5m49iTAVzanZXOwp/pgw6ibFLKXxpflqm71aSWZCRtnTXXO56gA=="; + }; + }; + "@types/rimraf-2.0.2" = { + name = "_at_types_slash_rimraf"; + packageName = "@types/rimraf"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.2.tgz"; + sha512 = "Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ=="; + }; + }; + "@types/rx-4.1.1" = { + name = "_at_types_slash_rx"; + packageName = "@types/rx"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx/-/rx-4.1.1.tgz"; + sha1 = "598fc94a56baed975f194574e0f572fd8e627a48"; + }; + }; + "@types/rx-core-4.0.3" = { + name = "_at_types_slash_rx-core"; + packageName = "@types/rx-core"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-core/-/rx-core-4.0.3.tgz"; + sha1 = "0b3354b1238cedbe2b74f6326f139dbc7a591d60"; + }; + }; + "@types/rx-core-binding-4.0.4" = { + name = "_at_types_slash_rx-core-binding"; + packageName = "@types/rx-core-binding"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz"; + sha512 = "5pkfxnC4w810LqBPUwP5bg7SFR/USwhMSaAeZQQbEHeBp57pjKXRlXmqpMrLJB4y1oglR/c2502853uN0I+DAQ=="; + }; + }; + "@types/rx-lite-4.0.5" = { + name = "_at_types_slash_rx-lite"; + packageName = "@types/rx-lite"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite/-/rx-lite-4.0.5.tgz"; + sha512 = "KZk5XTR1dm/kNgBx8iVpjno6fRYtAUQWBOmj+O8j724+nk097sz4fOoHJNpCkOJUtHUurZlJC7QvSFCZHbkC+w=="; + }; + }; + "@types/rx-lite-aggregates-4.0.3" = { + name = "_at_types_slash_rx-lite-aggregates"; + packageName = "@types/rx-lite-aggregates"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz"; + sha512 = "MAGDAHy8cRatm94FDduhJF+iNS5//jrZ/PIfm+QYw9OCeDgbymFHChM8YVIvN2zArwsRftKgE33QfRWvQk4DPg=="; + }; + }; + "@types/rx-lite-async-4.0.2" = { + name = "_at_types_slash_rx-lite-async"; + packageName = "@types/rx-lite-async"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz"; + sha512 = "vTEv5o8l6702ZwfAM5aOeVDfUwBSDOs+ARoGmWAKQ6LOInQ8J4/zjM7ov12fuTpktUKdMQjkeCp07Vd73mPkxw=="; + }; + }; + "@types/rx-lite-backpressure-4.0.3" = { + name = "_at_types_slash_rx-lite-backpressure"; + packageName = "@types/rx-lite-backpressure"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz"; + sha512 = "Y6aIeQCtNban5XSAF4B8dffhIKu6aAy/TXFlScHzSxh6ivfQBQw6UjxyEJxIOt3IT49YkS+siuayM2H/Q0cmgA=="; + }; + }; + "@types/rx-lite-coincidence-4.0.3" = { + name = "_at_types_slash_rx-lite-coincidence"; + packageName = "@types/rx-lite-coincidence"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz"; + sha512 = "1VNJqzE9gALUyMGypDXZZXzR0Tt7LC9DdAZQ3Ou/Q0MubNU35agVUNXKGHKpNTba+fr8GdIdkC26bRDqtCQBeQ=="; + }; + }; + "@types/rx-lite-experimental-4.0.1" = { + name = "_at_types_slash_rx-lite-experimental"; + packageName = "@types/rx-lite-experimental"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz"; + sha1 = "c532f5cbdf3f2c15da16ded8930d1b2984023cbd"; + }; + }; + "@types/rx-lite-joinpatterns-4.0.1" = { + name = "_at_types_slash_rx-lite-joinpatterns"; + packageName = "@types/rx-lite-joinpatterns"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz"; + sha1 = "f70fe370518a8432f29158cc92ffb56b4e4afc3e"; + }; + }; + "@types/rx-lite-testing-4.0.1" = { + name = "_at_types_slash_rx-lite-testing"; + packageName = "@types/rx-lite-testing"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz"; + sha1 = "21b19d11f4dfd6ffef5a9d1648e9c8879bfe21e9"; + }; + }; + "@types/rx-lite-time-4.0.3" = { + name = "_at_types_slash_rx-lite-time"; + packageName = "@types/rx-lite-time"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz"; + sha512 = "ukO5sPKDRwCGWRZRqPlaAU0SKVxmWwSjiOrLhoQDoWxZWg6vyB9XLEZViKOzIO6LnTIQBlk4UylYV0rnhJLxQw=="; + }; + }; + "@types/rx-lite-virtualtime-4.0.3" = { + name = "_at_types_slash_rx-lite-virtualtime"; + packageName = "@types/rx-lite-virtualtime"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz"; + sha512 = "3uC6sGmjpOKatZSVHI2xB1+dedgml669ZRvqxy+WqmGJDVusOdyxcKfyzjW0P3/GrCiN4nmRkLVMhPwHCc5QLg=="; + }; + }; + "@types/string-width-2.0.0" = { + name = "_at_types_slash_string-width"; + packageName = "@types/string-width"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/string-width/-/string-width-2.0.0.tgz"; + sha512 = "dA5z2WlP7uurAiveIWTDRgfr1U58Qdmo6doDeAyJlYFQ3vnUOW7BqJ+tl+M8FaLcflhrVvwIfzxJJvlz6anx4A=="; + }; + }; + "@types/strip-ansi-3.0.0" = { + name = "_at_types_slash_strip-ansi"; + packageName = "@types/strip-ansi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/strip-ansi/-/strip-ansi-3.0.0.tgz"; + sha1 = "9b63d453a6b54aa849182207711a08be8eea48ae"; + }; + }; + "@types/through-0.0.29" = { + name = "_at_types_slash_through"; + packageName = "@types/through"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/through/-/through-0.0.29.tgz"; + sha512 = "9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w=="; + }; + }; + "@types/untildify-3.0.0" = { + name = "_at_types_slash_untildify"; + packageName = "@types/untildify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/untildify/-/untildify-3.0.0.tgz"; + sha512 = "FTktI3Y1h+gP9GTjTvXBP5v8xpH4RU6uS9POoBcGy4XkS2Np6LNtnP1eiNNth4S7P+qw2c/rugkwBasSHFzJEg=="; + }; + }; + "@types/wrap-ansi-3.0.0" = { + name = "_at_types_slash_wrap-ansi"; + packageName = "@types/wrap-ansi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz"; + sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; + }; + }; + "@types/write-file-atomic-2.1.1" = { + name = "_at_types_slash_write-file-atomic"; + packageName = "@types/write-file-atomic"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/write-file-atomic/-/write-file-atomic-2.1.1.tgz"; + sha512 = "mROQhTxpJsOm/S0eOxDHUy5WJ0yS8fmqsq/s+u5OuAh1TxBFSqVBTkLjbyxDPcKh7DeJXk0OYrCkxXlkf8zu1g=="; }; }; "@webassemblyjs/ast-1.5.13" = { @@ -292,13 +985,13 @@ let sha512 = "QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ=="; }; }; - "@zeit/schemas-1.6.0" = { + "@zeit/schemas-1.7.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-1.6.0.tgz"; - sha512 = "fUCDfGPOU2FPOpX8+9ctuHs5+HIvuP3w6Fx+Q0eQLQs8Ow/GFa9zMgkYtVWhHS5S+dtXmBDm4ZpYcXtZgLQq0A=="; + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-1.7.0.tgz"; + sha512 = "Ma2HHFqwZZ5WOEMcd/8RJj70O9jy2esTvu9oaYLJSkenELKrv6vgkGeM5jB8xLRTYocpcnd2rCfpyKyhBqVphQ=="; }; }; "CSSselect-0.4.1" = { @@ -598,31 +1291,22 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "add-stream-1.0.0" = { - name = "add-stream"; - packageName = "add-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; - sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; - }; - }; - "addons-linter-1.0.0" = { + "addons-linter-1.2.6" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.0.0"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.0.0.tgz"; - sha512 = "6cC0Jcf0vMVgE86TV4A1lfjx78Fp0JltA1UH2icz/cALWMMfDZrD7YpB4dMrpobclsbKFPHexNOYhS4efAc5ng=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.2.6.tgz"; + sha512 = "8WjSUoleic9x3gS8SZF0kIvffrX7WkiRPF8Xs8CZi7Yu/Xq0qX9LOYG2Q66t9ThmTeMItt/24FxirqqdyFLGgw=="; }; }; - "addr-to-ip-port-1.4.3" = { + "addr-to-ip-port-1.5.1" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; - version = "1.4.3"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.3.tgz"; - sha512 = "+KHTG8KSAFdKYmLNZp3VnKj94AZ94gDdu2ipAwxNuMmN9vpf5hdsQgk1hNXFqQOXfd+BMHokyDa1GwDAlGAtGQ=="; + url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.5.1.tgz"; + sha512 = "bA+dyydTNuQtrEDJ0g9eR7XabNhvrM5yZY0hvTbNK3yvoeC73ZqMES6E1cEqH9WPxs4uMtMsOjfwS4FmluhsAA=="; }; }; "addressparser-0.3.2" = { @@ -760,15 +1444,6 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.5.0" = { - name = "ajv"; - packageName = "ajv"; - version = "6.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz"; - sha512 = "VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA=="; - }; - }; "ajv-6.5.2" = { name = "ajv"; packageName = "ajv"; @@ -787,15 +1462,6 @@ let sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; }; }; - "ajv-keywords-2.1.1" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz"; - sha1 = "617997fc5f60576894c435f940d819e135b80762"; - }; - }; "ajv-keywords-3.2.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -805,13 +1471,13 @@ let sha1 = "e86b819c602cf8821ad637413698f1dec021847a"; }; }; - "ajv-merge-patch-3.0.0" = { + "ajv-merge-patch-4.1.0" = { name = "ajv-merge-patch"; packageName = "ajv-merge-patch"; - version = "3.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-merge-patch/-/ajv-merge-patch-3.0.0.tgz"; - sha1 = "76f071e391f419fe9fe3fea7e920a1ad824b2b61"; + url = "https://registry.npmjs.org/ajv-merge-patch/-/ajv-merge-patch-4.1.0.tgz"; + sha512 = "0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw=="; }; }; "aliasify-2.1.0" = { @@ -859,15 +1525,6 @@ let sha512 = "l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA=="; }; }; - "anchor-markdown-header-0.5.7" = { - name = "anchor-markdown-header"; - packageName = "anchor-markdown-header"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz"; - sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7"; - }; - }; "ansi-0.3.1" = { name = "ansi"; packageName = "ansi"; @@ -1120,6 +1777,15 @@ let sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; }; }; + "apollo-codegen-0.19.1" = { + name = "apollo-codegen"; + packageName = "apollo-codegen"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-codegen/-/apollo-codegen-0.19.1.tgz"; + sha512 = "jlxz/b5iinRWfh48hXdmMtrjTPn/rDok0Z3b7icvkiaD6I30w4sq9B+JDkFbLnkldzsFLV2BZtBDa/dkZhx8Ng=="; + }; + }; "append-0.1.1" = { name = "append"; packageName = "append"; @@ -1876,13 +2542,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.275.1" = { + "aws-sdk-2.285.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.275.1"; + version = "2.285.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.275.1.tgz"; - sha512 = "lcpgoiHLhdcolUT7aJdg/CmlYO5ecf+3A+4dIceO72mFovCWZde1Rvr07QNbQ8gT0paqr5j2rs2b6c23Y/K0RQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.285.1.tgz"; + sha512 = "lkroCYcnb7UWR/jbaW6wyjAeGROrsBFWyqUukQjICuCV4a0Mapnjsxefl2A/z+0SX3gnBN7owUb/60UjQSHpzA=="; }; }; "aws-sign-0.2.0" = { @@ -2497,15 +3163,6 @@ let sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; }; }; - "bail-1.0.3" = { - name = "bail"; - packageName = "bail"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz"; - sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg=="; - }; - }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -2794,13 +3451,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.32" = { + "big-integer-1.6.34" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.32"; + version = "1.6.34"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.32.tgz"; - sha512 = "ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.34.tgz"; + sha512 = "+w6B0Uo0ZvTSzDkXjoBCTNK0oe+aVL+yPi7kwGZm8hd8+Nj1AFPoxoq1Bl/mEu/G/ivOkUc1LRqVR0XeWFUzuA=="; }; }; "big.js-3.2.0" = { @@ -2956,22 +3613,22 @@ let sha512 = "FRe/+MYBePev7Yb+BXSclkVuDxb/w+gUbao6nVHYQRaKO7aXE+ARRlL3phqm6Rdhw5CRVoLMbLd49nxmCuUhUQ=="; }; }; - "bittorrent-peerid-1.2.0" = { + "bittorrent-peerid-1.3.0" = { name = "bittorrent-peerid"; packageName = "bittorrent-peerid"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.2.0.tgz"; - sha1 = "9f675612f0e6afc6ef3450dfba51ff7238abf371"; + url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.3.0.tgz"; + sha512 = "SYd5H3RbN1ex+TrWAKXkEkASFWxAR7Tk6iLt9tfAT9ehBvZb/Y3AQDVRVJynlrixcWpnmsLYKI7tkRWgp7ORoQ=="; }; }; - "bittorrent-protocol-2.4.2" = { + "bittorrent-protocol-3.0.1" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "2.4.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.2.tgz"; - sha512 = "ZphU6H9B0Tf99P2noVmyKkT7Bf8FZG6T3VSurJva8ozvvCqSfLMnI7X4Khxn5qXXvw71/R9Vfq+aJvMgV9lquQ=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.0.1.tgz"; + sha512 = "hnvOzAu9u+2H0OLLL5byoFdz6oz5f3bx5f7R+ItUohTHMq9TgUhEJfcjo7xWtQHSKOVciYWwYTJ4EjczF5RX2A=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -2983,13 +3640,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.9.1" = { + "bittorrent-tracker-9.10.0" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.9.1"; + version = "9.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.9.1.tgz"; - sha512 = "PdCrhMP0ajbutZEcw5FLd/pTvcxr7m5NTXEck3t1qS+UMcC9+pie2Zd59TSFefia2ipDlstOhVAUTOlaoZLlDQ=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.10.0.tgz"; + sha512 = "mL/hLX5aT9D0ywIcleksJ3vaggxguwzyBTWEYU/8s7f3x8rvtB2SDNaQ548/CezqfVVxGNAHlBxctw4EeXSp8Q=="; }; }; "bl-0.8.2" = { @@ -3163,15 +3820,6 @@ let sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; }; }; - "body-5.1.0" = { - name = "body"; - packageName = "body"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/body/-/body-5.1.0.tgz"; - sha1 = "e4ba0ce410a46936323367609ecb4e6553125069"; - }; - }; "body-parser-1.13.3" = { name = "body-parser"; packageName = "body-parser"; @@ -3271,15 +3919,6 @@ let sha1 = "55fa64920d9670087d44150404525d59f9511c20"; }; }; - "boundary-1.0.1" = { - name = "boundary"; - packageName = "boundary"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boundary/-/boundary-1.0.1.tgz"; - sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; - }; - }; "bower-1.8.4" = { name = "bower"; packageName = "bower"; @@ -3595,13 +4234,13 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "buffer-5.1.0" = { + "buffer-5.2.0" = { name = "buffer"; packageName = "buffer"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; - sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz"; + sha512 = "nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw=="; }; }; "buffer-alloc-1.2.0" = { @@ -3703,13 +4342,13 @@ let sha512 = "RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="; }; }; - "buffer-from-1.1.0" = { + "buffer-from-1.1.1" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; - sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-indexof-1.1.1" = { @@ -3766,13 +4405,13 @@ let sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288"; }; }; - "bufferutil-3.0.5" = { + "bufferutil-4.0.0" = { name = "bufferutil"; packageName = "bufferutil"; - version = "3.0.5"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.5.tgz"; - sha512 = "0fUEthLqfCkYspEuP0vmiAe+PsXslE+AlILb2rmS9I4tAdm3SmpCI69M66zQL20GQEszdbXyVN6q+cpG/yhYlg=="; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.0.tgz"; + sha512 = "jpnqMVLo7sqfUY2W92RC4jjj9TuiOSkjB0k43TxPcrBSntZwXUOl8Krfd3eVEdApuScpSTwYKntm/dXU2T8gnw=="; }; }; "bufferview-1.0.1" = { @@ -4234,15 +4873,6 @@ let sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; }; }; - "ccount-1.0.3" = { - name = "ccount"; - packageName = "ccount"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz"; - sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw=="; - }; - }; "center-align-0.1.3" = { name = "center-align"; packageName = "center-align"; @@ -4324,6 +4954,15 @@ let sha512 = "LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ=="; }; }; + "chalk-2.3.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; + sha512 = "QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g=="; + }; + }; "chalk-2.4.0" = { name = "chalk"; packageName = "chalk"; @@ -4342,31 +4981,13 @@ let sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="; }; }; - "character-entities-1.2.2" = { - name = "character-entities"; - packageName = "character-entities"; - version = "1.2.2"; + "change-case-3.0.2" = { + name = "change-case"; + packageName = "change-case"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz"; - sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ=="; - }; - }; - "character-entities-html4-1.1.2" = { - name = "character-entities-html4"; - packageName = "character-entities-html4"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; - sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw=="; - }; - }; - "character-entities-legacy-1.1.2" = { - name = "character-entities-legacy"; - packageName = "character-entities-legacy"; - version = "1.1.2"; - 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/change-case/-/change-case-3.0.2.tgz"; + sha512 = "Mww+SLF6MZ0U6kdg11algyKd5BARbyM4TbFBepwowYSR5ClfQGCGtxNXgykpN0uF/bstWeaGDT4JWaDh8zWAHA=="; }; }; "character-parser-1.2.1" = { @@ -4387,15 +5008,6 @@ let sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; }; }; - "character-reference-invalid-1.1.2" = { - name = "character-reference-invalid"; - packageName = "character-reference-invalid"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; - sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ=="; - }; - }; "chardet-0.4.2" = { name = "chardet"; packageName = "chardet"; @@ -5107,15 +5719,6 @@ let sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; }; }; - "collapse-white-space-1.0.4" = { - name = "collapse-white-space"; - packageName = "collapse-white-space"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz"; - sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw=="; - }; - }; "collection-visit-1.0.0" = { name = "collection-visit"; packageName = "collection-visit"; @@ -5152,13 +5755,13 @@ let sha1 = "4b1415304cf50028ea81643643bd82ea05803689"; }; }; - "color-string-1.5.2" = { + "color-string-1.5.3" = { name = "color-string"; packageName = "color-string"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz"; - sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; + sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; "color-support-1.1.3" = { @@ -5206,13 +5809,13 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "colors-1.3.0" = { + "colors-1.3.1" = { name = "colors"; packageName = "colors"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz"; - sha512 = "EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw=="; + url = "https://registry.npmjs.org/colors/-/colors-1.3.1.tgz"; + sha512 = "jg/vxRmv430jixZrC+La5kMbUWqIg32/JsYNZb94+JEmzceYbWKTsv1OuTp+7EaqiaWRR2tPcykibwCRgclIsw=="; }; }; "colour-0.7.1" = { @@ -5269,13 +5872,13 @@ let sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; - "command-join-2.0.0" = { - name = "command-join"; - packageName = "command-join"; - version = "2.0.0"; + "command-exists-1.2.7" = { + name = "command-exists"; + packageName = "command-exists"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/command-join/-/command-join-2.0.0.tgz"; - sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf"; + url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.7.tgz"; + sha512 = "doWDvhXCcW5LK0cIUWrOQ8oMFXJv3lEQCkJpGVjM8v9SV0uhqYXB943538tEA2CiaWqSyuYUGAm5ezDwEx9xlw=="; }; }; "commander-0.6.1" = { @@ -5422,13 +6025,13 @@ let sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; }; }; - "common-tags-1.7.2" = { + "common-tags-1.8.0" = { name = "common-tags"; packageName = "common-tags"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz"; - sha512 = "joj9ZlUOjCrwdbmiLqafeUSgkUM74NqhLsZtSqDmhKudaIY197zTrb8JMl31fMnCUuxwFT23eC/oWvrZzDLRJQ=="; + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"; + sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; }; }; "commondir-1.0.1" = { @@ -5526,17 +6129,17 @@ let packageName = "compression"; version = "1.5.2"; src = fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; + url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; }; }; - "compression-1.7.2" = { + "compression-1.7.3" = { name = "compression"; packageName = "compression"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz"; - sha1 = "aaffbcd6aaf854b44ebb280353d5ad1651f59a69"; + url = "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz"; + sha512 = "HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg=="; }; }; "concat-map-0.0.1" = { @@ -5791,6 +6394,15 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; + "constant-case-2.0.0" = { + name = "constant-case"; + packageName = "constant-case"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz"; + sha1 = "4175764d389d3fa9c8ecd29186ed6005243b6a46"; + }; + }; "constantinople-3.0.2" = { name = "constantinople"; packageName = "constantinople"; @@ -5882,24 +6494,6 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "continuable-cache-0.3.1" = { - name = "continuable-cache"; - packageName = "continuable-cache"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz"; - sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; - }; - }; - "conventional-changelog-1.1.24" = { - name = "conventional-changelog"; - packageName = "conventional-changelog"; - version = "1.1.24"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.24.tgz"; - sha512 = "2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q=="; - }; - }; "conventional-changelog-angular-1.6.6" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -5909,33 +6503,6 @@ let sha512 = "suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg=="; }; }; - "conventional-changelog-atom-0.2.8" = { - name = "conventional-changelog-atom"; - packageName = "conventional-changelog-atom"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz"; - sha512 = "8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g=="; - }; - }; - "conventional-changelog-cli-1.3.22" = { - name = "conventional-changelog-cli"; - packageName = "conventional-changelog-cli"; - version = "1.3.22"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz"; - sha512 = "pnjdIJbxjkZ5VdAX/H1wndr1G10CY8MuZgnXuJhIHglOXfIrXygb7KZC836GW9uo1u8PjEIvIw/bKX0lOmOzZg=="; - }; - }; - "conventional-changelog-codemirror-0.3.8" = { - name = "conventional-changelog-codemirror"; - packageName = "conventional-changelog-codemirror"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz"; - sha512 = "3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ=="; - }; - }; "conventional-changelog-core-2.0.11" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; @@ -5945,60 +6512,6 @@ let sha512 = "HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg=="; }; }; - "conventional-changelog-ember-0.3.12" = { - name = "conventional-changelog-ember"; - packageName = "conventional-changelog-ember"; - version = "0.3.12"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz"; - sha512 = "mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ=="; - }; - }; - "conventional-changelog-eslint-1.0.9" = { - name = "conventional-changelog-eslint"; - packageName = "conventional-changelog-eslint"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz"; - sha512 = "h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q=="; - }; - }; - "conventional-changelog-express-0.3.6" = { - name = "conventional-changelog-express"; - packageName = "conventional-changelog-express"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz"; - sha512 = "3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q=="; - }; - }; - "conventional-changelog-jquery-0.1.0" = { - name = "conventional-changelog-jquery"; - packageName = "conventional-changelog-jquery"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz"; - sha1 = "0208397162e3846986e71273b6c79c5b5f80f510"; - }; - }; - "conventional-changelog-jscs-0.1.0" = { - name = "conventional-changelog-jscs"; - packageName = "conventional-changelog-jscs"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz"; - sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; - }; - }; - "conventional-changelog-jshint-0.3.8" = { - name = "conventional-changelog-jshint"; - packageName = "conventional-changelog-jshint"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz"; - sha512 = "hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig=="; - }; - }; "conventional-changelog-preset-loader-1.1.8" = { name = "conventional-changelog-preset-loader"; packageName = "conventional-changelog-preset-loader"; @@ -6035,13 +6548,13 @@ let sha512 = "BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ=="; }; }; - "conventional-recommended-bump-1.2.1" = { + "conventional-recommended-bump-2.0.9" = { name = "conventional-recommended-bump"; packageName = "conventional-recommended-bump"; - version = "1.2.1"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz"; - sha512 = "oJjG6DkRgtnr/t/VrPdzmf4XZv8c4xKVJrVT4zrSHd92KEL+EYxSbYoKq8lQ7U5yLMw7130wrcQTLRjM/T+d4w=="; + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-2.0.9.tgz"; + sha512 = "YE6/o+648qkX3fTNvfBsvPW3tSnbZ6ec3gF0aBahCPgyoVHU2Mw0nUAZ1h1UN65GazpORngrgRC8QCltNYHPpQ=="; }; }; "convert-source-map-1.1.3" = { @@ -6332,6 +6845,24 @@ let sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; }; }; + "cosmiconfig-3.1.0" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz"; + sha512 = "zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q=="; + }; + }; + "cosmiconfig-5.0.5" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.5.tgz"; + sha512 = "94j37OtvxS5w7qr7Ta6dt67tWdnOxigBVN4VnSxNXFez9o18PGQ0D33SchKP17r9LAcWVTYV72G6vDayAUBFIg=="; + }; + }; "couch-login-0.1.20" = { name = "couch-login"; packageName = "couch-login"; @@ -6377,13 +6908,13 @@ let sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; - "crc-3.7.0" = { + "crc-3.8.0" = { name = "crc"; packageName = "crc"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.7.0.tgz"; - sha512 = "ZwmUex488OBjSVOMxnR/dIa1yxisBMJNEi+UxzXpKhax8MPsQtoRQtl5Qgo+W7pcSVkRXa3BEVjaniaWKtvKvw=="; + url = "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz"; + sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; }; "crc32-stream-2.0.0" = { @@ -6431,13 +6962,13 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "create-torrent-3.32.0" = { + "create-torrent-3.32.1" = { name = "create-torrent"; packageName = "create-torrent"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.0.tgz"; - sha512 = "l9chXj5LLyVFfPF6nFCWlm5/Wt+04d+mXUpG5LJAogeyRruWfjnUozfmQspAi6iW91ibp7qKBuFMPJViz5lp1Q=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.1.tgz"; + sha512 = "8spZUeFyVc+2mGnWBRTuLOhuHmHrmUomFWf7QvxztCEvTpn5SIrvF8F+HKdkzBPM9B7v/2w+f/65jqLWBXSndg=="; }; }; "cron-1.3.0" = { @@ -6449,6 +6980,15 @@ let sha512 = "K/SF7JlgMmNjcThWxkKvsHhey2EDB4CeOEWJ9aXWj3fbQJppsvTPIeyLdHfNq5IbbsMUUjRW1nr5dSO95f2E4w=="; }; }; + "cross-fetch-2.0.0" = { + name = "cross-fetch"; + packageName = "cross-fetch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.0.0.tgz"; + sha512 = "gnx0GnDyW73iDq6DpqceL8i4GGn55PPKDzNwZkopJ3mKPcfJ0BUIXBsnYfJBVw+jFDB+hzIp2ELNRdqoxN6M3w=="; + }; + }; "cross-spawn-4.0.0" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -6791,6 +7331,15 @@ let sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; }; + "cucumber-html-reporter-3.0.4" = { + name = "cucumber-html-reporter"; + packageName = "cucumber-html-reporter"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cucumber-html-reporter/-/cucumber-html-reporter-3.0.4.tgz"; + sha512 = "uit68jymdI8Z6m+kJ5YnJPeHf5IdYXt2j52l5xLwgpcLBQRhCvr1peV9UODaCN5nLnRN9nqh1qaw4iNp1rTpvQ=="; + }; + }; "cuint-0.2.2" = { name = "cuint"; packageName = "cuint"; @@ -6872,15 +7421,6 @@ let sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; }; }; - "dargs-5.1.0" = { - name = "dargs"; - packageName = "dargs"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz"; - sha1 = "ec7ea50c78564cd36c9d5ec18f66329fade27829"; - }; - }; "dashdash-1.10.1" = { name = "dashdash"; packageName = "dashdash"; @@ -7196,6 +7736,15 @@ let sha512 = "GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg=="; }; }; + "debuglog-1.0.1" = { + name = "debuglog"; + packageName = "debuglog"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"; + sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; + }; + }; "decamelize-1.2.0" = { name = "decamelize"; packageName = "decamelize"; @@ -7403,6 +7952,15 @@ let sha512 = "Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw=="; }; }; + "deepmerge-2.1.1" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.1.tgz"; + sha512 = "urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w=="; + }; + }; "default-browser-id-1.0.4" = { name = "default-browser-id"; packageName = "default-browser-id"; @@ -7691,6 +8249,15 @@ let sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ=="; }; }; + "dezalgo-1.0.3" = { + name = "dezalgo"; + packageName = "dezalgo"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz"; + sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; + }; + }; "di-0.0.1" = { name = "di"; packageName = "di"; @@ -7826,13 +8393,22 @@ let sha512 = "aqNdl4l76PFb301I1hXkHZSakQTOXR0yRbfDtF7XrZKk+9V5gMQBbQ2xPgnQPfDVG0IeErxkQkoWqp4f9EJe5w=="; }; }; - "dispensary-0.18.0" = { + "disparity-2.0.0" = { + name = "disparity"; + packageName = "disparity"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/disparity/-/disparity-2.0.0.tgz"; + sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; + }; + }; + "dispensary-0.21.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.18.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.18.0.tgz"; - sha512 = "ikVxjigcj4leoPgjqYcHV1YhmLEZ5eXMq30CIPTf1BniWrH1C0X35F5iVCa4U2/JXZYcQJyHWniSRSOpM+hiNw=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.21.0.tgz"; + sha512 = "p7qK1sLukrOGYVVcea63lN9CSiE8wO61cweOjtG6MnKoeC9uKHRIO1iJuE5izcX0BeimhkqrQwEMrFWC1yOyAw=="; }; }; "diveSync-0.3.0" = { @@ -7943,15 +8519,6 @@ let sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; }; }; - "doctoc-1.3.1" = { - name = "doctoc"; - packageName = "doctoc"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.1.tgz"; - sha1 = "f012e3603e3156254c2ef22ac88c7190f55426ba"; - }; - }; "doctrine-2.1.0" = { name = "doctrine"; packageName = "doctrine"; @@ -8123,6 +8690,15 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; + "dot-case-2.1.1" = { + name = "dot-case"; + packageName = "dot-case"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz"; + sha1 = "34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"; + }; + }; "dot-prop-3.0.0" = { name = "dot-prop"; packageName = "dot-prop"; @@ -8141,6 +8717,24 @@ let sha512 = "tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ=="; }; }; + "dotenv-4.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; + sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; + }; + }; + "dotenv-5.0.1" = { + name = "dotenv"; + packageName = "dotenv"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz"; + sha512 = "4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="; + }; + }; "double-ended-queue-2.1.0-0" = { name = "double-ended-queue"; packageName = "double-ended-queue"; @@ -8276,13 +8870,22 @@ let sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73"; }; }; - "ecc-jsbn-0.1.1" = { + "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "ecc-jsbn-0.2.0" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.2.0.tgz"; + sha1 = "7c98afab245f6df32290473c0abee2f2d39334c7"; }; }; "ecdsa-sig-formatter-1.0.10" = { @@ -8430,15 +9033,6 @@ let sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; }; }; - "emoji-regex-6.1.3" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz"; - sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; - }; - }; "emojis-list-2.1.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -8979,22 +9573,22 @@ let sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; }; - "eslint-4.19.1" = { + "eslint-5.0.1" = { name = "eslint"; packageName = "eslint"; - version = "4.19.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz"; - sha512 = "bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; + sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.1.0" = { + "eslint-5.2.0" = { name = "eslint"; packageName = "eslint"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz"; - sha512 = "DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.2.0.tgz"; + sha512 = "zlggW1qp7/TBjwLfouRoY7eWXrXwJZFqCdIxxh0/LVB/QuuKuIMkzyUZEcDo6LBadsry5JcEMxIqd3H/66CXVg=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -9006,15 +9600,6 @@ let sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; - "eslint-scope-3.7.3" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "3.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz"; - sha512 = "W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA=="; - }; - }; "eslint-scope-4.0.0" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -9339,6 +9924,15 @@ let sha1 = "b09c2a9309bc0ef0501479472db3180f8d4c3edd"; }; }; + "execa-0.10.0" = { + name = "execa"; + packageName = "execa"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz"; + sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; + }; + }; "execa-0.4.0" = { name = "execa"; packageName = "execa"; @@ -9573,6 +10167,15 @@ let sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; }; }; + "express-request-proxy-2.2.0" = { + name = "express-request-proxy"; + packageName = "express-request-proxy"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-request-proxy/-/express-request-proxy-2.2.0.tgz"; + sha512 = "tObSNa1H5NMltFxg/UAB7tG2PdjkBeQI7fOTUTWyZWHchS7wY9TKqW1RAe3rn/Tq+EwsPTFRYptuLvBK722ipg=="; + }; + }; "express-session-1.11.3" = { name = "express-session"; packageName = "express-session"; @@ -9627,13 +10230,13 @@ let sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; }; }; - "extend-3.0.1" = { + "extend-3.0.2" = { name = "extend"; packageName = "extend"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extend-shallow-1.1.4" = { @@ -9852,15 +10455,6 @@ let sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; }; }; - "fast-json-patch-1.2.2" = { - name = "fast-json-patch"; - packageName = "fast-json-patch"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-1.2.2.tgz"; - sha1 = "d377d97c6911dbdd2a1c80bfacda048a4f83bbf9"; - }; - }; "fast-json-patch-2.0.6" = { name = "fast-json-patch"; packageName = "fast-json-patch"; @@ -9888,6 +10482,15 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; + "fast-redact-1.1.13" = { + name = "fast-redact"; + packageName = "fast-redact"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.1.13.tgz"; + sha512 = "DsXvFcPGct1AkO+5lIvsb6imkMeoXWUQv4yaSZVY5YvHiriKSkAuR/jhrhyv3lxfyKCCS525u78PQmk4AquAeA=="; + }; + }; "fast-safe-stringify-1.2.3" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; @@ -9897,6 +10500,15 @@ let sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw=="; }; }; + "fast-safe-stringify-2.0.5" = { + name = "fast-safe-stringify"; + packageName = "fast-safe-stringify"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.5.tgz"; + sha512 = "QHbbCj2PmRSMNL9P7EuNBCeNXO06/E3t3XyQgb32AZul8wLmRa1Wbt2cm7GeUsX9OZGyXTQxMYcPOEBqARyhNw=="; + }; + }; "fast-url-parser-1.1.3" = { name = "fast-url-parser"; packageName = "fast-url-parser"; @@ -9906,15 +10518,6 @@ let sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; }; }; - "faye-websocket-0.10.0" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; - }; - }; "faye-websocket-0.11.1" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -10167,6 +10770,15 @@ let sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; }; }; + "find-0.2.9" = { + name = "find"; + packageName = "find"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/find/-/find-0.2.9.tgz"; + sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; + }; + }; "find-cache-dir-1.0.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -10446,13 +11058,13 @@ let sha512 = "uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg=="; }; }; - "follow-redirects-1.5.1" = { + "follow-redirects-1.5.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.1.tgz"; - sha512 = "v9GI1hpaqq1ZZR6pBD1+kI7O24PhDvNGNodjS3MdcEqyrahCp8zbtpv+2B/krUnSmUH80lbAS7MrdeK5IylgKg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.2.tgz"; + sha512 = "kssLorP/9acIdpQ2udQVTiCS5LQmdEz9mvdIfDcl1gYX2tPKFADHSyFdvJS040XdFsPzemWtgI3q8mFVCxtX8A=="; }; }; "for-each-0.3.3" = { @@ -10599,6 +11211,15 @@ let sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; + "format-util-1.0.3" = { + name = "format-util"; + packageName = "format-util"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/format-util/-/format-util-1.0.3.tgz"; + sha1 = "032dca4a116262a12c43f4c3ec8566416c5b2d95"; + }; + }; "formidable-1.0.11" = { name = "formidable"; packageName = "formidable"; @@ -10815,6 +11436,15 @@ let sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; }; }; + "fs-extra-3.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + }; + }; "fs-extra-4.0.3" = { name = "fs-extra"; packageName = "fs-extra"; @@ -10833,6 +11463,15 @@ let sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ=="; }; }; + "fs-extra-6.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz"; + sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; + }; + }; "fs-minipass-1.2.5" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -11527,13 +12166,13 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "global-tunnel-ng-2.4.0" = { + "global-tunnel-ng-2.5.4" = { name = "global-tunnel-ng"; packageName = "global-tunnel-ng"; - version = "2.4.0"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.4.0.tgz"; - sha1 = "97a1847150e7f22ed30771a35aaa4922327a7957"; + url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.5.4.tgz"; + sha1 = "5ef9d5ff2f2a6bed1b305abd463837d47e85b5f4"; }; }; "globals-11.7.0" = { @@ -11563,15 +12202,6 @@ let sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; }; }; - "globby-6.1.0" = { - name = "globby"; - packageName = "globby"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; - }; - }; "globby-8.0.1" = { name = "globby"; packageName = "globby"; @@ -11689,6 +12319,24 @@ let sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; }; + "graphcool-json-schema-1.2.1" = { + name = "graphcool-json-schema"; + packageName = "graphcool-json-schema"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graphcool-json-schema/-/graphcool-json-schema-1.2.1.tgz"; + sha1 = "6cefb6c8b50543615e6efa43bb54f9e3fbb281f3"; + }; + }; + "graphcool-yml-0.4.15" = { + name = "graphcool-yml"; + packageName = "graphcool-yml"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/graphcool-yml/-/graphcool-yml-0.4.15.tgz"; + sha512 = "ZVbRfVI8l21+1JQkcG0XuRam9mgiVUh9/PIcluzCZca2+lZQg/e1WCDXpwsC69i2ZdPcZwpOCLFKQMg5rnulCA=="; + }; + }; "graphlib-2.1.5" = { name = "graphlib"; packageName = "graphlib"; @@ -11698,6 +12346,141 @@ let sha512 = "XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA=="; }; }; + "graphql-0.12.3" = { + name = "graphql"; + packageName = "graphql"; + version = "0.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-0.12.3.tgz"; + sha512 = "Hn9rdu4zacplKXNrLCvR8YFiTGnbM4Zw/UH8FDmzBDsH7ou40lSNH4tIlsxcYnz2TGNVJCpu1WxCM23yd6kzhA=="; + }; + }; + "graphql-0.13.2" = { + name = "graphql"; + packageName = "graphql"; + version = "0.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz"; + sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; + }; + }; + "graphql-cli-prepare-1.4.19" = { + name = "graphql-cli-prepare"; + packageName = "graphql-cli-prepare"; + version = "1.4.19"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-cli-prepare/-/graphql-cli-prepare-1.4.19.tgz"; + sha512 = "PJFm9/DvfZwKz3h2Wyn/5Sr/sX35XsYzNO3olfm5V8qqueNIONI0g7sVqpF7wYdvhEtt/8YA9DjgrGclCbpMfA=="; + }; + }; + "graphql-config-1.2.1" = { + name = "graphql-config"; + packageName = "graphql-config"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-config/-/graphql-config-1.2.1.tgz"; + sha512 = "BOtbEOn/fD13jT0peCy3Fzp1DSTsA/1AcZp266AQ5Sk3wFndKCEa/H7donbu5UriOw1V/N1WDirYPnr7rd8E7Q=="; + }; + }; + "graphql-config-2.0.0" = { + name = "graphql-config"; + packageName = "graphql-config"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-config/-/graphql-config-2.0.0.tgz"; + sha512 = "//hZmROEk79zzPlH6SVTQeXd8NVV65rquz1zxZeO6oEuX5KNnii8+oznLu7d897EfJ+NShTZtsY9FMmxxkWmJw=="; + }; + }; + "graphql-config-2.0.1" = { + name = "graphql-config"; + packageName = "graphql-config"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-config/-/graphql-config-2.0.1.tgz"; + sha512 = "eb4FzlODifHE/Q+91QptAmkGw39wL5ToinJ2556UUsGt2drPc4tzifL+HSnHSaxiIbH8EUhc/Fa6+neinF04qA=="; + }; + }; + "graphql-config-extension-graphcool-1.0.8" = { + name = "graphql-config-extension-graphcool"; + packageName = "graphql-config-extension-graphcool"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-config-extension-graphcool/-/graphql-config-extension-graphcool-1.0.8.tgz"; + sha512 = "eMvL/RAo88EHo8SmP40Zcsrx7nrLTE82G4ZochsHYoEvP+QMo0XA+Vq9lxYeRTJEtGMFD4imjHXGHWh4B0srQw=="; + }; + }; + "graphql-config-extension-openapi-1.0.6" = { + name = "graphql-config-extension-openapi"; + packageName = "graphql-config-extension-openapi"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-config-extension-openapi/-/graphql-config-extension-openapi-1.0.6.tgz"; + sha512 = "Do6tHyQyxaPhaZdJ+ZCpYbVhczlqNqMVuO46aG/YkMuRQPoj/FRmeH9BFXniFkz60TZyRpLTQNel2sllMekRLQ=="; + }; + }; + "graphql-config-extension-prisma-0.0.11" = { + name = "graphql-config-extension-prisma"; + packageName = "graphql-config-extension-prisma"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-config-extension-prisma/-/graphql-config-extension-prisma-0.0.11.tgz"; + sha512 = "Mlj/VYshHbwDrVHgNyNAl2cBU7+Rh503S43UYXcBtR9Am2KNvmPPPccXEeP6yist0yY2WM0WTwL8JoIGrWeFOw=="; + }; + }; + "graphql-import-0.4.5" = { + name = "graphql-import"; + packageName = "graphql-import"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-import/-/graphql-import-0.4.5.tgz"; + sha512 = "G/+I08Qp6/QGTb9qapknCm3yPHV0ZL7wbaalWFpxsfR8ZhZoTBe//LsbsCKlbALQpcMegchpJhpTSKiJjhaVqQ=="; + }; + }; + "graphql-playground-html-1.5.5" = { + name = "graphql-playground-html"; + packageName = "graphql-playground-html"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.5.5.tgz"; + sha512 = "PzSywpEKcjbDUkV6e3ivEixvAuUJGyYmBUvuittzySe/RgwHRo0xKLD7HouUCTbpFfWMw8kRKhAUVtt7Ys97uw=="; + }; + }; + "graphql-playground-middleware-express-1.6.2" = { + name = "graphql-playground-middleware-express"; + packageName = "graphql-playground-middleware-express"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.6.2.tgz"; + sha512 = "BHaEZe2J2lQ1TX2W73a6PI2zVjB9Nb0J9pFdbG1L7ugYdbait/elDrsNMxLCsDHVOGJF009VlYszrk7Cq7FiTg=="; + }; + }; + "graphql-request-1.8.0" = { + name = "graphql-request"; + packageName = "graphql-request"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-request/-/graphql-request-1.8.0.tgz"; + sha512 = "kX4u/rPNd8EkYdYXDzAiGyVrLBZmdZREOlQVemcUkXtNVaNTh6eXC0yhmRypIB070/YtRl1w01xR1efOrHO+JA=="; + }; + }; + "graphql-schema-linter-0.1.1" = { + name = "graphql-schema-linter"; + packageName = "graphql-schema-linter"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-schema-linter/-/graphql-schema-linter-0.1.1.tgz"; + sha512 = "caZbOgNw08/9p3a+qusmaFi1TklG9ti+KHI6a2yfdp009gyoClWGQ+ElKVIiZkJQSeWCri2s2UFBCZjoM0JwTw=="; + }; + }; + "graphql-static-binding-0.9.3" = { + name = "graphql-static-binding"; + packageName = "graphql-static-binding"; + version = "0.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-static-binding/-/graphql-static-binding-0.9.3.tgz"; + sha512 = "C8+EqwNCiQxUhbrWEokxN16oINAkhIDBzEpKHXeatBRaAyMczXm0J6HMaMSKOuQmk7P1PbDHIVW3FVZwXF2WJQ=="; + }; + }; "gray-matter-2.1.1" = { name = "gray-matter"; packageName = "gray-matter"; @@ -11761,15 +12544,6 @@ let sha512 = "jsbAj65WM08H1jCFOKpIvA1OlACk7OHS2FFTeeBZrSJ5OR1PJzAqi0I2R2LTWYN3oMd/N1JYN9cN2IS/8eYqdg=="; }; }; - "gulp-jsonminify-1.1.0" = { - name = "gulp-jsonminify"; - packageName = "gulp-jsonminify"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-jsonminify/-/gulp-jsonminify-1.1.0.tgz"; - sha512 = "nkqH5aRajfCGD8HB2yN+QSEQG0SMEpS7UyOp3HS966Og4DqUX0y8sPF5SU8uSsGLLLXbnHwyHbDkxauYO/pSpQ=="; - }; - }; "gulp-less-3.5.0" = { name = "gulp-less"; packageName = "gulp-less"; @@ -11797,13 +12571,13 @@ let sha512 = "Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA=="; }; }; - "gulp-uglify-3.0.0" = { + "gulp-uglify-3.0.1" = { name = "gulp-uglify"; packageName = "gulp-uglify"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.0.tgz"; - sha1 = "0df0331d72a0d302e3e37e109485dddf33c6d1ca"; + url = "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.1.tgz"; + sha512 = "KVffbGY9d4Wv90bW/B1KZJyunLMyfHTBbilpDvmcrj5Go0/a1G3uVpt+1gRBWSw/11dqR3coJ1oWNTt1AiXuWQ=="; }; }; "gulp-util-3.0.8" = { @@ -12211,6 +12985,15 @@ let sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; }; }; + "header-case-1.0.1" = { + name = "header-case"; + packageName = "header-case"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz"; + sha1 = "9535973197c144b09613cd65d317ef19963bd02d"; + }; + }; "headless-0.1.7" = { name = "headless"; packageName = "headless"; @@ -12463,6 +13246,15 @@ let sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; }; }; + "http-errors-1.7.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.0.tgz"; + sha512 = "hz3BtSHB7Z6dNWzYc+gUbWqG4dIpJedwwOhe1cvGUq5tGmcTTIRkPiAbyh/JlZx+ksSJyGJlgcHo5jGahiXnKw=="; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -12535,15 +13327,6 @@ let sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg=="; }; }; - "http-proxy-middleware-0.17.4" = { - name = "http-proxy-middleware"; - packageName = "http-proxy-middleware"; - version = "0.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz"; - sha1 = "642e8848851d66f09d4f124912846dbaeb41b833"; - }; - }; "http-response-object-1.1.0" = { name = "http-response-object"; packageName = "http-response-object"; @@ -12670,13 +13453,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.17.3" = { + "hypercore-6.18.1" = { name = "hypercore"; packageName = "hypercore"; - version = "6.17.3"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.3.tgz"; - sha512 = "BJwZ4bRV3tYG3R+iE3ydW3GWpZrPLbi86I75qUg9bQ5jMWgwdh+llKgYFvSJhJtoT/MVxrcuXFDkuHiJ0GYMvw=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.18.1.tgz"; + sha512 = "pH2t3ehdTfe/FFrwVq+6w7L9NoWEnFO9Yxix2kj43vSLMHTWCUFdOCJ9/MaOUAG4OeYy4tiT4+IE5NP0bff6Mg=="; }; }; "hypercore-crypto-1.0.0" = { @@ -12850,6 +13633,15 @@ let sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; + "ignore-4.0.3" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.3.tgz"; + sha512 = "Z/vAH2GGIEATQnBVXMclE2IGV6i0GyVngKThcGZ5kHgHMxLo9Ow2+XHRq1aEKEej5vOF1TPJNbvX6J/anT0M7A=="; + }; + }; "ignore-by-default-1.0.1" = { name = "ignore-by-default"; packageName = "ignore-by-default"; @@ -12913,6 +13705,15 @@ let sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; }; }; + "import-local-1.0.0" = { + name = "import-local"; + packageName = "import-local"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz"; + sha512 = "vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ=="; + }; + }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -12967,6 +13768,15 @@ let sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; }; }; + "inflected-2.0.4" = { + name = "inflected"; + packageName = "inflected"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inflected/-/inflected-2.0.4.tgz"; + sha512 = "HQPzFLTTUvwfeUH6RAGjD8cHS069mBqXG5n4qaxX7sJXBhVQrsGgF+0ZJGkSuN6a8pcUWB/GXStta11kKi/WvA=="; + }; + }; "inflection-1.12.0" = { name = "inflection"; packageName = "inflection"; @@ -13129,6 +13939,15 @@ let sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ=="; }; }; + "inquirer-5.1.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-5.1.0.tgz"; + sha512 = "kn7N70US1MSZHZHSGJLiZ7iCwwncc7b0gc68YtlX29OjI3Mp0tSVV+snVXpZ1G+ONS3Ac9zd1m6hve2ibLDYfA=="; + }; + }; "inquirer-5.2.0" = { name = "inquirer"; packageName = "inquirer"; @@ -13255,6 +14074,15 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; + "ip-regex-1.0.3" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz"; + sha1 = "dc589076f659f419c222039a33316f1c7387effd"; + }; + }; "ip-set-1.0.1" = { name = "ip-set"; packageName = "ip-set"; @@ -13282,15 +14110,6 @@ let sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; }; }; - "ipaddr.js-1.6.0" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz"; - sha1 = "e3fa357b773da619f26e95f049d055c72796f86b"; - }; - }; "ipaddr.js-1.8.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -13300,6 +14119,15 @@ let sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"; }; }; + "ipaddr.js-1.8.1" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.1.tgz"; + sha1 = "fa4b79fa47fd3def5e3b159825161c0a519c9427"; + }; + }; "irc-replies-2.0.1" = { name = "irc-replies"; packageName = "irc-replies"; @@ -13363,24 +14191,6 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; - "is-alphabetical-1.0.2" = { - name = "is-alphabetical"; - packageName = "is-alphabetical"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; - sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg=="; - }; - }; - "is-alphanumerical-1.0.2" = { - name = "is-alphanumerical"; - packageName = "is-alphanumerical"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; - sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg=="; - }; - }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -13489,15 +14299,6 @@ let sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; - "is-decimal-1.0.2" = { - name = "is-decimal"; - packageName = "is-decimal"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz"; - sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg=="; - }; - }; "is-descriptor-0.1.6" = { name = "is-descriptor"; packageName = "is-descriptor"; @@ -13516,6 +14317,15 @@ let sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; + "is-directory-0.3.1" = { + name = "is-directory"; + packageName = "is-directory"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + }; "is-docker-1.1.0" = { name = "is-docker"; packageName = "is-docker"; @@ -13660,15 +14470,6 @@ let sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; }; }; - "is-hexadecimal-1.0.2" = { - name = "is-hexadecimal"; - packageName = "is-hexadecimal"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; - sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A=="; - }; - }; "is-installed-globally-0.1.0" = { name = "is-installed-globally"; packageName = "is-installed-globally"; @@ -13678,6 +14479,15 @@ let sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; + "is-lower-case-1.1.3" = { + name = "is-lower-case"; + packageName = "is-lower-case"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz"; + sha1 = "7e147be4768dc466db3bfb21cc60b31e6ad69393"; + }; + }; "is-mergeable-object-1.1.0" = { name = "is-mergeable-object"; packageName = "is-mergeable-object"; @@ -14056,6 +14866,15 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; + "is-upper-case-1.1.2" = { + name = "is-upper-case"; + packageName = "is-upper-case"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz"; + sha1 = "8d0b1fa7e7933a1e58483600ec7d9661cbaf756f"; + }; + }; "is-url-1.2.4" = { name = "is-url"; packageName = "is-url"; @@ -14065,6 +14884,15 @@ let sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; }; }; + "is-url-superb-2.0.0" = { + name = "is-url-superb"; + packageName = "is-url-superb"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-url-superb/-/is-url-superb-2.0.0.tgz"; + sha1 = "b728a18cf692e4d16da6b94c7408a811db0d0492"; + }; + }; "is-utf8-0.2.1" = { name = "is-utf8"; packageName = "is-utf8"; @@ -14191,6 +15019,15 @@ let sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; + "isomorphic-fetch-2.2.1" = { + name = "isomorphic-fetch"; + packageName = "isomorphic-fetch"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; + sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -14209,6 +15046,24 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; + "iterall-1.1.3" = { + name = "iterall"; + packageName = "iterall"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/iterall/-/iterall-1.1.3.tgz"; + sha512 = "Cu/kb+4HiNSejAPhSaN1VukdNTTi/r4/e+yykqjlG/IW+1gZH5b4+Bq3whDX4tvbYugta3r8KTMUiqT3fIGxuQ=="; + }; + }; + "iterall-1.2.2" = { + name = "iterall"; + packageName = "iterall"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz"; + sha512 = "yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="; + }; + }; "iterare-0.0.8" = { name = "iterare"; packageName = "iterare"; @@ -14272,13 +15127,13 @@ let sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6"; }; }; - "jju-1.3.0" = { + "jju-1.4.0" = { name = "jju"; packageName = "jju"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz"; - sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; + url = "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz"; + sha1 = "a3abe2718af241a2b2904f84a625970f389ae32a"; }; }; "jmespath-0.15.0" = { @@ -14317,6 +15172,15 @@ let sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; + "js-base64-2.4.8" = { + name = "js-base64"; + packageName = "js-base64"; + version = "2.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz"; + sha512 = "hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q=="; + }; + }; "js-select-0.6.0" = { name = "js-select"; packageName = "js-select"; @@ -14443,6 +15307,15 @@ let sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; }; }; + "jsesc-2.5.1" = { + name = "jsesc"; + packageName = "jsesc"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz"; + sha1 = "e421a2a8e20d6b0819df28908f782526b96dd1fe"; + }; + }; "jshint-2.8.0" = { name = "jshint"; packageName = "jshint"; @@ -14533,6 +15406,15 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; + "json-schema-ref-parser-3.3.1" = { + name = "json-schema-ref-parser"; + packageName = "json-schema-ref-parser"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-3.3.1.tgz"; + sha512 = "stQTMhec2R/p2L9dH4XXRlpNCP0mY8QrLd/9Kl+8SHJQmwHtE1nDfXH4wbsSM+GkJMl8t92yZbI0OIol432CIQ=="; + }; + }; "json-schema-traverse-0.3.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -14659,6 +15541,15 @@ let sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; + "jsonfile-3.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + }; "jsonfile-4.0.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -14686,15 +15577,6 @@ let sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; }; }; - "jsonminify-0.2.3" = { - name = "jsonminify"; - packageName = "jsonminify"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.2.3.tgz"; - sha1 = "4b842c8a3fe5d6aa48b2f8f95a1cf9a80c019d8e"; - }; - }; "jsonminify-0.4.1" = { name = "jsonminify"; packageName = "jsonminify"; @@ -14758,6 +15640,15 @@ let sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw=="; }; }; + "jsonwebtoken-8.3.0" = { + name = "jsonwebtoken"; + packageName = "jsonwebtoken"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.3.0.tgz"; + sha512 = "oge/hvlmeJCH+iIz1DwcO7vKPkNGJHhgkspk8OH3VKlw+mbi42WtD4ig1+VXRln765vxptAv+xT26Fd3cteqag=="; + }; + }; "jspm-config-0.3.4" = { name = "jspm-config"; packageName = "jspm-config"; @@ -15128,6 +16019,15 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; + "klaw-2.1.1" = { + name = "klaw"; + packageName = "klaw"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/klaw/-/klaw-2.1.1.tgz"; + sha1 = "42b76894701169cc910fd0d19ce677b5fb378af1"; + }; + }; "knockout-3.5.0-rc" = { name = "knockout"; packageName = "knockout"; @@ -15461,22 +16361,13 @@ let sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3"; }; }; - "livereload-js-2.3.0" = { - name = "livereload-js"; - packageName = "livereload-js"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/livereload-js/-/livereload-js-2.3.0.tgz"; - sha512 = "j1R0/FeGa64Y+NmqfZhyoVRzcFlOZ8sNlKzHjh4VvLULFACZhn68XrX5DFg2FhMvSMJmROuFxRSa560ECWKBMg=="; - }; - }; - "load-ip-set-1.3.1" = { + "load-ip-set-2.1.0" = { name = "load-ip-set"; packageName = "load-ip-set"; - version = "1.3.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-1.3.1.tgz"; - sha1 = "cfd050c6916e7ba0ca85d0b566e7854713eb495e"; + url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.0.tgz"; + sha512 = "taz7U6B+F7Zq90dfIKwqsB1CrFKelSEmMGC68OUqem8Cgd1QZygQBYb2Fk9i6muBSfH4xwF/Pjt4KKlAdOyWZw=="; }; }; "load-json-file-1.1.0" = { @@ -16352,15 +17243,6 @@ let sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; }; }; - "longest-streak-1.0.0" = { - name = "longest-streak"; - packageName = "longest-streak"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz"; - sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"; - }; - }; "longjohn-0.2.11" = { name = "longjohn"; packageName = "longjohn"; @@ -16397,13 +17279,13 @@ let sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; - "lossless-json-1.0.2" = { + "lossless-json-1.0.3" = { name = "lossless-json"; packageName = "lossless-json"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.2.tgz"; - sha512 = "1213/0zHUiyQcPUuNOEyllQ4UWGOZLQImiYbUEdvKme/lGRWFRMt0ww9nAJp2DIEofMfD+I5Fm2FAhzHgMmhlA=="; + url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.3.tgz"; + sha512 = "r4w0WrhIHV1lOTVGbTg4Toqwso5x6C8pM7Q/Nto2vy4c7yUSdTYVYlj16uHVX3MT1StpSELDv8yrqGx41MBsDA=="; }; }; "loud-rejection-1.6.0" = { @@ -16433,6 +17315,15 @@ let sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; }; }; + "lower-case-first-1.0.2" = { + name = "lower-case-first"; + packageName = "lower-case-first"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz"; + sha1 = "e5da7c26f29a7073be02d52bac9980e5922adfa1"; + }; + }; "lowercase-keys-1.0.0" = { name = "lowercase-keys"; packageName = "lowercase-keys"; @@ -16595,13 +17486,13 @@ let sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; }; }; - "magnet-uri-5.1.8" = { + "magnet-uri-5.2.3" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.1.8"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.8.tgz"; - sha512 = "rHCJ81C3W2MuLpb4c3JKshQtCbRZhgeKKNYy1YFBtLR3eAB0FjQ5thfCo16w/+VF9yN5tJDtDq4NHPtf9a328A=="; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.2.3.tgz"; + sha512 = "INWVwcpWfZTVM+Yb4EXVBpm0FTd8Q98Fn5x7nuHv1hkFDRELgdIM+eJ3zYLbNTFpFPYtHs6B+sx8exs29IYwgA=="; }; }; "mailcomposer-2.1.0" = { @@ -16748,13 +17639,13 @@ let sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; }; }; - "markdown-it-8.4.1" = { + "markdown-it-8.4.2" = { name = "markdown-it"; packageName = "markdown-it"; - version = "8.4.1"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.1.tgz"; - sha512 = "CzzqSSNkFRUf9vlWvhK1awpJreMRqdCrBvZ8DIoDWTOkESMIF741UPAhuAmbyWmdiFPA6WARNhnu2M6Nrhwa+A=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz"; + sha512 = "GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ=="; }; }; "markdown-it-emoji-1.4.0" = { @@ -16784,24 +17675,6 @@ let sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; }; }; - "markdown-table-0.4.0" = { - name = "markdown-table"; - packageName = "markdown-table"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz"; - sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; - }; - }; - "markdown-to-ast-3.4.0" = { - name = "markdown-to-ast"; - packageName = "markdown-to-ast"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-to-ast/-/markdown-to-ast-3.4.0.tgz"; - sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; - }; - }; "marked-0.3.19" = { name = "marked"; packageName = "marked"; @@ -17279,6 +18152,15 @@ let sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; }; }; + "mime-types-2.1.19" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.19"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz"; + sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw=="; + }; + }; "mimelib-0.3.1" = { name = "mimelib"; packageName = "mimelib"; @@ -17711,13 +18593,13 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "mp4-box-encoding-1.1.4" = { + "mp4-box-encoding-1.3.0" = { name = "mp4-box-encoding"; packageName = "mp4-box-encoding"; - version = "1.1.4"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.4.tgz"; - sha512 = "p6AN8M4IBaMQLcnzynXhKXW+RTz3Cc6CE12lkyffnlvwy11IjgCmmQeeOSqVaNwXdePhYviXUbwD/1GUlHQKog=="; + url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.3.0.tgz"; + sha512 = "U4pMLpjT/UzB8d36dxj6Mf1bG9xypEvgbuRIa1fztRXNKKTCAtRxsnFZhNOd7YDFOKtjBgssYGvo4H/Q3ZY1MA=="; }; }; "mp4-stream-2.0.3" = { @@ -18661,6 +19543,33 @@ let sha512 = "DUqXaoEFcx0xqZnMyYniyEzTKcdBhAC5GAcNsRS4tiG3VR8tidwth73cr5/rc4NzbjXIk+Jje8P4VJI+fWXHuw=="; }; }; + "node-fetch-1.7.3" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz"; + sha512 = "NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ=="; + }; + }; + "node-fetch-2.0.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.0.0.tgz"; + sha1 = "982bba43ecd4f2922a29cc186a6bbb0bb73fcba6"; + }; + }; + "node-fetch-2.2.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.0.tgz"; + sha512 = "OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA=="; + }; + }; "node-forge-0.6.23" = { name = "node-forge"; packageName = "node-forge"; @@ -18679,6 +19588,15 @@ let sha512 = "MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ=="; }; }; + "node-gyp-3.7.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz"; + sha512 = "qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg=="; + }; + }; "node-gyp-build-3.4.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -18778,6 +19696,15 @@ let sha512 = "NAM6mlAiZk1EwHtdPNnP/E8P5EIijnqSag1vzE/Ya+ggywTiELt9HtYX26evyB/MrnVS+FIJg+M8S5HobklERg=="; }; }; + "node-request-by-swagger-1.1.3" = { + name = "node-request-by-swagger"; + packageName = "node-request-by-swagger"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-request-by-swagger/-/node-request-by-swagger-1.1.3.tgz"; + sha512 = "granjsEA0c+1GnJaKnOjJy1E3wWLADUnAg+x1eopWOo+oMDfRYKJjCBaInUgrli/yEnvUAJoymGhExP/6tcOyQ=="; + }; + }; "node-ssdp-2.9.1" = { name = "node-ssdp"; packageName = "node-ssdp"; @@ -19120,6 +20047,15 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; + "npm-lifecycle-2.0.3" = { + name = "npm-lifecycle"; + packageName = "npm-lifecycle"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-2.0.3.tgz"; + sha512 = "0U4Iim5ix2NHUT672G7FBpldJX0N2xKBjJqRTAzioEJjb6I6KpQXq+y1sB5EDSjKaAX8VCC9qPK31Jy+p3ix5A=="; + }; + }; "npm-package-arg-6.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -19129,13 +20065,31 @@ let sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; }; }; - "npm-packlist-1.1.10" = { + "npm-packlist-1.1.11" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.10"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; - sha512 = "AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz"; + sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA=="; + }; + }; + "npm-path-2.0.4" = { + name = "npm-path"; + packageName = "npm-path"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz"; + sha512 = "IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw=="; + }; + }; + "npm-paths-1.0.0" = { + name = "npm-paths"; + packageName = "npm-paths"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-paths/-/npm-paths-1.0.0.tgz"; + sha512 = "COlxSO5PK9UvZXIa7/sqJDZOlffWFx9+CKJJWkdbhUJMBwcf9sof2jxt4uiVsl+nY3sy0/XFGl4iGr8GoKfiXA=="; }; }; "npm-registry-client-0.2.27" = { @@ -19156,6 +20110,15 @@ let sha512 = "7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg=="; }; }; + "npm-run-4.1.2" = { + name = "npm-run"; + packageName = "npm-run"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run/-/npm-run-4.1.2.tgz"; + sha1 = "1030e1ec56908c89fcc3fa366d03a2c2ba98eb99"; + }; + }; "npm-run-path-1.0.0" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -19174,6 +20137,15 @@ let sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; }; + "npm-which-3.0.1" = { + name = "npm-which"; + packageName = "npm-which"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz"; + sha1 = "9225f26ec3a285c209cae67c3b11a6b4ab7140aa"; + }; + }; "npmconf-0.1.1" = { name = "npmconf"; packageName = "npmconf"; @@ -19607,6 +20579,15 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; + "ono-4.0.5" = { + name = "ono"; + packageName = "ono"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ono/-/ono-4.0.5.tgz"; + sha512 = "ZVNuV9kJbr/2tWs83I2snrYo+WIS0DISF/xUfX9p9b6GyDD6F5N9PzHjW+p/dep6IGwSYylf1HCub5I/nM0R5Q=="; + }; + }; "open-0.0.2" = { name = "open"; packageName = "open"; @@ -19976,6 +20957,33 @@ let sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; }; + "p-map-1.2.0" = { + name = "p-map"; + packageName = "p-map"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz"; + sha512 = "r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="; + }; + }; + "p-map-series-1.0.0" = { + name = "p-map-series"; + packageName = "p-map-series"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz"; + sha1 = "bf98fe575705658a9e1351befb85ae4c1f07bdca"; + }; + }; + "p-reduce-1.0.0" = { + name = "p-reduce"; + packageName = "p-reduce"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz"; + sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; + }; + }; "p-some-2.0.1" = { name = "p-some"; packageName = "p-some"; @@ -20021,6 +21029,15 @@ let sha512 = "hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ=="; }; }; + "p-waterfall-1.0.0" = { + name = "p-waterfall"; + packageName = "p-waterfall"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-waterfall/-/p-waterfall-1.0.0.tgz"; + sha1 = "7ed94b3ceb3332782353af6aae11aa9fc235bb00"; + }; + }; "pac-proxy-agent-2.0.2" = { name = "pac-proxy-agent"; packageName = "pac-proxy-agent"; @@ -20147,15 +21164,6 @@ let sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; }; }; - "parse-entities-1.1.2" = { - name = "parse-entities"; - packageName = "parse-entities"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz"; - sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg=="; - }; - }; "parse-filepath-1.0.2" = { name = "parse-filepath"; packageName = "parse-filepath"; @@ -20174,6 +21182,15 @@ let sha1 = "9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"; }; }; + "parse-github-url-1.0.2" = { + name = "parse-github-url"; + packageName = "parse-github-url"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz"; + sha512 = "kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw=="; + }; + }; "parse-glob-3.0.4" = { name = "parse-glob"; packageName = "parse-glob"; @@ -20210,6 +21227,15 @@ let sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; }; }; + "parse-json-3.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz"; + sha1 = "fa6f47b18e23826ead32f263e744d0e1e847fb13"; + }; + }; "parse-json-4.0.0" = { name = "parse-json"; packageName = "parse-json"; @@ -20255,13 +21281,13 @@ let sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; }; }; - "parse-torrent-6.0.1" = { + "parse-torrent-6.1.1" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "6.0.1"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.1.tgz"; - sha512 = "triz3PBolkV8kvyV2GEvVn3wne5HayJc+C1Px3L0o1UaNBO2qlv2u6seXDrbRicmL/qL2msZap+SuzMuzNb/Kg=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.1.1.tgz"; + sha512 = "VOQseFSgXOJE1tnwLJHA6GAILC62GaXRtoCkf3cOiTxMt2P/Xjz1Oe6TVJB7BCm4WkgOY7QS22bjqA7Z4ryuJA=="; }; }; "parse-torrent-file-2.1.4" = { @@ -20372,6 +21398,15 @@ let sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; }; }; + "pascal-case-2.0.1" = { + name = "pascal-case"; + packageName = "pascal-case"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz"; + sha1 = "2d578d3455f660da65eca18ef95b4e0de912761e"; + }; + }; "pascalcase-0.1.1" = { name = "pascalcase"; packageName = "pascalcase"; @@ -20507,6 +21542,15 @@ let sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; + "path-case-2.1.1" = { + name = "path-case"; + packageName = "path-case"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz"; + sha1 = "94b8037c372d3fe2906e465bb45e25d226e8eea5"; + }; + }; "path-dirname-1.0.2" = { name = "path-dirname"; packageName = "path-dirname"; @@ -20805,6 +21849,15 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "phantom-4.0.12" = { + name = "phantom"; + packageName = "phantom"; + version = "4.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/phantom/-/phantom-4.0.12.tgz"; + sha512 = "Tz82XhtPmwCk1FFPmecy7yRGZG2btpzY2KI9fcoPT7zT9det0CcMyfBFPp1S8DqzsnQnm8ZYEfdy528mwVtksA=="; + }; + }; "phantomjs-1.9.20" = { name = "phantomjs"; packageName = "phantomjs"; @@ -20868,13 +21921,22 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-4.16.1" = { + "pino-4.17.6" = { name = "pino"; packageName = "pino"; - version = "4.16.1"; + version = "4.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.16.1.tgz"; - sha512 = "ST/IC5RMyqrOZL+Hq6LDwz5h4fGKABXzx2/5Ze7rz5TjuPvE8uI72dzj409xkq9JjyWsKoOOApgXn8kEjJ73yg=="; + url = "https://registry.npmjs.org/pino/-/pino-4.17.6.tgz"; + sha512 = "LFDwmhyWLBnmwO/2UFbWu1jEGVDzaPupaVdx0XcZ3tIAx1EDEBauzxXf2S0UcFK7oe+X9MApjH0hx9U1XMgfCA=="; + }; + }; + "pino-5.0.0-rc.4" = { + name = "pino"; + packageName = "pino"; + version = "5.0.0-rc.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-5.0.0-rc.4.tgz"; + sha512 = "n5aJmABDjzZbwrB0AEbUeugz1Rh55c9T62yVGv6YL1vP1GuqpjIcLgwZIM1SI8E4Nfmcoo46SSmPgSSA9mPdog=="; }; }; "pino-std-serializers-2.1.0" = { @@ -21120,15 +22182,6 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "postcss-6.0.19" = { - name = "postcss"; - packageName = "postcss"; - version = "6.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz"; - sha512 = "f13HRz0HtVwVaEuW6J6cOUCBLFtymhgyLPV7t4QEk2UD3twRI9IluDcQNdzQdBpiixkXj2OmzejhhTbSbDxNTg=="; - }; - }; "postcss-6.0.23" = { name = "postcss"; packageName = "postcss"; @@ -21147,15 +22200,6 @@ let sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; - "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=="; - }; - }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -21255,6 +22299,24 @@ let sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; }; }; + "prisma-json-schema-0.0.4" = { + name = "prisma-json-schema"; + packageName = "prisma-json-schema"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.0.4.tgz"; + sha512 = "NTbourUhkmhM18rrcnp+IdxTdWftUsepZcNX2QntOqkOOwccYADmmZJpTr9tuvCYsW3i48B8LVEwvm0v1pAhxQ=="; + }; + }; + "prisma-yml-1.0.50" = { + name = "prisma-yml"; + packageName = "prisma-yml"; + version = "1.0.50"; + src = fetchurl { + url = "https://registry.npmjs.org/prisma-yml/-/prisma-yml-1.0.50.tgz"; + sha512 = "Vpt6q+YzS6yozMnIPU75hlHzmDR1Hj4Z3FXaazJrOXUyeQx/xDqeEwRJ+ii4xl/GRYiFnMEVSLfsPzjLehA1Zw=="; + }; + }; "private-0.1.8" = { name = "private"; packageName = "private"; @@ -21498,6 +22560,15 @@ let sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; }; }; + "protochain-1.0.5" = { + name = "protochain"; + packageName = "protochain"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/protochain/-/protochain-1.0.5.tgz"; + sha1 = "991c407e99de264aadf8f81504b5e7faf7bfa260"; + }; + }; "protocol-buffers-encodings-1.1.0" = { name = "protocol-buffers-encodings"; packageName = "protocol-buffers-encodings"; @@ -21525,13 +22596,22 @@ let sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; }; }; - "proxy-addr-2.0.3" = { + "proxy-addr-2.0.4" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz"; - sha512 = "jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz"; + sha512 = "5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA=="; + }; + }; + "proxy-agent-2.3.1" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz"; + sha512 = "CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg=="; }; }; "proxy-agent-3.0.1" = { @@ -22119,6 +23199,15 @@ let sha1 = "0ca581de3174becef25ac3c2e8956342381db698"; }; }; + "quick-format-unescaped-3.0.0" = { + name = "quick-format-unescaped"; + packageName = "quick-format-unescaped"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-3.0.0.tgz"; + sha512 = "XmIOc07VM2kPm6m3j/U6jgxyUgDm2Rgh2c1PPy0JUHoQRdoh86hOym0bHyF6G1T6sn+N5lildhvl/T59H5KVyA=="; + }; + }; "quick-lru-1.1.0" = { name = "quick-lru"; packageName = "quick-lru"; @@ -22245,13 +23334,13 @@ let sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f"; }; }; - "raven-js-3.26.3" = { + "raven-js-3.26.4" = { name = "raven-js"; packageName = "raven-js"; - version = "3.26.3"; + version = "3.26.4"; src = fetchurl { - url = "https://registry.npmjs.org/raven-js/-/raven-js-3.26.3.tgz"; - sha512 = "VPAsPfK73A9VPcJx5X/kt0GxOqUGpGDM8vdzsYNQXMhYemyZGiW1JX1AI+f4jxm37Apijj6VVtCyJcYFz3ocSQ=="; + url = "https://registry.npmjs.org/raven-js/-/raven-js-3.26.4.tgz"; + sha512 = "5VmC3IWhTQJkaiQaCY0S5V8za4bpUgbbuVT1MkDH7JVqgu8CPQ750XaFF8BVRbLV9F5nvoz7n0UT0CKteDuZAg=="; }; }; "raw-body-0.0.3" = { @@ -22263,15 +23352,6 @@ let sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; }; }; - "raw-body-1.1.7" = { - name = "raw-body"; - packageName = "raw-body"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz"; - sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425"; - }; - }; "raw-body-1.3.4" = { name = "raw-body"; packageName = "raw-body"; @@ -22407,6 +23487,15 @@ let sha512 = "/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg=="; }; }; + "read-package-tree-5.2.1" = { + name = "read-package-tree"; + packageName = "read-package-tree"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.2.1.tgz"; + sha512 = "2CNoRoh95LxY47LvqrehIAfUVda2JbuFE/HaGYs42bNrGG+ojbw1h3zOcPcQ+1GQ3+rkzNndZn85u1XyZ3UsIA=="; + }; + }; "read-pkg-1.1.0" = { name = "read-pkg"; packageName = "read-pkg"; @@ -22524,6 +23613,15 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; + "readdir-scoped-modules-1.0.2" = { + name = "readdir-scoped-modules"; + packageName = "readdir-scoped-modules"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz"; + sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747"; + }; + }; "readdirp-2.1.0" = { name = "readdirp"; packageName = "readdirp"; @@ -22794,33 +23892,6 @@ let sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4"; }; }; - "remark-5.1.0" = { - name = "remark"; - packageName = "remark"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark/-/remark-5.1.0.tgz"; - sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c"; - }; - }; - "remark-parse-1.1.0" = { - name = "remark-parse"; - packageName = "remark-parse"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz"; - sha1 = "c3ca10f9a8da04615c28f09aa4e304510526ec21"; - }; - }; - "remark-stringify-1.1.0" = { - name = "remark-stringify"; - packageName = "remark-stringify"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz"; - sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"; - }; - }; "remove-array-items-1.0.0" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -22857,13 +23928,13 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "render-media-3.1.0" = { + "render-media-3.1.2" = { name = "render-media"; packageName = "render-media"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/render-media/-/render-media-3.1.0.tgz"; - sha512 = "rTNcgMHJ/MrQbt96bTTwlfBY1A87EqNx0buJ2pPHTuLGwk0Aw99e1BrHgr6SpB4D7Cb7AMdiL/Gzx+UYrHliVw=="; + url = "https://registry.npmjs.org/render-media/-/render-media-3.1.2.tgz"; + sha512 = "SZZ1i5qsPTLKIkYZ5SHHFUArtj5hGzvNGcwnQnJcjcNI9X3yptAhB4dBdglTO9ViYG/CXQDz/liaqYLNFBWA/A=="; }; }; "render-readme-1.3.1" = { @@ -22938,6 +24009,15 @@ let sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; }; + "replaceall-0.1.6" = { + name = "replaceall"; + packageName = "replaceall"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/replaceall/-/replaceall-0.1.6.tgz"; + sha1 = "81d81ac7aeb72d7f5c4942adf2697a3220688d8e"; + }; + }; "request-2.16.6" = { name = "request"; packageName = "request"; @@ -23001,15 +24081,6 @@ let sha512 = "lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw=="; }; }; - "request-2.85.0" = { - name = "request"; - packageName = "request"; - version = "2.85.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; - sha512 = "8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg=="; - }; - }; "request-2.87.0" = { name = "request"; packageName = "request"; @@ -23037,6 +24108,24 @@ let sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; }; }; + "request-promise-4.2.2" = { + name = "request-promise"; + packageName = "request-promise"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.2.tgz"; + sha1 = "d1ea46d654a6ee4f8ee6a4fea1018c22911904b4"; + }; + }; + "request-promise-core-1.1.1" = { + name = "request-promise-core"; + packageName = "request-promise-core"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz"; + sha1 = "3eee00b2c5aa83239cfb04c5700da36f81cd08b6"; + }; + }; "requestretry-1.13.0" = { name = "requestretry"; packageName = "requestretry"; @@ -23127,6 +24216,15 @@ let sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; }; }; + "resolve-cwd-2.0.0" = { + name = "resolve-cwd"; + packageName = "resolve-cwd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + }; "resolve-dir-1.0.1" = { name = "resolve-dir"; packageName = "resolve-dir"; @@ -23163,6 +24261,15 @@ let sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; }; }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; "resolve-options-1.1.0" = { name = "resolve-options"; packageName = "resolve-options"; @@ -23550,15 +24657,6 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "safe-json-parse-1.0.1" = { - name = "safe-json-parse"; - packageName = "safe-json-parse"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz"; - sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; - }; - }; "safe-json-stringify-1.2.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; @@ -23595,13 +24693,13 @@ let sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad"; }; }; - "sanitize-html-1.18.2" = { + "sanitize-html-1.18.3" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.18.2"; + version = "1.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz"; - sha512 = "52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.3.tgz"; + sha512 = "xoXC9dV3SrfhJDPo9XkLCgLDC5yQ5TQwIpIC8bc/qOCH6DvHwMGYNI2qrdb/EX8RQA7PMYL4th5B+XvijTbVEQ=="; }; }; "sax-0.3.5" = { @@ -23676,6 +24774,15 @@ let sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; }; }; + "scuid-1.1.0" = { + name = "scuid"; + packageName = "scuid"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/scuid/-/scuid-1.1.0.tgz"; + sha512 = "MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg=="; + }; + }; "secure-keys-1.0.0" = { name = "secure-keys"; packageName = "secure-keys"; @@ -23892,6 +24999,15 @@ let sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; }; }; + "sentence-case-2.1.1" = { + name = "sentence-case"; + packageName = "sentence-case"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz"; + sha1 = "1f6e2dda39c168bf92d13f86d4a918933f667ed4"; + }; + }; "sentiment-2.1.0" = { name = "sentiment"; packageName = "sentiment"; @@ -23928,6 +25044,15 @@ let sha512 = "Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ=="; }; }; + "serializerr-1.0.3" = { + name = "serializerr"; + packageName = "serializerr"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serializerr/-/serializerr-1.0.3.tgz"; + sha1 = "12d4c5aa1c3ffb8f6d1dc5f395aa9455569c3f91"; + }; + }; "serve-favicon-2.3.2" = { name = "serve-favicon"; packageName = "serve-favicon"; @@ -23946,13 +25071,13 @@ let sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0"; }; }; - "serve-handler-3.3.0" = { + "serve-handler-3.6.0" = { name = "serve-handler"; packageName = "serve-handler"; - version = "3.3.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.3.0.tgz"; - sha512 = "cJi7lLmrYEOLdz8sWCSNwrYJaxdhgWGQKFLPUXS4swpm/CXbQ5QRtuvIESSXQF4/iheYRNcQ+M6maH9UhTp0LA=="; + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-3.6.0.tgz"; + sha512 = "YPMV1OCfOxub4OnGQQtcGEJNI6e49r0vfSid2U5xrcOB1l6TFWfvHmUhEbfrvU7sqhZgmicfVtVBiAAGRH7NTA=="; }; }; "serve-index-1.7.3" = { @@ -24180,13 +25305,13 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "shelljs-0.8.1" = { + "shelljs-0.8.2" = { name = "shelljs"; packageName = "shelljs"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz"; - sha512 = "YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA=="; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz"; + sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ=="; }; }; "shellwords-0.1.1" = { @@ -24261,6 +25386,15 @@ let sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; }; }; + "simple-errors-1.0.1" = { + name = "simple-errors"; + packageName = "simple-errors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-errors/-/simple-errors-1.0.1.tgz"; + sha1 = "b0bbecac1f1082f13b3962894b4a9e88f3a0c9ef"; + }; + }; "simple-get-1.4.3" = { name = "simple-get"; packageName = "simple-get"; @@ -24360,13 +25494,13 @@ let sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; - "simple-websocket-7.0.2" = { + "simple-websocket-7.2.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "7.0.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.0.2.tgz"; - sha512 = "cAjSaqHMtO2qc1HHSrW44aTrb2Xa7wZzHajvH6An4IhCFjTuPUXfmSByd9Z0B5Bc6bmiwQ2bFHMUMA8vGC5Bug=="; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.2.0.tgz"; + sha512 = "wdxFg1fHw1yqFKWDcw+yNb4VIYqtl+vknZMlpLhvZSlR6l7/iVuwozqo+Qtl73mB1IH5QnXzonD1S+hAaLNTvQ=="; }; }; "simplediff-0.1.1" = { @@ -24567,6 +25701,15 @@ let sha1 = "d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"; }; }; + "snake-case-2.1.0" = { + name = "snake-case"; + packageName = "snake-case"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz"; + sha1 = "41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"; + }; + }; "snapdragon-0.8.2" = { name = "snapdragon"; packageName = "snapdragon"; @@ -24630,13 +25773,13 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.88.2" = { + "snyk-1.90.0" = { name = "snyk"; packageName = "snyk"; - version = "1.88.2"; + version = "1.90.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.88.2.tgz"; - sha1 = "fff27ebbaa4f624398bd6d31b76c008912efd6b7"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.90.0.tgz"; + sha1 = "ba37f66484e18a56fc98f64d565a517a53fc8562"; }; }; "snyk-config-2.1.0" = { @@ -24693,13 +25836,13 @@ let sha512 = "ieTWhn1MB88gEQ6nUtGCeUKQ6Xoxm+u+QmD9u3zfP1QS5ep9fWt3YYDUQjgUiDTJJy7QyVQdZ/fsz3RECnOA7w=="; }; }; - "snyk-nuget-plugin-1.6.2" = { + "snyk-nuget-plugin-1.6.3" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.2.tgz"; - sha512 = "8l8hS85esXyweTFgUFdwnGT94Ts42KcG5fdBX2wYosQkpUMePd+GTT9+64k/GvdH5hqcNt2OvtzW+Uf8JF+pbA=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.3.tgz"; + sha512 = "sC590aveQb0ns7HuDheIZ7FhN/HZzWgzXKUnBGfia/SXIFBpQz/6tognraMJ4+877uLLSdsB2jkyDeHYeWICrg=="; }; }; "snyk-php-plugin-1.5.1" = { @@ -24720,13 +25863,13 @@ let sha512 = "CEioNnDzccHyid7UIVl3bJ1dnG4co4ofI+KxuC1mo0IUXy64gxnBTeVoZF5gVLWbAyxGxSeW8f0+8GmWMHVb7w=="; }; }; - "snyk-python-plugin-1.6.1" = { + "snyk-python-plugin-1.8.0" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.6.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.1.tgz"; - sha512 = "6zr5jAB3p/bwMZQxZpdj+aPmioTgHB4DI6JMLInhZupss0x8Ome5YqzVzBbOvUKNrc3KaLtjGrJWcAuxDL6M/g=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.0.tgz"; + sha512 = "44oDdNjCaNEy+uSmLB3iqtGJa6TAmB7bcG7j9+KkHH6WNxjrwCDHAZQXncIeliYXohb0FFTNMAnbAK4PosqN2Q=="; }; }; "snyk-resolve-1.0.1" = { @@ -25008,6 +26151,15 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; + "sonic-boom-0.5.0" = { + name = "sonic-boom"; + packageName = "sonic-boom"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.5.0.tgz"; + sha512 = "IqUrLNxgsUQGVyMLW8w8vELMa1BZIQ/uBjBuxLK0jg7HqWwedCgmBLqvgMFGihhXCoQ8w5m2vcnMs47C4KYxuQ=="; + }; + }; "sorcery-0.10.0" = { name = "sorcery"; packageName = "sorcery"; @@ -25557,6 +26709,15 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; + "stealthy-require-1.1.1" = { + name = "stealthy-require"; + packageName = "stealthy-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + }; "steno-0.4.4" = { name = "steno"; packageName = "steno"; @@ -25629,13 +26790,13 @@ let sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; }; }; - "stream-each-1.2.2" = { + "stream-each-1.2.3" = { name = "stream-each"; packageName = "stream-each"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; - sha512 = "mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA=="; + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz"; + sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; }; }; "stream-http-2.8.3" = { @@ -25917,13 +27078,13 @@ let sha512 = "WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q=="; }; }; - "string2compact-1.2.5" = { + "string2compact-1.3.0" = { name = "string2compact"; packageName = "string2compact"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.5.tgz"; - sha512 = "WujFln3AWQhpd/0UXjR8Ctcy/lCCb1jmED8h1Loa6938stww6LSSuP7FWqTMFlb4dxn/6l54jrAqlJhIAUlBWw=="; + url = "https://registry.npmjs.org/string2compact/-/string2compact-1.3.0.tgz"; + sha512 = "004ulKKANDuQilQsNxy2lisrpMG0qUJxBU+2YCEF7KziRyNR0Nredm2qk0f1V82nva59H3y9GWeHXE63HzGRFw=="; }; }; "string_decoder-0.10.31" = { @@ -25953,15 +27114,6 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "stringify-entities-1.3.2" = { - name = "stringify-entities"; - packageName = "stringify-entities"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz"; - sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A=="; - }; - }; "stringstream-0.0.6" = { name = "stringstream"; packageName = "stringstream"; @@ -26169,15 +27321,6 @@ let sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; }; }; - "structured-source-3.0.2" = { - name = "structured-source"; - packageName = "structured-source"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/structured-source/-/structured-source-3.0.2.tgz"; - sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5"; - }; - }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -26223,6 +27366,15 @@ let sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA=="; }; }; + "superagent-proxy-1.0.3" = { + name = "superagent-proxy"; + packageName = "superagent-proxy"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-1.0.3.tgz"; + sha512 = "79Ujg1lRL2ICfuHUdX+H2MjIw73kB7bXsIkxLwHURz3j0XUmEEEoJ+u/wq+mKwna21Uejsm2cGR3OESA00TIjA=="; + }; + }; "supports-color-0.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -26286,6 +27438,15 @@ let sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; }; }; + "swap-case-1.1.2" = { + name = "swap-case"; + packageName = "swap-case"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz"; + sha1 = "c39203a4587385fad3c850a0bd1bcafa081974e3"; + }; + }; "symbol-observable-1.0.1" = { name = "symbol-observable"; packageName = "symbol-observable"; @@ -26304,6 +27465,15 @@ let sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; }; }; + "sync-exec-0.6.2" = { + name = "sync-exec"; + packageName = "sync-exec"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sync-exec/-/sync-exec-0.6.2.tgz"; + sha1 = "717d22cc53f0ce1def5594362f3a89a2ebb91105"; + }; + }; "sync-request-3.0.0" = { name = "sync-request"; packageName = "sync-request"; @@ -26331,15 +27501,6 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "table-4.0.2" = { - name = "table"; - packageName = "table"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.2.tgz"; - sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA=="; - }; - }; "table-4.0.3" = { name = "table"; packageName = "table"; @@ -26440,13 +27601,13 @@ let sha512 = "pQNFsg+Wb6VXsrIPUnuQwrHR4wD5ASBR0jRyiT4/AALFA2Nl+CjhkDX5fTmIwCuULRtyQR3Dae2BBnP2EFHscw=="; }; }; - "tar-4.4.4" = { + "tar-4.4.6" = { name = "tar"; packageName = "tar"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz"; - sha512 = "mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz"; + sha512 = "tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg=="; }; }; "tar-fs-1.16.3" = { @@ -26512,15 +27673,6 @@ let sha1 = "8cff630fb7e9da05f047c74ce4ce4d685457d492"; }; }; - "tempfile-1.1.1" = { - name = "tempfile"; - packageName = "tempfile"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; - sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; - }; - }; "tempfile-2.0.0" = { name = "tempfile"; packageName = "tempfile"; @@ -26818,15 +27970,6 @@ let sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; }; }; - "tiny-lr-1.1.1" = { - name = "tiny-lr"; - packageName = "tiny-lr"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz"; - sha512 = "44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA=="; - }; - }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -26836,6 +27979,15 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; + "title-case-2.1.1" = { + name = "title-case"; + packageName = "title-case"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz"; + sha1 = "3e127216da58d2bc5becf137ab91dae3a7cd8faa"; + }; + }; "titleize-1.0.1" = { name = "titleize"; packageName = "titleize"; @@ -26935,6 +28087,15 @@ let sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; }; }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; "to-object-path-0.3.0" = { name = "to-object-path"; packageName = "to-object-path"; @@ -26980,6 +28141,15 @@ let sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852"; }; }; + "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=="; + }; + }; "toiletdb-1.4.1" = { name = "toiletdb"; packageName = "toiletdb"; @@ -27016,13 +28186,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-8.4.1" = { + "torrent-discovery-9.0.2" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "8.4.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.1.tgz"; - sha512 = "PHy/H+S2pxBMK8ZdiZxp16mIPfs50rdzYjOWJLJg974BCE/VbdxHirQv117kVl9STKKXKZWo5NADGAYfmIXH0w=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.0.2.tgz"; + sha512 = "UpkOyi/QUXRAwts8vSsFu/jRQ1mwGkaqv2OxLTJGr4DJKCiXpLHZ1+A4rxabcOWinM9RiqmS5mAjDuFfPHiJvw=="; }; }; "torrent-piece-1.1.2" = { @@ -27034,6 +28204,15 @@ let sha512 = "ElXPyXKKG73o+uziHJ8qlYE9EuyDVxnK2zWL+pW/2bma7RsLpSwFFIJAb8Qui7/tel2hsHQW1z3zBnfQNREpWA=="; }; }; + "torrent-piece-2.0.0" = { + name = "torrent-piece"; + packageName = "torrent-piece"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-2.0.0.tgz"; + sha512 = "H/Z/yCuvZJj1vl1IQHI8dvF2QrUuXRJoptT5DW5967/dsLpXlCg+uyhFR5lfNj5mNaYePUbKtnL+qKWZGXv4Nw=="; + }; + }; "torrent-stream-1.0.4" = { name = "torrent-stream"; packageName = "torrent-stream"; @@ -27169,13 +28348,13 @@ let sha1 = "d04b2280e4c792a5815429ef7b8b60c64c9ccc34"; }; }; - "traverse-0.6.6" = { - name = "traverse"; - packageName = "traverse"; - version = "0.6.6"; + "traverse-chain-0.1.0" = { + name = "traverse-chain"; + packageName = "traverse-chain"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; - sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + url = "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz"; + sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; "tree-kill-1.2.0" = { @@ -27241,24 +28420,6 @@ let sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; }; }; - "trim-trailing-lines-1.1.1" = { - name = "trim-trailing-lines"; - packageName = "trim-trailing-lines"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; - sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="; - }; - }; - "trough-1.0.2" = { - name = "trough"; - packageName = "trough"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz"; - sha512 = "FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ=="; - }; - }; "truncate-2.0.1" = { name = "truncate"; packageName = "truncate"; @@ -27286,6 +28447,15 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; + "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=="; + }; + }; "ttl-1.3.1" = { name = "ttl"; packageName = "ttl"; @@ -27583,13 +28753,13 @@ let sha512 = "hobogryjDV36VrLK3Y69ou4REyrTApzUblVFmdQOYRe8cYaSmFJXMb4dR9McdvYDSbeNdzUgYr2YVukJaErJcA=="; }; }; - "uglify-js-3.4.4" = { + "uglify-js-3.4.6" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.4"; + version = "3.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.4.tgz"; - sha512 = "RiB1kNcC9RMyqwRrjXC+EjgLoXULoDnCaOnEDzUCHkBN0bHwmtF5rzDMiDWU29gu0kXCRRWwtcTAVFWRECmU2Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz"; + sha512 = "O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -27673,15 +28843,6 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; - "uint64be-1.0.1" = { - name = "uint64be"; - packageName = "uint64be"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uint64be/-/uint64be-1.0.1.tgz"; - sha1 = "1f7154202f2a1b8af353871dda651bf34ce93e95"; - }; - }; "uint64be-2.0.2" = { name = "uint64be"; packageName = "uint64be"; @@ -27709,6 +28870,15 @@ let sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; + "umask-1.1.0" = { + name = "umask"; + packageName = "umask"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"; + sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; + }; + }; "umd-3.0.3" = { name = "umd"; packageName = "umd"; @@ -27844,13 +29014,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "unherit-1.1.1" = { - name = "unherit"; - packageName = "unherit"; - version = "1.1.1"; + "unicode-5.2.0-0.7.5" = { + name = "unicode-5.2.0"; + packageName = "unicode-5.2.0"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz"; - sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g=="; + url = "https://registry.npmjs.org/unicode-5.2.0/-/unicode-5.2.0-0.7.5.tgz"; + sha512 = "KVGLW1Bri30x00yv4HNM8kBxoqFXr0Sbo55735nvrlsx4PYBZol3UtoWgO492fSwmsetzPEZzy73rbU8OGXJcA=="; }; }; "unicode-emoji-modifier-base-1.0.0" = { @@ -27862,15 +29032,6 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; - "unified-4.2.1" = { - name = "unified"; - packageName = "unified"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz"; - sha1 = "76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e"; - }; - }; "union-value-1.0.0" = { name = "union-value"; packageName = "union-value"; @@ -27934,33 +29095,6 @@ let sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; }; }; - "unist-util-is-2.1.2" = { - name = "unist-util-is"; - packageName = "unist-util-is"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz"; - sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; - }; - }; - "unist-util-remove-position-1.1.2" = { - name = "unist-util-remove-position"; - packageName = "unist-util-remove-position"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; - sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q=="; - }; - }; - "unist-util-visit-1.3.1" = { - name = "unist-util-visit"; - packageName = "unist-util-visit"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz"; - sha512 = "0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA=="; - }; - }; "universalify-0.1.2" = { name = "universalify"; packageName = "universalify"; @@ -28096,15 +29230,6 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; - "upath-1.0.5" = { - name = "upath"; - packageName = "upath"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz"; - sha512 = "qbKn90aDQ0YEwvXoLqj0oiuUYroLX2lVHZ+b+xwjozFasAOC4GneDq5+OaIG5Zj+jFmbz/uO+f7a9qxjktJQww=="; - }; - }; "upath-1.1.0" = { name = "upath"; packageName = "upath"; @@ -28150,15 +29275,6 @@ let sha512 = "gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw=="; }; }; - "update-section-0.3.3" = { - name = "update-section"; - packageName = "update-section"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz"; - sha1 = "458f17820d37820dc60e20b86d94391b00123158"; - }; - }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -28186,6 +29302,15 @@ let sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; }; }; + "upper-case-first-1.1.2" = { + name = "upper-case-first"; + packageName = "upper-case-first"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz"; + sha1 = "5d79bedcff14419518fd2edb0a0507c9b6859115"; + }; + }; "uri-js-3.0.2" = { name = "uri-js"; packageName = "uri-js"; @@ -28240,6 +29365,15 @@ let sha1 = "5af22f18c052a000a48d7b82c5e9c2e2feeda728"; }; }; + "url-join-4.0.0" = { + name = "url-join"; + packageName = "url-join"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz"; + sha1 = "4d3340e807d3773bda9991f8305acdcc2a665d2a"; + }; + }; "url-parse-lax-1.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -28258,6 +29392,15 @@ let sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; }; }; + "url-regex-3.2.0" = { + name = "url-regex"; + packageName = "url-regex"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz"; + sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"; + }; + }; "url-to-options-1.0.1" = { name = "url-to-options"; packageName = "url-to-options"; @@ -28321,6 +29464,15 @@ let sha512 = "ZrxMCbffYtxQDqvREN9kBXK2CB9tPnd5PylHoqQX9ai+3HV9/S39FnA5JnhLOC82dxIQQg0nTN2wmhtAdGNtOA=="; }; }; + "utf-8-validate-5.0.1" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.1.tgz"; + sha512 = "Qef1AuiWWxQeZ1Oa4DTV3ArRafpZvsK+CLrlB8khLfsV+9mwhj58hNSGmel0ns5jYP+3yEwav6vxxW7Gz85bVw=="; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -28555,6 +29707,15 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; + "validator-10.4.0" = { + name = "validator"; + packageName = "validator"; + version = "10.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-10.4.0.tgz"; + sha512 = "Q/wBy3LB1uOyssgNlXSRmaf22NxjvDNZM2MtIQ4jaEOAB61xsh1TQxsq1CgzUMBV1lDrVMogIh8GjG1DYW0zLg=="; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -28690,24 +29851,6 @@ let sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; }; }; - "vfile-1.4.0" = { - name = "vfile"; - packageName = "vfile"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz"; - sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; - }; - }; - "vfile-location-2.0.3" = { - name = "vfile-location"; - packageName = "vfile-location"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz"; - sha512 = "zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A=="; - }; - }; "vhost-3.0.2" = { name = "vhost"; packageName = "vhost"; @@ -28717,13 +29860,13 @@ let sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; }; }; - "videostream-2.4.3" = { + "videostream-2.5.1" = { name = "videostream"; packageName = "videostream"; - version = "2.4.3"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/videostream/-/videostream-2.4.3.tgz"; - sha512 = "8AkDc1SBg3kw8+hHImYKtSamjKfJxMHuCXIcXvCFOAWGU7IcW41hxx7K7bU/tC6zWEck/tgB1rXLxf6o5Pn79Q=="; + url = "https://registry.npmjs.org/videostream/-/videostream-2.5.1.tgz"; + sha512 = "S3f34WE6NB1d/YUAa/EYcTURTkGaxsUqcDmsGWV1jQpQQJxeagc79/XA7ygNjzBf3DoQQ1MKTD+SocPsWSniAg=="; }; }; "vinyl-0.4.6" = { @@ -28897,13 +30040,22 @@ let sha512 = "bxj9nRadNkXYfVG/fjA5a+KA5WaJCeP1F2Tnj3rYFS0pKALZQCPNqk3KO/LdiGFidjyICMG7xoHvYO9J9xosXg=="; }; }; - "vscode-languageserver-4.3.0" = { + "vscode-languageserver-4.4.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.3.0.tgz"; - sha512 = "4dTpnyTB6Q0HmMhxaG60rrpQthbTBlMtFX5cwJpPxcPzLZIFDWB3msR6TxGCzWpdYF11REIJihWByobpGkljdQ=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.4.0.tgz"; + sha512 = "NO4JQg286YLSdU11Fko6cke19kwSob3O0bhf6xDxIJuDhUbFy0VEPRB5ITc3riVmp13+Ki344xtqJYmqfcmCrg=="; + }; + }; + "vscode-languageserver-protocol-3.10.0" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.10.0.tgz"; + sha512 = "PNNmKM0IcQPRiY1oUIxfwseBvxS5Sa5aZUpTcq/qsXWclnl8FFNs8oCCoAtyLhBXnuJvybWUNafiA78y0unJDA=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -28915,22 +30067,13 @@ let sha512 = "PN5hVQQQxrtHSZR8UCstqaoI9f2H9JctFTtdIpONWjzQNurWrc48qSXXU/vTfnbSrNou8qrJgkZ4QEZsyozOMA=="; }; }; - "vscode-languageserver-protocol-3.9.0" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.9.0.tgz"; - sha512 = "i1sG5iU88Mocc7egTeh6dAow/yRWpPK5PLJaxsWsKiA+dspq1Yzr/R1bNLPc+6P/ab010lXhzdUHQY0CuIUyDw=="; - }; - }; - "vscode-languageserver-types-3.9.0" = { + "vscode-languageserver-types-3.10.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.9.0.tgz"; - sha512 = "Qzh3VsU3t0zhKtYl1revyax+4gGHl2ejNzYXeiZYQMF3i0vX4dtPohxGDFoZYfGFQI738aXYbSUQmhLeBckDlQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.10.0.tgz"; + sha512 = "vxmCsVZGwq8X40SuLP8Ix7V0rq5V/7iQUjRVe2Oxm+TbmjxtjK4dpHHXQCUawjA4fhPA9FwjSRbDhbvQmYCfMw=="; }; }; "vscode-uri-1.0.3" = { @@ -29068,13 +30211,22 @@ let sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw=="; }; }; - "webtorrent-0.100.0" = { + "webtorrent-0.101.2" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.100.0"; + version = "0.101.2"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.100.0.tgz"; - sha512 = "b3NhfSC1luFj5lU0Q19V9e69tBnQ2KjDHEEOHz1YRDKTTemVveqjEDUHoL1ZDkRw0WpidbQtr2XZnHmG83vOCg=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.101.2.tgz"; + sha512 = "GEr6m98uiTNdPVvk4XQHd2cBYoqlpk07JHZAm/LoJOXJB5CGAu+/vIdwIb3DqciPoTKlNf0TOOFEjAkeRVLCQg=="; + }; + }; + "whatwg-fetch-2.0.3" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; + sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; }; }; "whatwg-fetch-2.0.4" = { @@ -29086,13 +30238,13 @@ let sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="; }; }; - "whatwg-url-6.4.1" = { + "whatwg-url-6.5.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "6.4.1"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz"; - sha512 = "FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz"; + sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -29176,15 +30328,6 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; - "which-pm-runs-1.0.0" = { - name = "which-pm-runs"; - packageName = "which-pm-runs"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; - sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; - }; - }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -29536,22 +30679,13 @@ let sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; }; }; - "ws-4.1.0" = { + "ws-6.0.0" = { name = "ws"; packageName = "ws"; - version = "4.1.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz"; - sha512 = "ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA=="; - }; - }; - "ws-5.2.2" = { - name = "ws"; - packageName = "ws"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; + url = "https://registry.npmjs.org/ws/-/ws-6.0.0.tgz"; + sha512 = "c2UlYcAZp1VS8AORtpq6y4RJIkJ9dQz18W32SpR/qXGfLDZ2jU4y4wKvvZwqbi7U6gxFQTeE+urMbXU/tsDy4w=="; }; }; "wtf-8-1.0.0" = { @@ -29915,6 +31049,15 @@ let sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; }; }; + "yaml-ast-parser-0.0.40" = { + name = "yaml-ast-parser"; + packageName = "yaml-ast-parser"; + version = "0.0.40"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.40.tgz"; + sha1 = "08536d4e73d322b1c9ce207ab8dd70e04d20ae6e"; + }; + }; "yaml-js-0.0.8" = { name = "yaml-js"; packageName = "yaml-js"; @@ -30095,13 +31238,13 @@ let sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; }; }; - "yauzl-2.9.1" = { + "yauzl-2.9.2" = { name = "yauzl"; packageName = "yauzl"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz"; - sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; + sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; }; }; "yeast-0.1.2" = { @@ -30131,13 +31274,13 @@ let sha512 = "/KbouQdKgnqxG6K3Tc8VBPAQLPbruQ7KkbinwR+ah507oOFobHnGs8kqj8oMfafY6rXInHdh7nC5YzicCR4Z0g=="; }; }; - "yeoman-environment-2.3.0" = { + "yeoman-environment-2.3.1" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.3.0.tgz"; - sha512 = "PHSAkVOqYdcR+C+Uht1SGC4eVD/9OhygYFkYaI66xF8vKIeS1RNYay+umj2ZrQeJ50tF5Q/RSO6qGDz9y3Ifug=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.3.1.tgz"; + sha512 = "7BFbWNnJqG8f0TFR/awcccHj7Vl9CeG66Yuu81DiVIamqO7Uo/EOrdryjNICdRJNFdaQTliN4HUkM1zQBzszCQ=="; }; }; "yosay-2.0.2" = { @@ -30149,6 +31292,15 @@ let sha512 = "avX6nz2esp7IMXGag4gu6OyQBsMh/SEn+ZybGu3yKPlOTE6z9qJrzG/0X5vCq/e0rPFy0CUYCze0G5hL310ibA=="; }; }; + "z-schema-3.22.0" = { + name = "z-schema"; + packageName = "z-schema"; + version = "3.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/z-schema/-/z-schema-3.22.0.tgz"; + sha512 = "Oq82unxX2PTcJ031gFGcksDHE5PNBs5CbcQ1tbre0Sl4Mu5habZTVmEAkuZS4cK//VgIdNg9UG9PMgMlN6KmiA=="; + }; + }; "zen-observable-0.5.2" = { name = "zen-observable"; packageName = "zen-observable"; @@ -30218,10 +31370,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.13.0.tgz"; - sha512 = "sMapc9fb5Jf2hOQYa0Rqs/IvEo979iK4oqfNYq55E6sPN6CiBhFwyAS655khFIAhajylFhsCa0jirGGMMYagwA=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.13.1.tgz"; + sha512 = "6Tnj4ylXV+pHnmHHFhDikMpe18ZmosXYQoDeFK8lpu79HMH7k5QFAmM4mRs5hQB3njCS3l3I2O1zpsT7rMQNWA=="; }; dependencies = [ sources."JSV-4.0.2" @@ -30252,7 +31404,7 @@ in sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."chmodr-1.0.2" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."commander-2.16.0" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" @@ -30381,8 +31533,8 @@ in sources."dashdash-1.14.1" sources."decompress-zip-0.3.0" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -30408,8 +31560,8 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."klaw-1.3.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -30467,7 +31619,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ - sources."@types/node-8.10.21" + sources."@types/node-8.10.23" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -30613,7 +31765,7 @@ in sources."brace-expansion-1.1.11" sources."browserify-mime-1.2.9" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."caller-id-0.1.0" sources."caseless-0.11.0" sources."chalk-1.1.3" @@ -30646,12 +31798,12 @@ in sources."delayed-stream-1.0.0" sources."duplexer-0.1.1" sources."easy-table-1.1.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.10" sources."envconf-0.0.4" sources."escape-string-regexp-1.0.5" sources."event-stream-3.1.5" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-1.1.0" @@ -30730,8 +31882,8 @@ in sources."lodash-4.17.10" sources."map-stream-0.1.0" sources."md5.js-1.3.4" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -31069,8 +32221,8 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.1.0" - sources."buffer-from-1.1.0" + sources."buffer-5.2.0" + sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" @@ -31211,7 +32363,7 @@ in sha512 = "VybZ8QYuJyJHt88TIi12nxsIO/89vmcM1Trna0bTq5O2uzz5SDBE2piU+x87B85V4woosyw9T45f39CZzYjxAw=="; }; dependencies = [ - sources."addr-to-ip-port-1.4.3" + sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" @@ -31247,7 +32399,7 @@ in sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."bufferview-1.0.1" sources."builtin-modules-1.1.1" sources."bytebuffer-3.5.5" @@ -31336,7 +32488,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.8.0" + sources."ipaddr.js-1.8.1" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -31356,7 +32508,7 @@ in sources."long-2.4.0" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."magnet-uri-5.1.8" + sources."magnet-uri-5.2.3" sources."map-obj-1.0.1" (sources."mdns-js-1.0.1" // { dependencies = [ @@ -31516,7 +32668,7 @@ in sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."stream-transcoder-0.0.5" - sources."string2compact-1.2.5" + sources."string2compact-1.3.0" sources."string_decoder-0.10.31" sources."strip-ansi-2.0.1" sources."strip-bom-2.0.0" @@ -31630,11 +32782,11 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."commander-2.16.0" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.5.1" + sources."follow-redirects-1.5.2" sources."has-flag-3.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" @@ -31735,7 +32887,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.32" + sources."big-integer-1.6.34" sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.2" @@ -31762,8 +32914,8 @@ in sources."browserify-sign-4.0.4" sources."browserify-transform-tools-1.7.0" sources."browserify-zlib-0.1.4" - sources."buffer-5.1.0" - sources."buffer-from-1.1.0" + sources."buffer-5.2.0" + sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" sources."builtin-status-codes-3.0.0" @@ -31779,16 +32931,8 @@ in sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" sources."commander-2.16.0" - (sources."compressible-2.0.14" // { - dependencies = [ - sources."mime-db-1.35.0" - ]; - }) - (sources."compression-1.7.2" // { - dependencies = [ - sources."safe-buffer-5.1.1" - ]; - }) + sources."compressible-2.0.14" + sources."compression-1.7.3" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -31870,7 +33014,7 @@ in sources."dot-prop-3.0.0" sources."duplexer2-0.1.4" sources."duplexify-3.6.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."editor-1.0.0" sources."ee-first-1.1.1" sources."elementtree-0.1.6" @@ -31888,7 +33032,7 @@ in sources."safe-buffer-5.1.1" ]; }) - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."falafel-2.1.0" sources."figures-1.7.0" @@ -31960,7 +33104,7 @@ in ]; }) sources."interpret-1.1.0" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.8.0" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -32007,8 +33151,8 @@ in sources."methods-1.1.2" sources."miller-rabin-4.0.1" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -32062,7 +33206,7 @@ in sources."process-nextick-args-1.0.7" sources."promzard-0.3.0" sources."properties-parser-0.3.1" - sources."proxy-addr-2.0.3" + sources."proxy-addr-2.0.4" sources."public-encrypt-4.0.2" sources."punycode-1.4.1" sources."q-1.5.1" @@ -32453,7 +33597,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" @@ -32471,7 +33615,7 @@ in sources."codecs-1.2.1" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -32530,13 +33674,13 @@ in sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."duplexify-3.6.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" @@ -32568,7 +33712,7 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.17.3" // { + (sources."hypercore-6.18.1" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -32651,8 +33795,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" sources."mime-2.3.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -32766,7 +33910,7 @@ in sources."sshpk-1.14.2" sources."stack-trace-0.0.10" sources."stream-collector-1.0.1" - sources."stream-each-1.2.2" + sources."stream-each-1.2.3" (sources."stream-parser-0.3.1" // { dependencies = [ sources."debug-2.6.9" @@ -32932,8 +34076,8 @@ in sources."merge-descriptors-0.0.2" sources."methods-1.1.2" sources."mime-1.2.11" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimist-0.0.10" sources."ms-0.7.0" sources."nan-2.10.0" @@ -33174,10 +34318,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.18"; + version = "3.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.18.tgz"; - sha512 = "bfdM9Dy7PeZQnNTEOt8JQCDv+nOQxQJgijLbP7LRg/bAYt6JcKNyGzUp+25iXhoZLd+X3RmLD55yh3hSIsKfAw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.19.tgz"; + sha512 = "vGWC/duKn+EgF3wQMQa2x21w1L1KTqKNydAvw0e2kShD1n/iNVekeF1e8juND/ttZW4yDvHLp4y10ZfoZ4st/Q=="; }; dependencies = [ sources."JSONStream-1.3.3" @@ -33186,7 +34330,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.275.1" + sources."aws-sdk-2.285.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" @@ -33199,9 +34343,9 @@ in sources."dashdash-1.14.1" sources."decimal.js-10.0.1" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."events-1.1.1" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -33224,9 +34368,9 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.10" - sources."lossless-json-1.0.2" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."lossless-json-1.0.3" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimist-0.0.10" sources."oauth-sign-0.8.2" sources."optimist-0.6.1" @@ -33330,11 +34474,11 @@ in ]; }) sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."filename-regex-2.0.1" @@ -33413,8 +34557,8 @@ in sources."lru-cache-4.1.3" sources."math-random-1.0.1" sources."micromatch-2.3.11" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -33742,10 +34886,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz"; - sha512 = "DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.2.0.tgz"; + sha512 = "zlggW1qp7/TBjwLfouRoY7eWXrXwJZFqCdIxxh0/LVB/QuuKuIMkzyUZEcDo6LBadsry5JcEMxIqd3H/66CXVg=="; }; dependencies = [ sources."acorn-5.7.1" @@ -33820,7 +34964,7 @@ in sources."has-flag-3.0.0" sources."has-symbols-1.0.0" sources."iconv-lite-0.4.23" - sources."ignore-3.3.10" + sources."ignore-4.0.3" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -33963,7 +35107,7 @@ in sources."es-abstract-1.12.0" sources."es-to-primitive-1.1.1" sources."escape-string-regexp-1.0.5" - sources."eslint-5.1.0" + sources."eslint-5.2.0" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -33993,7 +35137,7 @@ in sources."has-flag-3.0.0" sources."has-symbols-1.0.0" sources."iconv-lite-0.4.23" - sources."ignore-3.3.10" + sources."ignore-4.0.3" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -34123,7 +35267,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.2" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" @@ -34142,12 +35286,12 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."error-ex-1.3.2" sources."es6-promise-4.2.4" sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" @@ -34198,8 +35342,8 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -34428,7 +35572,7 @@ in sources."preserve-0.2.0" (sources."prettyjson-1.2.1" // { dependencies = [ - sources."colors-1.3.0" + sources."colors-1.3.1" sources."minimist-1.2.0" ]; }) @@ -34520,6 +35664,566 @@ in production = true; bypassCache = false; }; + graphql-cli = nodeEnv.buildNodePackage { + name = "graphql-cli"; + packageName = "graphql-cli"; + version = "2.16.5"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-2.16.5.tgz"; + sha512 = "a2QYKmjc6H/39ZGpcKGNQIGAtz84BIVYw9LyYy3Iv1cxJ46zeRgyLBdl8vk+f1aYjQ80TAGHL2+qlIKBD7mDfg=="; + }; + dependencies = [ + sources."@babel/generator-7.0.0-beta.38" + sources."@babel/types-7.0.0-beta.38" + (sources."@kbrandwijk/swagger-to-graphql-2.4.3" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."cliui-3.2.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."yargs-8.0.2" + sources."yargs-parser-7.0.0" + ]; + }) + sources."accepts-1.3.5" + sources."adm-zip-0.4.7" + sources."agent-base-4.2.1" + sources."ajv-5.5.2" + sources."ansi-align-2.0.0" + sources."ansi-escapes-3.1.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + (sources."apollo-codegen-0.19.1" // { + dependencies = [ + (sources."graphql-config-1.2.1" // { + dependencies = [ + sources."graphql-0.12.3" + ]; + }) + sources."node-fetch-1.7.3" + sources."yargs-10.1.2" + ]; + }) + sources."argparse-1.0.10" + sources."array-flatten-1.1.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" + sources."babel-runtime-6.26.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bluebird-3.5.1" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."iconv-lite-0.4.19" + ]; + }) + 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."builtin-modules-1.1.1" + sources."bytes-3.0.0" + sources."call-me-maybe-1.0.1" + sources."camel-case-3.0.0" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" + sources."chalk-2.4.1" + sources."change-case-3.0.2" + sources."chardet-0.4.2" + sources."ci-info-1.1.3" + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" + sources."cli-spinners-1.3.1" + sources."cli-width-2.2.0" + sources."cliui-4.1.0" + sources."clone-1.0.4" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."color-convert-1.9.2" + sources."color-name-1.1.1" + (sources."columnify-1.5.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."combined-stream-1.0.6" + sources."command-exists-1.2.7" + sources."commander-2.16.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-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."core-js-2.5.7" + sources."core-util-is-1.0.2" + (sources."cosmiconfig-3.1.0" // { + dependencies = [ + sources."parse-json-3.0.0" + ]; + }) + sources."create-error-class-3.0.2" + (sources."cross-fetch-2.0.0" // { + dependencies = [ + sources."node-fetch-2.0.0" + ]; + }) + sources."cross-spawn-6.0.5" + sources."crypto-random-string-1.0.0" + (sources."cucumber-html-reporter-3.0.4" // { + dependencies = [ + sources."fs-extra-3.0.1" + sources."jsonfile-3.0.1" + ]; + }) + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deep-extend-0.6.0" + sources."defaults-1.0.3" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."diff-1.4.0" + (sources."disparity-2.0.0" // { + dependencies = [ + sources."ansi-styles-2.2.1" + ]; + }) + sources."dot-case-2.1.1" + sources."dot-prop-4.2.0" + sources."dotenv-5.0.1" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.10" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."encoding-0.1.12" + sources."errno-0.1.7" + sources."error-ex-1.3.2" + sources."es6-promise-4.2.4" + sources."es6-promisify-5.0.0" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."esutils-2.0.2" + sources."etag-1.8.1" + (sources."execa-0.7.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + ]; + }) + sources."expand-tilde-2.0.2" + sources."express-4.16.3" + (sources."express-request-proxy-2.2.0" // { + dependencies = [ + (sources."body-parser-1.18.3" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."debug-3.1.0" + sources."path-to-regexp-1.7.0" + sources."qs-6.5.2" + sources."raw-body-2.3.3" + ]; + }) + sources."extend-3.0.2" + sources."external-editor-2.2.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."figures-2.0.0" + sources."finalhandler-1.1.1" + sources."find-0.2.9" + sources."find-up-2.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."format-util-1.0.3" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."fs-extra-5.0.0" + sources."fs.realpath-1.0.0" + sources."get-caller-file-1.0.3" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."global-dirs-0.1.1" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graphcool-json-schema-1.2.1" + (sources."graphcool-yml-0.4.15" // { + dependencies = [ + sources."debug-3.1.0" + sources."dotenv-4.0.0" + sources."fs-extra-4.0.3" + ]; + }) + (sources."graphql-0.13.2" // { + dependencies = [ + sources."iterall-1.2.2" + ]; + }) + (sources."graphql-cli-prepare-1.4.19" // { + dependencies = [ + sources."chalk-2.3.1" + sources."lodash-4.17.5" + ]; + }) + sources."graphql-config-2.0.1" + sources."graphql-config-extension-graphcool-1.0.8" + sources."graphql-config-extension-openapi-1.0.6" + sources."graphql-config-extension-prisma-0.0.11" + sources."graphql-import-0.4.5" + (sources."graphql-playground-html-1.5.5" // { + dependencies = [ + sources."graphql-config-2.0.0" + ]; + }) + sources."graphql-playground-middleware-express-1.6.2" + sources."graphql-request-1.8.0" + sources."graphql-schema-linter-0.1.1" + sources."graphql-static-binding-0.9.3" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."has-flag-3.0.0" + sources."header-case-1.0.1" + sources."homedir-polyfill-1.0.1" + sources."hosted-git-info-2.7.1" + sources."http-errors-1.6.3" + (sources."http-proxy-agent-2.1.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."http-signature-1.2.0" + (sources."https-proxy-agent-2.2.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."iconv-lite-0.4.23" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflected-2.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."inquirer-5.1.0" + sources."invert-kv-1.0.0" + sources."ip-regex-1.0.3" + sources."ipaddr.js-1.8.0" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-ci-1.1.0" + sources."is-directory-0.3.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-installed-globally-0.1.0" + sources."is-lower-case-1.1.3" + sources."is-npm-1.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-upper-case-1.1.2" + sources."is-url-superb-2.0.0" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + (sources."isomorphic-fetch-2.2.1" // { + dependencies = [ + sources."node-fetch-1.7.3" + ]; + }) + sources."isstream-0.1.2" + sources."iterall-1.1.3" + sources."js-base64-2.4.8" + sources."js-yaml-3.12.0" + sources."jsbn-0.1.1" + sources."jsesc-2.5.1" + sources."json-schema-0.2.3" + (sources."json-schema-ref-parser-3.3.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."json-schema-traverse-0.3.1" + sources."json-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-4.0.0" + sources."jsonify-0.0.0" + (sources."jsonwebtoken-8.3.0" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."jsprim-1.4.1" + sources."jwa-1.1.6" + sources."jws-3.1.5" + sources."latest-version-3.1.0" + sources."lcid-1.0.0" + sources."load-json-file-2.0.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.10" + sources."lodash.get-4.4.2" + sources."lodash.includes-4.3.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isequal-4.5.0" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.once-4.1.1" + sources."log-symbols-2.2.0" + sources."lower-case-1.1.4" + sources."lower-case-first-1.0.2" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.3" + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."media-typer-0.3.0" + sources."mem-1.1.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" + sources."mimic-fn-1.2.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."negotiator-0.6.1" + sources."nice-try-1.0.4" + sources."no-case-2.3.2" + sources."node-fetch-2.2.0" + sources."node-request-by-swagger-1.1.3" + sources."normalize-package-data-2.4.0" + sources."npm-path-2.0.4" + sources."npm-paths-1.0.0" + (sources."npm-run-4.1.2" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."minimist-1.2.0" + ]; + }) + sources."npm-run-path-2.0.2" + sources."npm-which-3.0.1" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."ono-4.0.5" + sources."open-0.0.5" + sources."opn-5.3.0" + sources."ora-1.4.0" + sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."package-json-4.0.1" + sources."param-case-2.1.1" + sources."parse-github-url-1.0.2" + sources."parse-json-2.2.0" + sources."parse-passwd-1.0.0" + sources."parseurl-1.3.2" + sources."pascal-case-2.0.1" + sources."path-case-2.1.1" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-to-regexp-0.1.7" + sources."path-type-2.0.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."prepend-http-1.0.4" + sources."prisma-json-schema-0.0.4" + (sources."prisma-yml-1.0.50" // { + dependencies = [ + sources."debug-3.1.0" + sources."dotenv-4.0.0" + ]; + }) + sources."process-nextick-args-2.0.0" + sources."protochain-1.0.5" + sources."proxy-addr-2.0.4" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."psl-1.1.28" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."range-parser-1.2.0" + (sources."raw-body-2.3.2" // { + dependencies = [ + sources."depd-1.1.1" + sources."http-errors-1.6.2" + sources."iconv-lite-0.4.19" + sources."setprototypeof-1.0.3" + ]; + }) + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."read-pkg-2.0.0" + sources."read-pkg-up-2.0.0" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."regenerator-runtime-0.11.1" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."replaceall-0.1.6" + (sources."request-2.87.0" // { + dependencies = [ + sources."tough-cookie-2.3.4" + ]; + }) + sources."request-promise-4.2.2" + sources."request-promise-core-1.1.1" + sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" + sources."require-main-filename-1.0.1" + sources."resolve-dir-1.0.1" + sources."restore-cursor-2.0.0" + sources."rimraf-2.6.2" + sources."run-async-2.3.0" + sources."rxjs-5.5.11" + sources."safe-buffer-5.1.1" + sources."safer-buffer-2.1.2" + sources."scuid-1.1.0" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."send-0.16.2" + sources."sentence-case-2.1.1" + sources."serializerr-1.0.3" + sources."serve-static-1.13.2" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."simple-errors-1.0.1" + sources."snake-case-2.1.0" + sources."source-map-0.5.7" + (sources."source-map-support-0.5.6" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.14.2" + sources."statuses-1.4.0" + sources."stealthy-require-1.1.1" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."string_decoder-1.1.1" + sources."strip-ansi-4.0.0" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.4.0" + sources."swap-case-1.1.2" + sources."symbol-observable-1.0.1" + sources."sync-exec-0.6.2" + sources."term-size-1.2.0" + sources."through-2.3.8" + sources."through2-2.0.3" + sources."timed-out-4.0.1" + sources."title-case-2.1.1" + sources."tmp-0.0.33" + sources."to-fast-properties-2.0.0" + sources."tough-cookie-2.4.3" + sources."traverse-chain-0.1.0" + sources."trim-right-1.0.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.16" + sources."unique-string-1.0.0" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."upper-case-1.1.3" + sources."upper-case-first-1.1.2" + sources."url-join-4.0.0" + sources."url-parse-lax-1.0.0" + sources."url-regex-3.2.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.3.2" + sources."validate-npm-package-license-3.0.3" + sources."validator-10.4.0" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."wcwidth-1.0.1" + sources."whatwg-fetch-2.0.3" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."widest-line-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + sources."xtend-4.0.1" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + sources."yaml-ast-parser-0.0.40" + (sources."yargs-11.0.0" // { + dependencies = [ + sources."yargs-parser-9.0.2" + ]; + }) + sources."yargs-parser-8.1.0" + sources."z-schema-3.22.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "GraphQL CLI"; + homepage = "https://github.com/graphql-cli/graphql-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; packageName = "grunt-cli"; @@ -34741,7 +36445,7 @@ in ]; }) sources."expand-tilde-2.0.2" - sources."extend-3.0.1" + sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -35151,7 +36855,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.4.4" // { + (sources."uglify-js-3.4.6" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -35170,180 +36874,159 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "3.20.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.20.0.tgz"; - sha512 = "yeLPusYOSyF+VmO+Hf2a5kf2Kx4ST1f3MILM8g+9ckF/MdaoD9UzXif2/sumGem6I6RTrqo9horBmC7QJYcClA=="; + url = "https://registry.npmjs.org/ionic/-/ionic-4.0.3.tgz"; + sha512 = "hnsbLBFfJAteX3FUIddr9jeIbyTizha3l2R3T4rTDhcEaegl3jyszeLc66lZZ1pwA3gZB501FGC1sy9hrKdKOw=="; }; dependencies = [ - sources."@ionic/cli-framework-0.1.3" - sources."@ionic/cli-utils-1.19.2" - sources."@ionic/discover-0.4.0" - sources."accepts-1.3.5" + sources."@ionic/cli-framework-1.0.2" + sources."@ionic/cli-utils-2.0.3" + sources."@ionic/discover-1.0.2" + sources."@types/cross-spawn-6.0.0" + sources."@types/debug-0.0.30" + sources."@types/events-1.2.0" + sources."@types/glob-5.0.35" + sources."@types/inquirer-0.0.42" + sources."@types/klaw-2.1.1" + sources."@types/lodash-4.14.115" + sources."@types/make-dir-1.0.3" + sources."@types/minimatch-3.0.3" + sources."@types/minimist-1.2.0" + sources."@types/ncp-2.0.1" + sources."@types/node-6.0.115" + sources."@types/rimraf-2.0.2" + sources."@types/rx-4.1.1" + sources."@types/rx-core-4.0.3" + sources."@types/rx-core-binding-4.0.4" + sources."@types/rx-lite-4.0.5" + sources."@types/rx-lite-aggregates-4.0.3" + sources."@types/rx-lite-async-4.0.2" + sources."@types/rx-lite-backpressure-4.0.3" + sources."@types/rx-lite-coincidence-4.0.3" + sources."@types/rx-lite-experimental-4.0.1" + sources."@types/rx-lite-joinpatterns-4.0.1" + sources."@types/rx-lite-testing-4.0.1" + sources."@types/rx-lite-time-4.0.3" + sources."@types/rx-lite-virtualtime-4.0.3" + sources."@types/string-width-2.0.0" + sources."@types/strip-ansi-3.0.0" + sources."@types/through-0.0.29" + sources."@types/untildify-3.0.0" + sources."@types/wrap-ansi-3.0.0" + sources."@types/write-file-atomic-2.1.1" + sources."agent-base-4.2.1" + sources."ansi-align-2.0.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."anymatch-1.3.2" - sources."archiver-2.1.1" - sources."archiver-utils-1.3.0" - sources."arr-diff-2.0.0" - sources."arr-flatten-1.1.0" - sources."array-flatten-1.1.1" - sources."array-unique-0.2.1" - sources."async-2.6.1" - sources."async-each-1.0.1" + sources."ast-types-0.11.5" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" - sources."base64-js-1.3.0" - sources."basic-auth-1.1.0" - sources."binary-extensions-1.11.0" - sources."bl-1.2.2" - (sources."body-5.1.0" // { - dependencies = [ - sources."bytes-1.0.0" - sources."raw-body-1.1.7" - sources."string_decoder-0.10.31" - ]; - }) - (sources."body-parser-1.18.3" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" - sources."buffer-5.1.0" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" sources."bytes-3.0.0" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" sources."chalk-2.4.1" - sources."chardet-0.4.2" - sources."chokidar-1.7.0" + sources."chardet-0.5.0" sources."chownr-1.0.1" sources."ci-info-1.1.3" + sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" + sources."co-4.6.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" - sources."compress-commons-1.2.2" sources."concat-map-0.0.1" - sources."content-disposition-0.5.2" - sources."content-type-1.0.4" - sources."continuable-cache-0.3.1" - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" + sources."configstore-3.1.2" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."crc-3.7.0" - sources."crc32-stream-2.0.0" + sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" - sources."dargs-5.1.0" + sources."crypto-random-string-1.0.0" + sources."data-uri-to-buffer-1.2.0" sources."debug-3.1.0" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" sources."depd-1.1.2" - sources."destroy-1.0.4" sources."diff-3.5.0" - sources."ee-first-1.1.1" + sources."dot-prop-4.2.0" + sources."duplexer2-0.1.4" + sources."duplexer3-0.1.4" sources."elementtree-0.1.7" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.1" - sources."error-7.0.2" - sources."escape-html-1.0.3" + sources."es6-promise-4.2.4" + sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."etag-1.8.1" - sources."eventemitter3-3.1.0" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - (sources."express-4.16.3" // { - dependencies = [ - sources."body-parser-1.18.2" - sources."debug-2.6.9" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - sources."safe-buffer-5.1.1" - sources."statuses-1.4.0" - ]; - }) - sources."extend-3.0.1" - sources."external-editor-2.2.0" - sources."extglob-0.3.2" - sources."faye-websocket-0.10.0" + sources."escodegen-1.11.0" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."execa-0.7.0" + sources."extend-3.0.2" + sources."external-editor-3.0.0" + sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."statuses-1.4.0" - ]; - }) - sources."follow-redirects-1.5.1" - sources."for-in-1.0.2" - sources."for-own-0.1.5" + sources."file-uri-to-path-1.0.0" sources."form-data-2.3.2" sources."formidable-1.2.1" - sources."forwarded-0.1.2" - sources."fresh-0.5.2" - sources."fs-constants-1.0.0" sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.4" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."get-stream-3.0.0" + (sources."get-uri-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."glob-7.1.2" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" + sources."global-dirs-0.1.1" + sources."got-6.7.1" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" sources."http-errors-1.6.3" - sources."http-parser-js-0.4.13" - sources."http-proxy-1.17.0" - (sources."http-proxy-middleware-0.17.4" // { - dependencies = [ - sources."is-extglob-2.1.1" - sources."is-glob-3.1.0" - ]; - }) + sources."http-proxy-agent-2.1.0" + sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.23" - sources."ieee754-1.1.12" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."inquirer-3.3.0" - sources."ipaddr.js-1.6.0" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - 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."ini-1.3.5" + sources."inquirer-6.0.0" + sources."ip-1.1.5" + sources."is-ci-1.1.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-2.0.1" - sources."is-number-2.1.0" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" + sources."is-obj-1.0.1" + sources."is-path-inside-1.0.1" sources."is-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-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."lazystream-1.0.0" + sources."klaw-2.1.1" + sources."latest-version-3.1.0" (sources."leek-0.0.24" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."livereload-js-2.3.0" + sources."levn-0.3.0" sources."lodash-4.17.10" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" @@ -35356,16 +37039,14 @@ in sources."lodash.isarray-3.0.4" sources."lodash.keys-3.1.2" sources."lodash.restparam-3.6.1" + sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."macos-release-1.1.0" - sources."math-random-1.0.1" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" + sources."make-dir-1.3.0" sources."methods-1.1.2" - sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -35382,105 +37063,99 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.10.0" sources."ncp-2.0.0" - sources."negotiator-0.6.1" sources."netmask-1.0.6" - sources."normalize-path-2.1.1" - sources."object-assign-4.1.1" - sources."object.omit-2.0.1" - sources."on-finished-2.3.0" + sources."npm-run-path-2.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."opn-5.3.0" + sources."optionator-0.8.2" sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" - sources."parse-glob-3.0.4" - sources."parseurl-1.3.2" + sources."p-finally-1.0.0" + sources."pac-proxy-agent-2.0.2" + sources."pac-resolver-3.0.0" + sources."package-json-4.0.1" sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.7" - sources."preserve-0.2.0" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."pify-3.0.0" + sources."prelude-ls-1.1.2" + sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" - sources."proxy-addr-2.0.3" + sources."proxy-agent-2.3.1" + sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."qs-6.5.2" - (sources."randomatic-3.0.0" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.2" - ]; - }) - sources."range-parser-1.2.0" sources."raw-body-2.3.3" + sources."rc-1.2.8" sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" - sources."regex-cache-0.4.4" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.2" - sources."repeat-string-1.6.1" - sources."requires-port-1.0.0" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."rsvp-3.6.2" sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" + sources."rxjs-6.2.2" sources."safe-buffer-5.1.2" - sources."safe-json-parse-1.0.1" sources."safer-buffer-2.1.2" sources."sax-1.1.4" sources."semver-5.5.0" - (sources."send-0.16.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."mime-1.4.1" - sources."statuses-1.4.0" - ]; - }) - sources."serve-static-1.13.2" - sources."set-immediate-shim-1.0.1" + sources."semver-diff-2.1.0" sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slice-ansi-1.0.0" + sources."smart-buffer-1.1.15" + sources."socks-1.1.10" + sources."socks-proxy-agent-3.0.1" + sources."source-map-0.6.1" + sources."split2-2.2.0" sources."ssh-config-1.1.3" sources."statuses-1.5.0" - sources."string-template-0.2.1" + sources."stream-combiner2-1.1.1" sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" sources."superagent-3.8.3" + sources."superagent-proxy-1.0.3" sources."supports-color-5.4.0" - (sources."tar-4.4.4" // { + (sources."tar-4.4.6" // { dependencies = [ sources."yallist-3.0.2" ]; }) - sources."tar-stream-1.6.1" + sources."term-size-1.2.0" sources."through-2.3.8" - sources."tiny-lr-1.1.1" + sources."through2-2.0.3" + sources."thunkify-2.1.2" + sources."timed-out-4.0.1" sources."tmp-0.0.33" - sources."to-buffer-1.1.1" sources."tslib-1.9.3" - sources."type-is-1.6.16" - sources."ultron-1.1.1" + sources."type-check-0.3.2" + sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."untildify-3.0.3" + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" sources."uuid-3.3.2" - sources."vary-1.1.2" - sources."websocket-driver-0.7.0" - sources."websocket-extensions-0.1.3" sources."which-1.3.1" + sources."widest-line-2.0.0" sources."win-release-1.1.1" + sources."wordwrap-1.0.0" sources."wrap-ansi-3.0.1" sources."wrappy-1.0.2" - sources."ws-3.3.3" + sources."write-file-atomic-2.3.0" + sources."ws-6.0.0" + sources."xdg-basedir-3.0.0" + sources."xregexp-2.0.0" sources."xtend-4.0.1" sources."yallist-2.1.2" - sources."zip-stream-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -35494,15 +37169,15 @@ in ios-deploy = nodeEnv.buildNodePackage { name = "ios-deploy"; packageName = "ios-deploy"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.2.tgz"; - sha1 = "c2f4c46b06db4771939b29f980c7c1a8906b47a2"; + url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.3.tgz"; + sha512 = "i/8DxXzcL2feqqL6DjUfjqUHyWVmHYNkzZFTyf6yoC4glrI3jQ+8Hhg63vzw/5OoFXN7OyXqjkshAj9c1EsVSw=="; }; buildInputs = globalBuildInputs; meta = { description = "launch iOS apps iOS devices from the command line (Xcode 7)"; - homepage = "https://github.com/phonegap/ios-deploy#readme"; + homepage = "https://github.com/ios-control/ios-deploy#readme"; license = "GPLv3"; }; production = true; @@ -35669,10 +37344,10 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.10.0"; + version = "2.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.10.0.tgz"; - sha512 = "y8IOlo8Ml/CFuvr8pFdaMpNV43W5eZhTl5UZuRxKGxX08PSi3OZsYjr5gMYsKT5ZzMNk/U+MqZXJNh6Ccm30hQ=="; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.4.tgz"; + sha512 = "kJTsyRj6KZZ5yVvoFyaxMkBOpiJbQeaFXihDJqWlKIYLwBL1SbkBdFOWPbfY9hf7N7gT6ifsqAhYberaqBZ66A=="; }; dependencies = [ sources."ansi-color-0.2.1" @@ -35731,9 +37406,9 @@ in sources."typescript-2.8.3" sources."uuid-3.3.2" sources."vscode-jsonrpc-3.6.2" - sources."vscode-languageserver-4.3.0" - sources."vscode-languageserver-protocol-3.9.0" - sources."vscode-languageserver-types-3.9.0" + sources."vscode-languageserver-4.4.0" + sources."vscode-languageserver-protocol-3.10.0" + sources."vscode-languageserver-types-3.10.0" sources."vscode-uri-1.0.5" sources."wrappy-1.0.2" sources."xorshift-0.2.1" @@ -35814,19 +37489,43 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.9.5"; + version = "2.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz"; - sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz"; + sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA=="; }; dependencies = [ + sources."ajv-5.5.2" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" + sources."buffer-from-1.1.1" + sources."caseless-0.12.0" sources."cli-1.0.1" + sources."co-4.6.0" + sources."colors-1.0.3" + sources."combined-stream-1.0.6" sources."concat-map-0.0.1" + (sources."concat-stream-1.6.2" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" + ]; + }) sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" + sources."cycle-1.0.3" + sources."dashdash-1.14.1" sources."date-now-0.1.4" + sources."debug-2.6.9" + sources."delayed-stream-1.0.0" (sources."dom-serializer-0.1.0" // { dependencies = [ sources."domelementtype-1.1.3" @@ -35836,23 +37535,89 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.3.0" sources."domutils-1.5.1" + sources."ecc-jsbn-0.1.2" sources."entities-1.0.0" + sources."es6-promise-4.2.4" sources."exit-0.1.2" + sources."extend-3.0.2" + sources."extract-zip-1.6.7" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-1.0.0" sources."fs.realpath-1.0.0" + sources."getpass-0.1.7" sources."glob-7.1.2" + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."hasha-2.2.0" sources."htmlparser2-3.8.3" + sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" sources."isarray-0.0.1" - sources."lodash-3.7.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.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kew-0.7.0" + sources."klaw-1.3.1" + sources."lodash-4.17.10" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."oauth-sign-0.8.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."phantom-4.0.12" + sources."phantomjs-prebuilt-2.1.16" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."process-nextick-args-2.0.0" + sources."progress-1.1.8" + sources."punycode-1.4.1" + sources."qs-6.5.2" sources."readable-stream-1.1.14" + sources."request-2.87.0" + sources."request-progress-2.0.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."shelljs-0.3.0" + sources."split-1.0.1" + sources."sshpk-1.14.2" + sources."stack-trace-0.0.10" sources."string_decoder-0.10.31" sources."strip-json-comments-1.0.4" + sources."throttleit-1.0.0" + sources."through-2.3.8" + sources."tough-cookie-2.3.4" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."unicode-5.2.0-0.7.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + sources."which-1.3.1" + sources."winston-2.4.3" sources."wrappy-1.0.2" + sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; meta = { @@ -35980,10 +37745,10 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.5.tgz"; - sha512 = "PxRt8e2ktX3ktNSGqfH+6ghfwXUjQ9pS/asLBSS4CSf1Jl4811WCvZL2YPvmdaWzi7LBAd/Y6lVg1BMnph51nw=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.6.tgz"; + sha512 = "umW/uhtvq2YO+MRtHXUiSIlaoslME3xjnpQJ5rkCQoF5RpDfuBqkbO22W3H4Q16VDOTECKHceqYQzef7sT/Hig=="; }; dependencies = [ sources."argparse-1.0.10" @@ -35996,7 +37761,7 @@ in sources."debug-3.1.0" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."form-data-2.3.2" sources."formidable-1.2.1" sources."graphlib-2.1.5" @@ -36006,8 +37771,8 @@ in sources."lodash-4.17.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."ms-2.0.0" sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" @@ -36052,7 +37817,11 @@ in sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."basic-auth-2.0.0" + (sources."basic-auth-2.0.0" // { + dependencies = [ + sources."safe-buffer-5.1.1" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.18.3" sources."boxen-1.3.0" @@ -36069,12 +37838,8 @@ in sources."color-convert-1.9.2" sources."color-name-1.1.1" sources."combined-stream-1.0.6" - (sources."compressible-2.0.14" // { - dependencies = [ - sources."mime-db-1.35.0" - ]; - }) - sources."compression-1.7.2" + sources."compressible-2.0.14" + sources."compression-1.7.3" sources."configstore-3.1.2" sources."connect-pause-0.1.1" sources."content-disposition-0.5.2" @@ -36095,7 +37860,7 @@ in sources."destroy-1.0.4" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."errorhandler-1.5.0" @@ -36115,6 +37880,7 @@ in sources."iconv-lite-0.4.19" sources."qs-6.5.1" sources."raw-body-2.3.2" + sources."safe-buffer-5.1.1" sources."statuses-1.4.0" ]; }) @@ -36123,7 +37889,7 @@ in sources."path-to-regexp-1.7.0" ]; }) - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -36154,7 +37920,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.8.0" sources."is-ci-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" @@ -36169,7 +37935,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jju-1.3.0" + sources."jju-1.4.0" sources."jsbn-0.1.1" sources."json-parse-helpfulerror-1.0.3" sources."json-schema-0.2.3" @@ -36191,8 +37957,8 @@ in sources."method-override-2.3.10" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimist-1.2.0" sources."morgan-1.9.0" @@ -36221,7 +37987,7 @@ in sources."please-upgrade-node-3.1.1" sources."pluralize-7.0.0" sources."prepend-http-1.0.4" - sources."proxy-addr-2.0.3" + sources."proxy-addr-2.0.4" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.2" @@ -36233,7 +37999,7 @@ in sources."request-2.87.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."semver-compare-1.0.0" @@ -36325,10 +38091,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-2.0.4.tgz"; - sha512 = "32yhTwoi6BZgJZhR78GwhzyFABbYG/1WwQqYgY7Vh96Demvua2jM3+FyRltIMTUH/Kd5xaQvDw2L7jTvkYFeXg=="; + url = "https://registry.npmjs.org/karma/-/karma-2.0.5.tgz"; + sha512 = "rECezBeY7mjzGUWhFlB7CvPHgkHJLXyUmWg+6vHCEsdWNUTnmiS6jRrIMcJEWgU2DUGZzGWG0bTRVky8fsDTOA=="; }; dependencies = [ sources."accepts-1.3.5" @@ -36427,7 +38193,7 @@ in }) sources."co-4.6.0" sources."collection-visit-1.0.0" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."combine-lists-1.0.1" sources."combined-stream-1.0.6" sources."commander-2.16.0" @@ -36456,7 +38222,7 @@ in sources."di-0.0.1" sources."dom-serialize-2.2.1" sources."double-ended-queue-2.1.0-0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" (sources."engine.io-3.1.5" // { @@ -36511,7 +38277,7 @@ in sources."repeat-string-0.2.2" ]; }) - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ @@ -36536,7 +38302,7 @@ in sources."statuses-1.3.1" ]; }) - (sources."follow-redirects-1.5.1" // { + (sources."follow-redirects-1.5.2" // { dependencies = [ sources."debug-3.1.0" ]; @@ -36676,8 +38442,8 @@ in sources."media-typer-0.3.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.1" @@ -36884,7 +38650,7 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tough-cookie-2.3.4" - sources."tsscmp-1.0.5" + sources."tsscmp-1.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -36961,11 +38727,7 @@ in sources."body-parser-1.13.3" sources."bytes-2.1.0" sources."commander-2.6.0" - (sources."compressible-2.0.14" // { - dependencies = [ - sources."mime-db-1.35.0" - ]; - }) + sources."compressible-2.0.14" sources."compression-1.5.2" sources."connect-2.30.2" sources."connect-restreamer-1.0.3" @@ -37017,8 +38779,8 @@ in }) sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."morgan-1.6.1" @@ -37128,7 +38890,7 @@ in sources."define-properties-1.1.2" sources."duplexify-3.6.0" sources."end-of-stream-1.4.1" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."flush-write-stream-1.0.3" sources."foreach-2.0.5" sources."fs-mkdirp-stream-1.0.0" @@ -37242,7 +39004,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -37270,7 +39032,7 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.3.0" sources."domutils-1.5.1" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."entities-1.1.1" sources."escape-string-regexp-1.0.5" sources."escodegen-1.11.0" @@ -37278,7 +39040,7 @@ in sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."execa-0.7.0" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-1.1.0" @@ -37328,8 +39090,8 @@ in sources."log-symbols-2.2.0" sources."lru-cache-4.1.3" sources."mem-1.1.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -37462,43 +39224,136 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.11.0"; + version = "3.0.0-rc.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.11.0.tgz"; - sha512 = "kgM6zwe2P2tR30MYvgiLLW+9buFCm6E7o8HnRlhTgm70WVBvXVhydqv+q/MF2HrVZkCawfVtCfetyQmtd4oHhQ=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.0.0-rc.0.tgz"; + sha512 = "fj5Ku6vGgJAzdnpXWE3Stlgnex9ZfaHBQvMQzts13qZ57cJNCzEq5AQPVOOFWE6qqqiABLQfE5T2+Yg/IEqWNQ=="; }; dependencies = [ + sources."@lerna/add-3.0.0-rc.0" + sources."@lerna/batch-packages-3.0.0-rc.0" + sources."@lerna/bootstrap-3.0.0-rc.0" + sources."@lerna/changed-3.0.0-rc.0" + sources."@lerna/child-process-3.0.0-rc.0" + sources."@lerna/clean-3.0.0-rc.0" + sources."@lerna/cli-3.0.0-rc.0" + sources."@lerna/collect-updates-3.0.0-rc.0" + sources."@lerna/command-3.0.0-rc.0" + sources."@lerna/conventional-commits-3.0.0-rc.0" + sources."@lerna/create-3.0.0-rc.0" + sources."@lerna/create-symlink-3.0.0-rc.0" + sources."@lerna/diff-3.0.0-rc.0" + sources."@lerna/exec-3.0.0-rc.0" + sources."@lerna/filter-options-3.0.0-rc.0" + sources."@lerna/filter-packages-3.0.0-rc.0" + sources."@lerna/get-npm-exec-opts-3.0.0-rc.0" + sources."@lerna/global-options-3.0.0-rc.0" + sources."@lerna/import-3.0.0-rc.0" + sources."@lerna/init-3.0.0-rc.0" + sources."@lerna/link-3.0.0-rc.0" + sources."@lerna/list-3.0.0-rc.0" + sources."@lerna/npm-conf-3.0.0-rc.0" + sources."@lerna/npm-dist-tag-3.0.0-rc.0" + sources."@lerna/npm-install-3.0.0-rc.0" + sources."@lerna/npm-publish-3.0.0-rc.0" + sources."@lerna/npm-run-script-3.0.0-rc.0" + sources."@lerna/output-3.0.0-rc.0" + sources."@lerna/package-3.0.0-rc.0" + sources."@lerna/package-graph-3.0.0-rc.0" + sources."@lerna/project-3.0.0-rc.0" + sources."@lerna/prompt-3.0.0-rc.0" + sources."@lerna/publish-3.0.0-rc.0" + sources."@lerna/resolve-symlink-3.0.0-rc.0" + sources."@lerna/rimraf-dir-3.0.0-rc.0" + sources."@lerna/run-3.0.0-rc.0" + sources."@lerna/run-lifecycle-3.0.0-rc.0" + sources."@lerna/run-parallel-batches-3.0.0-rc.0" + sources."@lerna/symlink-binary-3.0.0-rc.0" + sources."@lerna/symlink-dependencies-3.0.0-rc.0" + sources."@lerna/validation-error-3.0.0-rc.0" + sources."@lerna/write-log-file-3.0.0-rc.0" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.stat-1.1.0" sources."JSONStream-1.3.3" - sources."add-stream-1.0.0" - sources."align-text-0.1.4" + sources."abbrev-1.1.1" + sources."ajv-4.11.8" + (sources."align-text-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."amdefine-1.0.1" sources."ansi-escapes-3.1.0" - sources."ansi-regex-2.1.1" + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" + 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-differ-1.0.0" sources."array-find-index-1.0.2" sources."array-ify-1.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" sources."arrify-1.0.1" + sources."asap-2.0.6" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."assign-symbols-1.0.0" sources."async-1.5.2" + sources."asynckit-0.4.0" + sources."atob-2.1.1" + sources."aws-sign2-0.6.0" + sources."aws4-1.7.0" sources."balanced-match-1.0.0" - sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.0" - sources."builtin-modules-1.1.1" - sources."byline-5.0.0" - sources."camelcase-1.2.1" - (sources."camelcase-keys-2.1.0" // { + (sources."base-0.11.2" // { dependencies = [ - sources."camelcase-2.1.1" + sources."define-property-1.0.0" ]; }) + sources."bcrypt-pbkdf-1.0.2" + sources."block-stream-0.0.9" + sources."boom-2.10.1" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."buffer-from-1.1.1" + sources."builtin-modules-1.1.1" + sources."builtins-1.0.3" + sources."byline-5.0.0" + sources."cache-base-1.0.1" + sources."call-me-maybe-1.0.1" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" sources."center-align-0.1.3" sources."chalk-2.4.1" sources."chardet-0.4.2" sources."ci-info-1.1.3" + (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."cliui-2.1.0" // { @@ -37508,141 +39363,262 @@ in }) sources."clone-1.0.4" sources."cmd-shim-2.0.2" + sources."co-4.6.0" sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."columnify-1.5.4" - sources."command-join-2.0.0" - sources."compare-func-1.3.2" + (sources."columnify-1.5.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."combined-stream-1.0.6" + (sources."compare-func-1.3.2" // { + dependencies = [ + sources."dot-prop-3.0.0" + ]; + }) + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" + sources."config-chain-1.1.11" sources."console-control-strings-1.1.0" - sources."conventional-changelog-1.1.24" sources."conventional-changelog-angular-1.6.6" - sources."conventional-changelog-atom-0.2.8" - sources."conventional-changelog-cli-1.3.22" - sources."conventional-changelog-codemirror-0.3.8" (sources."conventional-changelog-core-2.0.11" // { dependencies = [ sources."load-json-file-1.1.0" + sources."parse-json-2.2.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" sources."read-pkg-1.1.0" + sources."strip-bom-2.0.0" ]; }) - sources."conventional-changelog-ember-0.3.12" - sources."conventional-changelog-eslint-1.0.9" - sources."conventional-changelog-express-0.3.6" - sources."conventional-changelog-jquery-0.1.0" - sources."conventional-changelog-jscs-0.1.0" - sources."conventional-changelog-jshint-0.3.8" sources."conventional-changelog-preset-loader-1.1.8" sources."conventional-changelog-writer-3.0.9" sources."conventional-commits-filter-1.1.6" sources."conventional-commits-parser-2.1.7" - (sources."conventional-recommended-bump-1.2.1" // { - dependencies = [ - sources."meow-3.7.0" - sources."minimist-1.2.0" - ]; - }) + sources."conventional-recommended-bump-2.0.9" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" + sources."cosmiconfig-5.0.5" sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" + sources."cryptiles-2.0.5" sources."currently-unhandled-0.4.1" sources."dargs-4.1.0" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."dateformat-3.0.3" + sources."debug-2.6.9" + sources."debuglog-1.0.1" sources."decamelize-1.2.0" - sources."decamelize-keys-1.1.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decode-uri-component-0.2.0" sources."dedent-0.7.0" sources."deep-extend-0.6.0" sources."defaults-1.0.3" + sources."define-property-2.0.2" + sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-indent-5.0.0" - sources."dot-prop-3.0.0" + sources."dezalgo-1.0.3" + sources."dir-glob-2.0.0" + sources."dot-prop-4.2.0" sources."duplexer-0.1.1" sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."execa-0.8.0" + sources."esprima-4.0.1" + sources."execa-0.10.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."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."external-editor-2.2.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + (sources."fast-glob-2.2.2" // { + dependencies = [ + sources."is-glob-4.0.0" + ]; + }) sources."figures-2.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."find-up-2.1.0" - sources."fs-extra-4.0.3" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."fragment-cache-0.2.1" + sources."fs-extra-6.0.1" sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" (sources."gauge-2.7.4" // { 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."get-caller-file-1.0.3" (sources."get-pkg-repo-1.4.0" // { dependencies = [ + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."indent-string-2.1.0" + sources."map-obj-1.0.1" sources."meow-3.7.0" sources."minimist-1.2.0" + sources."redent-1.0.0" + sources."strip-indent-1.0.1" + sources."trim-newlines-1.0.0" ]; }) sources."get-port-3.2.0" sources."get-stdin-4.0.1" sources."get-stream-3.0.0" + sources."get-value-2.0.6" + (sources."getpass-0.1.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."git-raw-commits-1.3.6" - sources."git-remote-origin-url-2.0.0" + (sources."git-remote-origin-url-2.0.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) sources."git-semver-tags-1.3.6" sources."gitconfiglocal-1.0.0" sources."glob-7.1.2" sources."glob-parent-3.1.0" - sources."globby-6.1.0" + sources."glob-to-regexp-0.3.0" + sources."globby-8.0.1" sources."got-6.7.1" sources."graceful-fs-4.1.11" - sources."handlebars-4.0.11" + (sources."handlebars-4.0.11" // { + dependencies = [ + sources."source-map-0.4.4" + ]; + }) + sources."har-schema-1.0.5" + sources."har-validator-4.2.1" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."hawk-3.1.3" + sources."hoek-2.16.3" sources."hosted-git-info-2.7.1" + sources."http-signature-1.1.1" sources."iconv-lite-0.4.23" + sources."ignore-3.3.10" + sources."import-local-1.0.0" sources."imurmurhash-0.1.4" - sources."indent-string-2.1.0" + sources."indent-string-3.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."inquirer-3.3.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."init-package-json-1.10.3" + sources."inquirer-5.2.0" sources."invert-kv-1.0.0" + sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-ci-1.1.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-directory-0.3.1" + sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-finite-1.0.2" 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-obj-1.0.1" sources."is-plain-obj-1.1.0" + sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."is-subset-0.1.1" sources."is-text-path-1.0.1" + sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."js-yaml-3.12.0" + sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" + sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" + sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" - sources."lcid-1.0.0" - (sources."load-json-file-4.0.0" // { + (sources."jsprim-1.4.1" // { dependencies = [ - sources."parse-json-4.0.0" - sources."pify-3.0.0" - sources."strip-bom-3.0.0" + sources."assert-plus-1.0.0" ]; }) + sources."kind-of-6.0.2" + sources."lazy-cache-1.0.4" + sources."lcid-1.0.0" + sources."load-json-file-4.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.10" sources."lodash._reinterpolate-3.0.0" @@ -37652,165 +39628,315 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."map-obj-1.0.1" + sources."make-dir-1.3.0" + sources."map-cache-0.2.2" + sources."map-obj-2.0.0" + sources."map-visit-1.0.0" sources."mem-1.1.0" (sources."meow-4.0.1" // { dependencies = [ - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."indent-string-3.2.0" - sources."map-obj-2.0.0" sources."minimist-1.2.0" sources."read-pkg-up-3.0.0" - sources."redent-2.0.0" - sources."strip-indent-2.0.0" - sources."trim-newlines-2.0.0" ]; }) + sources."merge2-1.2.2" + sources."micromatch-3.1.10" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-0.1.0" sources."minimist-options-3.0.2" - sources."mkdirp-0.5.1" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."modify-values-1.0.1" sources."moment-2.22.2" + sources."ms-2.0.0" + sources."multimatch-2.1.0" sources."mute-stream-0.0.7" + sources."nanomatch-1.2.13" + sources."nice-try-1.0.4" + (sources."node-gyp-3.7.0" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + sources."nopt-3.0.6" sources."normalize-package-data-2.4.0" + sources."npm-lifecycle-2.0.3" + sources."npm-package-arg-6.1.0" sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" + sources."oauth-sign-0.8.2" sources."object-assign-4.1.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-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."optimist-0.6.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + sources."os-homedir-1.0.2" (sources."os-locale-2.1.0" // { dependencies = [ + sources."cross-spawn-5.1.0" sources."execa-0.7.0" ]; }) sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" sources."p-finally-1.0.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" + sources."p-map-1.2.0" + sources."p-map-series-1.0.0" + sources."p-reduce-1.0.0" sources."p-try-1.0.0" + sources."p-waterfall-1.0.0" sources."package-json-4.0.1" sources."parse-github-repo-url-1.4.1" - sources."parse-json-2.2.0" + sources."parse-json-4.0.0" + 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-key-2.0.1" - sources."path-type-1.1.0" - sources."pify-2.3.0" + sources."path-type-3.0.0" + sources."performance-now-0.2.0" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + sources."pkg-dir-2.0.0" + sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" + sources."promzard-0.3.0" + sources."proto-list-1.2.4" sources."pseudomap-1.0.2" + sources."punycode-1.4.1" sources."q-1.5.1" + sources."qs-6.4.0" sources."quick-lru-1.1.0" (sources."rc-1.2.8" // { dependencies = [ sources."minimist-1.2.0" ]; }) + sources."read-1.0.7" sources."read-cmd-shim-1.0.1" - (sources."read-pkg-3.0.0" // { - dependencies = [ - sources."path-type-3.0.0" - sources."pify-3.0.0" - ]; - }) + sources."read-package-json-2.0.13" + sources."read-package-tree-5.2.1" + sources."read-pkg-3.0.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ sources."find-up-1.1.2" sources."load-json-file-1.1.0" + sources."parse-json-2.2.0" sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" sources."read-pkg-1.1.0" + sources."strip-bom-2.0.0" ]; }) sources."readable-stream-2.3.6" - sources."redent-1.0.0" + sources."readdir-scoped-modules-1.0.2" + sources."redent-2.0.0" + sources."regex-not-1.0.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" + sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."repeating-2.0.1" + sources."request-2.81.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" + (sources."resolve-cwd-2.0.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" + sources."ret-0.1.15" sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" + sources."rxjs-5.5.11" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."semver-5.5.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."slash-1.0.0" + sources."slide-1.1.6" + (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."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."sntp-1.0.9" sources."sort-keys-2.0.0" - sources."source-map-0.4.4" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."split-1.0.1" + sources."split-string-3.1.0" sources."split2-2.2.0" - (sources."string-width-2.1.1" // { + sources."sprintf-js-1.0.3" + (sources."sshpk-1.14.2" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."assert-plus-1.0.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."string-width-2.1.1" sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" + sources."stringstream-0.0.6" + sources."strip-ansi-4.0.0" + sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."strip-indent-1.0.1" + sources."strip-indent-2.0.0" sources."strip-json-comments-2.0.1" - (sources."strong-log-transformer-1.0.6" // { - dependencies = [ - sources."minimist-0.1.0" - ]; - }) + sources."strong-log-transformer-1.0.6" sources."supports-color-5.4.0" + sources."symbol-observable-1.0.1" + sources."tar-2.2.1" sources."temp-dir-1.0.0" - (sources."temp-write-3.4.0" // { - dependencies = [ - sources."pify-3.0.0" - sources."uuid-3.3.2" - ]; - }) - sources."tempfile-1.1.1" + sources."temp-write-3.4.0" sources."text-extensions-1.7.0" sources."through-2.3.8" sources."through2-2.0.3" sources."timed-out-4.0.1" sources."tmp-0.0.33" - sources."trim-newlines-1.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."tough-cookie-2.3.4" + sources."trim-newlines-2.0.0" sources."trim-off-newlines-1.0.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" (sources."uglify-js-2.8.29" // { dependencies = [ - sources."source-map-0.5.7" + sources."camelcase-1.2.1" sources."yargs-3.10.0" ]; }) sources."uglify-to-browserify-1.0.2" + sources."uid-number-0.0.6" + sources."umask-1.1.0" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) sources."universalify-0.1.2" + (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."unzip-response-2.0.1" + sources."urix-0.1.0" sources."url-parse-lax-1.0.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-2.0.3" + sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-name-3.0.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."wcwidth-1.0.1" sources."which-1.3.1" sources."which-module-2.0.0" @@ -37819,46 +39945,36 @@ in sources."wordwrap-0.0.3" (sources."wrap-ansi-2.1.0" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" ]; }) sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" - (sources."write-json-file-2.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."write-json-file-2.3.0" sources."write-pkg-3.2.0" + sources."xregexp-4.0.0" sources."xtend-4.0.1" - sources."y18n-3.2.1" + sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-8.0.2" // { + (sources."yargs-12.0.1" // { dependencies = [ - sources."camelcase-4.1.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - sources."is-fullwidth-code-point-1.0.0" - sources."load-json-file-2.0.0" - sources."path-type-2.0.0" - sources."read-pkg-2.0.0" - sources."read-pkg-up-2.0.0" - sources."strip-bom-3.0.0" - ]; - }) - (sources."yargs-parser-7.0.0" // { - dependencies = [ - sources."camelcase-4.1.0" + sources."cliui-4.1.0" + sources."decamelize-2.0.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" ]; }) + sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Tool for managing JavaScript projects with multiple packages"; + description = "A tool for managing JavaScript projects with multiple packages."; homepage = https://lernajs.io/; license = "MIT"; }; @@ -37868,10 +39984,10 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.7.1.tgz"; - sha512 = "Cmf5XJlzNklkBC8eAa+Ef16AHUBAkApHNAw3x9Vmn84h2BvGrri5Id7kf6H1n6SN74Fc0WdHIRPlFMxsl0eJkA=="; + url = "https://registry.npmjs.org/less/-/less-3.8.0.tgz"; + sha512 = "746DPDyL+Wsjo7h/Z3t+A3Mg/mpDTaxW4puZyLhCQJjWJJvHggN735orjuCLIYgo7jKqv1zWLiQrxkuUOg5oGA=="; }; dependencies = [ sources."ajv-5.5.2" @@ -37888,9 +40004,9 @@ in sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."errno-0.1.7" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -37910,8 +40026,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.8.2" @@ -37992,7 +40108,7 @@ in sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."chokidar-1.7.0" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."concat-map-0.0.1" sources."connect-3.5.1" sources."core-util-is-1.0.2" @@ -38047,8 +40163,8 @@ in sources."math-random-1.0.1" sources."micromatch-2.3.11" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" (sources."morgan-1.9.0" // { dependencies = [ @@ -38181,7 +40297,7 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" @@ -38217,7 +40333,7 @@ in sources."statuses-1.4.0" ]; }) - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" @@ -38256,7 +40372,7 @@ in sources."indexof-0.0.1" sources."inherits-2.0.3" sources."innertext-1.0.3" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.8.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-dotfile-1.0.3" @@ -38279,7 +40395,7 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."linkify-it-2.0.3" - sources."markdown-it-8.4.1" + sources."markdown-it-8.4.2" sources."markdown-it-emoji-1.4.0" sources."markdown-it-github-headings-1.1.1" sources."markdown-it-task-checkbox-1.0.6" @@ -38290,8 +40406,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.0.0" @@ -38312,7 +40428,7 @@ in sources."performance-now-2.1.0" sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" - sources."proxy-addr-2.0.3" + sources."proxy-addr-2.0.4" sources."punycode-1.4.1" sources."qs-6.5.2" (sources."randomatic-3.0.0" // { @@ -38426,10 +40542,10 @@ in meguca = nodeEnv.buildNodePackage { name = "meguca"; packageName = "meguca"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/meguca/-/meguca-1.0.8.tgz"; - sha512 = "6hEfEe5385DL95w4YPo68Y/DzSGo7vyw9/ckHsAMk/qO+GBcbI1pGRVkx0oJQtTdJ7mGSVc+gcVj09sj9auTQg=="; + url = "https://registry.npmjs.org/meguca/-/meguca-1.0.9.tgz"; + sha512 = "Q2O9s9cqu19UfhsA6+XDnuuYflxFKck5TvvYF2LMhtKWVVmIGuqVZiDAhx1XV3qO22B5A0vjU4gckaeQLALmPQ=="; }; dependencies = [ (sources."@gulp-sourcemaps/identity-map-1.0.2" // { @@ -38592,7 +40708,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."end-of-stream-0.1.5" sources."errno-0.1.7" sources."es5-ext-0.10.45" @@ -38620,7 +40736,7 @@ in ]; }) sources."expand-tilde-2.0.2" - sources."extend-3.0.1" + sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -38698,16 +40814,6 @@ in sources."through2-2.0.3" ]; }) - (sources."gulp-jsonminify-1.1.0" // { - dependencies = [ - sources."arr-diff-1.1.0" - sources."arr-union-2.1.0" - sources."array-slice-0.2.3" - sources."extend-shallow-1.1.4" - sources."kind-of-1.1.0" - sources."plugin-error-0.1.2" - ]; - }) (sources."gulp-less-3.5.0" // { dependencies = [ sources."arr-diff-1.1.0" @@ -38754,7 +40860,7 @@ in sources."vinyl-fs-3.0.3" ]; }) - (sources."gulp-uglify-3.0.0" // { + (sources."gulp-uglify-3.0.1" // { dependencies = [ sources."lodash-4.17.10" sources."readable-stream-2.3.6" @@ -38825,7 +40931,6 @@ in sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.0" - sources."jsonminify-0.2.3" (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -38881,8 +40986,8 @@ in sources."memoizee-0.4.12" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-2.0.10" sources."minimist-1.2.0" (sources."mixin-deep-1.3.1" // { @@ -39085,7 +41190,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typescript-2.7.2" - (sources."uglify-js-3.4.4" // { + (sources."uglify-js-3.4.6" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -39215,7 +41320,7 @@ in sources."debug-3.1.0" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."form-data-2.3.2" sources."formidable-1.2.1" sources."graphlib-2.1.5" @@ -39226,8 +41331,8 @@ in sources."lodash-4.17.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."ms-2.0.0" sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" @@ -39293,7 +41398,7 @@ in sources."aws4-1.7.0" sources."base64-js-1.2.3" sources."bcrypt-pbkdf-1.0.2" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" @@ -39307,8 +41412,8 @@ in sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -39347,8 +41452,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimist-0.0.8" sources."minipass-2.3.3" sources."minizlib-1.1.0" @@ -39464,8 +41569,8 @@ in }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."forever-agent-0.6.1" sources."form-data-2.1.4" @@ -39502,8 +41607,8 @@ in sources."assert-plus-1.0.0" ]; }) - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -39608,7 +41713,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.32" + sources."big-integer-1.6.34" sources."block-stream-0.0.9" sources."body-parser-1.18.2" sources."boom-2.10.1" @@ -39647,14 +41752,14 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-libc-1.0.3" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."error-ex-1.3.2" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."express-4.16.3" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."finalhandler-1.1.1" sources."find-up-1.1.2" @@ -39689,7 +41794,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.8.0" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -39719,8 +41824,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -39763,7 +41868,7 @@ in sources."pinkie-promise-2.0.1" sources."plist-1.2.0" sources."process-nextick-args-2.0.0" - sources."proxy-addr-2.0.3" + sources."proxy-addr-2.0.4" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" @@ -39923,7 +42028,7 @@ in sources."needle-2.2.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.3" - sources."npm-packlist-1.1.10" + sources."npm-packlist-1.1.11" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -39950,7 +42055,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.4" + sources."tar-4.4.6" sources."util-deprecate-1.0.2" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -39968,10 +42073,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.18.2"; + version = "1.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.2.tgz"; - sha512 = "FKuvzVurERMgX231T9KexWWWopjd93vapFY8rLn2JlPZ58uCW2s7U8utKElpGUEAqU5Y33///KFza5O9ndVRHQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz"; + sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -40359,7 +42464,7 @@ in sources."body-parser-1.18.3" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" (sources."buildmail-2.0.0" // { dependencies = [ sources."needle-0.10.0" @@ -40420,7 +42525,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.5.1" sources."duplexify-3.6.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."encoding-0.1.12" @@ -40446,7 +42551,7 @@ in ]; }) sources."express-session-1.15.6" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -40501,7 +42606,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.8.0" sources."is-absolute-1.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -40558,8 +42663,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" (sources."mimelib-0.3.1" // { dependencies = [ sources."addressparser-1.0.1" @@ -40633,7 +42738,7 @@ in sources."performance-now-2.1.0" sources."poplib-0.1.7" sources."process-nextick-args-2.0.0" - sources."proxy-addr-2.0.3" + sources."proxy-addr-2.0.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { @@ -40870,10 +42975,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.2.0.tgz"; - sha512 = "GnlNsOnxwVJX4WSfyQY0gY3LnUX2cc46XU0eu1g+WSuZgDRUGmw8tuptitJu6byp0RWGT8ZEAKajblwdhQHN8A=="; + url = "https://registry.npmjs.org/npm/-/npm-6.3.0.tgz"; + sha512 = "oDtLFo3wXue/xe3pU/oks9VHS5501OAWlYrZrApZkFv7l2LXk+9CfPMbjbfZWK7Jqlc1jbNcJMkB6KZC7K/vEA=="; }; buildInputs = globalBuildInputs; meta = { @@ -40927,8 +43032,8 @@ in sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -40970,8 +43075,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" @@ -41112,7 +43217,7 @@ in sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."isexe-2.0.0" - sources."jju-1.3.0" + sources."jju-1.4.0" sources."js-yaml-3.12.0" sources."json-parse-helpfulerror-1.0.3" sources."json5-0.5.1" @@ -41219,7 +43324,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."cross-spawn-5.1.0" sources."cvss-1.0.3" sources."debug-3.1.0" @@ -41361,7 +43466,7 @@ in sources."vscode-languageclient-4.0.1" sources."vscode-languageserver-4.0.0" sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.9.0" + sources."vscode-languageserver-types-3.10.0" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -41431,14 +43536,10 @@ in }) sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."combined-stream-1.0.6" - (sources."compressible-2.0.14" // { - dependencies = [ - sources."mime-db-1.35.0" - ]; - }) - sources."compression-1.7.2" + sources."compressible-2.0.14" + sources."compression-1.7.3" sources."concat-map-0.0.1" sources."connect-busboy-0.0.2" sources."content-disposition-0.5.2" @@ -41460,7 +43561,7 @@ in sources."dom-storage-2.1.0" sources."domino-1.0.30" sources."dtrace-provider-0.8.7" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."entities-1.1.1" @@ -41481,11 +43582,12 @@ in sources."iconv-lite-0.4.19" sources."qs-6.5.1" sources."raw-body-2.3.2" + sources."safe-buffer-5.1.1" sources."statuses-1.4.0" ]; }) sources."express-handlebars-3.0.0" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -41524,7 +43626,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.8.0" sources."is-arguments-1.0.2" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" @@ -41581,8 +43683,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.10" (sources."mkdirp-0.5.1" // { @@ -41627,7 +43729,7 @@ in sources."prfun-2.1.5" sources."process-nextick-args-2.0.0" sources."promise-7.3.1" - sources."proxy-addr-2.0.3" + sources."proxy-addr-2.0.4" sources."punycode-1.4.1" sources."qs-6.5.2" sources."range-parser-1.2.0" @@ -41641,7 +43743,7 @@ in sources."require-main-filename-1.0.1" sources."right-align-0.1.3" sources."rimraf-2.4.5" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."semver-5.5.0" @@ -41653,6 +43755,7 @@ in (sources."serve-favicon-2.5.0" // { dependencies = [ sources."ms-2.1.1" + sources."safe-buffer-5.1.1" ]; }) sources."serve-static-1.13.2" @@ -41726,7 +43829,7 @@ in sha512 = "spB+D+GXdM9JcPeWG8bpnWTxfXr/KwyyZ0OjNlpyw62ffxlCsbNhwaSmhXDpDC3wh4HuQejdYc1DlU+zTXL+WA=="; }; dependencies = [ - sources."addr-to-ip-port-1.4.3" + sources."addr-to-ip-port-1.5.1" sources."airplay-protocol-2.0.2" (sources."airplayer-2.0.0" // { dependencies = [ @@ -41742,7 +43845,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" - sources."big-integer-1.6.32" + sources."big-integer-1.6.34" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -41766,7 +43869,7 @@ in sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" sources."builtin-modules-1.1.1" sources."camelcase-2.1.1" @@ -41840,7 +43943,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.8.0" + sources."ipaddr.js-1.8.1" sources."is-arrayish-0.2.1" sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" @@ -41860,7 +43963,7 @@ in sources."lodash-3.10.1" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."magnet-uri-5.1.8" + sources."magnet-uri-5.2.3" sources."map-obj-1.0.1" sources."meow-3.7.0" sources."mime-2.3.1" @@ -41966,7 +44069,7 @@ in sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - sources."string2compact-1.2.5" + sources."string2compact-1.3.0" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -42027,7 +44130,7 @@ in }; dependencies = [ sources."accepts-1.2.13" - sources."addr-to-ip-port-1.4.3" + sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."async-0.2.10" @@ -42065,7 +44168,7 @@ in sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."bytes-2.1.0" sources."callsite-1.0.0" sources."combined-stream-0.0.7" @@ -42074,11 +44177,7 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" - (sources."compressible-2.0.14" // { - dependencies = [ - sources."mime-db-1.35.0" - ]; - }) + sources."compressible-2.0.14" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { @@ -42203,8 +44302,8 @@ in }) sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -42349,7 +44448,7 @@ in sources."speedometer-0.1.4" sources."statuses-1.5.0" sources."stream-counter-0.2.0" - sources."string2compact-1.2.5" + sources."string2compact-1.3.0" sources."string_decoder-0.10.31" sources."thirty-two-0.0.2" sources."thunky-1.0.2" @@ -42427,9 +44526,9 @@ in }) sources."debug-0.7.4" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extract-zip-1.5.0" sources."extsprintf-1.3.0" sources."fd-slicer-1.0.1" @@ -42475,8 +44574,8 @@ in sources."kew-0.7.0" sources."klaw-1.3.1" sources."lodash-4.17.10" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.0" @@ -42533,10 +44632,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.13.7"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz"; - sha512 = "KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w=="; + url = "https://registry.npmjs.org/prettier/-/prettier-1.14.0.tgz"; + sha512 = "KtQ2EGaUwf2EyDfp1fxyEb0PqGKakVm0WyXwDt6u+cAoxbO2Z2CwKvOe3+b4+F2IlO9lYHi1kqFuRM70ddBnow=="; }; buildInputs = globalBuildInputs; meta = { @@ -42626,7 +44725,7 @@ in sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" @@ -42651,7 +44750,7 @@ in ]; }) sources."collection-visit-1.0.0" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."combine-source-map-0.8.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" @@ -43088,7 +45187,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."doctypes-1.1.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.1" @@ -43113,7 +45212,7 @@ in sources."statuses-1.4.0" ]; }) - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" (sources."finalhandler-1.1.1" // { dependencies = [ @@ -43148,7 +45247,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."int64-buffer-0.1.10" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.8.0" sources."is-3.2.1" sources."is-buffer-1.1.6" (sources."is-expression-3.0.0" // { @@ -43185,8 +45284,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."morgan-1.9.0" @@ -43217,7 +45316,7 @@ in }) sources."process-nextick-args-2.0.0" sources."promise-7.3.1" - sources."proxy-addr-2.0.3" + sources."proxy-addr-2.0.4" sources."prr-1.0.1" sources."pug-2.0.3" sources."pug-attrs-2.0.3" @@ -43486,7 +45585,7 @@ in sources."dashdash-1.14.1" sources."debug-3.1.0" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" (sources."everyauth-0.4.5" // { dependencies = [ @@ -43505,7 +45604,7 @@ in sources."commander-1.3.2" ]; }) - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -43530,8 +45629,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mkdirp-0.3.5" sources."ms-2.0.0" sources."multiparty-2.2.0" @@ -43599,13 +45698,13 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "9.2.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-9.2.0.tgz"; - sha512 = "Of6n6QupoV+ybolrWS1e18Truux7VeYUa52XAo8no2dYKDAT+pWZZmrxf4RdCqoVTMfNWhvv8pjDnf8y1m3HkQ=="; + url = "https://registry.npmjs.org/serve/-/serve-9.4.0.tgz"; + sha512 = "a5TpnFytY2r59g0M3L9g2HvlLBcTHeevR8gTnDkzMWECfV2c8tUCEGC9tl3YYWM7xucdkUmov+xyKjWamQQJ7Q=="; }; dependencies = [ - sources."@zeit/schemas-1.6.0" + sources."@zeit/schemas-1.7.0" sources."ajv-6.5.2" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" @@ -43667,7 +45766,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" - sources."serve-handler-3.3.0" + sources."serve-handler-3.6.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -43750,7 +45849,7 @@ in sources."domhandler-2.2.1" sources."domutils-1.4.3" sources."duplexer-0.1.1" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" sources."encodeurl-1.0.2" @@ -43770,7 +45869,7 @@ in sources."etag-1.8.1" sources."event-stream-3.3.4" sources."express-4.16.3" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -43797,7 +45896,7 @@ in sources."iconv-lite-0.4.19" sources."indexof-0.0.1" sources."inherits-2.0.3" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.8.0" sources."irc-replies-2.0.1" sources."is-typedarray-1.0.0" sources."isarray-0.0.1" @@ -43815,8 +45914,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.7.0" @@ -43835,7 +45934,7 @@ in sources."path-to-regexp-0.1.7" sources."pause-stream-0.0.11" sources."performance-now-2.1.0" - sources."proxy-addr-2.0.3" + sources."proxy-addr-2.0.4" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" @@ -43944,9 +46043,12 @@ in (sources."body-parser-1.18.3" // { dependencies = [ 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.5.0" ]; }) sources."brace-expansion-1.1.11" @@ -43959,12 +46061,8 @@ in sources."color-name-1.1.1" sources."combined-stream-1.0.6" sources."commander-2.16.0" - (sources."compressible-2.0.14" // { - dependencies = [ - sources."mime-db-1.35.0" - ]; - }) - (sources."compression-1.7.2" // { + sources."compressible-2.0.14" + (sources."compression-1.7.3" // { dependencies = [ sources."bytes-3.0.0" ]; @@ -43991,7 +46089,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dtrace-provider-0.8.7" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."entities-1.1.1" @@ -44002,7 +46100,7 @@ in sources."etag-1.8.1" sources."express-5.0.0-alpha.6" sources."express-json5-0.1.0" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -44028,7 +46126,7 @@ in sources."readable-stream-2.3.6" ]; }) - (sources."http-errors-1.6.3" // { + (sources."http-errors-1.7.0" // { dependencies = [ sources."setprototypeof-1.1.0" sources."statuses-1.5.0" @@ -44042,7 +46140,7 @@ in sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."jju-1.3.0" + sources."jju-1.4.0" sources."js-yaml-3.12.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" @@ -44065,8 +46163,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-1.0.0" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -44116,12 +46214,21 @@ in sources."utils-merge-1.0.1" ]; }) - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - sources."sanitize-html-1.18.2" + sources."sanitize-html-1.18.3" sources."semver-4.3.6" - sources."send-0.15.6" + (sources."send-0.15.6" // { + dependencies = [ + (sources."http-errors-1.6.3" // { + dependencies = [ + sources."statuses-1.5.0" + ]; + }) + sources."setprototypeof-1.1.0" + ]; + }) sources."serve-static-1.12.6" sources."setprototypeof-1.0.3" sources."sigmund-1.0.1" @@ -44134,6 +46241,7 @@ in sources."string_decoder-1.1.1" sources."supports-color-5.4.0" sources."through-2.3.8" + sources."toidentifier-1.0.0" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -44233,7 +46341,7 @@ in sources."ctype-0.5.3" sources."dashdash-1.7.3" sources."dtrace-provider-0.6.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.2.0" sources."escape-regexp-component-1.0.2" sources."extsprintf-1.2.0" sources."formidable-1.2.1" @@ -44378,8 +46486,8 @@ in sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."object-component-0.0.3" @@ -44476,7 +46584,7 @@ in sha1 = "6c6a0d14684f0341e5ba013eed30302545532bc6"; }; dependencies = [ - sources."extend-3.0.1" + sources."extend-3.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -44685,9 +46793,9 @@ in sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."diff-3.2.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" (sources."fields-0.1.24" // { @@ -44737,8 +46845,8 @@ in sources."lodash-4.17.10" sources."longest-1.0.1" sources."longjohn-0.2.11" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimist-0.0.10" sources."moment-2.16.0" (sources."node-appc-0.2.44" // { @@ -44824,10 +46932,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.9.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"; - sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz"; + sha512 = "zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg=="; }; buildInputs = globalBuildInputs; meta = { @@ -44867,7 +46975,7 @@ in ]; }) sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."chalk-1.1.3" @@ -44899,7 +47007,7 @@ in sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" sources."exit-hook-1.1.1" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."form-data-2.3.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -44950,8 +47058,8 @@ in sources."make-dir-1.3.0" sources."make-error-1.3.4" sources."make-error-cause-1.2.2" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -45058,10 +47166,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.4"; + version = "3.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.4.tgz"; - sha512 = "RiB1kNcC9RMyqwRrjXC+EjgLoXULoDnCaOnEDzUCHkBN0bHwmtF5rzDMiDWU29gu0kXCRRWwtcTAVFWRECmU2Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz"; + sha512 = "O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg=="; }; dependencies = [ sources."commander-2.16.0" @@ -45079,10 +47187,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.29"; + version = "1.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.29.tgz"; - sha512 = "0aahbSMJj2FX4rpU6Rkp0eeW7SGKvWA8zGECRCJdfZ5wMAxFRzwddincC/8FOAIReM2jng6d75XeNrNsQdMB7w=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.31.tgz"; + sha512 = "ppS9UXM6/Gb3UT9JOydlxHnk409A+tVRjwrPYvkOL7QzytE+tvD7L6qu0pExES6bl9mvoNitvNVHMTFayXsNJg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -45118,7 +47226,7 @@ in sources."blueimp-md5-2.10.0" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" sources."builtins-1.0.3" sources."bytes-3.0.0" @@ -45139,7 +47247,7 @@ in sources."color-3.0.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."color-string-1.5.2" + sources."color-string-1.5.3" sources."colors-1.0.3" sources."combined-stream-0.0.7" sources."component-bind-1.0.0" @@ -45177,7 +47285,7 @@ in sources."diff2html-2.3.3" sources."dnd-page-scroll-0.0.4" sources."eachr-3.2.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."editions-1.3.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -45267,7 +47375,7 @@ in sources."inherits-2.0.3" sources."ini-1.3.5" sources."invert-kv-1.0.0" - sources."ipaddr.js-1.6.0" + sources."ipaddr.js-1.8.0" sources."is-arrayish-0.3.2" sources."is-builtin-module-1.0.0" sources."is-fullwidth-code-point-1.0.0" @@ -45309,8 +47417,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -45357,13 +47465,13 @@ in sources."pause-0.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."proxy-addr-2.0.3" + sources."proxy-addr-2.0.4" sources."pseudomap-1.0.2" sources."punycode-1.4.1" sources."qs-6.5.2" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - sources."raven-js-3.26.3" + sources."raven-js-3.26.4" sources."raw-body-2.3.3" (sources."rc-1.2.8" // { dependencies = [ @@ -45376,7 +47484,7 @@ in dependencies = [ sources."combined-stream-1.0.6" sources."delayed-stream-1.0.0" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."form-data-2.3.2" ]; }) @@ -45441,7 +47549,7 @@ in sources."cookiejar-2.1.2" sources."debug-3.1.0" sources."delayed-stream-1.0.0" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."form-data-2.3.2" sources."formidable-1.2.1" sources."isarray-1.0.0" @@ -45603,12 +47711,12 @@ in sources."download-5.0.3" sources."download-git-repo-1.0.2" sources."duplexer3-0.1.4" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."enable-1.3.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extend-shallow-2.0.1" sources."external-editor-3.0.0" sources."extsprintf-1.3.0" @@ -45699,8 +47807,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -45853,9 +47961,9 @@ in }) sources."debug-0.7.4" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" - sources."extend-3.0.1" + sources."extend-3.0.2" (sources."extract-zip-1.5.0" // { dependencies = [ sources."mkdirp-0.5.0" @@ -45907,8 +48015,8 @@ in sources."kew-0.1.7" sources."klaw-1.3.1" sources."lodash-4.17.10" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" @@ -45978,10 +48086,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.16.0"; + version = "4.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.16.0.tgz"; - sha512 = "oNx9djAd6uAcccyfqN3hyXLNMjZHiRySZmBQ4c8FNmf1SNJGhx7n9TSvHNyXxgToRdH65g/Q97s94Ip9N6F7xg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.16.3.tgz"; + sha512 = "3VcrVoFgzSz1IYgga71YpU3HO89Al5bSnDOj9RJQPsy+FNyI1sFsUyJITn3pktNuaRBlQT0usvKZE3GgkPGAIw=="; }; dependencies = [ sources."@webassemblyjs/ast-1.5.13" @@ -46051,7 +48159,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-4.9.1" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cacache-10.0.4" @@ -46106,7 +48214,7 @@ in sources."end-of-stream-1.4.1" sources."enhanced-resolve-4.1.0" sources."errno-0.1.7" - sources."eslint-scope-3.7.3" + sources."eslint-scope-4.0.0" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."events-1.1.1" @@ -46359,7 +48467,7 @@ in ]; }) sources."stream-browserify-2.0.1" - sources."stream-each-1.2.2" + sources."stream-each-1.2.3" sources."stream-http-2.8.3" sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" @@ -46447,36 +48555,31 @@ in sha512 = "NnBAGkD64CRsl9edM9q0QU+ku6nCX32nM0U+YC8Gs/36c8y+5m9Tya3mWIux3oZKZ54yGiVtnok4tUpqDE5tMA=="; }; dependencies = [ - sources."addr-to-ip-port-1.4.3" + sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" sources."ascli-0.3.0" sources."async-limiter-1.0.0" sources."balanced-match-1.0.0" sources."bencode-2.0.0" sources."binary-search-1.3.4" - sources."bindings-1.3.0" sources."bitfield-2.0.0" (sources."bittorrent-dht-8.4.0" // { dependencies = [ sources."debug-3.1.0" ]; }) - sources."bittorrent-peerid-1.2.0" - (sources."bittorrent-protocol-2.4.2" // { + sources."bittorrent-peerid-1.3.0" + (sources."bittorrent-protocol-3.0.1" // { dependencies = [ sources."debug-3.1.0" ]; }) - (sources."bittorrent-tracker-9.9.1" // { + (sources."bittorrent-tracker-9.10.0" // { dependencies = [ sources."debug-3.1.0" sources."simple-get-3.0.2" ]; }) - sources."bl-1.2.2" sources."blob-to-buffer-1.2.8" sources."block-stream2-1.1.0" sources."bn.js-4.11.8" @@ -46486,14 +48589,13 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" - sources."bufferutil-3.0.5" + sources."bufferutil-4.0.0" sources."bufferview-1.0.1" sources."bytebuffer-3.5.5" sources."castv2-0.1.9" sources."castv2-client-1.2.0" - sources."chownr-1.0.1" (sources."chromecasts-1.9.1" // { dependencies = [ sources."mime-1.6.0" @@ -46502,20 +48604,15 @@ in sources."chunk-store-stream-2.1.0" sources."clivas-0.2.0" sources."closest-to-2.0.0" - sources."code-point-at-1.1.0" sources."colour-0.7.1" sources."compact2string-1.4.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."create-torrent-3.32.0" + sources."create-torrent-3.32.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" sources."defined-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-1.0.3" (sources."dlnacasts-0.1.0" // { dependencies = [ sources."mime-1.6.0" @@ -46531,7 +48628,6 @@ in sources."elementtree-0.1.7" sources."end-of-stream-1.4.1" sources."executable-4.1.1" - sources."expand-template-1.1.1" sources."filestream-4.1.3" sources."flatten-1.0.2" (sources."fs-chunk-store-1.7.0" // { @@ -46539,25 +48635,19 @@ in sources."thunky-1.0.2" ]; }) - sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."gauge-2.7.4" sources."get-browser-rtc-1.0.2" sources."get-stdin-6.0.0" - sources."github-from-package-0.0.0" sources."glob-7.1.2" - sources."has-unicode-2.0.1" sources."he-1.1.1" sources."immediate-chunk-store-1.0.8" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" sources."ip-1.1.5" sources."ip-set-1.0.1" - sources."ipaddr.js-1.8.0" + sources."ipaddr.js-1.8.1" sources."is-ascii-1.0.0" sources."is-file-1.0.0" - sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."junk-2.1.0" @@ -46565,15 +48655,15 @@ in sources."k-rpc-5.0.0" sources."k-rpc-socket-1.8.0" sources."last-one-wins-1.0.4" - sources."load-ip-set-1.3.1" - sources."long-2.4.0" - sources."lru-3.1.0" - sources."magnet-uri-5.1.8" - (sources."mdns-js-0.5.0" // { + (sources."load-ip-set-2.1.0" // { dependencies = [ - sources."semver-5.1.1" + sources."simple-get-3.0.2" ]; }) + sources."long-2.4.0" + sources."lru-3.1.0" + sources."magnet-uri-5.2.3" + sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" sources."mediasource-2.2.1" sources."memory-chunk-store-1.3.0" @@ -46587,7 +48677,7 @@ in ]; }) sources."moment-2.22.2" - sources."mp4-box-encoding-1.1.4" + sources."mp4-box-encoding-1.3.0" sources."mp4-stream-2.0.3" sources."ms-2.0.0" (sources."multicast-dns-6.2.3" // { @@ -46596,24 +48686,18 @@ in ]; }) sources."multistream-2.1.1" - sources."nan-2.10.0" sources."netmask-1.0.6" sources."network-address-1.1.2" sources."next-event-1.0.0" - sources."node-abi-2.4.3" + sources."node-gyp-build-3.4.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" - sources."noop-logger-0.1.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."open-0.0.5" sources."optjs-3.2.2" - sources."os-homedir-1.0.2" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-0.0.2" - (sources."parse-torrent-6.0.1" // { + (sources."parse-torrent-6.1.1" // { dependencies = [ sources."simple-get-3.0.2" ]; @@ -46626,11 +48710,6 @@ in sources."xmlbuilder-0.4.3" ]; }) - (sources."prebuild-install-4.0.0" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.0" sources."protobufjs-3.8.2" @@ -46642,10 +48721,9 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."range-slice-stream-1.2.0" - sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."record-cache-1.1.0" - (sources."render-media-3.1.0" // { + (sources."render-media-3.1.2" // { dependencies = [ sources."debug-3.1.0" ]; @@ -46657,9 +48735,7 @@ in sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."sax-1.1.4" - sources."semver-5.5.0" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" + sources."semver-5.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" (sources."simple-peer-9.1.2" // { @@ -46668,10 +48744,9 @@ in ]; }) sources."simple-sha1-2.1.1" - (sources."simple-websocket-7.0.2" // { + (sources."simple-websocket-7.2.0" // { dependencies = [ sources."debug-3.1.0" - sources."ws-4.1.0" ]; }) sources."speedometer-1.1.0" @@ -46679,32 +48754,21 @@ in sources."stream-to-blob-1.0.1" sources."stream-to-blob-url-2.1.1" sources."stream-with-known-length-to-buffer-1.0.2" - sources."string-width-1.0.2" - sources."string2compact-1.2.5" + sources."string2compact-1.3.0" sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - (sources."tar-fs-1.16.3" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) - sources."tar-stream-1.6.1" sources."thirty-two-1.0.2" sources."through-2.3.8" sources."thunky-0.1.0" sources."to-arraybuffer-1.0.1" - sources."to-buffer-1.1.1" - (sources."torrent-discovery-8.4.1" // { + (sources."torrent-discovery-9.0.2" // { dependencies = [ sources."debug-3.1.0" ]; }) - sources."torrent-piece-1.1.2" - sources."tunnel-agent-0.6.0" + sources."torrent-piece-2.0.0" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uint64be-1.0.1" + sources."uint64be-2.0.2" sources."uniq-1.0.1" sources."unordered-array-remove-1.0.2" sources."upnp-device-client-1.0.2" @@ -46716,24 +48780,19 @@ in ]; }) sources."ut_pex-1.2.1" + sources."utf-8-validate-5.0.1" sources."util-deprecate-1.0.2" - (sources."videostream-2.4.3" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) + sources."videostream-2.5.1" sources."vlc-command-1.1.1" - (sources."webtorrent-0.100.0" // { + (sources."webtorrent-0.101.2" // { dependencies = [ sources."debug-3.1.0" sources."simple-get-3.0.2" ]; }) - sources."which-pm-runs-1.0.0" - sources."wide-align-1.1.3" sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-5.2.2" + sources."ws-6.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -46752,40 +48811,34 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.7.0.tgz"; - sha512 = "hXj/MV/x6G0oxplOirV4/j7BJ5MZJ2yZHml0gulBr7mH2BMNyTJHdRi+qzVBNPFdBMLV0/PS05YGZ7xr2YmwVA=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.8.0.tgz"; + sha512 = "3JuPYU3yrefysm3pvGwRP5k9plRMPUeLo5KLp2TSnE9g4t7x6SeIWZEWWG3jwVeFsPQuIj3sAuVHEDO5ai9mCw=="; }; dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.5.2" + sources."@types/node-10.5.5" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.1" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) + sources."acorn-jsx-4.1.1" sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.0.0" // { + (sources."addons-linter-1.2.6" // { dependencies = [ - sources."decamelize-1.2.0" sources."source-map-0.6.1" sources."source-map-support-0.5.6" - sources."yargs-11.0.0" + sources."yargs-12.0.1" ]; }) sources."adm-zip-0.4.11" sources."agent-base-4.2.1" - sources."ajv-6.5.0" - sources."ajv-keywords-2.1.1" - sources."ajv-merge-patch-3.0.0" - sources."anchor-markdown-header-0.5.7" + sources."ajv-6.5.2" + sources."ajv-keywords-3.2.0" + sources."ajv-merge-patch-4.1.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -46804,6 +48857,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-differ-1.0.0" sources."array-filter-0.0.1" sources."array-from-2.1.1" sources."array-map-0.0.0" @@ -46847,7 +48901,6 @@ in sources."babel-traverse-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" - sources."bail-1.0.3" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -46860,9 +48913,7 @@ in sources."bl-1.2.2" sources."bluebird-2.9.34" sources."boolbase-1.0.0" - sources."boom-4.3.1" sources."bops-0.1.1" - sources."boundary-1.0.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -46870,7 +48921,7 @@ in sources."extend-shallow-2.0.1" ]; }) - (sources."buffer-5.1.0" // { + (sources."buffer-5.2.0" // { dependencies = [ sources."base64-js-1.3.0" ]; @@ -46880,7 +48931,7 @@ in sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" sources."bunyan-1.8.12" sources."bytes-3.0.0" @@ -46890,17 +48941,12 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."ccount-1.0.3" (sources."chalk-2.4.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."supports-color-5.4.0" ]; }) - sources."character-entities-1.2.2" - sources."character-entities-html4-1.1.2" - sources."character-entities-legacy-1.1.2" - sources."character-reference-invalid-1.1.2" sources."chardet-0.4.2" sources."cheerio-1.0.0-rc.2" sources."chokidar-2.0.4" @@ -46935,7 +48981,6 @@ in sources."clone-deep-0.3.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."collapse-white-space-1.0.4" sources."collection-visit-1.0.0" sources."color-convert-1.9.2" sources."color-name-1.1.1" @@ -46943,7 +48988,7 @@ in sources."columnify-1.5.4" sources."combined-stream-1.0.6" sources."commander-2.16.0" - sources."common-tags-1.7.2" + sources."common-tags-1.8.0" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" sources."concat-map-0.0.1" @@ -46953,16 +48998,11 @@ in sources."copy-descriptor-0.1.1" sources."core-js-2.5.7" sources."core-util-is-1.0.2" - sources."crc-3.7.0" + sources."crc-3.8.0" sources."crc32-stream-2.0.0" sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" sources."crx-parser-0.1.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" sources."css-what-2.1.0" @@ -46981,24 +49021,27 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" - sources."deepmerge-2.1.0" + sources."deepmerge-2.1.1" sources."defaults-1.0.3" + sources."define-properties-1.1.2" sources."define-property-2.0.2" sources."degenerator-1.0.4" sources."del-2.2.2" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."detect-indent-4.0.0" - (sources."dispensary-0.18.0" // { + (sources."dispensary-0.21.0" // { dependencies = [ + sources."ansi-styles-3.2.1" sources."async-2.6.1" - sources."decamelize-1.2.0" + sources."chalk-2.4.1" + sources."pino-4.17.6" sources."source-map-0.6.1" sources."source-map-support-0.5.6" - sources."yargs-11.0.0" + sources."supports-color-5.4.0" + sources."yargs-12.0.1" ]; }) - sources."doctoc-1.3.1" sources."doctrine-2.1.0" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -47011,14 +49054,15 @@ in sources."dot-prop-4.2.0" sources."dtrace-provider-0.8.7" sources."duplexer3-0.1.4" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.10" sources."email-validator-2.0.4" - sources."emoji-regex-6.1.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.1" sources."error-ex-1.3.2" + sources."es-abstract-1.12.0" + sources."es-to-primitive-1.1.1" sources."es5-ext-0.10.45" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" @@ -47039,18 +49083,18 @@ in ]; }) sources."escope-3.6.0" - (sources."eslint-4.19.1" // { + (sources."eslint-5.0.1" // { dependencies = [ - sources."ajv-5.5.2" sources."ansi-regex-3.0.0" sources."debug-3.1.0" - sources."fast-deep-equal-1.1.0" sources."globals-11.7.0" sources."strip-ansi-4.0.0" ]; }) (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { dependencies = [ + sources."acorn-3.3.0" + sources."acorn-jsx-3.0.1" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" @@ -47058,6 +49102,7 @@ in sources."chalk-1.1.3" sources."cli-cursor-1.0.2" sources."eslint-3.19.0" + sources."espree-3.5.4" sources."figures-1.7.0" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-2.0.0" @@ -47066,7 +49111,6 @@ in sources."progress-1.1.8" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" - sources."rx-lite-3.1.2" sources."shelljs-0.7.8" sources."slice-ansi-0.0.4" sources."string-width-1.0.2" @@ -47078,9 +49122,9 @@ in }) ]; }) - sources."eslint-scope-3.7.3" + sources."eslint-scope-4.0.0" sources."eslint-visitor-keys-1.0.0" - sources."espree-3.5.4" + sources."espree-4.0.0" sources."esprima-3.1.3" sources."esquery-1.0.1" sources."esrecurse-4.2.1" @@ -47088,7 +49132,11 @@ in sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."execa-0.7.0" + (sources."execa-0.7.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + ]; + }) sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -47108,7 +49156,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."extend-3.0.1" + sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -47124,11 +49172,12 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-parse-1.0.3" - sources."fast-json-patch-1.2.2" + sources."fast-json-patch-2.0.6" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" + sources."fast-redact-1.1.13" sources."fast-safe-stringify-1.2.3" - sources."fd-slicer-1.0.1" + sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" sources."file-uri-to-path-1.0.0" @@ -47137,7 +49186,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" + sources."find-up-3.0.0" (sources."firefox-profile-1.1.0" // { dependencies = [ sources."async-2.5.0" @@ -47150,6 +49199,7 @@ in sources."fluent-syntax-0.7.0" sources."for-in-1.0.2" sources."for-own-1.0.0" + sources."foreach-2.0.5" sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."fragment-cache-0.2.1" @@ -47205,12 +49255,14 @@ in dependencies = [ sources."ajv-5.5.2" sources."fast-deep-equal-1.1.0" + sources."json-schema-traverse-0.3.1" ]; }) sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -47222,8 +49274,6 @@ in sources."async-1.5.2" ]; }) - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.7.1" sources."htmlparser2-3.9.2" @@ -47247,7 +49297,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."inquirer-3.3.0" // { + (sources."inquirer-5.2.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."strip-ansi-4.0.0" @@ -47263,18 +49313,17 @@ in sources."kind-of-6.0.2" ]; }) - sources."is-alphabetical-1.0.2" - sources."is-alphanumerical-1.0.2" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" + sources."is-callable-1.1.4" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" ]; }) - sources."is-decimal-1.0.2" + sources."is-date-object-1.0.1" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.2" @@ -47285,7 +49334,6 @@ in sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.0" - sources."is-hexadecimal-1.0.2" sources."is-installed-globally-0.1.0" sources."is-mergeable-object-1.1.0" sources."is-my-ip-valid-1.0.0" @@ -47300,10 +49348,12 @@ in sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-redirect-1.0.0" + sources."is-regex-1.0.4" sources."is-relative-0.1.3" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" + sources."is-symbol-1.0.1" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -47326,7 +49376,7 @@ in sources."json-merge-patch-0.2.3" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-1.0.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" @@ -47355,7 +49405,7 @@ in sources."strip-bom-2.0.0" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.10" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" @@ -47372,7 +49422,6 @@ in sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" - sources."longest-streak-1.0.0" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" @@ -47384,20 +49433,14 @@ in }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."markdown-table-0.4.0" - (sources."markdown-to-ast-3.4.0" // { - dependencies = [ - sources."traverse-0.6.6" - ]; - }) sources."mem-1.1.0" (sources."micromatch-3.1.10" // { dependencies = [ sources."kind-of-6.0.2" ]; }) - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -47418,6 +49461,7 @@ in }) sources."moment-2.22.2" sources."ms-2.0.0" + sources."multimatch-2.1.0" sources."mute-stream-0.0.7" (sources."mv-2.1.1" // { dependencies = [ @@ -47442,6 +49486,7 @@ in sources."decamelize-1.2.0" sources."os-locale-1.4.0" sources."string-width-1.0.2" + sources."y18n-3.2.1" sources."yargs-3.32.0" ]; }) @@ -47450,6 +49495,7 @@ in sources."neo-async-2.5.1" sources."netmask-1.0.6" sources."next-tick-1.0.0" + sources."nice-try-1.0.4" sources."node-forge-0.7.5" sources."node-notifier-5.2.1" (sources."nomnom-1.8.1" // { @@ -47457,7 +49503,6 @@ in sources."ansi-styles-1.0.0" sources."chalk-0.4.0" sources."strip-ansi-0.1.1" - sources."underscore-1.6.0" ]; }) sources."normalize-package-data-2.4.0" @@ -47479,6 +49524,7 @@ in }) ]; }) + sources."object-keys-1.0.12" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -47491,19 +49537,17 @@ in sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" (sources."pac-proxy-agent-2.0.2" // { dependencies = [ sources."debug-3.1.0" - sources."socks-proxy-agent-3.0.1" ]; }) sources."pac-resolver-3.0.0" sources."package-json-4.0.1" sources."pako-1.0.6" - sources."parse-entities-1.1.2" sources."parse-json-4.0.0" sources."parse5-3.0.3" sources."pascalcase-0.1.1" @@ -47520,14 +49564,21 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pino-4.16.1" + (sources."pino-5.0.0-rc.4" // { + dependencies = [ + sources."fast-safe-stringify-2.0.5" + sources."quick-format-unescaped-3.0.0" + ]; + }) sources."pino-std-serializers-2.1.0" sources."pkginfo-0.4.1" sources."pluralize-7.0.0" sources."po2json-0.4.5" sources."posix-character-classes-0.1.1" - (sources."postcss-6.0.19" // { + (sources."postcss-6.0.23" // { dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.1" sources."source-map-0.6.1" sources."supports-color-5.4.0" ]; @@ -47540,7 +49591,7 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."promise-7.3.1" - (sources."proxy-agent-3.0.1" // { + (sources."proxy-agent-2.3.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -47571,6 +49622,7 @@ in sources."recursive-readdir-2.2.2" sources."regenerator-runtime-0.11.1" sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.2.0" sources."regexpp-1.1.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -47579,14 +49631,11 @@ in sources."chalk-1.1.3" ]; }) - sources."remark-5.1.0" - sources."remark-parse-1.1.0" - sources."remark-stringify-1.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."repeating-2.0.1" - sources."request-2.85.0" + sources."request-2.87.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-uncached-1.0.3" @@ -47597,8 +49646,9 @@ in sources."ret-0.1.15" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rx-lite-4.0.8" + sources."rx-lite-3.1.2" sources."rx-lite-aggregates-4.0.8" + sources."rxjs-5.5.11" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" @@ -47624,7 +49674,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" - sources."shelljs-0.8.1" + sources."shelljs-0.8.2" sources."shellwords-0.1.1" (sources."sign-addon-0.3.1" // { dependencies = [ @@ -47632,7 +49682,6 @@ in sources."es6-error-4.0.0" sources."mz-2.5.0" sources."regenerator-runtime-0.9.6" - sources."request-2.87.0" sources."source-map-support-0.4.6" ]; }) @@ -47668,12 +49717,15 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."sntp-2.1.0" - (sources."snyk-1.88.2" // { + (sources."snyk-1.90.0" // { dependencies = [ + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.1" sources."debug-3.1.0" + sources."inquirer-3.3.0" + sources."rx-lite-4.0.8" + sources."strip-ansi-4.0.0" sources."supports-color-5.4.0" ]; }) @@ -47685,7 +49737,6 @@ in (sources."snyk-docker-plugin-1.10.3" // { dependencies = [ sources."debug-3.1.0" - sources."request-2.87.0" ]; }) sources."snyk-go-plugin-1.5.1" @@ -47696,7 +49747,7 @@ in ]; }) sources."snyk-mvn-plugin-1.2.0" - (sources."snyk-nuget-plugin-1.6.2" // { + (sources."snyk-nuget-plugin-1.6.3" // { dependencies = [ sources."debug-3.1.0" sources."es6-promise-4.2.4" @@ -47712,7 +49763,7 @@ in sources."debug-3.1.0" ]; }) - sources."snyk-python-plugin-1.6.1" + sources."snyk-python-plugin-1.8.0" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.1.0" @@ -47731,12 +49782,8 @@ in ]; }) sources."socks-1.1.10" - (sources."socks-proxy-agent-4.0.1" // { - dependencies = [ - sources."smart-buffer-4.0.1" - sources."socks-2.2.1" - ]; - }) + sources."socks-proxy-agent-3.0.1" + sources."sonic-boom-0.5.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" (sources."source-map-support-0.5.3" // { @@ -47788,23 +49835,17 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."string.prototype.matchall-2.0.0" sources."string_decoder-1.1.1" - sources."stringify-entities-1.3.2" - sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-bom-buf-1.0.0" sources."strip-bom-stream-3.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."structured-source-3.0.2" sources."supports-color-2.0.0" - (sources."table-4.0.2" // { - dependencies = [ - sources."ajv-5.5.2" - sources."fast-deep-equal-1.1.0" - ]; - }) + sources."symbol-observable-1.0.1" + sources."table-4.0.3" sources."tar-stream-1.6.1" sources."temp-dir-1.0.0" sources."tempfile-2.0.0" @@ -47833,18 +49874,13 @@ in }) sources."tr46-1.0.1" sources."traverse-0.4.6" - sources."trim-0.0.1" sources."trim-right-1.0.1" - sources."trim-trailing-lines-1.1.1" - sources."trough-1.0.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" sources."undefsafe-2.0.2" - sources."underscore-1.8.3" - sources."unherit-1.1.1" - sources."unified-4.2.1" + sources."underscore-1.6.0" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -47852,9 +49888,6 @@ in ]; }) sources."unique-string-1.0.0" - sources."unist-util-is-2.1.2" - sources."unist-util-remove-position-1.1.2" - sources."unist-util-visit-1.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { @@ -47868,9 +49901,8 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.0.5" + sources."upath-1.1.0" sources."update-notifier-2.3.0" - sources."update-section-0.3.3" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" @@ -47881,12 +49913,10 @@ in sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" - sources."vfile-1.4.0" - sources."vfile-location-2.0.3" sources."watchpack-1.5.0" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - sources."whatwg-url-6.4.1" + sources."whatwg-url-6.5.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" @@ -47909,7 +49939,7 @@ in sources."xmldom-0.1.27" sources."xregexp-2.0.0" sources."xtend-4.0.1" - sources."y18n-3.2.1" + sources."y18n-4.0.0" sources."yallist-2.1.2" (sources."yargs-6.6.0" // { dependencies = [ @@ -47919,11 +49949,12 @@ in 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-9.0.2" - sources."yauzl-2.9.1" + sources."yargs-parser-10.1.0" + sources."yauzl-2.9.2" sources."zip-1.2.0" (sources."zip-dir-1.0.2" // { dependencies = [ @@ -47961,10 +49992,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.7.0"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.7.0.tgz"; - sha1 = "0076b9fde6010e01950526a609bc53bc175ef925"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.9.2.tgz"; + sha1 = "7666c6db0fed8dc090ae0dce11a8a28b1d82e391"; }; buildInputs = globalBuildInputs; meta = { @@ -47978,10 +50009,10 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-2.0.4.tgz"; - sha512 = "IFqP6MBVbyN/EG1jPqBdzV9HNmnOFyC6u/CVN7KcQpxejulspdvY1IdxX0Aj0fMSFkoZGO3HX94e8rcxLHZN7A=="; + url = "https://registry.npmjs.org/yo/-/yo-2.0.5.tgz"; + sha512 = "PLyTNZSJjHkks/FIln+QE5PxV224MsekCzbROVhZEW0MvLyj/6ghWIVkdBmrwdAbapH8H9q21F1/pQ9Q0Lk9UA=="; }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -48036,7 +50067,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { @@ -48121,7 +50152,7 @@ in sources."onetime-1.1.0" ]; }) - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."env-paths-1.0.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" @@ -48150,7 +50181,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."extend-3.0.1" + sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -48198,7 +50229,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - sources."global-tunnel-ng-2.4.0" + sources."global-tunnel-ng-2.5.4" sources."globby-8.0.1" sources."got-8.3.2" sources."graceful-fs-4.1.11" @@ -48333,8 +50364,8 @@ in }) sources."merge2-1.2.2" sources."micromatch-3.1.10" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -48684,7 +50715,7 @@ in ]; }) sources."yeoman-doctor-3.0.2" - (sources."yeoman-environment-2.3.0" // { + (sources."yeoman-environment-2.3.1" // { dependencies = [ sources."chardet-0.4.2" sources."debug-3.1.0" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 241679e0b3b..4c6453ed049 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -22,13 +22,13 @@ let sha512 = "wOLMflfsszUXej5wSNxo06VgFqeWZ/GQFz/OzcrHv4r3oXvBsFh9KyyvIV6kOLpaZ+8bkOwBWbpGbJZWK00NFQ=="; }; }; - "@cycle/isolate-3.3.0" = { + "@cycle/isolate-3.4.0" = { name = "_at_cycle_slash_isolate"; packageName = "@cycle/isolate"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.3.0.tgz"; - sha512 = "WFbEhrS1+Wx7VrJtGnjE/TQ1GtSoxQi6mBcFgqh8CwFu9FRxbNk1QL5rrwel250m+zEcwRmxo+kUwtJSlj4DCA=="; + url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.4.0.tgz"; + sha512 = "mOAlwLeTr6wTdHwKWAfaFeuKeD540kKcJlLVKsqLhbfLp6orF1B3CzMfFNlmqNY30t6o6TORCFfV+0EATK9Y7Q=="; }; }; "@cycle/run-3.4.0" = { @@ -40,6 +40,15 @@ let sha512 = "YUZyPu0nC4YDC31mLH5PGxbMoPEH5dNEV+nmgt34GgGgJ0ykDd4PrY7/ph5MAEpQE6rOfov0VN44qQRs6beQow=="; }; }; + "@cycle/run-4.4.0" = { + name = "_at_cycle_slash_run"; + packageName = "@cycle/run"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cycle/run/-/run-4.4.0.tgz"; + sha512 = "vVxnTqKKlgasE+we9X2z3og8z5KouO2RMiIgHWkVek+NomsdaeZwfvbutqzm3VToEImaz0DE2Iln9AxtCOVjpQ=="; + }; + }; "@cycle/time-0.10.1" = { name = "_at_cycle_slash_time"; packageName = "@cycle/time"; @@ -49,13 +58,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-10.5.2" = { + "@types/node-10.5.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.5.2"; + version = "10.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz"; - sha512 = "m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.5.5.tgz"; + sha512 = "6Qnb1gXbp3g1JX9QVJj3A6ORzc9XCyhokxUKaoonHgNXcQhmk8adhotxfkeK8El9TnFeUuH72yI6jQ5nDJKS6w=="; }; }; "@types/superagent-3.5.6" = { @@ -805,13 +814,13 @@ let sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; }; }; - "buffer-from-1.1.0" = { + "buffer-from-1.1.1" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; - sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "builtins-1.0.3" = { @@ -1246,13 +1255,13 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "colors-1.3.0" = { + "colors-1.3.1" = { name = "colors"; packageName = "colors"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz"; - sha512 = "EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw=="; + url = "https://registry.npmjs.org/colors/-/colors-1.3.1.tgz"; + sha512 = "jg/vxRmv430jixZrC+La5kMbUWqIg32/JsYNZb94+JEmzceYbWKTsv1OuTp+7EaqiaWRR2tPcykibwCRgclIsw=="; }; }; "combine-errors-3.0.3" = { @@ -2038,13 +2047,13 @@ let sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ=="; }; }; - "ecc-jsbn-0.1.1" = { + "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; "ee-first-1.1.0" = { @@ -2254,13 +2263,13 @@ let sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; }; }; - "extend-3.0.1" = { + "extend-3.0.2" = { name = "extend"; packageName = "extend"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extend-shallow-2.0.1" = { @@ -3073,13 +3082,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "hypercore-6.17.3" = { + "hypercore-6.18.1" = { name = "hypercore"; packageName = "hypercore"; - version = "6.17.3"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.17.3.tgz"; - sha512 = "BJwZ4bRV3tYG3R+iE3ydW3GWpZrPLbi86I75qUg9bQ5jMWgwdh+llKgYFvSJhJtoT/MVxrcuXFDkuHiJ0GYMvw=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.18.1.tgz"; + sha512 = "pH2t3ehdTfe/FFrwVq+6w7L9NoWEnFO9Yxix2kj43vSLMHTWCUFdOCJ9/MaOUAG4OeYy4tiT4+IE5NP0bff6Mg=="; }; }; "hypercore-crypto-1.0.0" = { @@ -4594,22 +4603,22 @@ let sha512 = "OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="; }; }; - "mime-db-1.33.0" = { + "mime-db-1.35.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.33.0"; + version = "1.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz"; + sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="; }; }; - "mime-types-2.1.18" = { + "mime-types-2.1.19" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.18"; + version = "2.1.19"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz"; + sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw=="; }; }; "mimic-fn-1.2.0" = { @@ -4990,13 +4999,13 @@ let sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; }; }; - "nodemon-1.18.2" = { + "nodemon-1.18.3" = { name = "nodemon"; packageName = "nodemon"; - version = "1.18.2"; + version = "1.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.2.tgz"; - sha512 = "FKuvzVurERMgX231T9KexWWWopjd93vapFY8rLn2JlPZ58uCW2s7U8utKElpGUEAqU5Y33///KFza5O9ndVRHQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz"; + sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g=="; }; }; "nopt-1.0.10" = { @@ -5053,13 +5062,13 @@ let sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; }; - "npm-packlist-1.1.10" = { + "npm-packlist-1.1.11" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.10"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz"; - sha512 = "AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz"; + sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA=="; }; }; "npm-run-path-2.0.2" = { @@ -5656,6 +5665,15 @@ let sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; + "quicktask-1.1.0" = { + name = "quicktask"; + packageName = "quicktask"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quicktask/-/quicktask-1.1.0.tgz"; + sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; + }; + }; "raf-3.3.2" = { name = "raf"; packageName = "raf"; @@ -6574,13 +6592,13 @@ let sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; }; }; - "stream-each-1.2.2" = { + "stream-each-1.2.3" = { name = "stream-each"; packageName = "stream-each"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz"; - sha512 = "mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA=="; + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz"; + sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; }; }; "stream-parser-0.3.1" = { @@ -6844,13 +6862,13 @@ let sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; }; }; - "tar-4.4.4" = { + "tar-4.4.6" = { name = "tar"; packageName = "tar"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.4.tgz"; - sha512 = "mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz"; + sha512 = "tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg=="; }; }; "tar-stream-1.6.1" = { @@ -7738,10 +7756,14 @@ in dependencies = [ sources."@cycle/dom-18.3.0" sources."@cycle/http-14.9.0" - sources."@cycle/isolate-3.3.0" + (sources."@cycle/isolate-3.4.0" // { + dependencies = [ + sources."@cycle/run-4.4.0" + ]; + }) sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/node-10.5.2" + sources."@types/node-10.5.5" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -7777,7 +7799,7 @@ in sources."es6-symbol-3.1.1" sources."escape-string-regexp-1.0.5" sources."event-emitter-0.3.5" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."external-editor-2.2.0" sources."figures-2.0.0" sources."form-data-2.3.2" @@ -7807,8 +7829,8 @@ in sources."lru-cache-4.1.3" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimist-1.2.0" sources."ms-2.0.0" @@ -7821,6 +7843,7 @@ in sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."qs-6.5.2" + sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.6" sources."restore-cursor-2.0.0" @@ -7922,7 +7945,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" @@ -7940,7 +7963,7 @@ in sources."codecs-1.2.1" sources."color-convert-1.9.2" sources."color-name-1.1.1" - sources."colors-1.3.0" + sources."colors-1.3.1" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -7999,13 +8022,13 @@ in sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."duplexify-3.6.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" @@ -8037,7 +8060,7 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.17.3" // { + (sources."hypercore-6.18.1" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -8120,8 +8143,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-2.3.11" sources."mime-2.3.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -8235,7 +8258,7 @@ in sources."sshpk-1.14.2" sources."stack-trace-0.0.10" sources."stream-collector-1.0.1" - sources."stream-each-1.2.2" + sources."stream-each-1.2.3" (sources."stream-parser-0.3.1" // { dependencies = [ sources."debug-2.6.9" @@ -8447,8 +8470,8 @@ in }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."forever-agent-0.6.1" sources."form-data-2.1.4" @@ -8485,8 +8508,8 @@ in sources."assert-plus-1.0.0" ]; }) - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -8608,7 +8631,7 @@ in sources."needle-2.2.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.3" - sources."npm-packlist-1.1.10" + sources."npm-packlist-1.1.11" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -8635,7 +8658,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.4" + sources."tar-4.4.6" sources."util-deprecate-1.0.2" sources."wide-align-1.1.3" sources."wrappy-1.0.2" @@ -8653,10 +8676,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.11.2"; + version = "2.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.11.2.tgz"; - sha1 = "fc7235c2ec82a6ede6caf47485a68a2c6fa2e1f5"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.12.2.tgz"; + sha1 = "1b575512ae27d767f4aaec14e94b18e0c70bcc7b"; }; buildInputs = globalBuildInputs; meta = { @@ -8819,12 +8842,12 @@ in sources."download-5.0.3" sources."download-git-repo-1.0.2" sources."duplexer3-0.1.4" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."enable-1.3.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extend-shallow-2.0.1" sources."external-editor-3.0.0" sources."extsprintf-1.3.0" @@ -8915,8 +8938,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -9091,7 +9114,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."buffer-from-1.1.0" + sources."buffer-from-1.1.1" (sources."busboy-0.2.14" // { dependencies = [ sources."isarray-0.0.1" @@ -9205,7 +9228,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extend-shallow-3.0.2" (sources."extglob-2.0.4" // { dependencies = [ @@ -9370,8 +9393,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.35.0" + sources."mime-types-2.1.19" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.1" @@ -9398,7 +9421,7 @@ in sources."nan-2.10.0" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" - (sources."nodemon-1.18.2" // { + (sources."nodemon-1.18.3" // { dependencies = [ sources."debug-3.1.0" sources."supports-color-5.4.0" @@ -9684,10 +9707,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.2.0.tgz"; - sha512 = "GnlNsOnxwVJX4WSfyQY0gY3LnUX2cc46XU0eu1g+WSuZgDRUGmw8tuptitJu6byp0RWGT8ZEAKajblwdhQHN8A=="; + url = "https://registry.npmjs.org/npm/-/npm-6.3.0.tgz"; + sha512 = "oDtLFo3wXue/xe3pU/oks9VHS5501OAWlYrZrApZkFv7l2LXk+9CfPMbjbfZWK7Jqlc1jbNcJMkB6KZC7K/vEA=="; }; buildInputs = globalBuildInputs; meta = { @@ -9701,10 +9724,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.94.0"; + version = "0.95.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.94.0.tgz"; - sha1 = "4ce6db7f2bfbf79c2d73444aa6e3cfc08a32d762"; + url = "https://registry.npmjs.org/three/-/three-0.95.0.tgz"; + sha512 = "vy6jMYs7CDwn47CejYHNi+++OdQue7xGIBhbLfekQ/G6MDxKRm0QB0/xWScz46/JvQAvF6pJAS5Q907l0i5iQA=="; }; buildInputs = globalBuildInputs; meta = { @@ -9718,10 +9741,10 @@ in mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "2.7.4"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.4.tgz"; - sha512 = "B6SLtoETmV08kqTepRyz8eqMRGFzllPy2QASKFdFl0g0YB6SNgQVnWae11RaF3/y8ZKLTJNJ7hLbMIqmBEkLzw=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.5.tgz"; + sha512 = "OzsJNitEHAJB3y4IIlPCAvS0yoXwYjlo2Y4kmm9KQzyIBZt2d8yKRalby3uTRNN4fZQiGL2iMXjpdP1u2Rq2DQ=="; }; buildInputs = globalBuildInputs; meta = { From a568eec08cf85246f56528ff242e00678c51a3aa Mon Sep 17 00:00:00 2001 From: Carlos D'Agostino Date: Thu, 2 Aug 2018 23:35:29 +1000 Subject: [PATCH 034/229] tinyproxy: add docbook_xsl and add nonet option to a2x --- pkgs/tools/networking/tinyproxy/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index b4a2db8a970..8ecc8554435 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, automake, autoreconfHook, asciidoc, libxml2, libxslt }: +{ stdenv, fetchFromGitHub, automake, autoreconfHook, asciidoc, libxml2, + libxslt, docbook_xsl }: stdenv.mkDerivation rec{ name = "tinyproxy-${version}"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec{ owner = "tinyproxy"; }; - nativeBuildInputs = [ autoreconfHook asciidoc libxml2 libxslt ]; + nativeBuildInputs = [ autoreconfHook asciidoc libxml2 libxslt docbook_xsl ]; # -z flag is not supported in darwin preAutoreconf = stdenv.lib.optionalString stdenv.isDarwin '' @@ -24,11 +25,13 @@ stdenv.mkDerivation rec{ postConfigure = '' substituteInPlace docs/man5/Makefile --replace \ "-f manpage" \ - "-f manpage \\ + "--xsltproc-opts=--nonet \\ + -f manpage \\ -L" substituteInPlace docs/man8/Makefile --replace \ "-f manpage" \ - "-f manpage \\ + "--xsltproc-opts=--nonet \\ + -f manpage \\ -L" ''; From 632bda238fb278d5b77df40d03b1c7f2ed51a643 Mon Sep 17 00:00:00 2001 From: Imuli Date: Thu, 2 Aug 2018 10:24:48 -0400 Subject: [PATCH 035/229] idrisPackages.graphviz: fix homepage (#44355) --- pkgs/development/idris-modules/graphviz.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix index 955b459289a..47c2ee638c5 100644 --- a/pkgs/development/idris-modules/graphviz.nix +++ b/pkgs/development/idris-modules/graphviz.nix @@ -22,7 +22,7 @@ build-idris-package { meta = { description = "Parser and library for graphviz dot files"; - homepage = https://github.com/mgttlinger/idris-graphviz; + homepage = https://gitlab.com/mgttlinger/idris-graphviz; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.brainrape ]; }; From 3bd5580b04c1e74cc3cb1756a345040ce131e0da Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 2 Aug 2018 16:30:16 +0200 Subject: [PATCH 036/229] python34: 3.4.8 -> 3.4.9 --- pkgs/development/interpreters/python/cpython/3.4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 7e583087c08..c8a544c601a 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.4"; - minorVersion = "8"; + minorVersion = "9"; minorVersionSuffix = ""; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -49,7 +49,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "1sn3i9z9m56inlfrqs250qv8snl8w211wpig2pfjlyrcj3x75919"; + sha256 = "1n9b1kavmw8b7rc3gkrka4fjzrbfq9iqy791yncaf09bp9v9cqjr"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; From 3a61a9478973c62fc3c17d7d49e85cf6104926da Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 2 Aug 2018 16:30:27 +0200 Subject: [PATCH 037/229] python35: 3.5.5 -> 3.5.6 --- pkgs/development/interpreters/python/cpython/3.5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 588880c1e82..2de337a8395 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.5"; - minorVersion = "5"; + minorVersion = "6"; minorVersionSuffix = ""; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -49,7 +49,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "02ahsijk3a42sdzfp2il49shx0v4birhy7kkj0dikmh20hxjqg86"; + sha256 = "0pqmf51zy2lzhbaj4yya2py2qr653j9152d0rg3p7wi1yl2dwp7m"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; From 86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 2 Aug 2018 16:31:31 +0200 Subject: [PATCH 038/229] Revert "android-studio-preview: Print a deprecation warning" This reverts commit 88bfbf6c7d2308b59f1ca69169c8c9853815ae6b. It broke the tarball job. Discussion: https://github.com/NixOS/nixpkgs/pull/44310#issuecomment-409690460 --- .../editors/android-studio/common.nix | 16 ++-------------- .../editors/android-studio/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index c980999dc6b..cd031ce5ac8 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,4 +1,4 @@ -{ channel, pname, version, build, sha256Hash, deprecated ? false }: +{ channel, pname, version, build, sha256Hash }: { bash , buildFHSUserEnv @@ -37,18 +37,6 @@ }: let - # TODO: This is a bit stupid to be honest... - # The problem is that we have to make sure this is only executed if the - # derivation is actually build to avoid always printing this warning (e.g. - # "nix-env -qaP"). Since this will always evaluate to "" it won't actually - # change the derivation (only generate a side-effect) but we have to make - # sure this expression is evaluated lazily! - printDeprecationWarning = if deprecated then (builtins.trace '' - android-studio-preview and androidStudioPackages.preview are old aliases - and will be dropped at some point, please use androidStudioPackages.beta - instead (corresponds to the correct channel name).'' - "") - else ""; drvName = "android-studio-${channel}-${version}"; androidStudio = stdenv.mkDerivation { name = drvName; @@ -142,7 +130,7 @@ in text = '' #!${bash}/bin/bash ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh - '' + printDeprecationWarning; + ''; } // { meta = with stdenv.lib; { description = "The Official IDE for Android (${channel} channel)"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index af58611bddf..b60687c50ba 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -23,12 +23,8 @@ let sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh"; }; in rec { - # TODO: Drop old alias after 18.09 - preview = mkStudio (betaVersion // { - channel = "beta"; - pname = "android-studio-preview"; - deprecated = true; - }); + # Old alias + preview = beta; # Attributes are named by their corresponding release channels diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87b822fd7aa..77dc96884b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15204,7 +15204,7 @@ with pkgs; androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { }); android-studio = androidStudioPackages.stable; - android-studio-preview = androidStudioPackages.preview; # TODO: Drop old alias after 18.09 + android-studio-preview = androidStudioPackages.beta; antfs-cli = callPackage ../applications/misc/antfs-cli {}; From 0aae3fda066752a84762ccc5438cae1b22f07b5e Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 2 Aug 2018 16:39:57 +0200 Subject: [PATCH 039/229] graphite: 1.0.2 -> 1.1.3 & moved dependencies to python-modules (#44276) Fixes #30891 * Upgrade `graphite-web`, `carbon` and `whisper` from 1.0.2 -> 1.1.3. * Replaced the deprecated `pythonPackages.graphite_influxdb` with `pythonPackages.influxgraph.` * Renamed `pythonPackages.graphite_web` to `pythonPackages.graphite-web` to be consistent with the Python package name. * Replaced the unmaintained `pythonPackages.graphite_pager` with `pythonPackages.graphitepager` * Moved all new packages from `python-packages.nix` to `pkgs/development/python-modules` --- .../modules/services/monitoring/graphite.nix | 14 +- nixos/tests/graphite.nix | 5 +- .../python-modules/carbon/default.nix | 24 +++ .../python-modules/graphite-web/default.nix | 54 ++++++ .../graphite_beacon/default.nix | 25 +++ .../python-modules/graphitepager/default.nix | 32 ++++ .../python-modules/influxgraph/default.nix | 30 +++ .../python-modules/whisper/default.nix | 20 ++ pkgs/top-level/python-packages.nix | 171 ++---------------- 9 files changed, 207 insertions(+), 168 deletions(-) create mode 100644 pkgs/development/python-modules/carbon/default.nix create mode 100644 pkgs/development/python-modules/graphite-web/default.nix create mode 100644 pkgs/development/python-modules/graphite_beacon/default.nix create mode 100644 pkgs/development/python-modules/graphitepager/default.nix create mode 100644 pkgs/development/python-modules/influxgraph/default.nix create mode 100644 pkgs/development/python-modules/whisper/default.nix diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 7ad26c137e5..cdfd746bc5a 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -136,7 +136,7 @@ in { finders = mkOption { description = "List of finder plugins to load."; default = []; - example = literalExample "[ pkgs.python27Packages.graphite_influxdb ]"; + example = literalExample "[ pkgs.python27Packages.influxgraph ]"; type = types.listOf types.package; }; @@ -485,7 +485,7 @@ in { PYTHONPATH = let penv = pkgs.python.buildEnv.override { extraLibs = [ - pythonPackages.graphite_web + pythonPackages.graphite-web pythonPackages.pysqlite ]; }; @@ -524,16 +524,16 @@ in { fi # Only collect static files when graphite_web changes. - if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then + if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite-web}" ]; then mkdir -p ${staticDir} ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear chown -R graphite:graphite ${staticDir} - ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web" + ln -sfT "${pythonPackages.graphite-web}" "${dataDir}/current_graphite_web" fi ''; }; - environment.systemPackages = [ pythonPackages.graphite_web ]; + environment.systemPackages = [ pythonPackages.graphite-web ]; })) (mkIf cfg.api.enable { @@ -607,7 +607,7 @@ in { GRAPHITE_URL = cfg.pager.graphiteUrl; }; serviceConfig = { - ExecStart = "${pkgs.pythonPackages.graphite_pager}/bin/graphite-pager --config ${pagerConfig}"; + ExecStart = "${pkgs.pythonPackages.graphitepager}/bin/graphite-pager --config ${pagerConfig}"; User = "graphite"; Group = "graphite"; }; @@ -615,7 +615,7 @@ in { services.redis.enable = mkDefault true; - environment.systemPackages = [ pkgs.pythonPackages.graphite_pager ]; + environment.systemPackages = [ pkgs.pythonPackages.graphitepager ]; }) (mkIf cfg.beacon.enable { diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 1fe4357191e..27a87bdbb9f 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ ... } : +import ./make-test.nix ({ pkgs, ... } : { name = "graphite"; nodes = { @@ -11,10 +11,12 @@ import ./make-test.nix ({ ... } : api = { enable = true; port = 8082; + finders = [ pkgs.python27Packages.influxgraph ]; }; carbon.enableCache = true; seyren.enable = true; pager.enable = true; + beacon.enable = true; }; }; }; @@ -25,6 +27,7 @@ import ./make-test.nix ({ ... } : $one->waitForUnit("graphiteWeb.service"); $one->waitForUnit("graphiteApi.service"); $one->waitForUnit("graphitePager.service"); + $one->waitForUnit("graphite-beacon.service"); $one->waitForUnit("carbonCache.service"); $one->waitForUnit("seyren.service"); # The services above are of type "simple". systemd considers them active immediately diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix new file mode 100644 index 00000000000..df14f44f0b0 --- /dev/null +++ b/pkgs/development/python-modules/carbon/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, twisted, whisper, txamqp, cachetools, urllib3 +}: + +buildPythonPackage rec { + pname = "carbon"; + version = "1.1.3"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1s7327p30w4l9ak4gc7m5ga521233179n2lr3j0ggfbmfhd6blky"; + }; + + propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ]; + + meta = with stdenv.lib; { + homepage = http://graphite.wikidot.com/; + description = "Backend data caching and persistence daemon for Graphite"; + maintainers = with maintainers; [ rickynils offline basvandijk ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix new file mode 100644 index 00000000000..791eb1b8cf0 --- /dev/null +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -0,0 +1,54 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, which +, django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir +}: +if django.version != "1.8.18" +|| django_tagging.version != "0.4.3" +then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3" +else buildPythonPackage rec { + pname = "graphite-web"; + version = "1.1.3"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0nvyq1859abdch2l90avsjk9vb03s7wgxgrjsqvjhf2b9c1ncsfh"; + }; + + propagatedBuildInputs = [ + django django_tagging whisper pycairo cairocffi + ldap memcached pytz urllib3 scandir + ]; + + postInstall = '' + wrapProgram $out/bin/run-graphite-devel-server.py \ + --prefix PATH : ${which}/bin + ''; + + preConfigure = '' + # graphite is configured by storing a local_settings.py file inside the + # graphite python package. Since that package is stored in the immutable + # Nix store we can't modify it. So how do we configure graphite? + # + # First of all we rename "graphite.local_settings" to + # "graphite_local_settings" so that the settings are not looked up in the + # graphite package anymore. Secondly we place a directory containing a + # graphite_local_settings.py on the PYTHONPATH in the graphite module + # . + substituteInPlace webapp/graphite/settings.py \ + --replace "graphite.local_settings" " graphite_local_settings" + + substituteInPlace webapp/graphite/settings.py \ + --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" + ''; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://graphite.wikidot.com/; + description = "Enterprise scalable realtime graphing"; + maintainers = with maintainers; [ rickynils offline basvandijk ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix new file mode 100644 index 00000000000..b94a92bc02f --- /dev/null +++ b/pkgs/development/python-modules/graphite_beacon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi +, tornado, pyyaml, funcparserlib +}: +buildPythonPackage rec { + pname = "graphite_beacon"; + version = "0.27.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks"; + }; + + propagatedBuildInputs = [ tornado pyyaml funcparserlib ]; + + postPatch = '' + substituteInPlace requirements.txt --replace "==" ">=" + ''; + + meta = with stdenv.lib; { + description = "A simple alerting application for Graphite metrics"; + homepage = https://github.com/klen/graphite-beacon; + maintainers = [ maintainers.offline ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/graphitepager/default.nix b/pkgs/development/python-modules/graphitepager/default.nix new file mode 100644 index 00000000000..d2ab8d547fd --- /dev/null +++ b/pkgs/development/python-modules/graphitepager/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi +, jinja2, markupsafe, pagerduty, pushbullet, python_magic, python-simple-hipchat +, pyyaml, redis, requests, six, websocket_client, nose +}: +buildPythonPackage rec { + pname = "graphitepager"; + version = "0.2.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0v3g1qcgnkpgjzh6phnv13lnk8qjrcs9sq2qg6k0dk5ik31jfk3d"; + }; + + propagatedBuildInputs = [ + jinja2 markupsafe pagerduty pushbullet python_magic python-simple-hipchat + pyyaml redis requests six websocket_client + ]; + + postPatch = '' + substituteInPlace requirements.txt --replace "==" ">=" + ''; + + checkInputs = [ nose ]; + checkPhase = "nosetests"; + + meta = with stdenv.lib; { + description = "A simple alerting application for Graphite metrics"; + homepage = https://github.com/seatgeek/graphite-pager; + maintainers = with maintainers; [ offline basvandijk ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix new file mode 100644 index 00000000000..4f7ba65a27f --- /dev/null +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, influxdb, graphite_api, memcached, gnugrep +}: + +buildPythonPackage rec { + pname = "influxgraph"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy"; + }; + + patchPhase = stdenv.lib.optionalString isPy3k '' + sed 's/python-memcached/python3-memcached/' \ + -i ./influxgraph.egg-info/requires.txt \ + -i ./setup.py + ''; + + propagatedBuildInputs = [ influxdb graphite_api memcached ]; + + passthru.moduleName = "influxgraph.InfluxDBFinder"; + + meta = with stdenv.lib; { + description = "InfluxDB storage plugin for Graphite-API"; + homepage = https://github.com/InfluxGraph/influxgraph; + license = licenses.asl20; + maintainers = with maintainers; [ basvandijk ]; + }; +} diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix new file mode 100644 index 00000000000..4d48b63da54 --- /dev/null +++ b/pkgs/development/python-modules/whisper/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, six }: + +buildPythonPackage rec { + pname = "whisper"; + version = "1.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ahzsxk52ws8k3kdq52qbsbsx2r9z350j8gg9adw4x5fjwksz4r8"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + homepage = http://graphite.wikidot.com/; + description = "Fixed size round-robin style database"; + maintainers = with maintainers; [ rickynils offline basvandijk ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 614736ce744..757849dd2e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -69,8 +69,6 @@ let # See build-setupcfg/default.nix for documentation. buildSetupcfg = import ../build-support/build-setupcfg self; - graphiteVersion = "1.0.2"; - fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs: let fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: @@ -4782,13 +4780,14 @@ in { django_tagging = callPackage ../development/python-modules/django_tagging { }; django_tagging_0_4_3 = if - self.django != self.django_1_8 + self.django.version != "1.8.18" then throw "django_tagging_0_4_3 should be build with django_1_8" else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec { - name = "django-tagging-0.4.3"; + pname = "django-tagging"; + version = "0.4.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs"; }; propagatedBuildInputs = with self; [ django ]; @@ -15401,24 +15400,7 @@ EOF whichcraft = callPackage ../development/python-modules/whichcraft { }; - whisper = buildPythonPackage rec { - name = "whisper-${version}"; - version = graphiteVersion; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/whisper/${name}.tar.gz"; - sha256 = "1v1bi3fl1i6p4z4ki692bykrkw6907dn3mfq0151f70lvi3zpns3"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://graphite.wikidot.com/; - description = "Fixed size round-robin style database"; - maintainers = with maintainers; [ rickynils offline ]; - }; - }; + whisper = callPackage ../development/python-modules/whisper { }; worldengine = buildPythonPackage rec { name = "worldengine-${version}"; @@ -15468,27 +15450,7 @@ EOF }; }; - carbon = buildPythonPackage rec { - name = "carbon-${version}"; - version = graphiteVersion; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/carbon/${name}.tar.gz"; - sha256 = "142smpmgbnjinvfb6s4ijazish4vfgzyd8zcmdkh55y051fkixkn"; - }; - - propagatedBuildInputs = with self; [ whisper txamqp zope_interface twisted ]; - - meta = { - homepage = http://graphite.wikidot.com/; - description = "Backend data caching and persistence daemon for Graphite"; - maintainers = with maintainers; [ rickynils offline ]; - license = licenses.asl20; - }; - }; - + carbon = callPackage ../development/python-modules/carbon { }; ujson = buildPythonPackage rec { name = "ujson-1.35"; @@ -15616,126 +15578,15 @@ EOF }; }; - graphite_web = if - self.django != self.django_1_8 - || self.django_tagging != self.django_tagging_0_4_3 - then throw "graphite_web should be build with django_1_8 and django_tagging_0_4_3" - else buildPythonPackage rec { - name = "graphite-web-${version}"; - disabled = isPy3k; - version = graphiteVersion; - - src = pkgs.fetchurl rec { - url = "mirror://pypi/g/graphite-web/${name}.tar.gz"; - sha256 = "0q8bwlj75jqyzmazfsi5sa26xl58ssa8wdxm2l4j0jqyn8xpfnmc"; - }; - - propagatedBuildInputs = with self; [ - django django_tagging whisper pycairo cairocffi - ldap memcached pytz urllib3 scandir - ]; - - postInstall = '' - wrapProgram $out/bin/run-graphite-devel-server.py \ - --prefix PATH : ${pkgs.which}/bin - ''; - - preConfigure = '' - # graphite is configured by storing a local_settings.py file inside the - # graphite python package. Since that package is stored in the immutable - # Nix store we can't modify it. So how do we configure graphite? - # - # First of all we rename "graphite.local_settings" to - # "graphite_local_settings" so that the settings are not looked up in the - # graphite package anymore. Secondly we place a directory containing a - # graphite_local_settings.py on the PYTHONPATH in the graphite module - # . - substituteInPlace webapp/graphite/settings.py \ - --replace "graphite.local_settings" " graphite_local_settings" - - substituteInPlace webapp/graphite/settings.py \ - --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" - ''; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://graphite.wikidot.com/; - description = "Enterprise scalable realtime graphing"; - maintainers = with maintainers; [ rickynils offline ]; - }; - }; + graphite-web = callPackage ../development/python-modules/graphite-web { }; graphite_api = callPackage ../development/python-modules/graphite-api { }; - graphite_beacon = buildPythonPackage rec { - name = "graphite_beacon-0.27.0"; + graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; - src = pkgs.fetchurl { - url = "mirror://pypi/g/graphite_beacon/${name}.tar.gz"; - sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks"; - }; - - propagatedBuildInputs = [ self.tornado self.pyyaml self.funcparserlib ]; - - preBuild = "> requirements.txt"; - - meta = { - description = "A simple alerting application for Graphite metrics"; - homepage = https://github.com/klen/graphite-beacon; - maintainers = [ maintainers.offline ]; - license = licenses.mit; - }; - }; - - graphite_influxdb = buildPythonPackage rec { - name = "graphite-influxdb-0.3"; - - src = pkgs.fetchgit { - url = "https://github.com/vimeo/graphite-influxdb.git"; - rev = "2273d12a24e1d804685a36debfd4224b7416b62f"; - sha256 = "1v00fgrnmsd9c0ahggyw9sia5m7dyzz16i5pa4vy6w2sbfyrmm4v"; - }; - - propagatedBuildInputs = with self; [ influxdb graphite_api ]; - - passthru.moduleName = "graphite_influxdb.InfluxdbFinder"; - - meta = { - description = "An influxdb backend for Graphite-web and graphite-api"; - homepage = https://github.com/vimeo/graphite-influxdb; - license = licenses.asl20; - }; - }; - - graphite_pager = buildPythonPackage rec { - name = "graphite-pager-${version}"; - version = "2bbfe91220ec1e0ca1cdf4b5564386482a44ed7d"; - - src = pkgs.fetchgit { - url = "https://github.com/offlinehacker/graphite-pager.git"; - sha256 = "0ylal0vkc2yrjvssfz1gls84yk9vkvvkx3pyv4lx15jm2qqzdmxd"; - rev = version; - }; - - buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ - jinja2 pyyaml redis requests pagerduty - python-simple-hipchat pushbullet - ]; - - patchPhase = "> requirements.txt"; - checkPhase = "nosetests"; - - meta = { - description = "A simple alerting application for Graphite metrics"; - homepage = https://github.com/seatgeek/graphite-pager; - maintainers = with maintainers; [ offline ]; - license = licenses.bsd2; - }; - }; + influxgraph = callPackage ../development/python-modules/influxgraph { }; + graphitepager = callPackage ../development/python-modules/graphitepager { }; pyspotify = buildPythonPackage rec { name = "pyspotify-${version}"; From 559997179d612b57bbf8ad0f230235d8c34ae36d Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 3 Aug 2018 00:50:58 +0900 Subject: [PATCH 040/229] rPackages: export buildRPackage --- pkgs/development/r-modules/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index acaee897d93..a52b74ae080 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -216,7 +216,8 @@ let # `self` is `_self` with overridden packages; # packages in `_self` may depends on overridden packages. self = (defaultOverrides _self self) // overrides; - _self = import ./bioc-packages.nix { inherit self; derive = deriveBioc; } // + _self = { inherit buildRPackage; } // + import ./bioc-packages.nix { inherit self; derive = deriveBioc; } // import ./bioc-annotation-packages.nix { inherit self; derive = deriveBiocAnn; } // import ./bioc-experiment-packages.nix { inherit self; derive = deriveBiocExp; } // import ./cran-packages.nix { inherit self; derive = deriveCran; }; From 0a541aa38c47108bffb1c78cef0e09e125cc6023 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 3 Aug 2018 01:06:36 +0900 Subject: [PATCH 041/229] rPackages.buildRPackage: fix error if requireX is missing --- pkgs/development/r-modules/generic-builder.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 0d731de33f8..76bf29abc17 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,10 +1,10 @@ { stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation, gettext, gfortran }: -{ name, buildInputs ? [], ... } @ attrs: +{ name, buildInputs ? [], requireX ? false, ... } @ attrs: stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R gettext] ++ - stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++ + stdenv.lib.optionals requireX [utillinux xvfb_run] ++ stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = @@ -26,7 +26,7 @@ stdenv.mkDerivation ({ else [ "--no-test-load" ]; - rCommand = if attrs.requireX or false then + rCommand = if requireX then # Unfortunately, xvfb-run has a race condition even with -a option, so that # we acquire a lock explicitly. "flock ${xvfb_run} xvfb-run -a -e xvfb-error R" From b2b5b9746893754c1d8fe0bbf59123967b9c23c1 Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Thu, 2 Aug 2018 23:22:45 +0700 Subject: [PATCH 042/229] nixos/tomcat: allow non-package paths in services.tomcat.webapps Resolves #44370. --- nixos/modules/services/web-servers/tomcat.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index d8ccb7ca65d..341ab34220c 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -108,7 +108,7 @@ in }; webapps = mkOption { - type = types.listOf types.package; + type = types.listOf types.path; default = [ tomcat.webapps ]; defaultText = "[ pkgs.tomcat85.webapps ]"; description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; From 7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808 Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Thu, 2 Aug 2018 22:46:00 +0700 Subject: [PATCH 043/229] nixos/tomcat: correct type specification for virtualHosts The wrong specification was introduced as part of commit 472f16d. Fixes #44361. --- nixos/modules/services/web-servers/tomcat.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index d8ccb7ca65d..3a552f7a750 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -118,8 +118,15 @@ in type = types.listOf (types.submodule { options = { name = mkOption { - type = types.listOf types.str; + type = types.str; description = "name of the virtualhost"; + }; + webapps = mkOption { + type = types.listOf types.path; + description = '' + List containing web application WAR files and/or directories containing + web applications and configuration files for the virtual host. + ''; default = []; }; }; From bc96cec2952b2996c332e0916b9ad0897629dd53 Mon Sep 17 00:00:00 2001 From: Carlo Nucera Date: Thu, 2 Aug 2018 19:36:48 +0200 Subject: [PATCH 044/229] Add missing dependencies for swi-prolog In the previous version of this derivation, when the command ?- check_installation. was issued in the swipl prompt, five errors were encountered. This patch fixes that, so that the installation is correctly checked. This enables the usage of the command pack_install to install prolog libraries, which otherwise fails for the lack of libarchive. --- pkgs/development/compilers/swi-prolog/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 670a00e250f..5f8bebbde3e 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib -, libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig -, fontconfig, makeWrapper ? stdenv.isDarwin +, libXinerama, libarchive, db, pcre, libedit, libossp_uuid, libXft, libXpm +, libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin }: let @@ -15,7 +15,8 @@ stdenv.mkDerivation { }; buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama - libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ] + libarchive db pcre libedit libossp_uuid libXft libXpm libSM libXt + zlib freetype pkgconfig fontconfig ] ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; hardeningDisable = [ "format" ]; @@ -42,6 +43,6 @@ stdenv.mkDerivation { license = "LGPL"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.meditans ]; }; } From e5e91efa4cef9291834383ba5a4720e838f7bb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 19 Jul 2018 10:52:59 +0200 Subject: [PATCH 045/229] flatpak: Don't hardcode flatpak binary path in launchers The hardcoded flatpak path breaks all installed applications when flatpak is updated. fixes: https://github.com/NixOS/nixpkgs/issues/43581 --- .../development/libraries/flatpak/default.nix | 1 + .../flatpak/use-flatpak-from-path.patch | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/flatpak/use-flatpak-from-path.patch diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index e769cb50513..6591b13834e 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -24,6 +24,7 @@ in stdenv.mkDerivation rec { }) # patch taken from gtk_doc ./respect-xml-catalog-files-var.patch + ./use-flatpak-from-path.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch new file mode 100644 index 00000000000..e855902a930 --- /dev/null +++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch @@ -0,0 +1,48 @@ +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -5467,7 +5467,7 @@ export_desktop_file (const char *app, + + new_exec = g_string_new (""); + g_string_append_printf (new_exec, +- FLATPAK_BINDIR "/flatpak run --branch=%s --arch=%s", ++ "flatpak run --branch=%s --arch=%s", + escaped_branch, + escaped_arch); + +@@ -6644,8 +6644,8 @@ flatpak_dir_deploy (FlatpakDir *self, + error)) + return FALSE; + +- bin_data = g_strdup_printf ("#!/bin/sh\nexec %s/flatpak run --branch=%s --arch=%s %s \"$@\"\n", +- FLATPAK_BINDIR, escaped_branch, escaped_arch, escaped_app); ++ bin_data = g_strdup_printf ("#!/bin/sh\nexec flatpak run --branch=%s --arch=%s %s \"$@\"\n", ++ escaped_branch, escaped_arch, escaped_app); + if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data), NULL, FALSE, + G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) + return FALSE; +diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh +index 6937b041..01f8add7 100755 +--- a/tests/test-bundle.sh ++++ b/tests/test-bundle.sh +@@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files + assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export + assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop + # Ensure Exec key is rewritten +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" + assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png + assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png + +diff --git a/tests/test-run.sh b/tests/test-run.sh +index 9d83d82e..234e4ec6 100755 +--- a/tests/test-run.sh ++++ b/tests/test-run.sh +@@ -42,7 +42,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files + assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export + assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop + # Ensure Exec key is rewritten +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" + assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png + assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png + assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png From 81e65071bbc586a0c6622beecd482b69f5a02172 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 2 Aug 2018 18:49:19 +0000 Subject: [PATCH 046/229] hugo: 0.42.1 -> 0.46 (#44363) --- pkgs/applications/misc/hugo/default.nix | 6 +- pkgs/applications/misc/hugo/deps.nix | 114 +++++++++++++++++------- 2 files changed, 88 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 110d17492f8..6ed956a1c1b 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.42.1"; + version = "0.46"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,11 +10,13 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "17m8bkldvnd7yyzxi4rc8vv3qfypjzik38bjy4qavb7sjdjmfij9"; + sha256 = "0w5xkb6s03hprb4v151gdk8zzsgvy0i406363j1w03bic8ajwgmj"; }; goDeps = ./deps.nix; + buildFlags = "-tags extended"; + postInstall = '' rm $bin/bin/generate ''; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 837919b1c32..64f252d27fd 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,5 +1,14 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ + { + goPackagePath = "github.com/BurntSushi/locker"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/locker"; + rev = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"; + sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg"; + }; + } { goPackagePath = "github.com/BurntSushi/toml"; fetch = { @@ -32,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "d7b2ed20a4989ab604703f61f86523560f8a6a87"; - sha256 = "0ni2ncck787sxk9gl14xnyjnw4y27ipypjf4kc00g635fvc64ik6"; + rev = "5d7fef2ae60b501bbf28d476c3f273b8017d8261"; + sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f"; }; } { @@ -50,8 +59,17 @@ fetch = { type = "git"; url = "https://github.com/bep/gitmap"; - rev = "012701e8669671499fc43e9792335a1dcbfe2afb"; - sha256 = "10ixv4zwmrpxvpchws78yzsjvw1zplljw3iqvwpina2mkwwp71ql"; + rev = "ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960"; + sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6"; + }; + } + { + goPackagePath = "github.com/bep/go-tocss"; + fetch = { + type = "git"; + url = "https://github.com/bep/go-tocss"; + rev = "2abb118dc8688b6c7df44e12f4152c2bded9b19c"; + sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q"; }; } { @@ -68,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "48d8747a2ca13185e7cc8efe6e9fc196a83f71a5"; - sha256 = "01hpll16rvxhnvv35vs3z8p51x54c5jyl1gjdm0g7kwfwp2chvjx"; + rev = "691ee98543af2f262f35fbb54bdd42f00b9b9cc5"; + sha256 = "1864g10y9n6ni0p1yqjhvwyjdh0lgxnf7dlb0c4njazdg5rppww9"; }; } { @@ -86,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "5e63c9a565d0a3260d23d060a795783dab90fefe"; - sha256 = "1mmiz439lygi30dj1rbps57iqh762jkinnpb4wfl382v4h136qvp"; + rev = "8021a62ea0dfe0ed2e6107f5ccd37e0d4a92a996"; + sha256 = "1c32sqfz78g9wxvpng8n9r404lf2lgjn9b24mg8y3rxylx29gks7"; }; } { @@ -176,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/jdkato/prose"; - rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; - sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; + rev = "99216ea17cba4e2f2a4e8bca778643e5a529b7aa"; + sha256 = "1mdh276lmj21jbi22ky8ngdsl9hfcdv6czshycbaiwjr5y9cv7bn"; }; } { @@ -234,13 +252,22 @@ sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk"; }; } + { + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "2bca23e0e452137f789efbc8610126fd8b94f73b"; + sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; + }; + } { goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"; - sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7"; + rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; + sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; }; } { @@ -257,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "f6ac3d9cf0c4b6a32527779e992ebde26bd3d948"; - sha256 = "1vg25khaf7lr90xwf97bsyn873cdi1j7nxh68s80jrg2a86zw0ff"; + rev = "461e8b98df7454b4cb46a1611a6734f05ee331d0"; + sha256 = "0aq1q06y6azsi6mfmary5xs7gmmg8fh8lhx1wbpdlqk11asm9rq0"; }; } { @@ -275,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; + sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; }; } { @@ -320,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "1e58aa3361fd650121dceeedc399e7189c05674a"; - sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin"; + rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1"; + sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; }; } { @@ -365,8 +392,35 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4"; - sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v"; + rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793"; + sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh"; + }; + } + { + goPackagePath = "github.com/tdewolff/minify"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/minify"; + rev = "cf3a1790b606e292e4a0ee82e949a4f0d1c7617d"; + sha256 = "1r496149l5iqzxkfcbll5dqcqxy4a7jjxvzm62c8hrybmwj574kn"; + }; + } + { + goPackagePath = "github.com/tdewolff/parse"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/parse"; + rev = "4ceb50b40fad068875f5b093c5df0619012dc544"; + sha256 = "1ap76hdiabn41r7zxc7nq3n3ld7zqf97jaf71zlzzjrphi3fwrg1"; + }; + } + { + goPackagePath = "github.com/wellington/go-libsass"; + fetch = { + type = "git"; + url = "https://github.com/wellington/go-libsass"; + rev = "615eaa47ef794d037c1906a0eb7bf85375a5decf"; + sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s"; }; } { @@ -374,8 +428,8 @@ fetch = { type = "git"; url = "https://github.com/yosssi/ace"; - rev = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56"; - sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; + rev = "2b21b56204aee785bf8d500c3f9dcbe3ed7d4515"; + sha256 = "0cgpq1zdnh8l8zsn9w63asc9k7cm6k4qvjgrb4hr1106h8fjwfma"; }; } { @@ -383,8 +437,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "af66defab954cb421ca110193eed9477c8541e2a"; - sha256 = "0dgi7svwzs37c7m5dz2jig3xr45fyjihhr8cg0x8nc8sc8fsyq4h"; + rev = "c73c2afc3b812cdd6385de5a50616511c4a3d458"; + sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz"; }; } { @@ -392,8 +446,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"; - sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a"; + rev = "f4c29de78a2a91c00474a2e689954305c350adf9"; + sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x"; }; } { @@ -410,8 +464,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "6c888cc515d3ed83fc103cf1d84468aad274b0a7"; - sha256 = "18anqrdajp4p015v3f5y641k3lmgp2jr0lfyx0pb3ia0qvn93mrp"; + rev = "3dc4335d56c789b04b0ba99b7a37249d9b614314"; + sha256 = "1105b7jqzz8g2bfkdbkj2pdzq4vhfmhm42khir88vjqfd1l7ha31"; }; } { @@ -419,8 +473,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877"; - sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs"; + rev = "96e34ec0e18a62a1e59880c7bf617b655efecb66"; + sha256 = "1n1p5zz0vyvlhac40hxml6c5xwpsw8rjx1pbls9381a0s19ncbdg"; }; } { From c77e4de58e2a8ec0f2f00766ea48bc0abd5e68ca Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 3 Aug 2018 04:36:18 +0900 Subject: [PATCH 047/229] cataclysm-dda-git: fix desktop launcher installation (#44364) --- pkgs/games/cataclysm-dda/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 6a08a775545..2c55911defc 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -74,7 +74,7 @@ let installXDGAppLauncher = '' launcher="$out/share/applications/cataclysm-dda.desktop" - install -D -m 444 data/xdg/com.cataclysmdda.cataclysm-dda.desktop -T "$launcher" + install -D -m 444 data/xdg/*cataclysm-dda.desktop -T "$launcher" sed -i "$launcher" -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2," install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps ''; From 405cc5b1a0d4daa7ca5f73781f407dbbf322e3a0 Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 2 Aug 2018 22:16:29 +0200 Subject: [PATCH 048/229] lbdb: 0.46 -> 0.47 (#44376) --- pkgs/tools/misc/lbdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index d5194f42d0b..abffd6c70d5 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.46"; + version = "0.47"; in with stdenv.lib; with perlPackages; @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; - sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi"; + sha256 = "06zgj03q75gc6ri4cw3jdmi01f22anwchlv2kw4zp9nbm5swv36b"; }; buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] From b32d0a41d028d1f0483c435303d4e5e2e9113e61 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Aug 2018 12:50:22 -0400 Subject: [PATCH 049/229] llvm: fix triple setting llvm is a library so it should just need to know about build & host. GCC will already have a cross compiler built. /cc @Ericson2314 @dtzWill --- pkgs/development/compilers/llvm/5/llvm.nix | 7 +++---- pkgs/development/compilers/llvm/6/llvm.nix | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 129a6e48b71..3abba0ed340 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -79,8 +79,8 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -129,8 +129,7 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; - doCheck = stdenv.isLinux && (!stdenv.isi686) - && (stdenv.hostPlatform == stdenv.targetPlatform); + doCheck = stdenv.isLinux && (!stdenv.isi686); checkTarget = "check-all"; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index f95e19543a1..787a48416ab 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -75,8 +75,8 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" ] @@ -130,8 +130,7 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; - doCheck = stdenv.isLinux && (!stdenv.isi686) - && (stdenv.hostPlatform == stdenv.targetPlatform); + doCheck = stdenv.isLinux && (!stdenv.isi686); checkTarget = "check-all"; From f539c300954af9b71b3a49b541f1f6692840ca55 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 2 Aug 2018 16:22:42 -0400 Subject: [PATCH 050/229] postgresql: Fix nits after cross fixes --- pkgs/development/libraries/libossp-uuid/default.nix | 8 +++----- pkgs/servers/sql/postgresql/default.nix | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index fc727f39238..952509acc2e 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -10,14 +10,12 @@ stdenv.mkDerivation { sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; }; - configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + configureFlags = [ + "ac_cv_va_copy=yes" + ] ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; patches = [ ./shtool.patch ]; - preConfigure = '' - export ac_cv_va_copy=yes - ''; - meta = with stdenv.lib; { homepage = http://www.ossp.org/pkg/lib/uuid/; description = "OSSP uuid ISO-C and C++ shared library"; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index f4aabb971a6..4eb8d717309 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -30,9 +30,8 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}" - ] ++ ( - if stdenv.isDarwin then [ "--with-uuid=e2fs" ] else [ "--with-ossp-uuid" ] - ); + (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") + ]; patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) From 69ed31a57b1f6affe9205f6674e927bcb934ee5c Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 3 Aug 2018 01:51:15 +1000 Subject: [PATCH 051/229] mpv: Fix mpv 0.29.0 on macOS and disable OpenAL --- pkgs/applications/video/mpv/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index d994bd971dc..55ab1b95489 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeWrapper +{ stdenv, fetchpatch, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs , lua, luasocket, libuchardet, libiconv ? null, darwin @@ -35,7 +35,7 @@ , youtubeSupport ? true, youtube-dl ? null , vaapiSupport ? true, libva ? null , drmSupport ? true, libdrm ? null -, openalSupport ? true, openalSoft ? null +, openalSupport ? false, openalSoft ? null , vapoursynthSupport ? false, vapoursynth ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null @@ -93,6 +93,13 @@ in stdenv.mkDerivation rec { sha256 = "0i2nl65diqsjyz28dj07h6d8gq6ix72ysfm0nhs8514hqccaihs3"; }; + # FIXME: Remove this patch for building on macOS if it gets released in + # the future. + patches = optional stdenv.isDarwin (fetchpatch { + url = https://github.com/mpv-player/mpv/commit/dc553c8cf4349b2ab5d2a373ad2fac8bdd229ebb.patch; + sha256 = "0pa8vlb8rsxvd1s39c4iv7gbaqlkn3hx21a6xnpij99jdjkw3pg8"; + }); + postPatch = '' patchShebangs ./TOOLS/ ''; @@ -107,6 +114,7 @@ in stdenv.mkDerivation rec { "--disable-libmpv-static" "--disable-static-build" "--disable-build-date" # Purity + "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported (enableFeature archiveSupport "libarchive") (enableFeature dvdreadSupport "dvdread") (enableFeature dvdnavSupport "dvdnav") @@ -143,7 +151,6 @@ in stdenv.mkDerivation rec { ++ optional speexSupport speex ++ optional bs2bSupport libbs2b ++ optional openalSupport openalSoft - ++ optional (openalSupport && stdenv.isDarwin) darwin.apple_sdk.frameworks.OpenAL ++ optional libpngSupport libpng ++ optional youtubeSupport youtube-dl ++ optional sdl2Support SDL2 @@ -152,11 +159,12 @@ in stdenv.mkDerivation rec { ++ optional drmSupport libdrm ++ optional vapoursynthSupport vapoursynth ++ optional archiveSupport libarchive + ++ optional stdenv.isDarwin libiconv ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation libiconv Cocoa CoreAudio + CoreFoundation Cocoa CoreAudio ]); enableParallelBuilding = true; From 687771ced6dffd4a8662a068908cf4c78e3c264a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 28 Jul 2018 22:56:04 +0000 Subject: [PATCH 052/229] clickhouse: 1.1.54385 -> 18.1.0 --- pkgs/servers/clickhouse/default.nix | 21 ++++++++++++-------- pkgs/servers/clickhouse/find-mysql.patch | 11 ----------- pkgs/servers/clickhouse/termcap.patch | 25 ------------------------ pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 16 insertions(+), 45 deletions(-) delete mode 100644 pkgs/servers/clickhouse/find-mysql.patch delete mode 100644 pkgs/servers/clickhouse/termcap.patch diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 58a178a8b2e..10de85b0d36 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,30 +1,35 @@ -{ stdenv, fetchFromGitHub, cmake, libtool, boost, cctz, double-conversion, gperftools -, icu, lz4, mysql, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zstd +{ stdenv, fetchFromGitHub, 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 }: stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "1.1.54385"; + version = "18.1.0"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0s290xnx9dil2lbxdir5p5zmakvq5h523gdwax2cb37606wg8yj7"; + sha256 = "1vsfnggf69xh91ndycdxwfz6m2bs7psaxf2bh04svgk1vzj2z4l0"; }; - patches = [ ./find-mysql.patch ./termcap.patch ]; - nativeBuildInputs = [ cmake libtool ]; buildInputs = [ - boost cctz double-conversion gperftools icu lz4 mysql.connector-c openssl poco - re2 rdkafka readline sparsehash unixODBC zstd + 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 ]; cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; + postInstall = '' + rm -rf $out/share/clickhouse-test + ''; + meta = with stdenv.lib; { homepage = https://clickhouse.yandex/; description = "Column-oriented database management system"; diff --git a/pkgs/servers/clickhouse/find-mysql.patch b/pkgs/servers/clickhouse/find-mysql.patch deleted file mode 100644 index 3a5ec5181d1..00000000000 --- a/pkgs/servers/clickhouse/find-mysql.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libs/libmysqlxx/cmake/find_mysqlclient.cmake -+++ b/libs/libmysqlxx/cmake/find_mysqlclient.cmake -@@ -24,7 +24,7 @@ if (ENABLE_MYSQL) - if (USE_STATIC_LIBRARIES) - find_library (STATIC_MYSQLCLIENT_LIB mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS}) - else () -- find_library (MYSQLCLIENT_LIBRARIES mariadbclient mysqlclient PATHS ${MYSQL_LIB_PATHS}) -+ find_library (MYSQLCLIENT_LIBRARIES mariadbclient mysqlclient PATH_SUFFIXES mysql PATHS ${MYSQL_LIB_PATHS}) - endif () - - if (MYSQL_INCLUDE_DIR AND (STATIC_MYSQLCLIENT_LIB OR MYSQLCLIENT_LIBRARIES)) diff --git a/pkgs/servers/clickhouse/termcap.patch b/pkgs/servers/clickhouse/termcap.patch deleted file mode 100644 index e030d095690..00000000000 --- a/pkgs/servers/clickhouse/termcap.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c2105ecdf6a6cc1fbb4c1ae01475db6a65fee32f Mon Sep 17 00:00:00 2001 -From: Orivej Desh -Date: Mon, 27 Mar 2017 01:39:11 +0000 -Subject: [PATCH] Search for termcap in ncurses - ---- - cmake/find_readline_edit.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/find_readline_edit.cmake b/cmake/find_readline_edit.cmake -index 26f2768..f520ece 100644 ---- a/cmake/find_readline_edit.cmake -+++ b/cmake/find_readline_edit.cmake -@@ -7,7 +7,7 @@ endif () - - list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.2) - --find_library (TERMCAP_LIB NAMES termcap) -+find_library (TERMCAP_LIB NAMES ncurses) - find_library (EDIT_LIB NAMES edit) - - set(READLINE_INCLUDE_PATHS "/var/empty/local/var/empty/readline/include") --- -2.12.0 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77dc96884b8..fa555153e57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12721,7 +12721,9 @@ with pkgs; clamsmtp = callPackage ../servers/mail/clamsmtp { }; - clickhouse = callPackage ../servers/clickhouse { }; + clickhouse = callPackage ../servers/clickhouse { + inherit (llvmPackages_6) clang-unwrapped lld llvm; + }; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; From 3328ea77492edff2aed1827fb435ecceb68e430d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 3 Aug 2018 02:00:47 +0200 Subject: [PATCH 053/229] haskellPackages.sexpr: fix build --- .../haskell-modules/configuration-common.nix | 7 ++ .../haskell-modules/patches/sexpr-0.2.1.patch | 86 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/sexpr-0.2.1.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f2c2d8b2243..9fcdef69c3f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1128,4 +1128,11 @@ self: super: { # needed because of testing-feat >=0.4.0.2 && <1.1 language-ecmascript = doJailbreak super.language-ecmascript; + + # sexpr is old, broken and has no issue-tracker. Let's fix it the best we can. + sexpr = + appendPatch (overrideCabal super.sexpr (drv: { + isExecutable = false; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [self.QuickCheck]; + })) ./patches/sexpr-0.2.1.patch; } diff --git a/pkgs/development/haskell-modules/patches/sexpr-0.2.1.patch b/pkgs/development/haskell-modules/patches/sexpr-0.2.1.patch new file mode 100644 index 00000000000..acafadba031 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/sexpr-0.2.1.patch @@ -0,0 +1,86 @@ +diff -Naurw sexpr-0.2.1/Codec/Sexpr/Internal.hs sexpr-0.2.1-patched/Codec/Sexpr/Internal.hs +--- sexpr-0.2.1/Codec/Sexpr/Internal.hs 2009-04-30 00:51:06.000000000 +0200 ++++ sexpr-0.2.1-patched/Codec/Sexpr/Internal.hs 2018-08-03 01:38:08.000000000 +0200 +@@ -62,11 +62,6 @@ + return $ List []] + arbSexpr n = oneof [Atom <$> arbitrary, + List <$> (resize (n `div` 2) arbitrary)] +- coarbitrary (Atom s) = variant 0 . coarbitrary s +- coarbitrary (HintedAtom h s) = variant 1 . coarbitrary_h . coarbitrary s +- where coarbitrary_h = +- foldr (\a b -> variant (ord a) . variant 1 . b) (variant 0) h +- coarbitrary (List ss) = variant 2 . coarbitrary ss + + -- |@fold f s@ applies f to each sub-S-expression of s, from each leaf + -- to the root. @f@ need not preserve the shape of @s@, in contrast +diff -Naurw sexpr-0.2.1/Codec/Sexpr/Printer.hs sexpr-0.2.1-patched/Codec/Sexpr/Printer.hs +--- sexpr-0.2.1/Codec/Sexpr/Printer.hs 2009-04-30 00:51:06.000000000 +0200 ++++ sexpr-0.2.1-patched/Codec/Sexpr/Printer.hs 2018-08-03 01:41:56.000000000 +0200 +@@ -1,4 +1,4 @@ +-{-# LANGUAGE FlexibleInstances, OverlappingInstances #-} ++{-# LANGUAGE FlexibleInstances #-} + + -- | Export S-expressions in any of the three ordinary forms: + -- +@@ -17,6 +17,8 @@ + + module Codec.Sexpr.Printer where + ++import Prelude hiding ((<>)) ++ + import Codec.Sexpr.Internal + + import Data.Binary.Put +@@ -30,7 +32,7 @@ + instance Show (Sexpr String) where + show s = advancedString s + +-instance Show s => Show (Sexpr s) where ++instance {-# OVERLAPPABLE #-} Show s => Show (Sexpr s) where + show s = advancedString $ fmap show s + + raw :: String -> String -> String +diff -Naurw sexpr-0.2.1/Codec/Sexpr/Tests.hs sexpr-0.2.1-patched/Codec/Sexpr/Tests.hs +--- sexpr-0.2.1/Codec/Sexpr/Tests.hs 2009-04-30 00:51:06.000000000 +0200 ++++ sexpr-0.2.1-patched/Codec/Sexpr/Tests.hs 2018-08-03 01:46:32.000000000 +0200 +@@ -67,11 +67,9 @@ + + instance Arbitrary B.ByteString where + arbitrary = B.pack `fmap` arbitrary +- coarbitrary = undefined + + instance Arbitrary Char where + arbitrary = choose (32,255) >>= \n -> return (chr n) +- coarbitrary n = variant (ord n) + + + main :: IO () +diff -Naurw sexpr-0.2.1/sexpr.cabal sexpr-0.2.1-patched/sexpr.cabal +--- sexpr-0.2.1/sexpr.cabal 2018-08-03 01:36:11.000000000 +0200 ++++ sexpr-0.2.1-patched/sexpr.cabal 2018-08-03 01:49:13.000000000 +0200 +@@ -13,23 +13,9 @@ + maintainer: bts@evenmere.org + build-type: Simple + +-flag testing +- description: build test executable +- default: False +- + library +- if flag(testing) +- ghc-options: -Wall +- Build-Depends: base, base64-string, pretty, bytestring, binary ++ Build-Depends: base, base64-string, pretty, bytestring, binary, QuickCheck + Exposed-modules: Codec.Sexpr +- +-executable sexpr-test +- if !flag(testing) +- buildable: False +- ghc-options: -Wall +- main-is: Codec/Sexpr/Tests.hs +- other-modules: Codec.Sexpr +- Codec.Sexpr.Parser ++ other-modules: Codec.Sexpr.Parser + Codec.Sexpr.Printer + Codec.Sexpr.Internal +- build-depends: QuickCheck, random From dc8aa01c91545c53431473039236dec0983aabd3 Mon Sep 17 00:00:00 2001 From: Carlos D Date: Fri, 3 Aug 2018 12:36:24 +1000 Subject: [PATCH 054/229] tldr: add support for darwin --- pkgs/tools/misc/tldr/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index bb03b9a809b..91dae68bebc 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ curl clang libzip ]; nativeBuildInputs = [ pkgconfig ]; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "gcc" "$CC" + substituteInPlace Makefile --replace "gcc" "$CC" + ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { @@ -24,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tldr-pages.github.io; license = licenses.mit; - maintainers = with maintainers; [ taeer ]; - platforms = platforms.linux; + maintainers = with maintainers; [ taeer carlosdagos ]; + platforms = platforms.all; }; } From ed5531383e6610f2db659c7a145565d03c9209a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 05:43:43 +0100 Subject: [PATCH 055/229] tldr: override makeFlags to set CC --- pkgs/tools/misc/tldr/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 91dae68bebc..fcd556c5596 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }: +{ stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: stdenv.mkDerivation rec { name = "tldr-${version}"; @@ -11,13 +11,10 @@ stdenv.mkDerivation rec { sha256 = "10ylpiqc06p0qpma72vwksd7hd107s0vlx9c6s9rz4vc3i274lb6"; }; - buildInputs = [ curl clang libzip ]; + buildInputs = [ curl libzip ]; nativeBuildInputs = [ pkgconfig ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace "gcc" "$CC" - substituteInPlace Makefile --replace "gcc" "$CC" - ''; + makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; installFlags = [ "PREFIX=$(out)" ]; From 2553369795fe1f563a95fd21e499a00fc62a5031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 07:48:04 +0200 Subject: [PATCH 056/229] python.pkgs.keras-preprocessing: init at 1.0.2 --- .../keras-preprocessing/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/keras-preprocessing/default.nix diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix new file mode 100644 index 00000000000..043e43eb184 --- /dev/null +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six }: + +buildPythonPackage rec { + pname = "Keras_Preprocessing"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "f5306554d2b454d825b36f35e327744f5477bd2ae21017f1a93b2097bed6757e"; + }; + + # Cyclic dependency: keras-preprocessing requires keras, which requires keras-preprocessing + postPatch = '' + sed -i "s/keras>=[^']*//" setup.py + ''; + + # No tests in PyPI tarball + doCheck = false; + + propagatedBuildInputs = [ numpy scipy six ]; + + meta = with lib; { + description = "Easy data preprocessing and data augmentation for deep learning models"; + homepage = https://github.com/keras-team/keras-preprocessing; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28cb0509e97..9d7a392c068 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17082,6 +17082,8 @@ EOF Keras = callPackage ../development/python-modules/keras { }; + keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; + Lasagne = buildPythonPackage rec { name = "Lasagne-${version}"; version = "0.1"; From 052e4baf0a233f1860a9fe993b9b759c22aa1239 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 3 Aug 2018 08:27:41 +0200 Subject: [PATCH 057/229] somatic-sniper: disable parallel building to fix non-deterministic failure --- pkgs/applications/science/biology/somatic-sniper/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix index adc8648c698..4bbd6a32003 100644 --- a/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake zlib ncurses ]; + enableParallelBuilding = false; + meta = with stdenv.lib; { description = "Identify single nucleotide positions that are different between tumor and normal"; license = licenses.mit; From 79cd841713f59a760ac3bcfe0a8960aadea020a6 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Fri, 3 Aug 2018 09:08:26 +0200 Subject: [PATCH 058/229] bcal: 1.8 -> 1.9 --- pkgs/applications/science/math/bcal/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 8db4bd157df..61eb1fd3ce4 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, fetchFromGitHub, python3Packages, readline }: with stdenv.lib; stdenv.mkDerivation rec { name = "bcal-${version}"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "0jdn46wzwq7yn3x6p1xyqarp52pcr0ghnfhkm7nyxv734g1abw7r"; + sha256 = "0h6qi5rvzl6c6fsfdpdb3l4jcgip03l18i0b1x08z1y89i56y8mm"; }; nativeBuildInputs = [ python3Packages.pytest ]; + buildInputs = [ readline ]; + doCheck = true; checkPhase = '' python3 -m pytest test.py From 7d7c36f8be6b064aa14d1004d6418f2b3e005e86 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Thu, 26 Jul 2018 16:25:34 +0200 Subject: [PATCH 059/229] nixos/cfssl: init - based on module originally written by @srhb - complies with available options in cfssl v1.3.2 - uid and gid 299 reserved in ids.nix - added simple nixos test case --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/security/cfssl.nix | 209 ++++++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/cfssl.nix | 67 +++++++ 5 files changed, 280 insertions(+) create mode 100644 nixos/modules/services/security/cfssl.nix create mode 100644 nixos/tests/cfssl.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 782f6c8f69d..f73660ed99d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -323,6 +323,7 @@ mapred = 296; hadoop = 297; hydron = 298; + cfssl = 299; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -606,6 +607,7 @@ mapred = 296; hadoop = 297; hydron = 298; + cfssl = 299; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e5dce84d6ee..db4e2c545b8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -621,6 +621,7 @@ ./services/search/hound.nix ./services/search/kibana.nix ./services/search/solr.nix + ./services/security/cfssl.nix ./services/security/clamav.nix ./services/security/fail2ban.nix ./services/security/fprintd.nix diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix new file mode 100644 index 00000000000..1eb2f65ba60 --- /dev/null +++ b/nixos/modules/services/security/cfssl.nix @@ -0,0 +1,209 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.cfssl; +in { + options.services.cfssl = { + enable = mkEnableOption "the CFSSL CA api-server"; + + dataDir = mkOption { + default = "/var/lib/cfssl"; + type = types.path; + description = "Cfssl work directory."; + }; + + address = mkOption { + default = "127.0.0.1"; + type = types.str; + description = "Address to bind."; + }; + + port = mkOption { + default = 8888; + type = types.ints.u16; + description = "Port to bind."; + }; + + ca = mkOption { + defaultText = "\${cfg.dataDir}/ca.pem"; + type = types.str; + description = "CA used to sign the new certificate -- accepts '[file:]fname' or 'env:varname'."; + }; + + caKey = mkOption { + defaultText = "file:\${cfg.dataDir}/ca-key.pem"; + type = types.str; + description = "CA private key -- accepts '[file:]fname' or 'env:varname'."; + }; + + caBundle = mkOption { + default = null; + type = types.nullOr types.path; + description = "Path to root certificate store."; + }; + + intBundle = mkOption { + default = null; + type = types.nullOr types.path; + description = "Path to intermediate certificate store."; + }; + + intDir = mkOption { + default = null; + type = types.nullOr types.path; + description = "Intermediates directory."; + }; + + metadata = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Metadata file for root certificate presence. + The content of the file is a json dictionary (k,v): each key k is + a SHA-1 digest of a root certificate while value v is a list of key + store filenames. + ''; + }; + + remote = mkOption { + default = null; + type = types.nullOr types.str; + description = "Remote CFSSL server."; + }; + + configFile = mkOption { + default = null; + type = types.nullOr types.str; + description = "Path to configuration file. Do not put this in nix-store as it might contain secrets."; + }; + + responder = mkOption { + default = null; + type = types.nullOr types.path; + description = "Certificate for OCSP responder."; + }; + + responderKey = mkOption { + default = null; + type = types.nullOr types.str; + description = "Private key for OCSP responder certificate. Do not put this in nix-store."; + }; + + tlsKey = mkOption { + default = null; + type = types.nullOr types.str; + description = "Other endpoint's CA private key. Do not put this in nix-store."; + }; + + tlsCert = mkOption { + default = null; + type = types.nullOr types.path; + description = "Other endpoint's CA to set up TLS protocol."; + }; + + mutualTlsCa = mkOption { + default = null; + type = types.nullOr types.path; + description = "Mutual TLS - require clients be signed by this CA."; + }; + + mutualTlsCn = mkOption { + default = null; + type = types.nullOr types.str; + description = "Mutual TLS - regex for whitelist of allowed client CNs."; + }; + + tlsRemoteCa = mkOption { + default = null; + type = types.nullOr types.path; + description = "CAs to trust for remote TLS requests."; + }; + + mutualTlsClientCert = mkOption { + default = null; + type = types.nullOr types.path; + description = "Mutual TLS - client certificate to call remote instance requiring client certs."; + }; + + mutualTlsClientKey = mkOption { + default = null; + type = types.nullOr types.path; + description = "Mutual TLS - client key to call remote instance requiring client certs. Do not put this in nix-store."; + }; + + dbConfig = mkOption { + default = null; + type = types.nullOr types.path; + description = "Certificate db configuration file. Path must be writeable."; + }; + + logLevel = mkOption { + default = 1; + type = types.enum [ 0 1 2 3 4 5 ]; + description = "Log level (0 = DEBUG, 5 = FATAL)."; + }; + }; + + config = { + users.extraGroups.cfssl = { + gid = config.ids.gids.cfssl; + }; + + users.extraUsers.cfssl = { + description = "cfssl user"; + createHome = true; + home = cfg.dataDir; + group = "cfssl"; + uid = config.ids.uids.cfssl; + }; + + systemd.services.cfssl = mkIf cfg.enable { + description = "CFSSL CA API server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + WorkingDirectory = cfg.dataDir; + StateDirectory = cfg.dataDir; + StateDirectoryMode = 700; + Restart = "always"; + User = "cfssl"; + + ExecStart = with cfg; let + opt = n: v: optionalString (v != null) ''-${n}="${v}"''; + in + lib.concatStringsSep " \\\n" [ + "${pkgs.cfssl}/bin/cfssl serve" + (opt "address" address) + (opt "port" (toString port)) + (opt "ca" ca) + (opt "ca-key" caKey) + (opt "ca-bundle" caBundle) + (opt "int-bundle" intBundle) + (opt "int-dir" intDir) + (opt "metadata" metadata) + (opt "remote" remote) + (opt "config" configFile) + (opt "responder" responder) + (opt "responder-key" responderKey) + (opt "tls-key" tlsKey) + (opt "tls-cert" tlsCert) + (opt "mutual-tls-ca" mutualTlsCa) + (opt "mutual-tls-cn" mutualTlsCn) + (opt "mutual-tls-client-key" mutualTlsClientKey) + (opt "mutual-tls-client-cert" mutualTlsClientCert) + (opt "tls-remote-ca" tlsRemoteCa) + (opt "db-config" dbConfig) + (opt "loglevel" (toString logLevel)) + ]; + }; + }; + + services.cfssl = { + ca = mkDefault "${cfg.dataDir}/ca.pem"; + caKey = mkDefault "${cfg.dataDir}/ca-key.pem"; + }; + }; +} diff --git a/nixos/release.nix b/nixos/release.nix index dfa4ee9e127..6a0fd85d7e1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -256,6 +256,7 @@ in rec { tests.buildbot = callTest tests/buildbot.nix {}; tests.cadvisor = callTestOnMatchingSystems ["x86_64-linux"] tests/cadvisor.nix {}; tests.ceph = callTestOnMatchingSystems ["x86_64-linux"] tests/ceph.nix {}; + tests.cfssl = callTestOnMatchingSystems ["x86_64-linux"] tests/cfssl.nix {}; tests.chromium = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/chromium.nix {}).stable or {}; tests.cjdns = callTest tests/cjdns.nix {}; tests.cloud-init = callTest tests/cloud-init.nix {}; diff --git a/nixos/tests/cfssl.nix b/nixos/tests/cfssl.nix new file mode 100644 index 00000000000..513ed8c4574 --- /dev/null +++ b/nixos/tests/cfssl.nix @@ -0,0 +1,67 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "cfssl"; + + machine = { config, lib, pkgs, ... }: + { + networking.firewall.allowedTCPPorts = [ config.services.cfssl.port ]; + + services.cfssl.enable = true; + systemd.services.cfssl.after = [ "cfssl-init.service" ]; + + systemd.services.cfssl-init = { + description = "Initialize the cfssl CA"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "cfssl"; + Type = "oneshot"; + WorkingDirectory = config.services.cfssl.dataDir; + }; + script = with pkgs; '' + ${cfssl}/bin/cfssl genkey -initca ${pkgs.writeText "ca.json" (builtins.toJSON { + hosts = [ "ca.example.com" ]; + key = { + algo = "rsa"; size = 4096; }; + names = [ + { + C = "US"; + L = "San Francisco"; + O = "Internet Widgets, LLC"; + OU = "Certificate Authority"; + ST = "California"; + } + ]; + })} | ${cfssl}/bin/cfssljson -bare ca + ''; + }; + }; + + testScript = + let + cfsslrequest = with pkgs; writeScript "cfsslrequest" '' + curl -X POST -H "Content-Type: application/json" -d @${csr} \ + http://localhost:8888/api/v1/cfssl/newkey | ${cfssl}/bin/cfssljson /tmp/certificate + ''; + csr = pkgs.writeText "csr.json" (builtins.toJSON { + CN = "www.example.com"; + hosts = [ "example.com" "www.example.com" ]; + key = { + algo = "rsa"; + size = 2048; + }; + names = [ + { + C = "US"; + L = "San Francisco"; + O = "Example Company, LLC"; + OU = "Operations"; + ST = "California"; + } + ]; + }); + in + '' + $machine->waitForUnit('cfssl.service'); + $machine->waitUntilSucceeds('${cfsslrequest}'); + $machine->succeed('ls /tmp/certificate-key.pem'); + ''; +}) From 148f0746ab7f1481db5307e8bbad85f282c26b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 11:34:32 +0200 Subject: [PATCH 060/229] python.pkgs.keras-applications: init at 1.0.4 --- .../keras-applications/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/keras-applications/default.nix diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix new file mode 100644 index 00000000000..e06a0b75b50 --- /dev/null +++ b/pkgs/development/python-modules/keras-applications/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, numpy, h5py }: + +buildPythonPackage rec { + pname = "Keras_Applications"; + version = "1.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "8c95300328630ae74fb0828b6fa38269a25c0228a02f1e5181753bfd48961f49"; + }; + + # Cyclic dependency: keras-applications requires keras, which requires keras-applications + postPatch = '' + sed -i "s/keras>=[^']*//" setup.py + ''; + + # No tests in PyPI tarball + doCheck = false; + + propagatedBuildInputs = [ numpy h5py ]; + + meta = with lib; { + description = "Reference implementations of popular deep learning models"; + homepage = https://github.com/keras-team/keras-applications; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d7a392c068..8ef327ee442 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17082,6 +17082,8 @@ EOF Keras = callPackage ../development/python-modules/keras { }; + keras-applications = callPackage ../development/python-modules/keras-applications { }; + keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; Lasagne = buildPythonPackage rec { From b7ce7d5b3f3b2b95476afb39739f40d1f38f5e36 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Fri, 22 Jun 2018 21:23:58 +0200 Subject: [PATCH 061/229] nixos/display-managers: fix loading of module-x11-publish module-x11-publish is only provided by the pulseaudioFull package. --- nixos/modules/services/x11/display-managers/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 43ed21c95fe..c934642db5c 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -90,7 +90,9 @@ let } # Publish access credentials in the root window. - ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" + if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then + ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" + fi ''} # Tell systemd about our $DISPLAY and $XAUTHORITY. From 0a519ad6df8b2a23da9332421bc5c73735fd182b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 3 Aug 2018 12:40:34 +0200 Subject: [PATCH 062/229] pythonPackages.shippai: init at 0.2.3 --- .../python-modules/shippai/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/shippai/default.nix diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix new file mode 100644 index 00000000000..5f9fa408d0f --- /dev/null +++ b/pkgs/development/python-modules/shippai/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "shippai"; + # Please make sure that vdirsyncer still builds if you update this package. + version = "0.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ppwywzg4d12h658682ssmingm6ls6a96p4ak26i2w9d4lf8pfsc"; + }; + + meta = with stdenv.lib; { + description = "Use Rust failures as Python exceptions"; + homepage = https://github.com/untitaker/shippai; + license = licenses.mit; + maintainer = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 757849dd2e9..2844bf6aba7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -422,7 +422,7 @@ in { }; pykerberos = callPackage ../development/python-modules/pykerberos { }; - + pymatgen = callPackage ../development/python-modules/pymatgen { }; pynisher = callPackage ../development/python-modules/pynisher { }; @@ -12449,6 +12449,8 @@ in { }; }; + shippai = callPackage ../development/python-modules/shippai {}; + simanneal = callPackage ../development/python-modules/simanneal { }; simplebayes = buildPythonPackage rec { From feabc475c09f3aaf82fb973f184b5680849312e3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 3 Aug 2018 12:40:46 +0200 Subject: [PATCH 063/229] vdirsyncer: 0.17.0a2 -> 0.17.0a3 fixes build --- pkgs/tools/misc/vdirsyncer/default.nix | 31 +++++++++----------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 9e9ded5c3a7..0655264cc54 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,30 +1,25 @@ -{ stdenv, python3Packages, glibcLocales, rustPlatform }: +{ stdenv, python3Packages, glibcLocales, rustPlatform, pkgconfig, openssl }: # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst let pythonPackages = python3Packages; - version = "0.17.0a2"; + version = "0.17.0a3"; pname = "vdirsyncer"; name = pname + "-" + version; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0y464rsx5la6bp94z2g0nnkbl4nwfya08abynvifw4c84vs1gr4q"; + sha256 = "1n7izfa5x9mh0b4zp20gd8qxfcca5wpjh834bsbi5pk6zam5pfdy"; }; native = rustPlatform.buildRustPackage { name = name + "-native"; inherit src; sourceRoot = name + "/rust"; - cargoSha256 = "1cr7xs11gbsc3x5slga9qahchwc22qq49amf28g4jgs9lzf57qis"; - postInstall = '' - mkdir $out/include $out/lib - cp $out/bin/libvdirsyncer_rustext* $out/lib - rm -r $out/bin - cp target/vdirsyncer_rustext.h $out/include - ''; + cargoSha256 = "08xq9q5fx37azzkqqgwcnds1yd8687gh26dsl3ivql5h13fa2w3q"; + buildInputs = [ pkgconfig openssl ]; }; in pythonPackages.buildPythonApplication rec { - inherit version pname src; + inherit version pname src native; propagatedBuildInputs = with pythonPackages; [ click click-log click-threading @@ -33,6 +28,7 @@ in pythonPackages.buildPythonApplication rec { requests_oauthlib # required for google oauth sync atomicwrites milksnake + shippai ]; buildInputs = with pythonPackages; [ setuptools_scm ]; @@ -40,25 +36,20 @@ in pythonPackages.buildPythonApplication rec { checkInputs = with pythonPackages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ]; postPatch = '' - sed -i "/cargo build/d" Makefile + sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py ''; preBuild = '' mkdir -p rust/target/release - ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/ - ln -s ${native}/include/vdirsyncer_rustext.h rust/target/ + ln -s ${native}/bin/libvdirsyncer_rustext* rust/target/release/ ''; LC_ALL = "en_US.utf8"; - preCheck = '' - ln -sf ../dist/tmpbuild/vdirsyncer/vdirsyncer/_native__lib.so vdirsyncer - ''; - checkPhase = '' - runHook preCheck + rm -rf vdirsyncer + export PYTHONPATH=$out/${pythonPackages.python.sitePackages}:$PYTHONPATH make DETERMINISTIC_TESTS=true test - runHook postCheck ''; meta = with stdenv.lib; { From 915e506f7c85bf13d4e11eb9d5c4574f5efe64ce Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 3 Aug 2018 13:00:13 +0200 Subject: [PATCH 064/229] signal-desktop: 1.14.4 -> 1.15.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 87ee10d0db7..b7066a501a3 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.14.4"; + version = "1.15.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0590r7748kv6g7zygq95v8qxf7vi2n5ypj6734x9yshrn8z6p8lr"; + sha256 = "1q73jx92h8zwk1dn103ymskz35q6kfiqc44886jr0p7mlpndqsa4"; }; phases = [ "unpackPhase" "installPhase" ]; From a4ec1ec0394eabcb0b6acd3066a0c0d631060b60 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 3 Aug 2018 13:18:41 +0200 Subject: [PATCH 065/229] pythonPackages.shippai: fix eval (typo) --- pkgs/development/python-modules/shippai/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix index 5f9fa408d0f..ac035061692 100644 --- a/pkgs/development/python-modules/shippai/default.nix +++ b/pkgs/development/python-modules/shippai/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { description = "Use Rust failures as Python exceptions"; homepage = https://github.com/untitaker/shippai; license = licenses.mit; - maintainer = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner ]; }; } From 9216da8928bc17878635ef50dac089f01a8c6466 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 2 Aug 2018 15:27:00 +0200 Subject: [PATCH 066/229] nixos/prometheus-exporters: use nixos-fw chain Use nixos-fw chain instead of INPUT so that the rules don't keep stacking everytime the firewall is reloaded. This also adds a comment to each rule about the associated exporter. --- .../modules/services/monitoring/prometheus/exporters.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 9c58a15bcd7..1d5f400250f 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -73,7 +73,7 @@ let description = '' Specify a filter for iptables to use when - is true. It is used as `ip46tables -I INPUT -j ACCEPT`. + is true. It is used as `ip46tables -I nixos-fw -j nixos-fw-accept`. ''; }; user = mkOption { @@ -116,9 +116,10 @@ let mkExporterConf = { name, conf, serviceOpts }: mkIf conf.enable { - networking.firewall.extraCommands = mkIf conf.openFirewall '' - ip46tables -I INPUT ${conf.firewallFilter} -j ACCEPT - ''; + networking.firewall.extraCommands = mkIf conf.openFirewall (concatStrings [ + "ip46tables -I nixos-fw ${conf.firewallFilter} " + "-m comment --comment ${name}-exporter -j nixos-fw-accept" + ]); systemd.services."prometheus-${name}-exporter" = mkMerge ([{ wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; From 6cf519df6ec81bf6549ae0cbf20c27e02c976d2f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 3 Aug 2018 13:25:09 +0200 Subject: [PATCH 067/229] androidStudioPackages.{dev,canary}: 3.3.0.2 -> 3.3.0.3 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b60687c50ba..eded9f2722e 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "016nyn1pqviy089hg0dq7m4cqb39fdxdcy4zknkaq7dmgv1dj6x9"; }; latestVersion = { # canary & dev - version = "3.3.0.2"; # "Android Studio 3.3 Canary 3" - build = "181.4884283"; - sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh"; + version = "3.3.0.3"; # "Android Studio 3.3 Canary 4" + build = "182.4924367"; + sha256Hash = "03fxjxlsbrpklsss1nvlkb41skr5ymmq9vdns8iikcm1ng925vfd"; }; in rec { # Old alias From d99d14f357ca9abe9d7399fa7b2206c3e5929edd Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Fri, 3 Aug 2018 11:36:11 +0000 Subject: [PATCH 068/229] reaper: init at 5.93 (#44391) --- pkgs/applications/audio/reaper/default.nix | 81 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 83 insertions(+) create mode 100644 pkgs/applications/audio/reaper/default.nix diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix new file mode 100644 index 00000000000..6d6b228eead --- /dev/null +++ b/pkgs/applications/audio/reaper/default.nix @@ -0,0 +1,81 @@ +{ stdenv, fetchurl, autoPatchelfHook, makeWrapper +, alsaLib, xorg +, fetchFromGitHub, pkgconfig, gnome3 +, gnome2, gdk_pixbuf, cairo, glib, freetype +, libpulseaudio +}: + +let + libSwell = stdenv.mkDerivation { + name = "libSwell"; + + src = fetchFromGitHub { + owner = "justinfrankel"; + repo = "WDL"; + rev = "e87f5bdee7327b63398366fde6ec0a3f08bf600d"; + sha256 = "147idjqc6nc23w9krl8a9w571k5jx190z3id6ir6cr8zsx0lakdb"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnome3.gtk ]; + + buildPhase = '' + cd WDL/swell + make + ''; + + installPhase = '' + mv libSwell.so $out + ''; + }; + +in stdenv.mkDerivation rec { + name = "reaper-${version}"; + version = "5.93"; + + src = fetchurl { + url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; + sha256 = "17ciysyqp4by0yy08avk7z16inrmfwrmzh5l1r6fdni0y4ax65iq"; + }; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = [ + alsaLib + stdenv.cc.cc.lib + + xorg.libX11 + xorg.libXi + + gnome3.gtk + gdk_pixbuf + gnome2.pango + cairo + glib + freetype + ]; + + dontBuild = true; + + installPhase = '' + ./install-reaper.sh --install $out/opt + rm $out/opt/REAPER/uninstall-reaper.sh + + cp ${libSwell.out} $out/opt/REAPER/libSwell.so + + wrapProgram $out/opt/REAPER/reaper5 \ + --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib + + mkdir $out/bin + ln -s $out/opt/REAPER/reaper5 $out/bin/ + ln -s $out/opt/REAPER/reamote-server $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Digital audio workstation"; + homepage = https://www.reaper.fm/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa555153e57..8d151eadf4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18117,6 +18117,8 @@ with pkgs; tcl = tcl-8_5; }; + reaper = callPackage ../applications/audio/reaper { }; + recode = callPackage ../tools/text/recode { }; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; From 3f9edf1bd6a0eee8df1e7a592fb4d77a5cac64a9 Mon Sep 17 00:00:00 2001 From: LightDiscord Date: Thu, 2 Aug 2018 11:47:09 +0200 Subject: [PATCH 069/229] protonmail-bridge: init at 1.0.5-1 --- .../networking/protonmail-bridge/default.nix | 83 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/applications/networking/protonmail-bridge/default.nix diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix new file mode 100644 index 00000000000..7c501401824 --- /dev/null +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, full, + libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: + +let + version = "1.0.5-1"; + + description = '' + An application that runs on your computer in the background and seamlessly encrypts + and decrypts your mail as it enters and leaves your computer + ''; + + desktopItem = makeDesktopItem { + name = "Desktop-Bridge"; + exec = "Desktop-Bridge"; + icon = "desktop-bridge"; + comment = stdenv.lib.replaceStrings ["\n"] [" "] description; + desktopName = "ProtonMail Bridge"; + genericName = "ProtonMail Bridge for Linux"; + categories = "Utility;Security;Network;Email"; + }; +in stdenv.mkDerivation rec { + name = "protonmail-bridge-${version}"; + + src = fetchurl { + url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; + sha256 = "1fsf4l5c9ii370fgy721a71h34g7vjfddscal3jblb4mm3ywzxfl"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + sourceRoot = "."; + + unpackCmd = '' + ar p "$src" data.tar.xz | tar xJ + ''; + + installPhase = '' + mkdir -p $out/{bin,lib,share} + mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + + cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib + cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg + cp ${desktopItem}/share/applications/* $out/share/applications + + ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge + ''; + + postFixup = let + rpath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + qtbase + qtmultimedia + qtsvg + qtdeclarative + qttools + libGL + libsecret + libpulseaudio + glib + ]; + + qtPath = prefix: "${full}/${prefix}"; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" \ + $out/lib/Desktop-Bridge + + wrapProgram $out/lib/Desktop-Bridge \ + --set QT_PLUGIN_PATH "${qtPath qtbase.qtPluginPrefix}" \ + --set QML_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ + --set QML2_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ + ''; + + meta = with stdenv.lib; { + homepage = https://www.protonmail.com/bridge; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lightdiscord ]; + + inherit description; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77dc96884b8..c41f240d78f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17920,6 +17920,8 @@ with pkgs; python = python3; }; + protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { }; From b4a826404767d17ecf62e83f43a7af8ed666e68b Mon Sep 17 00:00:00 2001 From: LightDiscord Date: Thu, 2 Aug 2018 12:05:48 +0200 Subject: [PATCH 070/229] Add lightdiscord as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ec601841abb..b807b87aa44 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2174,6 +2174,11 @@ github = "nathanielbaxter"; name = "Nathaniel Baxter"; }; + lightdiscord = { + email = "arnaud@lightdiscord.me"; + github = "lightdiscord"; + name = "Arnaud Pascal"; + }; lihop = { email = "nixos@leroy.geek.nz"; github = "lihop"; From 1ebee36c232611c8540df93bf435825beb6d2f65 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 3 Aug 2018 14:12:20 +0200 Subject: [PATCH 071/229] tdesktopPackages.preview: 1.3.10 -> 1.3.11 --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 39d664805fa..dab23e1cb4a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,5 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; + version = "1.3.11"; + sha256Hash = "057b7ccba7k2slzbp9xzcs3fni40x7gz3wy13xfgxywr12f04h1r"; }); } From 2e4410ac384a9ca6c038ad87b07cefd8e709dd56 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Aug 2018 08:20:03 -0400 Subject: [PATCH 072/229] linux: 4.9.116 -> 4.9.117 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d89d0151d9b..231e24be911 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.116"; + version = "4.9.117"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07gzjfv24jrn76aga7c8f1y5xsz5if6xbdli1cpfzg60ps8q57lr"; + sha256 = "1c3r0a4fchg358zff2ww8kw789kah3bhr750p9qlsy65d8rflcl2"; }; } // (args.argsOverride or {})) From 52c4a7a90923070cfb0ea577990559410692f1aa Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Aug 2018 08:20:13 -0400 Subject: [PATCH 073/229] linux: 4.14.59 -> 4.14.60 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index c5a53555d20..d8040fbf3bf 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.59"; + version = "4.14.60"; # 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 = "16ribg80jk830wyk4k7v86jysmnkj59v62rlkqil3advc7337iky"; + sha256 = "15djfcl4m388vm3wkfa6yx0sglyp8zh04s7m7xa1ybmsiwjl7qbc"; }; } // (args.argsOverride or {})) From 4ac27408951269d024c23a2df026ccd688d48889 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Aug 2018 08:20:22 -0400 Subject: [PATCH 074/229] linux: 4.17.11 -> 4.17.12 --- pkgs/os-specific/linux/kernel/linux-4.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index 71984ec5c77..6004577fad6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.11"; + version = "4.17.12"; # 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 = "133jyd75a0gq71m783s3ydjkpnzw5xxn4wrk1zal6fr19znq87nv"; + sha256 = "18xmkj1bmfrmvx6p8cl5l7pyv0zk5y3mxhyfnlzqwkxnvkjf5660"; }; } // (args.argsOverride or {})) From 83cc1e3d38100fac3f2937bfcd9bb12616671df2 Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Fri, 3 Aug 2018 22:39:55 +1000 Subject: [PATCH 075/229] pythonPackages.imgaug: init at 0.2.6 (#43720) --- .../python-modules/imgaug/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/imgaug/default.nix diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix new file mode 100644 index 00000000000..08f1d49d8c6 --- /dev/null +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, scikitimage, opencv3, six }: + +buildPythonPackage rec { + pname = "imgaug"; + version = "0.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wy8ydkqq0jrwxwdv04q89n3gwsr9pjaspsbw26ipg5a5lnhb9c2"; + }; + + propagatedBuildInputs = [ + numpy + scipy + scikitimage + opencv3 + six + ]; + + # disable tests when there are no tests in the PyPI archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/aleju/imgaug; + description = "Image augmentation for machine learning experiments"; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2844bf6aba7..159d791e84f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6515,6 +6515,8 @@ in { }; }; + imgaug = callPackage ../development/python-modules/imgaug { }; + inflection = callPackage ../development/python-modules/inflection { }; influxdb = buildPythonPackage rec { From a6c7132abc972b91826db1cf6f820d6b1b454ba0 Mon Sep 17 00:00:00 2001 From: Matthew Harm Bekkema Date: Fri, 3 Aug 2018 23:01:34 +1000 Subject: [PATCH 076/229] doc: change git:// links to https:// (#44395) The server is not verified over the git:// transfer protocol. If you clone a repository over git://, you should check if the latest commit's hash is correct. On the other hand, https:// will always verify the server automatically, using certificate authorities. --- README.md | 2 +- doc/quick-start.xml | 2 +- nixos/doc/manual/configuration/adding-custom-packages.xml | 2 +- nixos/doc/manual/development/sources.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 96902b9ab33..86bc8534b3c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ build daemon as so-called channels. To get channel information via git, add [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: ``` -% git remote add channels git://github.com/NixOS/nixpkgs-channels.git +% git remote add channels https://github.com/NixOS/nixpkgs-channels.git ``` For stability and maximum binary package support, it is recommended to maintain diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 0cba3a4769c..b9e6d789404 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -9,7 +9,7 @@ Checkout the Nixpkgs source tree: -$ git clone git://github.com/NixOS/nixpkgs.git +$ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index b59287a622e..028a9427534 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -14,7 +14,7 @@ xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual. In short, you clone Nixpkgs: -$ git clone git://github.com/NixOS/nixpkgs.git +$ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs Then you write and test the package as described in the Nixpkgs manual. diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index c7b64cb84be..eec9b56b1c0 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -11,9 +11,9 @@ modify NixOS, however, you should check out the latest sources from Git. This is as follows: -$ git clone git://github.com/NixOS/nixpkgs.git +$ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs -$ git remote add channels git://github.com/NixOS/nixpkgs-channels.git +$ git remote add channels https://github.com/NixOS/nixpkgs-channels $ git remote update channels This will check out the latest Nixpkgs sources to From 86f058c8427da6a563b799aecf6c4cccdd395278 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 10 Jul 2018 14:54:28 +0200 Subject: [PATCH 077/229] python2Packages.ipython: apply upstream signature patch --- pkgs/development/python-modules/ipython/5.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index f2066fee2a4..36f581c98af 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch # Build dependencies , glibcLocales # Test dependencies @@ -36,6 +37,16 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'gnureadline'" " " ''; + patches = [ + # improve cython support, needed by sage, accepted upstream + # https://github.com/ipython/ipython/pull/11139 + (fetchpatch { + name = "signature-use-inspect.patch"; + url = "https://github.com/ipython/ipython/commit/8d399b98d3ed5c765835594100c4d36fb2f739dc.patch"; + sha256 = "1r7v9clwwbskmj4y160vcj6g0vzqbvnj4y1bm2n4bskafapm42g0"; + }) + ]; + buildInputs = [ glibcLocales ]; checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; From 0fd688a1a5d51030c913e814b07ad69009e9bfa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 15:25:19 +0200 Subject: [PATCH 078/229] blueman: use python3Packages --- pkgs/tools/bluetooth/blueman/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index da562fde160..29c9a21465c 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,9 +1,10 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, gtk3 +{ stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: let + pythonPackages = python3Packages; binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ]; in stdenv.mkDerivation rec { From bf256564f9489417696e1986483068f1ae6e07f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 15:37:25 +0200 Subject: [PATCH 079/229] pdf-redact-tools: explicitly use python2Packages Python2-only syntax, e.g. print without paratheses, is used in the pdf-redact-tools script. --- pkgs/tools/graphics/pdfredacttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix index d66c0b0a945..28b13c782b9 100644 --- a/pkgs/tools/graphics/pdfredacttools/default.nix +++ b/pkgs/tools/graphics/pdfredacttools/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages, imagemagick, exiftool, file, ghostscript }: +{ stdenv, fetchFromGitHub, python2Packages, imagemagick, exiftool, file, ghostscript }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "pdf-redact-tools"; version = "0.1.2"; From 2f5bbbebfd1716e3c319992e8be704e07a89ad1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 15:53:52 +0200 Subject: [PATCH 080/229] doitlive: use python3Packages --- pkgs/tools/misc/doitlive/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index aa3e1e18ae6..3520d67abd2 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -1,15 +1,15 @@ -{ stdenv, pythonPackages }: +{ stdenv, python3Packages }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "doitlive"; version = "3.0.3"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "19i16ca835rb3gal1sxyvpyilj9a80n6nikf0smlzmxck38x86fj"; }; - propagatedBuildInputs = with pythonPackages; [ click ]; + propagatedBuildInputs = with python3Packages; [ click ]; # disable tests (too many failures) doCheck = false; From c5fb1d70ca53935fa69dd10cd18a920a362a138c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 16:02:33 +0200 Subject: [PATCH 081/229] bashplotlib: use python3Packages --- pkgs/tools/misc/bashplotlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index 2757f5f3e21..c334ee77634 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -1,7 +1,7 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { - pname = "bashplotlib-${version}"; +python3Packages.buildPythonApplication rec { + pname = "bashplotlib"; version = "2017-10-11"; src = fetchFromGitHub { From 70e7235510930aa5d98b1cf0b8b4599ddb9c6b42 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 3 Aug 2018 16:06:02 +0200 Subject: [PATCH 082/229] nixos/doc: add the new strongswan-swanctl service to the 18.09 release notes --- nixos/doc/manual/release-notes/rl-1809.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 33026c5cbae..62aaec4ac5d 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -81,6 +81,22 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' routing tables for instance. + + + services.strongswan-swanctl + is a modern replacement for services.strongswan. + You can use either one of them to setup IPsec VPNs but not both at the same time. + + + services.strongswan-swanctl uses the + swanctl + command which uses the modern + vici + Versatile IKE Configuration Interface. + The deprecated ipsec command used in services.strongswan is using the legacy + stroke configuration interface. + + From 8d708d28a11a3ca3a15f380cfd2b4c932f1ad06f Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 3 Aug 2018 17:54:30 +0300 Subject: [PATCH 083/229] parity: 1.10.8 -> 1.11.8; parity-beta: init at 2.0.1 (#44170) * parity: 1.10.8 -> 1.10.9 * parity: 1.10.8 -> 1.11.8; parity-beta: init at 2.0.1 --- pkgs/applications/altcoins/default.nix | 1 + pkgs/applications/altcoins/parity/beta.nix | 7 ++ pkgs/applications/altcoins/parity/default.nix | 8 +- pkgs/applications/altcoins/parity/parity.nix | 9 +- ...1.10.patch => vendored-sources-1.11.patch} | 25 +++-- .../parity/patches/vendored-sources-2.0.patch | 98 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 7 files changed, 130 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/altcoins/parity/beta.nix rename pkgs/applications/altcoins/parity/patches/{vendored-sources-1.10.patch => vendored-sources-1.11.patch} (93%) create mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 9f1763087de..f4a49e79f6a 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -86,6 +86,7 @@ rec { }; parity = callPackage ./parity { }; + parity-beta = callPackage ./parity/beta.nix { }; parity-ui = callPackage ./parity-ui { }; particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; }; diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix new file mode 100644 index 00000000000..fe58579e6b5 --- /dev/null +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -0,0 +1,7 @@ +let + version = "2.0.1"; + sha256 = "0rfq0izpswfwbyvr5kb6zjyf6sd7l1706c0sp7ccy6ykdfb4v6zs"; + cargoSha256 = "1ij17bfwvikqi5aj71j1nwf3jhkf3y9a0kwydajviwal47p9grl9"; + patches = [ ./patches/vendored-sources-2.0.patch ]; +in + import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index a41488c48b5..993bc3615aa 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.10.9"; - sha256 = "1irfksx887vvvdf97q26qacn22kmyj8fgb3ghh9wv5qnzrn3564g"; - cargoSha256 = "0rzhabyhprmcg0cdmibbb8zgqf6z4izsdq8m060mppkkv675x0lf"; - patches = [ ./patches/vendored-sources-1.10.patch ]; + version = "1.11.8"; + sha256 = "0qk5vl8ql3pr9pz5iz7whahwqi1fcbsf8kphn6z4grgc87id7b19"; + cargoSha256 = "0p2idd36cyzp2ax81k533bdma4hz0ws2981qj2s7jnhvmj4941l8"; + patches = [ ./patches/vendored-sources-1.11.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix index 9c9d1d4293e..55665034ccf 100644 --- a/pkgs/applications/altcoins/parity/parity.nix +++ b/pkgs/applications/altcoins/parity/parity.nix @@ -10,6 +10,8 @@ , pkgconfig , openssl , systemd +, cmake +, perl }: rustPlatform.buildRustPackage rec { @@ -18,12 +20,15 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "paritytech"; - repo = "parity"; + repo = "parity-ethereum"; rev = "v${version}"; inherit sha256; }; - buildInputs = [ pkgconfig systemd.lib systemd.dev openssl openssl.dev ]; + buildInputs = [ + pkgconfig cmake perl + systemd.lib systemd.dev openssl openssl.dev + ]; # Some checks failed doCheck = false; diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch similarity index 93% rename from pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch rename to pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch index e59858442c9..733f6880ad9 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch @@ -1,5 +1,5 @@ diff --git a/.cargo/config b/.cargo/config -index 72652ad2f..b21c6aa7b 100644 +index 72652ad2f..57c5c2f8f 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,3 +1,108 @@ @@ -52,19 +52,19 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/daemonize"] ++git = "https://github.com/paritytech/daemonize" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/hidapi-rs"] +git = "https://github.com/paritytech/hidapi-rs" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/hyper"] -+git = "https://github.com/paritytech/hyper" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/paritytech/jsonrpc.git"] +git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.10" ++branch = "parity-1.11" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/libusb-rs"] @@ -77,6 +77,11 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/ring"] ++git = "https://github.com/paritytech/ring" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/rust-ctrlc.git"] +git = "https://github.com/paritytech/rust-ctrlc.git" +branch = "master" @@ -102,13 +107,7 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/tailhook/rotor"] -+git = "https://github.com/tailhook/rotor" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tomusdrw/ws-rs"] +git = "https://github.com/tomusdrw/ws-rs" +branch = "master" +replace-with = "vendored-sources" -+ diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch new file mode 100644 index 00000000000..9af64559d97 --- /dev/null +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch @@ -0,0 +1,98 @@ +diff --git a/.cargo/config b/.cargo/config +index 72652ad2f..3c0eca89a 100644 +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,3 +1,93 @@ + [target.x86_64-pc-windows-msvc] + # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 + rustflags = ["-Ctarget-feature=+crt-static"] ++ ++[source."https://github.com/alexcrichton/mio-named-pipes"] ++git = "https://github.com/alexcrichton/mio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/parity-tokio-ipc"] ++git = "https://github.com/nikvolf/parity-tokio-ipc" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/tokio-named-pipes"] ++git = "https://github.com/nikvolf/tokio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/bn"] ++git = "https://github.com/paritytech/bn" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/daemonize"] ++git = "https://github.com/paritytech/daemonize" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hidapi-rs"] ++git = "https://github.com/paritytech/hidapi-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/jsonrpc.git"] ++git = "https://github.com/paritytech/jsonrpc.git" ++branch = "parity-1.11" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-rs"] ++git = "https://github.com/paritytech/libusb-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-sys"] ++git = "https://github.com/paritytech/libusb-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/parity-common"] ++git = "https://github.com/paritytech/parity-common" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/ring"] ++git = "https://github.com/paritytech/ring" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-ctrlc.git"] ++git = "https://github.com/paritytech/rust-ctrlc.git" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-rocksdb"] ++git = "https://github.com/paritytech/rust-rocksdb" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-secp256k1"] ++git = "https://github.com/paritytech/rust-secp256k1" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-snappy"] ++git = "https://github.com/paritytech/rust-snappy" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/trezor-sys"] ++git = "https://github.com/paritytech/trezor-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tomusdrw/ws-rs"] ++git = "https://github.com/tomusdrw/ws-rs" ++branch = "master" ++replace-with = "vendored-sources" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b022e02eb87..899e34adf08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15294,6 +15294,7 @@ with pkgs; hevm = self.altcoins.hevm; parity = self.altcoins.parity; + parity-beta = self.altcoins.parity-beta; parity-ui = self.altcoins.parity-ui; stellar-core = self.altcoins.stellar-core; From 57b6eb65144fd01a29dff4a0f5b5768661e5496b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 16:56:46 +0200 Subject: [PATCH 084/229] EmptyEpsilon: use python3 --- pkgs/games/empty-epsilon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index d7742d31664..bf3b16dc9a4 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python }: +{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python3 }: let @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ serious-proton sfml glew libX11 python ]; + buildInputs = [ serious-proton sfml glew libX11 python3 ]; cmakeFlags = [ "-DSERIOUS_PROTON_DIR=${serious-proton.src}" From 011c6411f3a08028ddeebe82c1b0420df21dcce1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 3 Aug 2018 15:58:14 +0100 Subject: [PATCH 085/229] bundler: 1.16.2 -> 1.16.3 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index b1d0b76f086..7f89d1ffa87 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.16.2"; - source.sha256 = "3bb53e03db0a8008161eb4c816ccd317120d3c415ba6fee6f90bbc7f7eec8690"; + version = "1.16.3"; + source.sha256 = "0spddjiq6yscl4sywwcj5zrjk3lq02zacigrz2fh78yfdzyi34fq"; dontPatchShebangs = true; postFixup = '' From 841e2ed5470d19891f2570bef9ba9860e4c9a2fb Mon Sep 17 00:00:00 2001 From: snaar Date: Fri, 3 Aug 2018 11:18:13 -0400 Subject: [PATCH 086/229] run-scaled: init at 2018-06-03 (#44385) * run-scaled: init at 2018-06-03 * run-scaled: change platform from linux to unix to match dependencies --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/X11/run-scaled/default.nix | 30 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/tools/X11/run-scaled/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b807b87aa44..b5b5484e82c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3688,6 +3688,11 @@ github = "s-na"; name = "S. Nordin Abouzahra"; }; + snaar = { + email = "snaar@snaar.net"; + github = "snaar"; + name = "Serguei Narojnyi"; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix new file mode 100644 index 00000000000..ea661b0f8c7 --- /dev/null +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }: + +stdenv.mkDerivation rec { + version = "git-2018-06-03"; + name = "run-scaled-${version}"; + + src = fetchFromGitHub { + owner = "kaueraal"; + repo = "run_scaled"; + rev = "fa71b3c17e627a96ff707ad69f1def5361f2245c"; + sha256 = "1ma4ax7ydq4xvyzrc4zapihmf7v3d9zl9mbi8bgpps7nlgz544ys"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp run_scaled $out/bin + wrapProgram $out/bin/run_scaled --prefix PATH ":" \ + ${stdenv.lib.makeBinPath [ bc xorgserver xpra xrandr ]} + ''; + + meta = with stdenv.lib; { + description = "Run an X application scaled via xpra"; + homepage = https://github.com/kaueraal/run_scaled; + maintainers = [ maintainers.snaar ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 899e34adf08..19d393fc89b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21558,6 +21558,8 @@ with pkgs; rss-glx = callPackage ../misc/screensavers/rss-glx { }; + run-scaled = callPackage ../tools/X11/run-scaled { }; + runit = callPackage ../tools/system/runit { }; refind = callPackage ../tools/bootloaders/refind { }; From 505007471d0ad0d967c76f0f61a21cf7e3fad41b Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Fri, 3 Aug 2018 16:52:15 +0200 Subject: [PATCH 087/229] certmgr: init at 1.6.1 --- pkgs/tools/security/certmgr/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/security/certmgr/default.nix diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix new file mode 100644 index 00000000000..fa3076e8b59 --- /dev/null +++ b/pkgs/tools/security/certmgr/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "1.6.1"; + name = "certmgr-${version}"; + + goPackagePath = "github.com/cloudflare/certmgr/"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "certmgr"; + rev = "v${version}"; + sha256 = "1ky2pw1wxrb2fxfygg50h0mid5l023x6xz9zj5754a023d01qqr2"; + }; + + meta = with stdenv.lib; { + homepage = https://cfssl.org/; + description = "Cloudflare's certificate manager"; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ johanot srhb ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77dc96884b8..593c351acb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1696,6 +1696,8 @@ with pkgs; ceph = callPackage ../tools/filesystems/ceph { boost = boost165; }; ceph-dev = ceph; + certmgr = callPackage ../tools/security/certmgr { }; + cfdg = callPackage ../tools/graphics/cfdg { ffmpeg = ffmpeg_2; }; From 405e4fbea9f4bca545e919f29f50cb7aa192e446 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 3 Aug 2018 10:40:38 -0500 Subject: [PATCH 088/229] quicktemplate: Use fetchFromGitHub, not fetchgit --- pkgs/development/tools/quicktemplate/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 624866ea9e3..e66500ac833 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,20 +1,19 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "quicktemplate-unstable-${version}"; version = "2018-04-30"; - rev = "a91e0946457b6583004fbfc159339b8171423aed"; - goPackagePath = "github.com/valyala/quicktemplate"; + goDeps = ./deps.nix; - src = fetchgit { - inherit rev; - url = "https://github.com/valyala/quicktemplate"; + src = fetchFromGitHub { + owner = "valyala"; + repo = "quicktemplate"; + rev = "a91e0946457b6583004fbfc159339b8171423aed"; sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; }; - goDeps = ./deps.nix; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "https://github.com/valyala/quicktemplate"; From 95134fb939d198b64a515d205ea29ad3ac7cf83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 17:40:56 +0200 Subject: [PATCH 089/229] pythonPackages.actdiag: run tests --- .../development/python-modules/actdiag/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 2172aa1165a..27a9a455c47 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pep8, nose, unittest2, docutils, blockdiag }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +, pep8, nose, unittest2, docutils, blockdiag, reportlab }: buildPythonPackage rec { pname = "actdiag"; @@ -10,13 +10,17 @@ buildPythonPackage rec { sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af"; }; + patches = fetchpatch { + name = "drop_test_pep8.py.patch"; + url = https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw; + sha256 = "1zxzwb0fvwlc8xgs45fx65341sjhb3h6l2p6rdj6i127vg1hsxb4"; + }; + buildInputs = [ pep8 nose unittest2 docutils ]; propagatedBuildInputs = [ blockdiag ]; - # One test fails: - # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) - doCheck = false; + checkInputs = [ reportlab ]; meta = with stdenv.lib; { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; From 8e690b6ffd57ae9b9f74b2f4be576ed2e4ae0738 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 3 Aug 2018 10:41:15 -0500 Subject: [PATCH 090/229] easyjson: 2018-06-06 -> 2018-07-30 --- pkgs/development/tools/easyjson/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index de9fb82f66f..3ae17221363 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,20 +1,19 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "easyjson-unstable-${version}"; - version = "2018-06-06"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - + version = "2018-07-30"; goPackagePath = "github.com/mailru/easyjson"; + goDeps = ./deps.nix; - src = fetchgit { - inherit rev; - url = "https://github.com/mailru/easyjson"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + src = fetchFromGitHub { + owner = "mailru"; + repo = "easyjson"; + rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; + sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; }; - goDeps = ./deps.nix; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "https://github.com/mailru/easyjson"; From 54ae6ea537b7ea3dc34fa169eb7ba652def7684b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 17:41:31 +0200 Subject: [PATCH 091/229] actdiag: use python3 and toPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d151eadf4e..0e199d5a16c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -429,7 +429,7 @@ with pkgs; acpica-tools = callPackage ../tools/system/acpica-tools { }; - actdiag = pythonPackages.actdiag; + actdiag = with python3.pkgs; toPythonApplication actdiag; actkbd = callPackage ../tools/system/actkbd { }; From 4f99b189850db8fd5a1214ac236c510cc985a880 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 3 Aug 2018 10:41:45 -0500 Subject: [PATCH 092/229] nodePackages: meguca: 1.0.8 -> 1.0.9 --- .../node-packages/node-packages-v6.nix | 197 ++++++++++-------- .../node-packages/node-packages-v8.nix | 24 +-- 2 files changed, 119 insertions(+), 102 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 0a3bccdffe7..6dae8dd7013 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -571,13 +571,13 @@ let sha512 = "awiTDstwQfX6026T7oC01AoP7knJoM5IT1tgx9STIM4hQzNQlkW8keTxNC+/xxpMgP657ebHMTqrsQ4qtfSJKg=="; }; }; - "@types/lodash-4.14.115" = { + "@types/lodash-4.14.116" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.115"; + version = "4.14.116"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.115.tgz"; - sha512 = "9K/P4XMQxk61omAzQh3bbbFiqnG17eLcFysjlAYz0aPcYrVo8T+ujaCeIeY0Gpzux7x1YbxtEtLKB7ZWf79qdg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.116.tgz"; + sha512 = "lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg=="; }; }; "@types/make-dir-1.0.3" = { @@ -2245,13 +2245,13 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; - "asn1-0.2.3" = { + "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "asn1.js-4.10.1" = { @@ -2542,22 +2542,22 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.285.1" = { + "aws-sdk-2.286.2" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.285.1"; + version = "2.286.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.285.1.tgz"; - sha512 = "lkroCYcnb7UWR/jbaW6wyjAeGROrsBFWyqUukQjICuCV4a0Mapnjsxefl2A/z+0SX3gnBN7owUb/60UjQSHpzA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.286.2.tgz"; + sha512 = "46a/2+rGEgIlmUz08vZOkYFmZIgj+An/cc+Ngz9XBLkAZbx+3sBzOrxexrlVV69MPkMbckbeZjIq8NEJWV5gPw=="; }; }; - "aws-sign-0.2.0" = { + "aws-sign-0.2.1" = { name = "aws-sign"; packageName = "aws-sign"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; - sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; + url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.1.tgz"; + sha512 = "cQFl6jK/Lq416OqpT+lb1RIay1wShuQjHF3/kAJbyMvruV8vSpDahaGNkbeupdGRgXR8Ii0O/ZIbTQPdp+l3pA=="; }; }; "aws-sign2-0.6.0" = { @@ -2947,13 +2947,13 @@ let sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; }; }; - "azure-storage-2.10.0" = { + "azure-storage-2.10.1" = { name = "azure-storage"; packageName = "azure-storage"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.0.tgz"; - sha1 = "020ac343262c5552ef86516cbb7679241e95e4de"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.1.tgz"; + sha512 = "rnFo1uMIPtilusRCpK91tfY3P4Q7qRsDNwriXdp+OeTIGkGt0cTxL4mhqYfNPYPK+WBQmBdGWhOk+iROM05dcw=="; }; }; "babel-code-frame-6.26.0" = { @@ -5269,6 +5269,15 @@ let sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a"; }; }; + "clean-css-4.2.0" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.0.tgz"; + sha1 = "0a9d62040cddc7904c5edaee9bdeca642d9b9c1c"; + }; + }; "clean-stack-1.3.0" = { name = "clean-stack"; packageName = "clean-stack"; @@ -14974,13 +14983,13 @@ let sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="; }; }; - "isbinaryfile-3.0.2" = { + "isbinaryfile-3.0.3" = { name = "isbinaryfile"; packageName = "isbinaryfile"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz"; - sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; + sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; }; "isexe-1.1.2" = { @@ -22686,13 +22695,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.1.28" = { + "psl-1.1.29" = { name = "psl"; packageName = "psl"; - version = "1.1.28"; + version = "1.1.29"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz"; - sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz"; + sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="; }; }; "pstree.remy-1.1.0" = { @@ -24693,13 +24702,13 @@ let sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad"; }; }; - "sanitize-html-1.18.3" = { + "sanitize-html-1.18.4" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.18.3"; + version = "1.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.3.tgz"; - sha512 = "xoXC9dV3SrfhJDPo9XkLCgLDC5yQ5TQwIpIC8bc/qOCH6DvHwMGYNI2qrdb/EX8RQA7PMYL4th5B+XvijTbVEQ=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.4.tgz"; + sha512 = "hjyDYCYrQuhnEjq+5lenLlIfdPBtnZ7z0DkQOC8YGxvkuOInH+1SrkNTj30t4f2/SSv9c5kLniB+uCIpBvYuew=="; }; }; "sax-0.3.5" = { @@ -29707,13 +29716,13 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "validator-10.4.0" = { + "validator-10.5.0" = { name = "validator"; packageName = "validator"; - version = "10.4.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.4.0.tgz"; - sha512 = "Q/wBy3LB1uOyssgNlXSRmaf22NxjvDNZM2MtIQ4jaEOAB61xsh1TQxsq1CgzUMBV1lDrVMogIh8GjG1DYW0zLg=="; + url = "https://registry.npmjs.org/validator/-/validator-10.5.0.tgz"; + sha512 = "6OOi+eV2mOxCFLq0f2cJDrdB6lrtLXEUxabhNRGjgOLT/l3SSll9J49Cl+LIloUqkWWTPraK/mucEQ3dc2jStQ=="; }; }; "validator-5.2.0" = { @@ -31511,7 +31520,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."ajv-5.5.2" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -31628,7 +31637,7 @@ in sources."ansi-styles-2.2.1" sources."applicationinsights-0.16.0" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."async-1.4.2" sources."asynckit-0.4.0" @@ -31745,7 +31754,7 @@ in sources."request-2.74.0" ]; }) - (sources."azure-storage-2.10.0" // { + (sources."azure-storage-2.10.1" // { dependencies = [ sources."extend-1.2.1" sources."readable-stream-2.0.6" @@ -32374,7 +32383,7 @@ in sources."array-shuffle-1.0.1" sources."ascli-0.3.0" sources."async-0.2.10" - sources."aws-sign-0.2.0" + sources."aws-sign-0.2.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" sources."bencode-2.0.0" @@ -32729,13 +32738,13 @@ in clean-css = nodeEnv.buildNodePackage { name = "clean-css"; packageName = "clean-css"; - version = "4.1.11"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz"; - sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.0.tgz"; + sha1 = "0a9d62040cddc7904c5edaee9bdeca642d9b9c1c"; }; dependencies = [ - sources."source-map-0.5.7" + sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { @@ -32871,7 +32880,7 @@ in sources."array-flatten-1.1.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."asn1.js-4.10.1" (sources."assert-1.4.1" // { dependencies = [ @@ -33571,7 +33580,7 @@ in sources."arr-flatten-1.1.0" sources."array-lru-1.1.1" sources."array-unique-0.2.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-0.9.2" sources."asynckit-0.4.0" @@ -34326,11 +34335,11 @@ in dependencies = [ sources."JSONStream-1.3.3" sources."ajv-5.5.2" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.285.1" + sources."aws-sdk-2.286.2" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."base64-js-1.3.0" @@ -34439,7 +34448,7 @@ in sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."array-unique-0.2.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."async-each-1.0.1" sources."asynckit-0.4.0" @@ -35261,7 +35270,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."array-find-index-1.0.2" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -35706,7 +35715,7 @@ in }) sources."argparse-1.0.10" sources."array-flatten-1.1.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" @@ -36071,7 +36080,7 @@ in sources."proxy-addr-2.0.4" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."psl-1.1.28" + sources."psl-1.1.29" sources."punycode-1.4.1" sources."qs-6.5.1" sources."range-parser-1.2.0" @@ -36185,7 +36194,7 @@ in sources."utils-merge-1.0.1" sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.3" - sources."validator-10.4.0" + sources."validator-10.5.0" sources."vary-1.1.2" sources."verror-1.10.0" sources."wcwidth-1.0.1" @@ -36889,7 +36898,7 @@ in sources."@types/glob-5.0.35" sources."@types/inquirer-0.0.42" sources."@types/klaw-2.1.1" - sources."@types/lodash-4.14.115" + sources."@types/lodash-4.14.116" sources."@types/make-dir-1.0.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" @@ -37496,7 +37505,7 @@ in }; dependencies = [ sources."ajv-5.5.2" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-1.0.0" sources."asynckit-0.4.0" @@ -37812,7 +37821,7 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."array-flatten-1.1.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -38118,7 +38127,7 @@ in sources."array-slice-0.2.3" sources."array-unique-0.3.2" sources."arraybuffer.slice-0.0.7" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."ast-types-0.11.5" @@ -38165,6 +38174,9 @@ in sources."is-extendable-0.1.1" ]; }) + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" sources."buffer-more-ints-0.0.2" sources."buildmail-4.0.1" sources."bytes-3.0.0" @@ -38392,7 +38404,7 @@ in sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" - sources."isbinaryfile-3.0.2" + sources."isbinaryfile-3.0.3" sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" @@ -38977,7 +38989,7 @@ in sources."ajv-5.5.2" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.0" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-1.5.2" sources."asynckit-0.4.0" @@ -39127,7 +39139,7 @@ in sources."prelude-ls-1.1.2" sources."prompt-1.0.0" sources."pseudomap-1.0.2" - sources."psl-1.1.28" + sources."psl-1.1.29" sources."punycode-1.4.1" sources."qs-6.5.2" sources."read-1.0.7" @@ -39300,7 +39312,7 @@ in sources."array-unique-0.3.2" sources."arrify-1.0.1" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."assign-symbols-1.0.0" sources."async-1.5.2" @@ -39992,7 +40004,7 @@ in dependencies = [ sources."ajv-5.5.2" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -40259,7 +40271,7 @@ in sources."array-flatten-1.1.1" sources."array-unique-0.2.1" sources."arraybuffer.slice-0.0.7" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-each-1.0.1" sources."async-limiter-1.0.0" @@ -40598,7 +40610,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."assign-symbols-1.0.0" sources."asynckit-0.4.0" @@ -41391,7 +41403,7 @@ in sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -41544,7 +41556,7 @@ in sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" @@ -41703,7 +41715,7 @@ in sources."are-we-there-yet-1.1.5" sources."array-find-index-1.0.2" sources."array-flatten-1.1.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."async-0.9.2" sources."asynckit-0.4.0" @@ -42447,7 +42459,7 @@ in sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-indexofobject-0.0.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-0.1.22" sources."async-limiter-1.0.0" @@ -43005,7 +43017,7 @@ in sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."argparse-0.1.15" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -43497,7 +43509,7 @@ in sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-0.9.2" sources."asynckit-0.4.0" @@ -44134,7 +44146,7 @@ in sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."async-0.2.10" - sources."aws-sign-0.2.0" + sources."aws-sign-0.2.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -44502,7 +44514,7 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."async-2.6.1" sources."aws-sign2-0.6.0" @@ -45134,7 +45146,7 @@ in sources."are-we-there-yet-1.1.5" sources."array-flatten-1.1.1" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" @@ -45158,7 +45170,11 @@ in sources."center-align-0.1.3" sources."character-parser-2.2.0" sources."chownr-1.0.1" - sources."clean-css-4.1.11" + (sources."clean-css-4.2.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" @@ -45558,7 +45574,7 @@ in }; dependencies = [ sources."ajv-5.5.2" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sdk-1.18.0" @@ -45808,7 +45824,7 @@ in sources."ajv-5.5.2" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -46032,7 +46048,7 @@ in sources."argparse-1.0.10" sources."array-flatten-2.1.1" sources."array-uniq-1.0.3" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-0.9.2" sources."asynckit-0.4.0" @@ -46217,7 +46233,7 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - sources."sanitize-html-1.18.3" + sources."sanitize-html-1.18.4" sources."semver-4.3.6" (sources."send-0.15.6" // { dependencies = [ @@ -46390,6 +46406,7 @@ in sources."rimraf-2.4.5" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" + sources."safer-buffer-2.1.2" sources."semver-4.3.6" (sources."smartdc-auth-2.3.1" // { dependencies = [ @@ -46419,7 +46436,7 @@ in sources."spdy-1.32.5" (sources."sshpk-1.7.1" // { dependencies = [ - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" (sources."dashdash-1.14.1" // { dependencies = [ @@ -46761,7 +46778,7 @@ in sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."async-2.1.2" sources."asynckit-0.4.0" @@ -47093,7 +47110,7 @@ in sources."process-nextick-args-2.0.0" sources."promise-finally-3.0.0" sources."pseudomap-1.0.2" - sources."psl-1.1.28" + sources."psl-1.1.29" sources."punycode-1.4.1" sources."rc-1.2.8" sources."readable-stream-2.3.6" @@ -47208,7 +47225,7 @@ in }) sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.7" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-0.9.2" sources."async-limiter-1.0.0" @@ -47643,7 +47660,7 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" @@ -47932,7 +47949,7 @@ in sources."adm-zip-0.4.11" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."async-2.6.1" sources."aws-sign2-0.6.0" @@ -48086,10 +48103,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.16.3"; + version = "4.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.16.3.tgz"; - sha512 = "3VcrVoFgzSz1IYgga71YpU3HO89Al5bSnDOj9RJQPsy+FNyI1sFsUyJITn3pktNuaRBlQT0usvKZE3GgkPGAIw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.16.4.tgz"; + sha512 = "RqUfwp4qMqv3oFwBQQOoK69C2tdu2FHJEqPABPqgjGDvOIOLqkTOhmmdJjpiRabzNAAH1ahmkA3z4xowlHN+VA=="; }; dependencies = [ sources."@webassemblyjs/ast-1.5.13" @@ -48867,7 +48884,7 @@ in sources."array-unique-0.3.2" sources."arrify-1.0.1" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."ast-types-0.11.5" @@ -50034,7 +50051,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-1.0.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" @@ -50466,7 +50483,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."psl-1.1.28" + sources."psl-1.1.29" sources."punycode-1.4.1" sources."qs-6.5.2" sources."query-string-5.1.1" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 4c6453ed049..aeb940fc4fb 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -418,13 +418,13 @@ let sha1 = "898508da2226f380df904728456849c1501a4b0d"; }; }; - "asn1-0.2.3" = { + "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "assert-plus-0.2.0" = { @@ -7447,13 +7447,13 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "validator-10.4.0" = { + "validator-10.5.0" = { name = "validator"; packageName = "validator"; - version = "10.4.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.4.0.tgz"; - sha512 = "Q/wBy3LB1uOyssgNlXSRmaf22NxjvDNZM2MtIQ4jaEOAB61xsh1TQxsq1CgzUMBV1lDrVMogIh8GjG1DYW0zLg=="; + url = "https://registry.npmjs.org/validator/-/validator-10.5.0.tgz"; + sha512 = "6OOi+eV2mOxCFLq0f2cJDrdB6lrtLXEUxabhNRGjgOLT/l3SSll9J49Cl+LIloUqkWWTPraK/mucEQ3dc2jStQ=="; }; }; "variable-diff-1.1.0" = { @@ -7919,7 +7919,7 @@ in sources."arr-flatten-1.1.0" sources."array-lru-1.1.1" sources."array-unique-0.2.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-0.9.2" sources."asynckit-0.4.0" @@ -8445,7 +8445,7 @@ in sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-0.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" @@ -8774,7 +8774,7 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" @@ -9678,7 +9678,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."valid-url-1.0.9" - sources."validator-10.4.0" + sources."validator-10.5.0" sources."which-1.3.1" sources."widest-line-2.0.0" sources."window-size-0.1.0" From 74a57e24d08d7115f00cc444f44e791f5125c56f Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 3 Aug 2018 10:43:00 -0500 Subject: [PATCH 093/229] hydron: 2018-07-15 -> 2018-07-30 --- pkgs/servers/hydron/default.nix | 11 +++-------- pkgs/servers/hydron/deps.nix | 34 +++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 22191e19976..0be112d4e11 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,26 +3,21 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-07-15"; + version = "2018-07-30"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { - rev = "3906ace0b4cf48ba9acccf372377c7feb0665be4"; owner = "bakape"; repo = "hydron"; - sha256 = "079a88740wxgq73sq8w96zppfng7af76k7h484x3w695qk83j33r"; + rev = "586af9da1e551b2a7128c154200e2e2e32d1af7e"; + sha256 = "1lif63kcllsbmv06n3b8ayx89k90lximyp23108blcq456wrf0zi"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ]; - # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/43593 - preBuild = '' - rm go/src/github.com/bakape/hydron/ico.syso - ''; - meta = with stdenv.lib; { homepage = "https://github.com/bakape/hydron"; description = "High performance media tagger and organizer"; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index 9ef0fd23b45..76e9e28ed5f 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "fa88f595f3882773bc425b382eee71e3e2fa1291"; - sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf"; + rev = "93664eb81b19dcb232062bf55f92cf4d7c805a7f"; + sha256 = "0jdkb776f6gk0g8zi7r1vcfs6w0i33mn2327x6960jybli7bcfsp"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572"; - sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v"; + rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"; + sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; }; } { @@ -54,13 +54,22 @@ sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7"; }; } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; + sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; + }; + } { goPackagePath = "github.com/mailru/easyjson"; fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; + sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; }; } { @@ -68,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "3aefd9f0a162514f66d0e4ceda3edc44e66b502e"; - sha256 = "0as2kqmlvd21r481vxl457n5lxxp4i1jdjkmyqsjf5vg6xr9gd2d"; + rev = "b3511bfdd742af558b54eb6160aca9446d762a19"; + sha256 = "1v41is0h05p4jgv8nal3l8lcdcggylsyblq0ihycnprkdzwls808"; }; } { @@ -90,4 +99,13 @@ sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; }; } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "49c15d80dfbc983ea25246ee959d970efe09ec09"; + sha256 = "1knkww5jfn73frm8m939ck91jkjfapk798xwscm4g991mpcd6j4v"; + }; + } ] From 6de26d6647c54306a54b9ed09f94e6d1c7e2d30a Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 3 Aug 2018 10:43:28 -0500 Subject: [PATCH 094/229] meguca: 2018-07-01 -> 2018-08-02 --- pkgs/servers/meguca/default.nix | 22 ++--- pkgs/servers/meguca/server_deps.nix | 134 +++++++++++++++++++++------- 2 files changed, 112 insertions(+), 44 deletions(-) diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 67b2685262d..45702e92621 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,30 +1,26 @@ -{ stdenv, buildGoPackage, fetchgit, pkgconfig, cmake, ffmpeg-full, ghostscript +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript , graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-07-01"; - rev = "80db8298b6546c93944251c17fe03371e521671f"; + version = "2018-08-02"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; - src = fetchgit { - inherit rev; - url = "https://github.com/bakape/meguca"; - sha256 = "1yix0kxsjm9f3zw9jx2nb3pl8pbqjfhbvbrz42m1h20b1h02s5ml"; + src = fetchFromGitHub { + owner = "bakape"; + repo = "meguca"; + rev = "9224ab13f6c08bcfee5a930088c35bbfbf7491e1"; + sha256 = "1cp7d8a216nap1fzxcb58dgkbxdazs14hs9705h1xgly86cvwgv0"; fetchSubmodules = true; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ]; - - buildInputs = [ - ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson - emscripten - ]; + buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ]; buildPhase = '' - export HOME=$PWD + export HOME=`pwd` export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go cd $HOME/go/src/github.com/bakape/meguca ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index b2e31515ab4..6ddb1dac8eb 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/ErikDubbelboer/gspt"; - rev = "08ed213262b5bb2cf6ccb0baa71c6b201d353e63"; - sha256 = "1vdgvwjagk1n4mwvpil59idgg7ibdj6frk9mz8c2ckbmxsfpp8rq"; + rev = "e39e726e09cc23d1ccf13b36ce10dbdb4a4510e0"; + sha256 = "1l0s9srl7kbi7rs9ki989rgvx1kx6an7d6pwfqyy42x48f7a5g81"; }; } { @@ -14,8 +14,17 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a"; - sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg"; + rev = "cebd809c54c4812b96aadd528be66e01bbe81437"; + sha256 = "0xfbxn921h95b5di9cay3bjb8ygam3h718z0plqjdnrqlvqxfbzx"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/goquery"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/goquery"; + rev = "dc2ec5c7ca4d9aae063b79b9f581dd3ea6afd2b2"; + sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; }; } { @@ -27,6 +36,15 @@ sha256 = "0ci71nk6jijspzbgcfrgi4in9lmd2c39f6xzcf9k3z9ixwv8c79j"; }; } + { + goPackagePath = "github.com/andybalholm/cascadia"; + fetch = { + type = "git"; + url = "https://github.com/andybalholm/cascadia"; + rev = "901648c87902174f774fac311d7f176f8647bdaa"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + }; + } { goPackagePath = "github.com/aquilax/tripcode"; fetch = { @@ -36,15 +54,6 @@ sha256 = "0maqk0rwp39kcc64w4mfkgcvn2q76hqwziwc3g7ckc1qpwxql5z3"; }; } - { - goPackagePath = "github.com/badoux/goscraper"; - fetch = { - type = "git"; - url = "https://github.com/badoux/goscraper"; - rev = "0213ced7087832e81e8892e8d044150cfc153856"; - sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w"; - }; - } { goPackagePath = "github.com/bakape/mnemonics"; fetch = { @@ -59,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "fa88f595f3882773bc425b382eee71e3e2fa1291"; - sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf"; + rev = "93664eb81b19dcb232062bf55f92cf4d7c805a7f"; + sha256 = "0jdkb776f6gk0g8zi7r1vcfs6w0i33mn2327x6960jybli7bcfsp"; }; } { @@ -90,6 +99,15 @@ sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk"; }; } + { + goPackagePath = "github.com/dsnet/compress"; + fetch = { + type = "git"; + url = "https://github.com/dsnet/compress"; + rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; + sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; + }; + } { goPackagePath = "github.com/go-playground/ansi"; fetch = { @@ -104,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/go-playground/errors"; - rev = "14d2d30656a95a5fa5a17d2e33540269eda5f158"; - sha256 = "0w13vgxwc1x780x716kqzzwp9ld3w3jpkclabh2qwpcwx821nhpy"; + rev = "9aa88f624b398d37201c30583065aee54071bc0c"; + sha256 = "0d4b73m564gc12ddbss78929kcya81ifqxv28f05zqhrywkih4mh"; }; } { @@ -117,13 +135,22 @@ sha256 = "1gr2658m8nwswiybnz5i54d4gzwx4nk79gnh7j5fj1rcmbxdkkjh"; }; } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; + sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; + }; + } { goPackagePath = "github.com/gorilla/handlers"; fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572"; - sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v"; + rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"; + sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; }; } { @@ -176,8 +203,26 @@ fetch = { type = "git"; url = "https://github.com/mailru/easyjson"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; + sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; + }; + } + { + goPackagePath = "github.com/mholt/archiver"; + fetch = { + type = "git"; + url = "https://github.com/mholt/archiver"; + rev = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3"; + sha256 = "1krxyh6iq0s0rwhz7gg6dn795j9qq64rsgq9nivav7fhrqpgr6hb"; + }; + } + { + goPackagePath = "github.com/nwaples/rardecode"; + fetch = { + type = "git"; + url = "https://github.com/nwaples/rardecode"; + rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"; + sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw"; }; } { @@ -198,6 +243,24 @@ sha256 = "0n8vhinm2x0prbn0vhxw38c24iiaizwk1b76s4srg30gk3dfdd39"; }; } + { + goPackagePath = "github.com/otium/ytdl"; + fetch = { + type = "git"; + url = "https://github.com/otium/ytdl"; + rev = "325bc9755fb5979d67b65939b8ff88f480424c0e"; + sha256 = "0r6b9y2jb1cz1q2w722174lk3qvb3ipsi9jj3cizmhq2n6qqfpmk"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "6b9367c9ff401dbc54fabce3fb8d972e799b702d"; + sha256 = "0bxxap7jn3wvqxr2yqn8m3aqgb9y94j9ci6fwjrk01caq575r1qs"; + }; + } { goPackagePath = "github.com/sevlyar/go-daemon"; fetch = { @@ -207,13 +270,22 @@ sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc"; }; } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "d329d24db4313262a3b0a24d8aeb1dc4bd294fb0"; + sha256 = "1jjmh1nd7lcsrxgr6ycv9m9iwmr8dfn5cxynnj16vw3qazihajk7"; + }; + } { goPackagePath = "github.com/ulikunitz/xz"; fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; - sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; + rev = "636d36a76670e6c700f22fd5f4588679ff2896c4"; + sha256 = "01d71xnhdd60cmd9xk8zcjiq2n7fhgc6kzxd0s0plvs70y6dk27g"; }; } { @@ -239,8 +311,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; - sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + rev = "c126467f60eb25f8f27e5a981f32a87e3965053f"; + sha256 = "0xvvzwxqi1dbrnsvq00klx4bnjalf90haf1slnxzrdmbadyp992q"; }; } { @@ -248,8 +320,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9"; - sha256 = "05xdcj0pn245y3gpy9p5iamx09424zqwh1w34gwwn5kh51ybgv7k"; + rev = "f4c29de78a2a91c00474a2e689954305c350adf9"; + sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x"; }; } { @@ -257,8 +329,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"; - sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0"; + rev = "3dc4335d56c789b04b0ba99b7a37249d9b614314"; + sha256 = "1105b7jqzz8g2bfkdbkj2pdzq4vhfmhm42khir88vjqfd1l7ha31"; }; } { @@ -266,8 +338,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "c0fe8dde8a10c9b32154bd9bdf080b8b3d635127"; - sha256 = "0zi15k236nmqrlpfy3hgnxnh3f0n1aag0h6gs41xlxdkr9lpmnsz"; + rev = "96e34ec0e18a62a1e59880c7bf617b655efecb66"; + sha256 = "1n1p5zz0vyvlhac40hxml6c5xwpsw8rjx1pbls9381a0s19ncbdg"; }; } { From d49b5bdfb9f7c9dba84ca982acae75ebe3b0ef9a Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 3 Aug 2018 10:43:53 -0500 Subject: [PATCH 095/229] nixos/hydron: Various fixes, create db_conf.json and link to it --- nixos/modules/services/web-servers/hydron.nix | 66 +++++++++++++++++-- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-servers/hydron.nix b/nixos/modules/services/web-servers/hydron.nix index 49a18f5e7b2..c49efaede16 100644 --- a/nixos/modules/services/web-servers/hydron.nix +++ b/nixos/modules/services/web-servers/hydron.nix @@ -1,6 +1,8 @@ { config, lib, pkgs, ... }: -let cfg = config.services.hydron; +let + cfg = config.services.hydron; + postgres = config.services.postgresql; in with lib; { options.services.hydron = { enable = mkEnableOption "hydron"; @@ -25,6 +27,38 @@ in with lib; { ''; }; + password = mkOption { + type = types.str; + default = "hydron"; + example = "dumbpass"; + description = "Password for the hydron database."; + }; + + passwordFile = mkOption { + type = types.path; + default = "/run/keys/hydron-password-file"; + example = "/home/okina/hydron/keys/pass"; + description = "Password file for the hydron database."; + }; + + postgresArgs = mkOption { + type = types.str; + description = "Postgresql connection arguments."; + example = '' + { + "driver": "postgres", + "connection": "user=hydron password=dumbpass dbname=hydron sslmode=disable" + } + ''; + }; + + postgresArgsFile = mkOption { + type = types.path; + default = "/run/keys/hydron-postgres-args"; + example = "/home/okina/hydron/keys/postgres"; + description = "Postgresql connection arguments file."; + }; + listenAddress = mkOption { type = types.nullOr types.str; default = null; @@ -47,16 +81,36 @@ in with lib; { }; config = mkIf cfg.enable { + security.sudo.enable = cfg.enable; + services.postgresql.enable = cfg.enable; + services.hydron.passwordFile = mkDefault (pkgs.writeText "hydron-password-file" cfg.password); + services.hydron.postgresArgsFile = mkDefault (pkgs.writeText "hydron-postgres-args" cfg.postgresArgs); + services.hydron.postgresArgs = mkDefault '' + { + "driver": "postgres", + "connection": "user=hydron password=${cfg.password} dbname=hydron sslmode=disable" + } + ''; + systemd.services.hydron = { description = "hydron"; - after = [ "network.target" ]; + after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - # Ensure folder exists and permissions are correct - mkdir -p ${escapeShellArg cfg.dataDir}/images + # Ensure folder exists or create it and permissions are correct + mkdir -p ${escapeShellArg cfg.dataDir}/{.hydron,images} + ln -sf ${escapeShellArg cfg.postgresArgsFile} ${escapeShellArg cfg.dataDir}/.hydron/db_conf.json chmod 750 ${escapeShellArg cfg.dataDir} chown -R hydron:hydron ${escapeShellArg cfg.dataDir} + + # Ensure the database is correct or create it + ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \ + -SDR hydron || true + ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \ + -T template0 -E UTF8 -O hydron hydron || true + ${pkgs.sudo}/bin/sudo -u hydron ${postgres.package}/bin/psql \ + -c "ALTER ROLE hydron WITH PASSWORD '$(cat ${escapeShellArg cfg.passwordFile})';" || true ''; serviceConfig = { @@ -101,5 +155,9 @@ in with lib; { }; }; + imports = [ + (mkRenamedOptionModule [ "services" "hydron" "baseDir" ] [ "services" "hydron" "dataDir" ]) + ]; + meta.maintainers = with maintainers; [ chiiruno ]; } From 0f8185e3fcec403b30fdc07e0a28bf6f2408a079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 11:43:14 +0200 Subject: [PATCH 096/229] python.pkgs.Keras: 2.2.0 -> 2.2.2 --- pkgs/development/python-modules/keras/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 3b221238f3a..ea699c9c04a 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,15 +1,16 @@ { stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, pytestpep8, pytest_xdist , six, numpy, scipy, pyyaml, h5py +, keras-applications, keras-preprocessing }: buildPythonPackage rec { pname = "Keras"; - version = "2.2.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "5b8499d157af217f1a5ee33589e774127ebc3e266c833c22cb5afbb0ed1734bf"; + sha256 = "468d98da104ec5c3dbb10c2ef6bb345ab154f6ca2d722d4c250ef4d6105de17a"; }; checkInputs = [ @@ -21,6 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pyyaml numpy scipy h5py + keras-applications keras-preprocessing ]; # Couldn't get tests working From a6900b9a139c830878d66ac13c72f84cc824c4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 28 Jul 2018 11:32:39 +0100 Subject: [PATCH 097/229] dino: 2018-06-03 -> 2018-07-08 --- .../networking/instant-messengers/dino/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 2cd30ab9604..3682097e302 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-06-03"; + name = "dino-unstable-2018-07-08"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "52e116ee44be1667660c08858a28fe8fda125f79"; - sha256 = "1yybmjd50r41366clrsw21qybbpjfkvim2n5b3dkcagjnifak0zl"; + rev = "df8b5fcb722c4a33ed18cbbaafecb206f127b849"; + sha256 = "1r7h9pxix0sylnwab7a8lir9h5yssk98128x2bzva77id9id33vi"; fetchSubmodules = true; }; From 8413f1883e4b6b4fd4ef8489f2d6a601fea48d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 17:53:51 +0200 Subject: [PATCH 098/229] afflib: use python3 Python3 is supported since 3.7.14. --- pkgs/development/libraries/afflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index b398af0db34..a1c46660522 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl -, autoreconfHook, python +, autoreconfHook, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ zlib curl expat fuse openssl python ]; + buildInputs = [ zlib curl expat fuse openssl python3 ]; meta = { homepage = http://afflib.sourceforge.net/; From 36ab89900b51ed4e1d1407caa225e28c1df9da97 Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 3 Aug 2018 10:59:06 -0500 Subject: [PATCH 099/229] nixos/meguca: Various fixes --- nixos/modules/services/web-servers/meguca.nix | 79 +++++++++---------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix index ed7325ff079..11aebcb91d8 100644 --- a/nixos/modules/services/web-servers/meguca.nix +++ b/nixos/modules/services/web-servers/meguca.nix @@ -1,65 +1,71 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.services.meguca; postgres = config.services.postgresql; -in -{ +in with lib; { options.services.meguca = { enable = mkEnableOption "meguca"; - baseDir = mkOption { + dataDir = mkOption { type = types.path; - default = "/run/meguca"; + default = "/var/lib/meguca"; + example = "/home/okina/meguca"; description = "Location where meguca stores it's database and links."; }; password = mkOption { type = types.str; default = "meguca"; + example = "dumbpass"; description = "Password for the meguca database."; }; passwordFile = mkOption { type = types.path; default = "/run/keys/meguca-password-file"; + example = "/home/okina/meguca/keys/pass"; description = "Password file for the meguca database."; }; reverseProxy = mkOption { type = types.nullOr types.str; default = null; + example = "192.168.1.5"; description = "Reverse proxy IP."; }; sslCertificate = mkOption { type = types.nullOr types.str; default = null; + example = "/home/okina/meguca/ssl.cert"; description = "Path to the SSL certificate."; }; listenAddress = mkOption { type = types.nullOr types.str; default = null; + example = "127.0.0.1:8000"; description = "Listen on a specific IP address and port."; }; cacheSize = mkOption { type = types.nullOr types.int; default = null; + example = 256; description = "Cache size in MB."; }; postgresArgs = mkOption { type = types.str; - default = "user=meguca password=" + cfg.password + " dbname=meguca sslmode=disable"; + example = "user=meguca password=dumbpass dbname=meguca sslmode=disable"; description = "Postgresql connection arguments."; }; postgresArgsFile = mkOption { type = types.path; default = "/run/keys/meguca-postgres-args"; + example = "/home/okina/meguca/keys/postgres"; description = "Postgresql connection arguments file."; }; @@ -83,18 +89,11 @@ in }; config = mkIf cfg.enable { - security.sudo.enable = cfg.enable == true; - services.postgresql.enable = cfg.enable == true; - - services.meguca.passwordFile = mkDefault (toString (pkgs.writeTextFile { - name = "meguca-password-file"; - text = cfg.password; - })); - - services.meguca.postgresArgsFile = mkDefault (toString (pkgs.writeTextFile { - name = "meguca-postgres-args"; - text = cfg.postgresArgs; - })); + security.sudo.enable = cfg.enable; + services.postgresql.enable = cfg.enable; + services.meguca.passwordFile = mkDefault (pkgs.writeText "meguca-password-file" cfg.password); + services.meguca.postgresArgsFile = mkDefault (pkgs.writeText "meguca-postgres-args" cfg.postgresArgs); + services.meguca.postgresArgs = mkDefault "user=meguca password=${cfg.password} dbname=meguca sslmode=disable"; systemd.services.meguca = { description = "meguca"; @@ -102,10 +101,11 @@ in wantedBy = [ "multi-user.target" ]; preStart = '' - # Ensure folder exists and links are correct or create them - mkdir -p ${cfg.baseDir} - chmod 750 ${cfg.baseDir} - ln -sf ${pkgs.meguca}/share/meguca/www ${cfg.baseDir} + # Ensure folder exists or create it and links and permissions are correct + mkdir -p ${escapeShellArg cfg.dataDir} + ln -sf ${pkgs.meguca}/share/meguca/www ${escapeShellArg cfg.dataDir} + chmod 750 ${escapeShellArg cfg.dataDir} + chown -R meguca:meguca ${escapeShellArg cfg.dataDir} # Ensure the database is correct or create it ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \ @@ -113,47 +113,46 @@ in ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \ -T template0 -E UTF8 -O meguca meguca || true ${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \ - -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true + -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${escapeShellArg cfg.passwordFile})';" || true ''; script = '' - cd ${cfg.baseDir} + cd ${escapeShellArg cfg.dataDir} - ${pkgs.meguca}/bin/meguca -d "$(cat ${cfg.postgresArgsFile})"\ - ${optionalString (cfg.reverseProxy != null) " -R ${cfg.reverseProxy}"}\ - ${optionalString (cfg.sslCertificate != null) " -S ${cfg.sslCertificate}"}\ - ${optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}"}\ - ${optionalString (cfg.cacheSize != null) " -c ${toString cfg.cacheSize}"}\ - ${optionalString (cfg.compressTraffic) " -g"}\ - ${optionalString (cfg.assumeReverseProxy) " -r"}\ - ${optionalString (cfg.httpsOnly) " -s"} start - ''; + ${pkgs.meguca}/bin/meguca -d "$(cat ${escapeShellArg cfg.postgresArgsFile})"'' + + optionalString (cfg.reverseProxy != null) " -R ${cfg.reverseProxy}" + + optionalString (cfg.sslCertificate != null) " -S ${cfg.sslCertificate}" + + optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}" + + optionalString (cfg.cacheSize != null) " -c ${toString cfg.cacheSize}" + + optionalString (cfg.compressTraffic) " -g" + + optionalString (cfg.assumeReverseProxy) " -r" + + optionalString (cfg.httpsOnly) " -s" + " start"; serviceConfig = { PermissionsStartOnly = true; Type = "forking"; User = "meguca"; Group = "meguca"; - RuntimeDirectory = "meguca"; ExecStop = "${pkgs.meguca}/bin/meguca stop"; }; }; users = { + groups.meguca.gid = config.ids.gids.meguca; + users.meguca = { description = "meguca server service user"; - home = cfg.baseDir; + home = cfg.dataDir; createHome = true; group = "meguca"; uid = config.ids.uids.meguca; }; - - groups.meguca = { - gid = config.ids.gids.meguca; - members = [ "meguca" ]; - }; }; }; + imports = [ + (mkRenamedOptionModule [ "services" "meguca" "baseDir" ] [ "services" "meguca" "dataDir" ]) + ]; + meta.maintainers = with maintainers; [ chiiruno ]; } From ae3bbf2958ff72cad357074eb24ccc18afab21c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 18:04:46 +0200 Subject: [PATCH 100/229] almonds: use python3 --- pkgs/applications/science/math/almonds/default.nix | 8 +++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index fb76699b0c8..96613f4e38a 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, ncurses, pillow, pytest }: +{ stdenv, python3, fetchFromGitHub, ncurses }: -let +with python3.pkgs; buildPythonApplication rec { + pname = "almonds"; version = "1.25b"; -in -buildPythonApplication { - name = "almonds-${version}"; src = fetchFromGitHub { owner = "Tenchi2xh"; repo = "Almonds"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d151eadf4e..fdffd26490b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20461,7 +20461,7 @@ with pkgs; ### SCIENCE/MATH - almonds = pythonPackages.callPackage ../applications/science/math/almonds { }; + almonds = callPackage ../applications/science/math/almonds { }; arpack = callPackage ../development/libraries/science/math/arpack { }; From 974cb36abda578a7551406aeb99dd6f7d8901085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 18:11:55 +0200 Subject: [PATCH 101/229] ams-lv2: use python3 It is python3-compatible since 1.1.5. --- pkgs/applications/audio/ams-lv2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index bc72c3e1314..7858631f797 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }: +{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python3 }: stdenv.mkDerivation rec { name = "ams-lv2-${version}"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo fftw gtkmm2 lv2 lvtk python ]; + buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python3.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python3.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python3.interpreter} waf install"; meta = with stdenv.lib; { description = "An LV2 port of the internal modules found in Alsa Modular Synth"; From e6fc21af9cce0e50443fff5b032ab8a251cb5d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 18:35:38 +0200 Subject: [PATCH 102/229] antfs-cli: use python3Packages --- pkgs/applications/misc/antfs-cli/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 30b8a435f90..f21438dfcec 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - name = "antfs-cli-unstable-2017-02-11"; +python3Packages.buildPythonApplication rec { + pname = "antfs-cli"; + version = "unstable-2017-02-11"; meta = with stdenv.lib; { homepage = https://github.com/Tigge/antfs-cli; @@ -17,5 +18,5 @@ pythonPackages.buildPythonApplication rec { sha256 = "0v8y64kldfbs809j1g9d75dd1vxq7mfxnp4b45pz8anpxhjf64fy"; }; - propagatedBuildInputs = [ pythonPackages.openant ]; + propagatedBuildInputs = [ python3Packages.openant ]; } From c0589af34e5baf006d7a581640c5f0687015e99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 19:13:38 +0200 Subject: [PATCH 103/229] apt-offline: 1.3 -> 1.8.1 --- pkgs/tools/misc/apt-offline/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 1044c0acc0a..921c1af4ad6 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - version = "1.3"; - name = "apt-offline-${version}"; +python3Packages.buildPythonApplication rec { + version = "1.8.1"; + pname = "apt-offline"; - src = fetchurl { - #url = "https://alioth.debian.org/frs/download.php/file/3855/${name}.tar.gz"; - # The above URL has two problems: it requires one to be logged in, and it - # uses a CA that curl doesn't know about. Instead, we use this mirror: - url = "http://www.falsifian.org/a/cFi5/${name}.tar.gz"; - sha256 = "1sp7ai2abzhbg9y84700qziybphvpzl2nk3mz1d1asivzyjvxlxy"; + src = fetchFromGitHub { + owner = "rickysarraf"; + repo = pname; + rev = "v${version}"; + sha256 = "0k79d1d8jiwg1s684r05njmk1dz8gsb8a9bl4agz7m31snc11j84"; }; doCheck = false; From 8769f25c6a804b8ef8742c32d2c16e9534470cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 19:18:22 +0200 Subject: [PATCH 104/229] blockdiag: use python3Packages and toPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e199d5a16c..8df33c48f2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -905,7 +905,7 @@ with pkgs; blobfuse = callPackage ../tools/filesystems/blobfuse { }; - blockdiag = pythonPackages.blockdiag; + blockdiag = with python3Packages; toPythonApplication blockdiag; blsd = callPackage ../tools/misc/blsd { libgit2 = libgit2_0_27; From 7d4d49bf1daf4be39403b19c3b34f330145f006a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 19:21:02 +0200 Subject: [PATCH 105/229] seqdiag: use python3Packages and toPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8df33c48f2d..448ff8fd622 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5074,7 +5074,7 @@ with pkgs; setserial = callPackage ../tools/system/setserial { }; - seqdiag = pythonPackages.seqdiag; + seqdiag = with python3Packages; toPythonApplication seqdiag; screenfetch = callPackage ../tools/misc/screenfetch { }; From 5acb3f5774759d9eff3dc66f7cc8195dccab777d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 19:22:18 +0200 Subject: [PATCH 106/229] nwdiag: use python3Packages and toPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 448ff8fd622..9ad932bdb97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4242,7 +4242,7 @@ with pkgs; nssmdns = callPackage ../tools/networking/nss-mdns { }; - nwdiag = pythonPackages.nwdiag; + nwdiag = with python3Packages; toPythonApplication nwdiag; nylon = callPackage ../tools/networking/nylon { }; From 0cd86e1e9d1df4e3c2bb7bffdc479ebcc252d9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 19:48:42 +0200 Subject: [PATCH 107/229] adb-sync: use python3 (#44409) According to https://github.com/google/adb-sync/pull/2#commitcomment-11399661, it should work with python2 and python3. Using python3 is prefered in nixpkgs. --- pkgs/development/mobile/adb-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index 68f7e6c49ce..ee6ff3cecd5 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python, androidsdk, makeWrapper }: +{ stdenv, fetchgit, python3, androidsdk, makeWrapper }: stdenv.mkDerivation rec { name = "adb-sync-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d"; }; - buildInputs = [ python androidsdk makeWrapper ]; + buildInputs = [ python3 androidsdk makeWrapper ]; phases = "installPhase"; From e2a81241e5a3ef2090d67dc3b4673443b5b4a0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 19:52:14 +0200 Subject: [PATCH 108/229] awslogs: use python3Packages --- pkgs/tools/admin/awslogs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index ec7febaa598..c4dbb39cdd8 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - name = "awslogs-${version}"; +python3Packages.buildPythonApplication rec { + pname = "awslogs"; version = "0.10"; src = fetchFromGitHub { @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ boto3 termcolor dateutil docutils ]; From f0702c62a6d433c788aeda59e3b30218c037a84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 18:52:37 +0200 Subject: [PATCH 109/229] antlr: explicitly use python2 Also, put python2 into nativeBuildInputs because Arch lists it in makedepends. --- pkgs/development/tools/parsing/antlr/2.7.7.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index cafb076aa81..519540ef52a 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jdk, python}: +{ stdenv, fetchurl, jdk, python2 }: stdenv.mkDerivation { name = "antlr-2.7.7"; @@ -7,7 +7,8 @@ stdenv.mkDerivation { sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5"; }; patches = [ ./2.7.7-fixes.patch ]; - buildInputs = [jdk python]; + buildInputs = [ jdk ]; + nativeBuildInputs = [ python2 ]; meta = with stdenv.lib; { description = "Powerful parser generator"; From 7e60f1c678ff336a68721cd5dfbda489e8c8a8e2 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Fri, 3 Aug 2018 20:18:32 +0200 Subject: [PATCH 110/229] mfcl8690cdw: init lpdr and cupswrapper at 1.0.2/1.0.3 (#43968) Provide printer driver for Brother MFC-L8690CDW. --- .../mfcl8690cdwcupswrapper/default.nix | 45 +++++++++++++++++++ .../cups/drivers/mfcl8690cdwlpr/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 93 insertions(+) create mode 100644 pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix create mode 100644 pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix new file mode 100644 index 00000000000..9aa127dd630 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -0,0 +1,45 @@ +{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, +mfcl8690cdwlpr, perl, stdenv}: + +stdenv.mkDerivation rec { + name = "mfcl8690cdwcupswrapper-${version}"; + version = "1.3.0-0"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb"; + sha256 = "16nnh3hd5yv0m4191wja9fvxxzngzfccfj2rfhcswbakajyk5ywn"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + + basedir=${mfcl8690cdwlpr}/opt/brother/Printers/mfcl8690cdw + dir=$out/opt/brother/Printers/mfcl8690cdw + + substituteInPlace $dir/cupswrapper/brother_lpdwrapper_mfcl8690cdw \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "basedir =~" "basedir = \"$basedir/\"; #" \ + --replace "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #" + + wrapProgram $dir/cupswrapper/brother_lpdwrapper_mfcl8690cdw \ + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + + ln $dir/cupswrapper/brother_lpdwrapper_mfcl8690cdw $out/lib/cups/filter + ln $dir/cupswrapper/brother_mfcl8690cdw_printer_en.ppd $out/share/cups/model + ''; + + meta = { + description = "Brother MFC-L8690CDW CUPS wrapper driver"; + homepage = http://www.brother.com/; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix new file mode 100644 index 00000000000..3b6ae73c70d --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -0,0 +1,45 @@ +{ coreutils, dpkg, fetchurl, file, ghostscript, gnugrep, gnused, +makeWrapper, perl, pkgs, stdenv, which }: + +stdenv.mkDerivation rec { + name = "mfcl8690cdwlpr-${version}"; + version = "1.2.0-0"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb"; + sha256 = "02k43nh51pn4lf7gaid9yhil0a3ikpy4krw7dhgphmm5pap907sx"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + + dir=$out/opt/brother/Printers/mfcl8690cdw + filter=$dir/lpd/filter_mfcl8690cdw + + substituteInPlace $filter \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir/\"; #" \ + --replace "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #" + + wrapProgram $filter \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils file ghostscript gnugrep gnused which + ]} + + # need to use i686 glibc here, these are 32bit proprietary binaries + interpreter=${pkgs.pkgsi686Linux.glibc}/lib/ld-linux.so.2 + patchelf --set-interpreter "$interpreter" $dir/lpd/brmfcl8690cdwfilter + ''; + + meta = { + description = "Brother MFC-L8690CDW LPR printer driver"; + homepage = http://www.brother.com/; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; + platforms = [ "i686-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b6afdce4be..5af0060cb80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21597,6 +21597,9 @@ with pkgs; mfcl2740dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2740dwcupswrapper { }; mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { }; + mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; + mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; + samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; From fd0c467f9671835a71bcaa36439c7f7adfccb126 Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Thu, 2 Aug 2018 16:15:52 -0400 Subject: [PATCH 111/229] tensorflow: workaround tensorboard collision from upstream pip hack Upstream lists tensorboard as a utility from tensorflow despite it being provided by tensorboard to stop pip for deleting it. This causes python.withPackages collisions between the two. --- pkgs/development/python-modules/tensorflow/bin.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 4e3621157f9..42e35df7497 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -61,6 +61,15 @@ in buildPythonPackage rec { # bleach) Hence we disable dependency checking for now. installFlags = lib.optional isPy36 "--no-dependencies"; + + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propageted input tensorflow-tensorboard which causes environment collisions. + # + # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 + postInstall = '' + rm $out/bin/tensorboard + ''; + # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then # patchelf --shrink-rpath will remove the cuda libraries. From 51b8c7986aba69e0c0a5022a3420b6d370af3018 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 3 Aug 2018 20:34:47 +0200 Subject: [PATCH 112/229] qgis: 2.18.20 -> 2.18.22 (#44266) --- pkgs/applications/gis/qgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index f9220e107f3..8f06a659f60 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.20"; + name = "qgis-2.18.22"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ] @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "0bm9sv268lc3v48zjypsjjs62xnyb7zabzrms4jsy020waz6sk9g"; + sha256 = "00b3a2hfn3i7bdx7x96vz2nj0976vpkhid4ss7n8c33fdvw3k82a"; }; # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system From b8da5fc4bdd78522d70840ab9a509fe75187c556 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 3 Aug 2018 19:06:39 +0200 Subject: [PATCH 113/229] pius: introduce perl as buildInput (#44415) Otherwise, pius-party-worksheet would be unusable. (cherry picked from commit 4dbf327d924d454a931c93da3eb4c6e8a13935a2) --- pkgs/tools/security/pius/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index f9dced33ed4..2a48bf2c2c6 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, pythonPackages, gnupg }: +{ fetchFromGitHub, stdenv, pythonPackages, gnupg, perl }: let version = "2.2.6"; in pythonPackages.buildPythonApplication { @@ -18,6 +18,8 @@ pythonPackages.buildPythonApplication { done ''; + buildInputs = [ perl ]; + meta = { homepage = https://www.phildev.net/pius/; From b9234ea49c6bfb71d1435fd584ae83123f61fa67 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 21 Jul 2018 23:19:34 +0200 Subject: [PATCH 114/229] nixos/mpd: allow storage plugins in musicDirectory --- nixos/modules/services/audio/mpd.nix | 4 ++-- pkgs/servers/mpd/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 3add6556d0d..5bfe2b6a22a 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -55,11 +55,11 @@ in { }; musicDirectory = mkOption { - type = types.path; + type = with types; either path (strMatching "(http|https|nfs|smb)://.+"); default = "${cfg.dataDir}/music"; defaultText = ''''${dataDir}/music''; description = '' - The directory where mpd reads music from. + The directory or NFS/SMB network share where mpd reads music from. ''; }; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d22beac6e9d..b88b13cdf16 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -84,8 +84,8 @@ in stdenv.mkDerivation rec { ++ opt clientSupport mpd_clientlib ++ opt opusSupport libopus ++ opt soundcloudSupport yajl - ++ opt nfsSupport libnfs - ++ opt smbSupport smbclient; + ++ opt (!stdenv.isDarwin && nfsSupport) libnfs + ++ opt (!stdenv.isDarwin && smbSupport) smbclient; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { (mkFlag clientSupport "libmpdclient") (mkFlag opusSupport "opus") (mkFlag soundcloudSupport "soundcloud") - (mkFlag nfsSupport "libnfs") - (mkFlag smbSupport "smbclient") + (mkFlag (!stdenv.isDarwin && nfsSupport) "libnfs") + (mkFlag (!stdenv.isDarwin && smbSupport) "smbclient") "--enable-debug" "--with-zeroconf=avahi" ] From af176db5d725b2213139ac46699a4e6a59d5e994 Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Fri, 3 Aug 2018 21:43:08 +0200 Subject: [PATCH 115/229] obnam: removed (#44422) --- pkgs/tools/backup/obnam/default.nix | 23 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/tools/backup/obnam/default.nix diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix deleted file mode 100644 index 5e1d1ab3068..00000000000 --- a/pkgs/tools/backup/obnam/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, attr }: - -pythonPackages.buildPythonApplication rec { - name = "obnam-${version}"; - version = "1.22"; - - src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "0z3absbcpdk8zmmi6n3vwmwyv0pnzy7lp1rcsymb292p04alcn3x"; - }; - - buildInputs = [ pythonPackages.sphinx attr ]; - propagatedBuildInputs = with pythonPackages; [ pycrypto paramiko tracing ttystatus cliapp larch pyyaml fuse ]; - - doCheck = false; - - meta = { - homepage = http://obnam.org; - description = "Backup program supporting deduplication, compression and encryption"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af0060cb80..dc1ecf53ab6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4270,8 +4270,6 @@ with pkgs; objconv = callPackage ../development/tools/misc/objconv {}; - obnam = callPackage ../tools/backup/obnam { }; - odpdown = callPackage ../tools/typesetting/odpdown { }; odpic = callPackage ../development/libraries/odpic { }; From 5c897b4effc4f51b2d6aa5dba158a839b179d964 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 3 Aug 2018 22:01:56 +0200 Subject: [PATCH 116/229] nixos/disnix: fix broken service because of rename --- nixos/modules/services/misc/disnix.nix | 2 +- nixos/modules/services/misc/dysnomia.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index bb3ac1ecf07..c21cb2afc3c 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -47,7 +47,7 @@ in ###### implementation config = mkIf cfg.enable { - services.dysnomia.enable = true; + dysnomia.enable = true; environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index ba74b18b697..61ea822890e 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.services.dysnomia; + cfg = config.dysnomia; printProperties = properties: concatMapStrings (propertyName: @@ -69,7 +69,7 @@ let in { options = { - services.dysnomia = { + dysnomia = { enable = mkOption { type = types.bool; @@ -142,7 +142,7 @@ in environment.systemPackages = [ cfg.package ]; - services.dysnomia.package = pkgs.dysnomia.override (origArgs: { + dysnomia.package = pkgs.dysnomia.override (origArgs: { enableApacheWebApplication = config.services.httpd.enable; enableAxis2WebService = config.services.tomcat.axis2.enable; enableEjabberdDump = config.services.ejabberd.enable; @@ -153,7 +153,7 @@ in enableMongoDatabase = config.services.mongodb.enable; }); - services.dysnomia.properties = { + dysnomia.properties = { hostname = config.networking.hostName; inherit (config.nixpkgs.localSystem) system; @@ -171,7 +171,7 @@ in }}"); }; - services.dysnomia.containers = lib.recursiveUpdate ({ + dysnomia.containers = lib.recursiveUpdate ({ process = {}; wrapper = {}; } From 32bda9a1129bf71757bcf710cbaa2d64380aa5c6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 3 Aug 2018 22:16:03 +0200 Subject: [PATCH 117/229] pdf2djvu: 0.9.9 -> 0.9.10 --- pkgs/tools/typesetting/pdf2djvu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 23ec4521729..97dd885b778 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.9.9"; + version = "0.9.10"; name = "pdf2djvu-${version}"; src = fetchurl { url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; - sha256 = "0v1his9ph04dllzyxkirc8kd23l41qc41bwg9bfsbzkri16b7xik"; + sha256 = "026vgg4v6wsq8j091yxg3xzh5953kqg5cyay87y7yidnzn39livn"; }; nativeBuildInputs = [ pkgconfig ]; From e2a32b747fd6a1291540064b82ab43a37efad635 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 4 Aug 2018 00:26:34 +0200 Subject: [PATCH 118/229] Revert "nixos/disnix: fix broken service because of rename" Broke evaluation of the nixos options. The option `services.dysnomia' defined in `.../nixos/modules/rename.nix' does not exist. This reverts commit 5c897b4effc4f51b2d6aa5dba158a839b179d964. --- nixos/modules/services/misc/disnix.nix | 2 +- nixos/modules/services/misc/dysnomia.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index c21cb2afc3c..bb3ac1ecf07 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -47,7 +47,7 @@ in ###### implementation config = mkIf cfg.enable { - dysnomia.enable = true; + services.dysnomia.enable = true; environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 61ea822890e..ba74b18b697 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.dysnomia; + cfg = config.services.dysnomia; printProperties = properties: concatMapStrings (propertyName: @@ -69,7 +69,7 @@ let in { options = { - dysnomia = { + services.dysnomia = { enable = mkOption { type = types.bool; @@ -142,7 +142,7 @@ in environment.systemPackages = [ cfg.package ]; - dysnomia.package = pkgs.dysnomia.override (origArgs: { + services.dysnomia.package = pkgs.dysnomia.override (origArgs: { enableApacheWebApplication = config.services.httpd.enable; enableAxis2WebService = config.services.tomcat.axis2.enable; enableEjabberdDump = config.services.ejabberd.enable; @@ -153,7 +153,7 @@ in enableMongoDatabase = config.services.mongodb.enable; }); - dysnomia.properties = { + services.dysnomia.properties = { hostname = config.networking.hostName; inherit (config.nixpkgs.localSystem) system; @@ -171,7 +171,7 @@ in }}"); }; - dysnomia.containers = lib.recursiveUpdate ({ + services.dysnomia.containers = lib.recursiveUpdate ({ process = {}; wrapper = {}; } From 5d4ab1baaa3732f7c6510ce2141204b3384c5f29 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 Aug 2018 21:56:08 +0200 Subject: [PATCH 119/229] terraform: update all providers also, stop excluding terraform.plugins.telefonicaopencloud (since c07670bcdc718dbabf09f49d8094186541bc5940), as there's a tag on their repo now. --- .../cluster/terraform/providers/data.nix | 125 ++++++++++-------- .../cluster/terraform/providers/update-all | 2 +- 2 files changed, 74 insertions(+), 53 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 554c56fdae6..d6d29d7863c 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,15 +4,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.9.5"; - sha256 = "12yhy0p4xciw70i0gvwzbg39f6mfin2cfdblxyqjlv9bwg26k7jz"; + version = "1.10.0"; + sha256 = "19lplakpl8dz4a8xw9va86gd774yq4gayq4kzv3pvr62b03a999x"; }; archive = { owner = "terraform-providers"; repo = "terraform-provider-archive"; - version = "1.0.3"; - sha256 = "1il8v9zi838naprr8dqzipk6ns71l8vdqidarxklnn8wdwxmacg4"; + version = "1.1.0"; + sha256 = "1fsynv725cmqz819v9p4i4h4w4y77mbya5y9v81sqvacqvr3i05h"; }; arukas = { @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.25.0"; - sha256 = "1cg2pch6nip96qdzca7q0ak6308fkjxz9zjdcv74cwg0f65frh7d"; + version = "1.30.0"; + sha256 = "1si2fm5nm7gad90lf410zwjf2q5kd8mv6nkkbfnfdzkpkchavr95"; }; azure-classic = { @@ -46,15 +46,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.7.0"; - sha256 = "0lf83pc5gdmd61i93221zdg9pdzfpfnvhis8kf1s2jlc6zshbabv"; + version = "1.12.0"; + sha256 = "1avp2vhlj60iw17pw39003p30byms7xvq5lkippm60ak4ky9p51b"; }; azurestack = { owner = "terraform-providers"; repo = "terraform-provider-azurestack"; - version = "0.1.0"; - sha256 = "144dfaq16g41i9y2pcq2ilgygndad3vivr6fbygg8yl10m5l4qp0"; + version = "0.2.0"; + sha256 = "0s1ga0ga0rbpp552hbq1dfnkpdjvk1c40i7qqnqmm20xlz6k55mb"; }; bitbucket = { @@ -63,6 +63,13 @@ version = "1.0.0"; sha256 = "0gi8p1q0y8x5y8lqihijkpqs3v152h0q7icv7ixk33xsdcvb418y"; }; + brightbox = + { + owner = "terraform-providers"; + repo = "terraform-provider-brightbox"; + version = "1.0.5"; + sha256 = "0sn7k5bqgms5sxjhjikmby0jf2n6y14z6s4wsifxaw7b0082fy28"; + }; chef = { owner = "terraform-providers"; @@ -88,8 +95,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.0.0"; - sha256 = "1ar9wcgr45f2v6bqjn24zii0qwfppla8ya3gjc546sh1a7m0h9p3"; + version = "1.1.0"; + sha256 = "1rmg7gndhmb1wp0zszhwx9vrax8411iy24yrpkmayjify3vsvdpx"; }; cloudscale = { @@ -123,8 +130,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.0.3"; - sha256 = "0nh2dww3hx6jrkcd9lq5hpnqr3grp9cmqi4nwmxlrc5azf8x0mii"; + version = "1.1.0"; + sha256 = "0ckmjpw9dkj5490kwxamdvnnidnjdgxnb1biqpvwj4139hlcl628"; }; digitalocean = { @@ -158,8 +165,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "0.1.1"; - sha256 = "02lhbl34dq7lsby3g32969i4g9l3z6xw1v00shljd3amgyz2l2r2"; + version = "1.0.0"; + sha256 = "09ribvyv02r907pdvyrwaklr14xyvyn14rijslnm16xp8d4waz9h"; }; dyn = { @@ -179,15 +186,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.2.0"; - sha256 = "0vrvyqhzbrvhyhdkg2y2dgadf5j7bj0cbzd13f9m86d146zlf8lb"; + version = "0.3.0"; + sha256 = "1hh4s81g256iy1rvp9snqbyhidz8n6p7pzanlxp89ffrq9p32sp0"; }; flexibleengine = { owner = "terraform-providers"; repo = "terraform-provider-flexibleengine"; - version = "1.0.1"; - sha256 = "1xf5cmn434a0zr9qxc7f0jma9gf111cp7fm2vgyhkd62hipafcas"; + version = "1.1.0"; + sha256 = "07g6kc211crxf9nvgvghg05jdahd1fb09lpwfcps9ph259pwwam3"; }; github = { @@ -207,15 +214,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.15.0"; - sha256 = "0xwijnv7mzlyzplkylfphph568b9bxavrclnlwvp9ylvklq70nzl"; + version = "1.16.2"; + sha256 = "1d8by6rb4s2dggapcbb4b2g5hf280bjayz9p5q9njgsn83579pnm"; }; grafana = { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "1.0.2"; - sha256 = "17pj4mm7ik9llhgckza822866x6986cdcr821f16dchvn3bfbf2i"; + version = "1.2.0"; + sha256 = "1kn2bbdgci6nfl2gyk4w8w203fscqws2748idv9m53ikczg8n573"; }; hcloud = { @@ -228,8 +235,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "1.0.1"; - sha256 = "1kx74d0ywzim5zj3y5ac80r18igsqax39yv9qaam546a88ya31yy"; + version = "1.2.0"; + sha256 = "1w2r0wnfcr9aqij5ckq0apd8az8yzdg704hi1zjb1ggb54v97n31"; }; http = { @@ -238,6 +245,13 @@ version = "1.0.1"; sha256 = "1bnqrx4xya3lm5wp4byy6npazll6w1g6bv4rawgncswsgx08zqng"; }; + huaweicloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-huaweicloud"; + version = "1.1.0"; + sha256 = "1jsvv5yfxgz998p4wbldbq82hl4ykn1yp21igphl94n3b0jj33dj"; + }; icinga2 = { owner = "terraform-providers"; @@ -256,8 +270,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "1.0.0"; - sha256 = "1w1izzs22b2w2qmpdxbhaj9kvnfyw0wlq3nigrigwwvqav43knh9"; + version = "1.0.1"; + sha256 = "0713h50675njnpdy4w1azfq8h6yai40gx6w2fbvw4n59h6jlfny4"; }; kubernetes = { @@ -347,22 +361,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-oneandone"; - version = "1.1.0"; - sha256 = "1yps2mcdy61afxva7vg0i82s24zkdrn5abwblm0gcgc0cz588r9d"; + version = "1.2.0"; + sha256 = "1lrcy05zklv7vc8653f8cn3jjc9zjjwi488dpaphsmsl1md3m88b"; }; opc = { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.1.2"; - sha256 = "0v413wgnr8h682han88s0n15cdwd9a0dxr9s2mknpi4664c41qlk"; + version = "1.2.0"; + sha256 = "19rfm12w97ccyrzpdw0qlwfn7gh64lqh17kj3cv11y1f731z8rlw"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.6.0"; - sha256 = "14chn2vb8y9rz5irh8m2ky9yxmw2za45gikncjm4gfc3xl6803iq"; + version = "1.7.0"; + sha256 = "0sw2kmcsi9sjzi549fj6knida01q0lnpqvc3cpyjyv92f6w4bznn"; }; opentelekomcloud = { @@ -382,15 +396,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.2.1"; - sha256 = "0r404rysjhbsxh45ad23k12rs8js2pdczakzavnjx508kr29gcqc"; + version = "1.3.0"; + sha256 = "09vsb52cbf2h1rdwfg4xb54gklwgmaxdgjcdq1yx5gxj7lfbdl9v"; }; ovh = { owner = "terraform-providers"; repo = "terraform-provider-ovh"; - version = "0.2.0"; - sha256 = "12dpgx0fpmqw64v5a70fihbgixyw71bdjbdi17gal7s2pj1xw159"; + version = "0.3.0"; + sha256 = "05bzkwa50alh8mpslh64dddp815m8df240w1mmphdmp9rsi6hqp8"; }; packet = { @@ -417,8 +431,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-postgresql"; - version = "0.1.1"; - sha256 = "0ls5z02vaalcrbaq375qnk0267pb17rpsx4s3plfnr7qclv21pwn"; + version = "0.1.2"; + sha256 = "08wv03j70mych4nnamivjihwvca3aksjxgjlj8yasz5292qgl05w"; }; powerdns = { @@ -431,8 +445,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - version = "1.3.1"; - sha256 = "1g4filwv38rq9wcdbpnpgfnv8qj1kzdnjc8awvbsdlxlj4fa06bi"; + version = "1.3.2"; + sha256 = "0mk77n833np6ahm6bzvpg31a0m1qazaipd0vqzccqfkbz78sm3jb"; }; rabbitmq = { @@ -466,15 +480,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-runscope"; - version = "0.1.0"; - sha256 = "05l305423njds2cmmxg67swpdnp3zibs36dq4cfjk47i4byvipjz"; + version = "0.3.0"; + sha256 = "1srnnlw94q1av8rzy8753fk4vazv5ldbimgr9gd51vrmpvmlgxas"; }; scaleway = { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.4.1"; - sha256 = "1zxb3981w30hv1aax28ayiy0sl0vzrrwkynp4lmwwhfjyhyagnm1"; + version = "1.5.1"; + sha256 = "1b42fh7mwj2cx3g16lgp4sw6ca5qqj0mhm6i7qid8agwsga34v0y"; }; softlayer = { @@ -487,15 +501,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - version = "1.0.0"; - sha256 = "1p05wamv70mywfqf0b3nxpvxc0m8ydb5zcl2kpzsrii9mq21pjrf"; + version = "1.2.0"; + sha256 = "09k79xg5cbs4qhxr0b4f42qpxj6j2795z5vmwbxfkirb5bkpqdq1"; }; statuscake = { owner = "terraform-providers"; repo = "terraform-provider-statuscake"; - version = "0.1.0"; - sha256 = "084520cak2krwpks2ipqcjfw3k4rrzn6gqqncz8c4i6g01f1m7yg"; + version = "0.2.0"; + sha256 = "065izach0hq04664hz7rc3gd0r3l06lzwcbj5800zjfv1inp6pxs"; + }; + telefonicaopencloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-telefonicaopencloud"; + version = "1.0.0"; + sha256 = "1761wkjz3d2458xl7855lxklyxgyk05fddh92rp6975y0ca6xa5m"; }; template = { @@ -536,8 +557,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.1.0"; - sha256 = "1g0cca662glqcz83l1skhj3nb7g386x65kwz95kyp59nvyxywvbq"; + version = "1.1.1"; + sha256 = "0kiqpnb4669xw9b8nf6a8ky0jhnp14bipaizml3gdh1hnda6hflw"; }; vcd = { diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index e7ded437edb..24695066fa2 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -71,7 +71,7 @@ fi org=terraform-providers -repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-telefonicaopencloud | sort) +repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort) # Get all the providers with index From 5bf656e33b5a1a445c5144b77965c790de2cd286 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 Aug 2018 22:39:12 +0200 Subject: [PATCH 120/229] terraform: filter out azure-classic while generating data.nix --- .../networking/cluster/terraform/providers/data.nix | 7 ------- .../networking/cluster/terraform/providers/default.nix | 7 +------ .../networking/cluster/terraform/providers/update-all | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index d6d29d7863c..4ae44cafbf4 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -35,13 +35,6 @@ version = "1.30.0"; sha256 = "1si2fm5nm7gad90lf410zwjf2q5kd8mv6nkkbfnfdzkpkchavr95"; }; - azure-classic = - { - owner = "terraform-providers"; - repo = "terraform-provider-azure-classic"; - version = "0.1.1"; - sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1"; - }; azurerm = { owner = "terraform-providers"; diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index cf1649f7bb3..a535ab06f45 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -16,10 +16,5 @@ let # if the versions are not provided via file paths. postBuild = "mv go/bin/${repo}{,_v${version}}"; }; - - maybeDrv = name: data: - # azure-classic is an archived repo - if name == "azure-classic" then null - else toDrv data; in - lib.mapAttrs maybeDrv list + lib.mapAttrs (n: v: toDrv v) list diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index 24695066fa2..31a5a4a750d 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -71,7 +71,7 @@ fi org=terraform-providers -repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | sort) +repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-azure-classic | sort) # Get all the providers with index From 0a772e3c045717c2c00511a50169720833a109db Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 3 Aug 2018 21:59:18 +0200 Subject: [PATCH 121/229] terraform-provider-libvirt: 0.3 -> 0.4 goDeps isn't used anymore add note about why cdrtools is propagated --- .../cluster/terraform-provider-libvirt/default.nix | 8 ++++---- .../cluster/terraform-provider-libvirt/deps.nix | 12 ------------ 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix index 34a3be55f30..2beceddc7fb 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { name = "terraform-provider-libvirt-${version}"; - version = "0.3"; + version = "0.4"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; @@ -27,13 +27,13 @@ buildGoPackage rec { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "004gxy55p5cf39f2zpah0i2zhvs4x6ixnxy8z9v7314604ggpkna"; + sha256 = "05jkjp1kis4ncryv34pkb9cz2yhzbwg62x9qmlqsqlxwz9hqny3r"; }; buildInputs = [ libvirt pkgconfig makeWrapper ]; - goDeps = ./deps.nix; - + # mkisofs needed to create ISOs holding cloud-init data, + # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 propagatedBuildInputs = [ cdrtools ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix deleted file mode 100644 index fdf394073ab..00000000000 --- a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"; - sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl"; - }; - } -] From 88b2b6c71c0bc590d9900730d1c137d7ff2ae7e2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 23 Jul 2018 23:24:16 +0200 Subject: [PATCH 122/229] network-manager: 1.12.0 -> 1.12.2 fix VPN activation through nm-applet (#43806), upstream bug https://gitlab.gnome.org/GNOME/network-manager-applet/issues/12 --- pkgs/tools/networking/network-manager/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 62c9e7b63d1..1ebd9547294 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ let pname = "NetworkManager"; in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.12.0"; + version = "1.12.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15bzjkrfa7sw5p5hkdha4a67y1zfnzh1s6za11sh8s1yxmyvkziq"; + sha256 = "09hsh34m8hg4m402pw5n11f29vsfjw6lm3p5m56yxwq57bwnzq3b"; }; outputs = [ "out" "dev" ]; @@ -66,11 +66,6 @@ in stdenv.mkDerivation rec { ]; patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=796752 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=372955; - sha256 = "17rl19lprnsz4wjmp54c1qw6a3pf8x97bhd69xavwy7cx6z84b3n"; - }) # https://bugzilla.gnome.org/show_bug.cgi?id=796751 (fetchurl { url = https://bugzilla.gnome.org/attachment.cgi?id=372953; From e63ef63c93c9f578fc06bf2ecd708b902e543bab Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 24 Jul 2018 02:08:28 +0200 Subject: [PATCH 123/229] network-manager-applet: add patch for import file chooser --- .../networking/network-manager/applet.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 98b9b0aef4d..644bf00e8c2 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -20,6 +20,25 @@ in stdenv.mkDerivation rec { url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch; sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk"; }) + + # following 3 patches: + # https://gitlab.gnome.org/GNOME/network-manager-applet/issues/11 + # should be fixed in 1.8.16 + (fetchpatch { + name = "0001-connection-editor-hold-GApplication-while-the-import.patch"; + url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/419c459e70ac752eb9226b0db1192fb0433d5d5e.patch; + sha256 = "0zi4fn2ynymi6ckkdrj8vcl78pwmkan4n8l53axaqb4kn0wnahdj"; + }) + (fetchpatch { + name = "0002-connection-list-attempt-a-VPN-import-first.patch"; + url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/9d79ffdb148b31c7194c66946c87b6cd57ed54a3.patch; + sha256 = "1v0pdvkglrcfl1khp9j17cw0gvwg8scdha0wfziy054s1r6kyj23"; + }) + (fetchpatch { + name = "0003-bluetooth-fix-an-assert-failure-on-creation-cancella.patch"; + url = https://gitlab.gnome.org/GNOME/network-manager-applet/commit/516f3f6c70ef9694d6004c64d50a9f3cd2725ab7.patch; + sha256 = "1msk4hmri3x5chmclxm7sdj1v9jg7pxqqrarlvsmfmshdwq4ljwk"; + }) ]; mesonFlags = [ From 24726a35d936cb3f49e663663b91b610522c1267 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 4 Aug 2018 01:32:45 +0200 Subject: [PATCH 124/229] networkmanager: fix compile error due to NM_AVAILABLE_IN_1_12_2 macro --- pkgs/tools/networking/network-manager/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 1ebd9547294..01b979c3c5b 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -71,6 +71,10 @@ in stdenv.mkDerivation rec { url = https://bugzilla.gnome.org/attachment.cgi?id=372953; sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a"; }) + (fetchurl { + url = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch; + sha256 = "af1717f7c6fdd6dadb4082dd847f4bbc42cf1574833299f3e47024e785533f2e"; + }) (substituteAll { src = ./fix-paths.patch; inherit inetutils kmod openconnect; From 4cc3a5a6c922513a8f4ebe6ff959045a3fd2fdd1 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 3 Aug 2018 21:58:57 -0400 Subject: [PATCH 125/229] added the pecl oci8 library for php had to make an adjustment to the oracle instantclient to make it compile --- .../development/libraries/oracle-instantclient/default.nix | 3 +++ pkgs/top-level/php-packages.nix | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 56f0cc084d1..a4196e0dc9f 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -52,6 +52,9 @@ in stdenv.mkDerivation rec { install -Dm644 *.jar $out/share/java install -Dm644 sdk/include/* $out/include install -Dm644 sdk/demo/* $out/share/${name}/demo + + # PECL::oci8 will not build without this + ln -s $out/lib/libclntsh.so.12.1 $out/lib/libclntsh.so ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0057353c3e0..8592e3136ae 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -160,6 +160,13 @@ let buildInputs = with pkgs; [ cyrus_sasl zlib ]; }; + oci8 = buildPecl rec { + name = "oci8-2.1.8"; + sha256 = "1bp6fss2f2qmd5bdk7x22j8vx5qivrdhz4x7csf29vjgj6gvchxy"; + buildInputs = [ pkgs.re2c pkgs.oracle-instantclient ]; + configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient}/lib" ]; + }; + pcs = buildPecl rec { name = "pcs-1.3.3"; From f8fb13e64caf482f06137f93f16d9147440d2d90 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Mon, 16 Jul 2018 23:04:10 +1000 Subject: [PATCH 126/229] mpv: build and install macOS App Bundle --- pkgs/applications/video/mpv/default.nix | 29 +++++++++++++++++-------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 55ab1b95489..c384455d672 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -171,9 +171,12 @@ in stdenv.mkDerivation rec { buildPhase = '' python3 ${waf} build + '' + optionalString stdenv.isDarwin '' + python3 TOOLS/osxbundle.py -s build/mpv ''; - installPhase = + # Ensure youtube-dl is available in $PATH for mpv + wrapperFlags = let getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; @@ -181,24 +184,32 @@ in stdenv.mkDerivation rec { luaCPath = getPath "so"; in '' - python3 ${waf} install - - # Use a standard font - mkdir -p $out/share/mpv - ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - # Ensure youtube-dl is available in $PATH for MPV - wrapProgram $out/bin/mpv \ --prefix LUA_PATH : "${luaPath}" \ --prefix LUA_CPATH : "${luaCPath}" \ '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" - '' + '' + ''; + + installPhase = '' + python3 ${waf} install + + # Use a standard font + mkdir -p $out/share/mpv + ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf + wrapProgram "$out/bin/mpv" \ + ${wrapperFlags} cp TOOLS/umpv $out/bin wrapProgram $out/bin/umpv \ --set MPV "$out/bin/mpv" + + '' + optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r build/mpv.app $out/Applications + wrapProgram "$out/Applications/mpv.app/Contents/MacOS/mpv" \ + ${wrapperFlags} ''; meta = with stdenv.lib; { From e6d3c654427bafb68269c4b9bf7ed43e8090d7d2 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 4 Aug 2018 06:19:08 +0000 Subject: [PATCH 127/229] r-packages: fix regression --- pkgs/development/r-modules/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a52b74ae080..a526cf8578a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -42,20 +42,20 @@ let # from the name, version, sha256, and optional per-package arguments above # deriveBioc = mkDerive { - mkHomepage = {name, biocVersion}: "https://bioconductor.org/packages/${biocVersion}/bioc/html/${name}.html"; + mkHomepage = {name, biocVersion, ...}: "https://bioconductor.org/packages/${biocVersion}/bioc/html/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/bioc/src/contrib/${name}_${version}.tar.gz" "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ]; }; deriveBiocAnn = mkDerive { - mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html"; + mkHomepage = {name, ...}: "http://www.bioconductor.org/packages/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ]; }; deriveBiocExp = mkDerive { - mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html"; + mkHomepage = {name, ...}: "http://www.bioconductor.org/packages/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ]; }; deriveCran = mkDerive { - mkHomepage = {name, snapshot}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/"; + mkHomepage = {name, snapshot, ...}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/"; mkUrls = {name, version, snapshot}: [ "http://mran.revolutionanalytics.com/snapshot/${snapshot}/src/contrib/${name}_${version}.tar.gz" ]; }; From 9bf7ff3b57688dc79f4eaabf2cadea7c3f831d44 Mon Sep 17 00:00:00 2001 From: smithtim Date: Fri, 3 Aug 2018 23:23:54 -0700 Subject: [PATCH 128/229] nixos/doc: added MATE to list of desktop managers in manual (#44442) --- nixos/doc/manual/configuration/x-windows.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 9a0969ad635..948b35209b7 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -26,6 +26,7 @@ = true; = true; = true; + = true; = true; = true; = true; From dc02a284bc885a746a902764db243123a1de0bb6 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 4 Aug 2018 07:56:04 +0000 Subject: [PATCH 129/229] reaper: 5.93 -> 5.94 (#44445) --- pkgs/applications/audio/reaper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 6d6b228eead..28aaf8a5354 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.93"; + version = "5.94"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "17ciysyqp4by0yy08avk7z16inrmfwrmzh5l1r6fdni0y4ax65iq"; + sha256 = "16g5q12wh1cfbl9wq03vb7vpsd870k7i7883z0wn492x7y9syz8z"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; @@ -63,11 +63,11 @@ in stdenv.mkDerivation rec { cp ${libSwell.out} $out/opt/REAPER/libSwell.so - wrapProgram $out/opt/REAPER/reaper5 \ + wrapProgram $out/opt/REAPER/reaper \ --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib mkdir $out/bin - ln -s $out/opt/REAPER/reaper5 $out/bin/ + ln -s $out/opt/REAPER/reaper $out/bin/ ln -s $out/opt/REAPER/reamote-server $out/bin/ ''; From 558c032e53141f0f53536f0f2a5ac4741ba024b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 4 Aug 2018 10:09:58 +0200 Subject: [PATCH 130/229] scriptaculous: Init at 1.9.0 (#44429) --- .../libraries/scriptaculous/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/scriptaculous/default.nix diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix new file mode 100644 index 00000000000..ba291dc97ff --- /dev/null +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip, ... }: stdenv.mkDerivation rec { + name = "scriptaculous-${version}"; + version = "1.9.0"; + + src = fetchurl { + url = "https://script.aculo.us/dist/scriptaculous-js-${version}.zip"; + sha256 = "1xpnk3cq8n07lxd69k5jxh48s21zh41ihq10z4a6lcnk238rp8qz"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir $out + cp src/*.js $out + ''; + + meta = with stdenv.lib; { + description = "A set of JavaScript libraries to enhance the user interface of web sites"; + longDescription = '' + script.aculo.us provides you with + easy-to-use, cross-browser user + interface JavaScript libraries to make + your web sites and web applications fly. + ''; + homepage = https://script.aculo.us/; + downloadPage = https://script.aculo.us/dist/; + license = licenses.mit; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc1ecf53ab6..cafc4c12ddb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5050,6 +5050,8 @@ with pkgs; scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; + scriptaculous = callPackage ../development/libraries/scriptaculous { }; + scrot = callPackage ../tools/graphics/scrot { }; scrypt = callPackage ../tools/security/scrypt { }; From adc4e1d6b79efa20dae246242e6b885a3659ac0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= Date: Sat, 4 Aug 2018 10:59:32 +0200 Subject: [PATCH 131/229] inter-ui: init at 2.5 (#44433) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg --- maintainers/maintainer-list.nix | 5 +++++ pkgs/data/fonts/inter-ui/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/data/fonts/inter-ui/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b5b5484e82c..ab555b19b9f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -936,6 +936,11 @@ github = "demin-dmitriy"; name = "Dmitriy Demin"; }; + demize = { + email = "johannes@kyriasis.com"; + github = "kyrias"; + name = "Johannes Löthberg"; + }; demyanrogozhin = { email = "demyan.rogozhin@gmail.com"; github = "demyanrogozhin"; diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix new file mode 100644 index 00000000000..87eaa9383a7 --- /dev/null +++ b/pkgs/data/fonts/inter-ui/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + version = "2.5"; +in fetchzip { + name = "inter-ui-${version}"; + + url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-UI-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "1d88y6c9vbjz5siazhavnpfpazfkvpbcbb4pdycbnj03mmx6y07v"; + + meta = with stdenv.lib; { + homepage = https://rsms.me/inter/; + description = "A typeface specially designed for user interfaces"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ demize ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cafc4c12ddb..6faec3e8b66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15033,6 +15033,8 @@ with pkgs; hasklig = callPackage ../data/fonts/hasklig {}; + inter-ui = callPackage ../data/fonts/inter-ui { }; + siji = callPackage ../data/fonts/siji { }; sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; From ae4dc14f0b4d8f25205188f8058eaa27cabf4ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 4 Aug 2018 11:02:23 +0200 Subject: [PATCH 132/229] smarty3: Init at 3.1.32 (#44427) --- .../development/libraries/smarty3/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/smarty3/default.nix diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix new file mode 100644 index 00000000000..2fce5b3368f --- /dev/null +++ b/pkgs/development/libraries/smarty3/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { + name = "smarty3-${version}"; + version = "3.1.32"; + + src = fetchFromGitHub { + owner = "smarty-php"; + repo = "smarty"; + rev = "v${version}"; + sha256 = "1rfa5pzr23db1bivpivljgmgpn99m6ksgli64kmii5cmpvxi00y2"; + }; + + installPhase = '' + mkdir $out + cp -r libs/* $out + ''; + + meta = with stdenv.lib; { + description = "Smarty 3 template engine"; + longDescription = '' + Smarty is a template engine for PHP, facilitating the + separation of presentation (HTML/CSS) from application + logic. This implies that PHP code is application + logic, and is separated from the presentation. + ''; + homepage = https://www.smarty.net; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6faec3e8b66..90576e34da0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5173,6 +5173,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; }; + smarty3 = callPackage ../development/libraries/smarty3 { }; + smbldaptools = callPackage ../tools/networking/smbldaptools { inherit (perlPackages) perlldap CryptSmbHash DigestSHA1; }; From 880bc29d45bb9297110fe1fbbd80c807f53af2a1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Aug 2018 11:54:43 +0200 Subject: [PATCH 133/229] gnome3.gnome-todo: init at 3.28.1 --- .../gnome-3/apps/gnome-todo/default.nix | 47 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 4 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/apps/gnome-todo/default.nix diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix new file mode 100644 index 00000000000..8e506b52270 --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook +, gettext, gnome3, glib, gtk, libpeas +, gnome-online-accounts, gsettings-desktop-schemas +, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }: + +let + pname = "gnome-todo"; + version = "3.28.1"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext wrapGAppsHook + ]; + buildInputs = [ + glib gtk libpeas gnome-online-accounts + gsettings-desktop-schemas gnome3.defaultIconTheme + # Plug-ins + evolution-data-server libxml2 libsoup libical + rest json-glib + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Personal task manager for GNOME"; + homepage = https://wiki.gnome.org/Apps/Todo; + license = licenses.gpl3Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 15707575e7f..ce542e7f88b 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -30,7 +30,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-usage + gnome-power-manager gnome-todo gnome-usage ]; gamesPackages = with gnome3; [ swell-foop lightsoff iagno @@ -291,6 +291,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; + gnome-todo = callPackage ./apps/gnome-todo {}; + gnome-weather = callPackage ./apps/gnome-weather { }; nautilus-sendto = callPackage ./apps/nautilus-sendto { }; From e002b543afd3bf770621423b91720fa50b8d5ec5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 4 Aug 2018 13:30:24 +0200 Subject: [PATCH 134/229] python.pkgs.basiciw: move expression --- .../python-modules/basiciw/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 ++------------ 2 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/basiciw/default.nix diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix new file mode 100644 index 00000000000..0d25d7cdbe9 --- /dev/null +++ b/pkgs/development/python-modules/basiciw/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, gcc +, wirelesstools +, isPy27 +, isPyPy +}: + +buildPythonPackage rec { + pname = "basiciw"; + version = "0.2.2"; + + disabled = isPy27 || isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1ajmflvvlkflrcmqmkrx0zaira84z8kv4ssb2jprfwvjh8vfkysb"; + }; + + buildInputs = [ gcc ]; + propagatedBuildInputs = [ wirelesstools ]; + + meta = { + description = "Get info about wireless interfaces using libiw"; + homepage = https://github.com/enkore/basiciw; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cc65554284..b0ae8a1e41a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -925,26 +925,8 @@ in { babelfish = callPackage ../development/python-modules/babelfish {}; - basiciw = buildPythonPackage rec { - name = "${pname}-${version}"; - version = "0.2.2"; - pname = "basiciw"; - disabled = isPy27 || isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "1ajmflvvlkflrcmqmkrx0zaira84z8kv4ssb2jprfwvjh8vfkysb"; - }; - - buildInputs = [ pkgs.gcc ]; - propagatedBuildInputs = [ pkgs.wirelesstools ]; - - meta = { - description = "Get info about wireless interfaces using libiw"; - homepage = https://github.com/enkore/basiciw; - platforms = platforms.linux; - license = licenses.gpl2; - }; + basiciw = callPackage ../development/python-modules/basiciw { + inherit (pkgs) gcc wirelesstools; }; batinfo = callPackage ../development/python-modules/batinfo {}; From d296a379bad2612d9a8ed688f404c7b192586022 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 4 Aug 2018 13:33:32 +0200 Subject: [PATCH 135/229] python.pkgs.beaker: move expression --- .../python-modules/beaker/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 +------------- 2 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/beaker/default.nix diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix new file mode 100644 index 00000000000..7a17fd0f1d0 --- /dev/null +++ b/pkgs/development/python-modules/beaker/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, mock +, webtest +, sqlalchemy +, pycrypto +, isPy27 +, funcsigs +, pycryptopp +}: + +buildPythonPackage rec { + pname = "Beaker"; + version = "1.8.0"; + + # The pypy release do not contains the tests + src = fetchFromGitHub { + owner = "bbangert"; + repo = "beaker"; + rev = "${version}"; + sha256 = "17yfr7a307n8rdl09was4j60xqk2s0hk0hywdkigrpj4qnw0is7g"; + }; + + buildInputs = + [ nose + mock + webtest + ]; + propagatedBuildInputs = [ + sqlalchemy + pycrypto + ] ++ lib.optionals (isPy27) [ + funcsigs + pycryptopp + ]; + + meta = { + description = "A Session and Caching library with WSGI Middleware"; + maintainers = with lib.maintainers; [ garbas domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0ae8a1e41a..e68c11028ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -937,37 +937,7 @@ in { beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; - beaker = buildPythonPackage rec { - name = "Beaker-${version}"; - version = "1.8.0"; - - # The pypy release do not contains the tests - src = pkgs.fetchFromGitHub { - owner = "bbangert"; - repo = "beaker"; - rev = "${version}"; - sha256 = "17yfr7a307n8rdl09was4j60xqk2s0hk0hywdkigrpj4qnw0is7g"; - }; - - buildInputs = - [ self.nose - self.mock - self.webtest - ]; - propagatedBuildInputs = [ - self.sqlalchemy - self.pycrypto - ] ++ optionals (isPy27) [ - self.funcsigs - self.pycryptopp - ]; - - meta = { - description = "A Session and Caching library with WSGI Middleware"; - maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.all; - }; - }; + beaker = callPackage ../development/python-modules/beaker { }; betamax = callPackage ../development/python-modules/betamax {}; From 20f1388c3fb7c1c56367fd96fd21cfd316f465b7 Mon Sep 17 00:00:00 2001 From: aanderse Date: Sat, 4 Aug 2018 07:40:48 -0400 Subject: [PATCH 136/229] perlPackages.Apache-AuthCookie: init at 3.27 (#44437) --- pkgs/top-level/perl-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcc17cd7124..004fd3a663b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -206,6 +206,26 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose Mouse ]; }; + ApacheAuthCookie = buildPerlPackage rec { + name = "Apache-AuthCookie-3.27"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/${name}.tar.gz"; + sha256 = "58daeb3e44c681ff88f8fb00e4aabaa7a40cbee73dbdb84fcf6c285b15d357bd"; + }; + buildInputs = [ ApacheTest URI ]; + propagatedBuildInputs = [ ClassLoad HTTPBody HashMultiValue WWWFormUrlEncoded ]; + + # Fails because /etc/protocols is not available in sandbox and make + # getprotobyname('tcp') in ApacheTest fail. + doCheck = !stdenv.isLinux; + + meta = { + homepage = http://search.cpan.org/dist/Apache-AuthCookie/; + description = "Perl Authentication and Authorization via cookies"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ApacheLogFormatCompiler = buildPerlModule rec { name = "Apache-LogFormat-Compiler-0.35"; src = fetchurl { From 840b64fdb8e7298734396aa0a27468b021433efa Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 8 Jul 2018 22:51:24 +0200 Subject: [PATCH 137/229] sage: 8.2 -> 8.3 --- .../science/math/sage/default.nix | 2 +- .../math/sage/patches/arb-2.13.0.patch | 427 ---------------- .../math/sage/patches/known-padics-bug.patch | 15 + .../sage/patches/maxima-5.41.0-doctests.patch | 48 -- .../math/sage/patches/pynac-0.7.22.patch | 479 ------------------ .../python3-syntax-without-write.patch | 40 -- .../math/sage/patches/sagenb-sphinx-1.7.patch | 31 -- .../math/sage/patches/sphinx-1.7.patch | 62 --- .../math/sage/patches/spkg-scripts.patch | 46 ++ .../math/sage/patches/zn_poly_version.patch | 13 - .../science/math/sage/sage-src.nix | 110 +--- 11 files changed, 74 insertions(+), 1199 deletions(-) delete mode 100644 pkgs/applications/science/math/sage/patches/arb-2.13.0.patch create mode 100644 pkgs/applications/science/math/sage/patches/known-padics-bug.patch delete mode 100644 pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch delete mode 100644 pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch delete mode 100644 pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch delete mode 100644 pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch delete mode 100644 pkgs/applications/science/math/sage/patches/sphinx-1.7.patch create mode 100644 pkgs/applications/science/math/sage/patches/spkg-scripts.patch delete mode 100644 pkgs/applications/science/math/sage/patches/zn_poly_version.patch diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 0bbf2cec0dc..014a1302147 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -131,7 +131,6 @@ let }); # *not* to confuse with the python package "pynac" - # https://trac.sagemath.org/ticket/24838 (depends on arb update) pynac = nixpkgs.pynac.override { inherit singular flint; }; eclib = nixpkgs.eclib.override { inherit pari ntl; }; @@ -167,6 +166,7 @@ let ecl = nixpkgs.ecl_16_1_2; # sage currently uses an unreleased version of pari + # https://trac.sagemath.org/ticket/25567 pari = (nixpkgs.pari.override { withThread = false; }).overrideAttrs (attrs: rec { version = "2.10-1280-g88fb5b3"; # on update remove pari-stackwarn patch from `sage-src.nix` src = fetchurl { diff --git a/pkgs/applications/science/math/sage/patches/arb-2.13.0.patch b/pkgs/applications/science/math/sage/patches/arb-2.13.0.patch deleted file mode 100644 index a20f1670a25..00000000000 --- a/pkgs/applications/science/math/sage/patches/arb-2.13.0.patch +++ /dev/null @@ -1,427 +0,0 @@ -commit c885927e25b29bd23869e02379c2918da430323e -Author: Timo Kaufmann -Date: Sat Jun 30 02:26:15 2018 +0200 - -diff --git a/build/pkgs/arb/checksums.ini b/build/pkgs/arb/checksums.ini -index 1924ee03c3..9323b97391 100644 ---- a/build/pkgs/arb/checksums.ini -+++ b/build/pkgs/arb/checksums.ini -@@ -1,4 +1,4 @@ - tarball=arb-VERSION.tar.gz --sha1=27476d0529e48a07d92da90bd0fb80dd18f443e3 --md5=733285d9705d10b8024e551ffa81952f --cksum=2391183744 -+sha1=44eda7bf8eaa666c45b1fc2c1b5bd08756d94b58 -+md5=fa24de9fffe4394fb6a7a6792e2ecc5f -+cksum=3689220688 -diff --git a/build/pkgs/arb/package-version.txt b/build/pkgs/arb/package-version.txt -index c8810e9bdb..fb2c0766b7 100644 ---- a/build/pkgs/arb/package-version.txt -+++ b/build/pkgs/arb/package-version.txt -@@ -1 +1 @@ --2.12.0.p0 -+2.13.0 -diff --git a/build/pkgs/arb/patches/arb-pie-hardening-conflict.patch b/build/pkgs/arb/patches/arb-pie-hardening-conflict.patch -deleted file mode 100644 -index 3e5c0e708b..0000000000 ---- a/build/pkgs/arb/patches/arb-pie-hardening-conflict.patch -+++ /dev/null -@@ -1,17 +0,0 @@ --In newer binutils, ld options -r and -pie conflict. --Patch due to Jörg-Volker Peetz --(source : https://groups.google.com/d/msg/sage-devel/TduebNoZuBE/sEULolL0BQAJ), --packaged by Emmanuel Charpentier -- --diff -ru arb-2.8.1-orig/Makefile.subdirs arb-2.8.1-new/Makefile.subdirs ----- arb-2.8.1-orig/Makefile.subdirs 2015-12-31 17:30:01.000000000 +0100 --+++ arb-2.8.1-new/Makefile.subdirs 2016-11-07 18:50:34.540051779 +0100 --@@ -52,7 +52,7 @@ -- $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@" -- -- $(MOD_LOBJ): $(LOBJS) --- $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib --+ $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib -- -- -include $(LOBJS:.lo=.d) -- -diff --git a/src/sage/rings/complex_arb.pyx b/src/sage/rings/complex_arb.pyx -index 70d51e655a..00e7caea2c 100644 ---- a/src/sage/rings/complex_arb.pyx -+++ b/src/sage/rings/complex_arb.pyx -@@ -857,14 +857,14 @@ class ComplexBallField(UniqueRepresentation, Field): - [0.500000000000000 +/- 2.09e-16] - - sage: CBF.integral(lambda x, _: x.gamma(), 1 - CBF(i), 1 + CBF(i)) -- [+/- 3.95e-15] + [1.5723926694981 +/- 4.53e-14]*I -+ [+/- 4...e-15] + [1.5723926694981 +/- 4...e-14]*I - - sage: C = ComplexBallField(100) - sage: C.integral(lambda x, _: x.cos() * x.sin(), 0, 1) - [0.35403670913678559674939205737 +/- 8.89e-30] - - sage: CBF.integral(lambda x, _: (x + x.exp()).sin(), 0, 8) -- [0.34740017266 +/- 6.36e-12] -+ [0.34740017266 +/- 6...e-12] - - sage: C = ComplexBallField(2000) - sage: C.integral(lambda x, _: (x + x.exp()).sin(), 0, 8) # long time -@@ -879,14 +879,14 @@ class ComplexBallField(UniqueRepresentation, Field): - ....: else: - ....: return z.sqrt() - sage: CBF.integral(my_sqrt, -1 + CBF(i), -1 - CBF(i)) -- [+/- 1.14e-14] + [-0.4752076627926 +/- 5.18e-14]*I -+ [+/- 1.14e-14] + [-0.4752076627926 +/- 5...e-14]*I - - Note, though, that proper handling of the ``analytic`` flag is required - even when the path does not touch the branch cut:: - - sage: correct = CBF.integral(my_sqrt, 1, 2); correct - [1.21895141649746 +/- 3.73e-15] -- sage: RBF(integral(sqrt(x), x, 1, 2)) -+ sage: RBF(integral(sqrt(x), x, 1, 2)) # long time - [1.21895141649746 +/- 1.79e-15] - sage: wrong = CBF.integral(lambda z, _: z.sqrt(), 1, 2) # WRONG! - sage: correct - wrong -@@ -915,9 +915,9 @@ class ComplexBallField(UniqueRepresentation, Field): - the integrand is unbounded:: - - sage: CBF.integral(lambda x, _: 1/x, -1, 1) -- [+/- inf] + [+/- inf]*I -+ nan + nan*I - sage: CBF.integral(lambda x, _: 1/x, 10^-1000, 1) -- [+/- inf] + [+/- inf]*I -+ nan + nan*I - sage: CBF.integral(lambda x, _: 1/x, 10^-1000, 1, abs_tol=1e-10) - [2302.5850930 +/- 1.26e-8] - -@@ -928,14 +928,15 @@ class ComplexBallField(UniqueRepresentation, Field): - sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, abs_tol=1e-450) - [2.304377150950e-439 +/- 9.74e-452] - sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, abs_tol=0) -- [2.304377150949e-439 +/- 7.53e-452] -- sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, rel_tol=1e-4, abs_tol=0) -- [2.30438e-439 +/- 3.90e-445] -+ [2.304377150950e-439 +/- 7...e-452] -+ sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, rel_tol=1e-2, abs_tol=0) -+ [2.30438e-439 +/- 5.94e-445] - -- sage: CBF.integral(lambda x, _: x*(1/x).sin(), 0, 1) -- [+/- 0.644] -- sage: CBF.integral(lambda x, _: x*(1/x).sin(), 0, 1, use_heap=True) -- [0.3785300 +/- 4.32e-8] -+ sage: epsi = CBF(1e-10) -+ sage: CBF.integral(lambda x, _: x*(1/x).sin(), epsi, 1) -+ [0.38 +/- 8.54e-3] -+ sage: CBF.integral(lambda x, _: x*(1/x).sin(), epsi, 1, use_heap=True) -+ [0.37853002 +/- 8.73e-9] - - ALGORITHM: - -@@ -951,12 +952,12 @@ class ComplexBallField(UniqueRepresentation, Field): - - sage: i = QuadraticField(-1).gen() - sage: CBF.integral(lambda x, _: (1 + i*x).gamma(), -1, 1) -- [1.5723926694981 +/- 4.53e-14] + [+/- 3.95e-15]*I -+ [1.5723926694981 +/- 4...e-14] + [+/- 4...e-15]*I - -- sage: ComplexBallField(10000).integral(lambda x, _: x.sin(), 0, 1, rel_tol=1e-400) -- [0.459... +/- ...e-4...] -+ sage: ComplexBallField(10000).integral(lambda x, _: x.sin(), 0, 1, rel_tol=1e-300) -+ [0.459... +/- ...e-3...] - sage: CBF.integral(lambda x, _: x.sin(), 0, 100, rel_tol=10) -- [+/- 7.61] -+ [0.138 +/- 5.53e-4] - - sage: ComplexBallField(10000).integral(lambda x, _: x.sin(), 0, 1, abs_tol=1e-400) - [0.459697... +/- ...e-4...] -@@ -2389,9 +2390,9 @@ cdef class ComplexBall(RingElement): - sage: ~CBF(i/3) - [-3.00000000000000 +/- 9.44e-16]*I - sage: ~CBF(0) -- [+/- inf] -+ nan - sage: ~CBF(RIF(10,11)) -- [0.1 +/- 9.53e-3] -+ [0.1 +/- 9.10e-3] - """ - cdef ComplexBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -2512,9 +2513,9 @@ cdef class ComplexBall(RingElement): - sage: CBF(-2, 1)/CBF(1, 1/3) - [-1.500000000000000 +/- 8.83e-16] + [1.500000000000000 +/- 5.64e-16]*I - sage: CBF(2+I)/CBF(0) -- [+/- inf] + [+/- inf]*I -+ nan + nan*I - sage: CBF(1)/CBF(0) -- [+/- inf] -+ nan - sage: CBF(1)/CBF(RBF(0, 1.)) - nan - """ -@@ -2543,9 +2544,9 @@ cdef class ComplexBall(RingElement): - sage: CBF(0)^(1/3) - 0 - sage: CBF(0)^(-1) -- [+/- inf] -+ nan - sage: CBF(0)^(-2) -- [+/- inf] + [+/- inf]*I -+ nan + nan*I - - TESTS:: - -@@ -2656,12 +2657,12 @@ cdef class ComplexBall(RingElement): - sage: CBF(1).rising_factorial(5) - 120.0000000000000 - sage: CBF(1/3, 1/2).rising_factorial(300) -- [-3.87949484514e+612 +/- 5.23e+600] + [-3.52042209763e+612 +/- 5.55e+600]*I -+ [-3.87949484514e+612 +/- 5...e+600] + [-3.52042209763e+612 +/- 5...e+600]*I - - sage: CBF(1).rising_factorial(-1) - nan - sage: CBF(1).rising_factorial(2**64) -- [+/- 2.30e+347382171305201370464] -+ [+/- 2.30e+347382171326740403407] - sage: ComplexBallField(128)(1).rising_factorial(2**64) - [2.343691126796861348e+347382171305201285713 +/- 4.71e+347382171305201285694] - sage: CBF(1/2).rising_factorial(CBF(2,3)) -@@ -2700,7 +2701,7 @@ cdef class ComplexBall(RingElement): - [1.000000000000000 +/- 2.83e-16] + [-0.441271200305303 +/- 2.82e-16]*I - - sage: CBF('inf').log() -- nan + nan*I -+ [+/- inf] - sage: CBF(2).log(0) - nan + nan*I - """ -@@ -2808,7 +2809,7 @@ cdef class ComplexBall(RingElement): - sage: CBF(pi/2, 1/10).tan() - [+/- 2.87e-14] + [10.0333111322540 +/- 2.36e-14]*I - sage: CBF(pi/2).tan() -- [+/- inf] -+ nan - """ - cdef ComplexBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -2825,7 +2826,7 @@ cdef class ComplexBall(RingElement): - sage: CBF(pi, 1/10).cot() - [+/- 5.74e-14] + [-10.0333111322540 +/- 2.81e-14]*I - sage: CBF(pi).cot() -- [+/- inf] -+ nan - """ - cdef ComplexBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -3211,9 +3212,9 @@ cdef class ComplexBall(RingElement): - 1.000000000000000*I - - sage: CBF(2+3*I).hypergeometric([1/4,1/3],[1/2]) -- [0.7871684267473 +/- 7.34e-14] + [0.2749254173721 +/- 9.23e-14]*I -+ [0.7871684267473 +/- 7...e-14] + [0.2749254173721 +/- 9...e-14]*I - sage: CBF(2+3*I).hypergeometric([1/4,1/3],[1/2],regularized=True) -- [0.4441122268685 +/- 3.96e-14] + [0.1551100567338 +/- 5.75e-14]*I -+ [0.4441122268685 +/- 3...e-14] + [0.1551100567338 +/- 5...e-14]*I - - sage: CBF(5).hypergeometric([2,3], [-5]) - nan + nan*I -@@ -4041,9 +4042,9 @@ cdef class ComplexBall(RingElement): - - sage: phi = CBF(1,1) - sage: (CBF.pi()/2).elliptic_e_inc(phi) -- [1.283840957898 +/- 3.23e-13] + [-0.5317843366915 +/- 7.79e-14]*I -+ [1.283840957898 +/- 3...e-13] + [-0.5317843366915 +/- 7...e-14]*I - sage: phi.elliptic_e() -- [1.2838409578982 +/- 5.90e-14] + [-0.5317843366915 +/- 3.35e-14]*I -+ [1.2838409578982 +/- 5...e-14] + [-0.5317843366915 +/- 3...e-14]*I - - sage: phi = CBF(2, 3/7) - sage: (CBF.pi()/2).elliptic_e_inc(phi) -@@ -4312,8 +4313,7 @@ cdef class ComplexBall(RingElement): - sage: CBF(10).laguerre_L(3, 2) - [-6.666666666667 +/- 4.15e-13] - sage: CBF(5,7).laguerre_L(CBF(2,3), CBF(1,-2)) -- [5515.315030271 +/- 4.37e-10] + [-12386.942845271 +/- 5.47e-10]*I -- -+ [5515.315030271 +/- 4...e-10] + [-12386.942845271 +/- 5...e-10]*I - """ - cdef ComplexBall my_n = self._parent.coerce(n) - cdef ComplexBall my_m = self._parent.coerce(m) -@@ -4357,9 +4357,9 @@ cdef class ComplexBall(RingElement): - EXAMPLES:: - - sage: CBF(1/2).legendre_P(5) -- [0.08984375000000000 +/- 4.5...e-18] -+ [0.0898437500000000 +/- 7...e-17] - sage: CBF(1,2).legendre_P(CBF(2,3), CBF(0,1)) -- [0.10996180744364 +/- 7.45e-15] + [0.14312767804055 +/- 8.38e-15]*I -+ [0.10996180744364 +/- 7.12e-15] + [0.14312767804055 +/- 8.07e-15]*I - sage: CBF(-10).legendre_P(5, 325/100) - [-22104403.487377 +/- 6.81e-7] + [53364750.687392 +/- 7.25e-7]*I - sage: CBF(-10).legendre_P(5, 325/100, type=3) -@@ -4393,9 +4393,9 @@ cdef class ComplexBall(RingElement): - sage: CBF(1/2).legendre_Q(5) - [0.55508089057168 +/- 2.79e-15] - sage: CBF(1,2).legendre_Q(CBF(2,3), CBF(0,1)) -- [0.167678710 +/- 4.60e-10] + [-0.161558598 +/- 7.47e-10]*I -+ [0.167678710 +/- 3.91e-10] + [-0.161558598 +/- 6.77e-10]*I - sage: CBF(-10).legendre_Q(5, 325/100) -- [-83825154.36008 +/- 4.94e-6] + [-34721515.80396 +/- 5.40e-6]*I -+ [-83825154.36008 +/- 5.02e-6] + [-34721515.80396 +/- 5.42e-6]*I - sage: CBF(-10).legendre_Q(5, 325/100, type=3) - [-4.797306921692e-6 +/- 6.82e-19] + [-4.797306921692e-6 +/- 6.57e-19]*I - -diff --git a/src/sage/rings/polynomial/polynomial_complex_arb.pyx b/src/sage/rings/polynomial/polynomial_complex_arb.pyx -index c436d4705b..ef611a566b 100644 ---- a/src/sage/rings/polynomial/polynomial_complex_arb.pyx -+++ b/src/sage/rings/polynomial/polynomial_complex_arb.pyx -@@ -543,7 +543,7 @@ cdef class Polynomial_complex_arb(Polynomial): - sage: (1 - x/3).inverse_series_trunc(3) - ([0.1111111111111111 +/- 5.99e-17])*x^2 + ([0.3333333333333333 +/- 7.04e-17])*x + 1.000000000000000 - sage: x.inverse_series_trunc(1) -- [+/- inf] -+ nan - sage: Pol(0).inverse_series_trunc(2) - (nan + nan*I)*x + nan + nan*I - -@@ -671,7 +671,7 @@ cdef class Polynomial_complex_arb(Polynomial): - sage: pol._sqrt_series(2) - ([+/- 7.51e-3] + [+/- 0.501]*I)*x + [+/- 5.01e-3] + [+/- 1.01]*I - sage: x._sqrt_series(2) -- ([+/- inf] + [+/- inf]*I)*x -+ (nan + nan*I)*x - """ - cdef Polynomial_complex_arb res = self._new() - if n < 0: -diff --git a/src/sage/rings/real_arb.pyx b/src/sage/rings/real_arb.pyx -index c9f68e38d7..76e3037a9a 100644 ---- a/src/sage/rings/real_arb.pyx -+++ b/src/sage/rings/real_arb.pyx -@@ -161,7 +161,7 @@ values and should be preferred:: - - sage: RBF(NaN) < RBF(infinity) - False -- sage: 1/RBF(0) <= RBF(infinity) -+ sage: RBF(0).add_error(infinity) <= RBF(infinity) - True - - TESTS:: -@@ -252,6 +252,8 @@ cdef void mpfi_to_arb(arb_t target, const mpfi_t source, const long precision): - (+infinity, +infinity) - sage: RBF(RIF(-infinity)).endpoints() - (-infinity, -infinity) -+ sage: RBF(RIF(-infinity, infinity)).endpoints() -+ (-infinity, +infinity) - sage: RIF(RBF(infinity)).endpoints() - (+infinity, +infinity) - sage: RIF(RBF(-infinity)).endpoints() -@@ -266,10 +268,11 @@ cdef void mpfi_to_arb(arb_t target, const mpfi_t source, const long precision): - if _do_sig(precision): sig_on() - mpfi_get_left(left, source) - mpfi_get_right(right, source) -- arb_set_interval_mpfr(target, left, right, precision) -- # Work around weakness of arb_set_interval_mpfr(tgt, inf, inf) -- if mpfr_equal_p(left, right): -- mag_zero(arb_radref(target)) -+ if mpfr_inf_p(left) and mpfr_inf_p(right) and mpfr_sgn(left) < 0 < mpfr_sgn(right): -+ # Work around a weakness of arb_set_interval_mpfr(tgt, -inf, inf) -+ arb_zero_pm_inf(target) -+ else: -+ arb_set_interval_mpfr(target, left, right, precision) - if _do_sig(precision): sig_off() - - mpfr_clear(left) -@@ -649,17 +652,15 @@ class RealBallField(UniqueRepresentation, Field): - EXAMPLES:: - - sage: RBF.some_elements() -- [1.000000000000000, -- [0.3333333333333333 +/- 7.04e-17], -+ [0, 1.000000000000000, [0.3333333333333333 +/- 7.04e-17], - [-4.733045976388941e+363922934236666733021124 +/- 3.46e+363922934236666733021108], -- [+/- inf], -- [+/- inf], -- nan] -+ [+/- inf], [+/- inf], [+/- inf], nan] - """ - import sage.symbolic.constants -- return [self(1), self(1)/3, -+ inf = self(sage.rings.infinity.Infinity) -+ return [self(0), self(1), self(1)/3, - -self(2)**(Integer(2)**80), -- self(sage.rings.infinity.Infinity), ~self(0), -+ inf, -inf, self.zero().add_error(inf), - self.element_class(self, sage.symbolic.constants.NotANumber())] - - def _sum_of_products(self, terms): -@@ -881,7 +882,7 @@ class RealBallField(UniqueRepresentation, Field): - sage: RBF.gamma(5) - 24.00000000000000 - sage: RBF.gamma(10**20) -- [+/- 5.92e+1956570551809674821757] -+ [+/- 5.50e+1956570552410610660600] - sage: RBF.gamma(1/3) - [2.678938534707747 +/- 8.99e-16] - sage: RBF.gamma(-5) -@@ -2247,7 +2248,7 @@ cdef class RealBall(RingElement): - sage: inf = RBF(+infinity) - sage: other_inf = RBF(+infinity, 42.r) - sage: neg_inf = RBF(-infinity) -- sage: extended_line = 1/RBF(0) -+ sage: extended_line = RBF(0).add_error(infinity) - sage: exact_nan = inf - inf - sage: exact_nan.mid(), exact_nan.rad() - (NaN, 0.00000000) -@@ -2659,7 +2660,7 @@ cdef class RealBall(RingElement): - sage: ~RBF(5) - [0.2000000000000000 +/- 4.45e-17] - sage: ~RBF(0) -- [+/- inf] -+ nan - sage: RBF(RIF(-0.1,0.1)) - [+/- 0.101] - -@@ -2739,7 +2740,7 @@ cdef class RealBall(RingElement): - sage: RBF(pi)/RBF(e) - [1.155727349790922 +/- 8.43e-16] - sage: RBF(2)/RBF(0) -- [+/- inf] -+ nan - """ - cdef RealBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -2765,7 +2766,7 @@ cdef class RealBall(RingElement): - sage: RBF(-1)^(1/3) - nan - sage: RBF(0)^(-1) -- [+/- inf] -+ nan - sage: RBF(-e)**RBF(pi) - nan - -@@ -3129,7 +3130,7 @@ cdef class RealBall(RingElement): - sage: RBF(1).tan() - [1.557407724654902 +/- 3.26e-16] - sage: RBF(pi/2).tan() -- [+/- inf] -+ nan - """ - cdef RealBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -3146,7 +3147,7 @@ cdef class RealBall(RingElement): - sage: RBF(1).cot() - [0.642092615934331 +/- 4.79e-16] - sage: RBF(pi).cot() -- [+/- inf] -+ nan - """ - cdef RealBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -3257,7 +3258,7 @@ cdef class RealBall(RingElement): - sage: RBF(1).coth() - [1.313035285499331 +/- 4.97e-16] - sage: RBF(0).coth() -- [+/- inf] -+ nan - """ - cdef RealBall res = self._new() - if _do_sig(prec(self)): sig_on() diff --git a/pkgs/applications/science/math/sage/patches/known-padics-bug.patch b/pkgs/applications/science/math/sage/patches/known-padics-bug.patch new file mode 100644 index 00000000000..bdccd73e0ce --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/known-padics-bug.patch @@ -0,0 +1,15 @@ +diff --git a/build/pkgs/openblas/package-version.txt b/build/pkgs/openblas/package-version.txt +index 3bc45c25d4..7c7c224887 100644 +--- a/src/sage/schemes/elliptic_curves/padics.py ++++ b/src/sage/schemes/elliptic_curves/padics.py +@@ -292,8 +292,8 @@ def padic_regulator(self, p, prec=20, height=None, check_hypotheses=True): + + sage: max_prec = 30 # make sure we get past p^2 # long time + sage: full = E.padic_regulator(5, max_prec) # long time +- sage: for prec in range(1, max_prec): # long time +- ....: assert E.padic_regulator(5, prec) == full # long time ++ sage: for prec in range(1, max_prec): # known bug (#25969) # long time ++ ....: assert E.padic_regulator(5, prec) == full # known bug (#25969) # long time + + A case where the generator belongs to the formal group already + (:trac:`3632`):: diff --git a/pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch b/pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch deleted file mode 100644 index fad434e52ad..00000000000 --- a/pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/sage/interfaces/maxima_abstract.py b/src/sage/interfaces/maxima_abstract.py -index 961c20aaac..3d601d8939 100644 ---- a/src/sage/interfaces/maxima_abstract.py -+++ b/src/sage/interfaces/maxima_abstract.py -@@ -1743,7 +1743,7 @@ class MaximaAbstractElement(ExtraTabCompletion, InterfaceElement): - sage: y,d = var('y,d') - sage: f = function('f') - sage: latex(maxima(derivative(f(x*y), x))) -- \left(\left.{{{\it \partial}}\over{{\it \partial}\, {\it t_0}}}\,f\left({\it t_0}\right) \right|_{{\it t_0}={\it x}\, {\it y}}\right)\,{\it y} -+ \left(\left.{{{\it \partial}}\over{{\it \partial}\, {\it t}_{0}}}\,f\left({\it t}_{0}\right) \right|_{{\it t}_{0}={\it x}\, {\it y}}\right)\,{\it y} - sage: latex(maxima(derivative(f(x,y,d), d,x,x,y))) - {{{\it \partial}^4}\over{{\it \partial}\,{\it d}\, {\it \partial}\,{\it x}^2\,{\it \partial}\, {\it y}}}\,f\left({\it x} , {\it y} , {\it d}\right) - sage: latex(maxima(d/(d-2))) -diff --git a/src/sage/manifolds/differentiable/metric.py b/src/sage/manifolds/differentiable/metric.py -index 3cd6ad3235..1e18af1a6b 100644 ---- a/src/sage/manifolds/differentiable/metric.py -+++ b/src/sage/manifolds/differentiable/metric.py -@@ -993,7 +993,7 @@ class PseudoRiemannianMetric(TensorField): - 2-dimensional differentiable manifold S^2 - sage: g.riemann()[:] - [[[[0, 0], [0, 0]], [[0, sin(th)^2], [-sin(th)^2, 0]]], -- [[[0, (cos(th)^2 - 1)/sin(th)^2], [1, 0]], [[0, 0], [0, 0]]]] -+ [[[0, -1], [1, 0]], [[0, 0], [0, 0]]]] - - In dimension 2, the Riemann tensor can be expressed entirely in terms of - the Ricci scalar `r`: -diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx -index dfb8751467..27402e54ab 100644 ---- a/src/sage/symbolic/expression.pyx -+++ b/src/sage/symbolic/expression.pyx -@@ -7154,7 +7154,7 @@ cdef class Expression(CommutativeRingElement): - sage: ex = lcm(sin(x)^2 - 1, sin(x)^2 + sin(x)); ex - (sin(x)^2 + sin(x))*(sin(x)^2 - 1)/(sin(x) + 1) - sage: ex.simplify_full() -- -cos(x)^2*sin(x) -+ sin(x)^3 - sin(x) - - TESTS: - -@@ -10004,7 +10004,7 @@ cdef class Expression(CommutativeRingElement): - - sage: f=tan(3*x) - sage: f.simplify_trig() -- (4*cos(x)^2 - 1)*sin(x)/(4*cos(x)^3 - 3*cos(x)) -+ -(4*cos(x)^2 - 1)*sin(x)/(4*cos(x)*sin(x)^2 - cos(x)) - sage: f.simplify_trig(False) - sin(3*x)/cos(3*x) - diff --git a/pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch b/pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch deleted file mode 100644 index 22f274d608d..00000000000 --- a/pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch +++ /dev/null @@ -1,479 +0,0 @@ -diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py -index 3a417d9d5c..fadaadbaf6 100644 ---- a/src/sage/calculus/calculus.py -+++ b/src/sage/calculus/calculus.py -@@ -231,7 +231,7 @@ Another example:: - sage: f(x=3) - arcsinh(1) - sage: f.derivative(x) -- 1/3/sqrt(1/9*x^2 + 1) -+ 1/sqrt(x^2 + 9) - - We compute the length of the parabola from 0 to 2:: - -@@ -1509,8 +1509,8 @@ def laplace(ex, t, s, algorithm='maxima'): - Testing SymPy:: - - sage: laplace(t^n, t, s, algorithm='sympy') -- (s^(-n)*gamma(n + 1)/s, 0, -re(n) < 1) -- -+ (gamma(n + 1)/(s*s^n), 0, -re(n) < 1) -+ - Testing Maxima:: - - sage: laplace(t^n, t, s, algorithm='maxima') -diff --git a/src/sage/functions/hypergeometric.py b/src/sage/functions/hypergeometric.py -index 1fc2db5c94..f3e49b9cdb 100644 ---- a/src/sage/functions/hypergeometric.py -+++ b/src/sage/functions/hypergeometric.py -@@ -34,7 +34,7 @@ Simplification (note that ``simplify_full`` does not yet call - sage: a.simplify_hypergeometric() - 1/((-e^x + 1)^e^x) - sage: a.simplify_hypergeometric(algorithm='sage') -- (-e^x + 1)^(-e^x) -+ 1/((-e^x + 1)^e^x) - - Equality testing:: - -@@ -145,7 +145,7 @@ Series expansions of confluent hypergeometric functions:: - - sage: hypergeometric_M(2, 2, x).series(x, 3) - 1 + 1*x + 1/2*x^2 + Order(x^3) -- sage: hypergeometric_U(2, 2, x).series(x == 3, 100).subs(x=1).n() -+ sage: hypergeometric_U(2, 2, x).series(x == 3, 100).subs(x=1).n() # known bug (see :trac:`25688`) - 0.403652637676806 - sage: hypergeometric_U(2, 2, 1).n() - 0.403652637676806 -@@ -773,7 +773,7 @@ def closed_form(hyp): - sage: closed_form(hypergeometric([], [], z)) - e^z - sage: closed_form(hypergeometric([a], [], z)) -- (-z + 1)^(-a) -+ 1/((-z + 1)^a) - sage: closed_form(hypergeometric([1, 1, 2], [1, 1], z)) - (z - 1)^(-2) - sage: closed_form(hypergeometric([2, 3], [1], x)) -@@ -1121,7 +1121,7 @@ class Hypergeometric_U(BuiltinFunction): - sage: var('a b z') - (a, b, z) - sage: hypergeometric_U(a, b, z).generalized() -- z^(-a)*hypergeometric((a, a - b + 1), (), -1/z) -+ hypergeometric((a, a - b + 1), (), -1/z)/z^a - sage: hypergeometric_U(1, 3, 1/2).generalized() - 2*hypergeometric((1, -1), (), -2) - sage: hypergeometric_U(3, I, 2).generalized() -diff --git a/src/sage/functions/log.py b/src/sage/functions/log.py -index 75d1bf8060..61968582af 100644 ---- a/src/sage/functions/log.py -+++ b/src/sage/functions/log.py -@@ -518,17 +518,17 @@ class Function_polylog(GinacFunction): - - sage: BF = RealBallField(100) - sage: polylog(2, BF(1/3)) -- [0.36621322997706348761674629766 +/- 4.51e-30] -+ [0.36621322997706348761674629766... +/- ...] - sage: polylog(2, BF(4/3)) -- nan -+ [2.27001825336107090380391448586 +/- 5.64e-30] + [-0.90377988538400159956755721265 +/- 8.39e-30]*I - sage: parent(_) -- Real ball field with 100 bits of precision -+ Complex ball field with 100 bits of precision - sage: polylog(2, CBF(1/3)) -- [0.366213229977063 +/- 5.85e-16] -+ [0.366213229977063 +/- ...] - sage: parent(_) - Complex ball field with 53 bits of precision - sage: polylog(2, CBF(1)) -- [1.644934066848226 +/- 6.59e-16] -+ [1.644934066848226 +/- ...] - sage: parent(_) - Complex ball field with 53 bits of precision - """ -diff --git a/src/sage/functions/trig.py b/src/sage/functions/trig.py -index e7e7a311cd..1f2926d6c9 100644 ---- a/src/sage/functions/trig.py -+++ b/src/sage/functions/trig.py -@@ -529,13 +529,8 @@ class Function_arcsin(GinacFunction): - arcsin - sage: asin(complex(1,1)) - (0.6662394324925152+1.0612750619050357j) -- -- Check that :trac:`22823` is fixed:: -- -- sage: bool(asin(SR(2.1)) == NaN) -- True -- sage: asin(SR(2.1)).is_real() -- False -+ sage: asin(SR(2.1)) -+ 1.57079632679490 - 1.37285914424258*I - """ - GinacFunction.__init__(self, 'arcsin', latex_name=r"\arcsin", - conversions=dict(maxima='asin', sympy='asin', fricas="asin", giac="asin")) -@@ -595,13 +590,8 @@ class Function_arccos(GinacFunction): - arccos - sage: acos(complex(1,1)) - (0.9045568943023814-1.0612750619050357j) -- -- Check that :trac:`22823` is fixed:: -- -- sage: bool(acos(SR(2.1)) == NaN) -- True -- sage: acos(SR(2.1)).is_real() -- False -+ sage: acos(SR(2.1)) -+ 1.37285914424258*I - """ - GinacFunction.__init__(self, 'arccos', latex_name=r"\arccos", - conversions=dict(maxima='acos', sympy='acos', fricas='acos', giac='acos')) -@@ -807,7 +797,7 @@ class Function_arcsec(GinacFunction): - sage: arcsec(2).n(100) - 1.0471975511965977461542144611 - sage: arcsec(1/2).n(100) -- NaN -+ 1.3169578969248167086250463473*I - sage: RDF(arcsec(2)) # abs tol 1e-15 - 1.0471975511965976 - sage: arcsec(1 + I) -@@ -958,7 +948,9 @@ class Function_arctan2(GinacFunction): - sage: atan2(0,0,hold=True) - arctan2(0, 0) - sage: atan2(0,0,hold=True).n() -- NaN -+ Traceback (most recent call last): -+ ... -+ RuntimeError: atan2(): division by zero - - Check if :trac:`10062` is fixed, this was caused by - ``(I*I).is_positive()`` returning ``True``:: -diff --git a/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py b/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py -index 3b5c8d1729..1c6b73a16c 100644 ---- a/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py -+++ b/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py -@@ -1422,8 +1422,10 @@ class HyperbolicGeodesicUHP(HyperbolicGeodesic): - expressions do not generate runtime errors. :: - - sage: g=HyperbolicPlane().UHP().get_geodesic(-1+I,1+I) -- sage: g.midpoint() -- Point in UHP 1/2*(sqrt(2)*e^(1/2*arccosh(3)) - sqrt(2) + (I - 1)*e^(1/2*arccosh(3)) + I - 1)/((1/4*I - 1/4)*sqrt(2)*e^(1/2*arccosh(3)) - (1/4*I - 1/4)*sqrt(2) + 1/2*e^(1/2*arccosh(3)) + 1/2) -+ sage: point = g.midpoint(); point -+ Point in UHP -1/2*(sqrt(2)*... -+ sage: QQbar(point.coordinates()).radical_expression() -+ I*sqrt(2) - - Check that floating points remain floating points - in :meth:`midpoint` :: -diff --git a/src/sage/interfaces/fricas.py b/src/sage/interfaces/fricas.py -index 82aae78e37..8501ea2a18 100644 ---- a/src/sage/interfaces/fricas.py -+++ b/src/sage/interfaces/fricas.py -@@ -1084,14 +1084,14 @@ class FriCASElement(ExpectElement): - 0.451026811796262, - 0.732815101786507, - 0.837981225008390, -- NaN, -- NaN, -+ 1.57079632679490 - 0.467145308103262*I, -+ 0.467145308103262*I, - 1.11976951499863, - 0.451026811796262, - 0.732815101786507, - 0.837981225008390, -- NaN, -- NaN] -+ 1.57079632679490 - 0.467145308103262*I, -+ 0.467145308103262*I] - sage: l = [tanh, sinh, cosh, coth, sech, csch, asinh, acosh, atanh, acoth, asech, acsch, arcsinh, arccosh, arctanh, arccoth, arcsech, arccsch] - sage: [f(x)._fricas_().sage().subs(x=0.9) for f in l] # optional - fricas - [0.716297870199024, -diff --git a/src/sage/libs/pynac/pynac.pyx b/src/sage/libs/pynac/pynac.pyx -index 9e9d8f664b..e3406f007e 100644 ---- a/src/sage/libs/pynac/pynac.pyx -+++ b/src/sage/libs/pynac/pynac.pyx -@@ -1824,7 +1824,7 @@ cdef py_atan2(x, y): - sage: atan2(CC(I), CC(I+1)) - 0.553574358897045 + 0.402359478108525*I - sage: atan2(CBF(I), CBF(I+1)) -- [0.55357435889705 +/- 5.58e-15] + [0.402359478108525 +/- 7.11e-16]*I -+ [0.55357435889705 +/- ...] + [0.402359478108525 +/- ...]*I - - Check that :trac:`23776` is fixed and RDF input gives real output:: - -diff --git a/src/sage/matrix/matrix_symbolic_dense.pyx b/src/sage/matrix/matrix_symbolic_dense.pyx -index 46a15e53eb..7a0beb437b 100644 ---- a/src/sage/matrix/matrix_symbolic_dense.pyx -+++ b/src/sage/matrix/matrix_symbolic_dense.pyx -@@ -200,7 +200,7 @@ cdef class Matrix_symbolic_dense(Matrix_generic_dense): - sage: eval, [evec], mult = es[0] - sage: delta = eval*evec - evec*A - sage: abs(abs(delta)) < 1e-10 -- sqrt(9/25*((2*sqrt(6) - 3)*(sqrt(6) - 2) + 7*sqrt(6) - 18)^2 + 9/25*((sqrt(6) - 2)*(sqrt(6) - 4) + 6*sqrt(6) - 14)^2) < (1.00000000000000e-10) -+ 3/5*sqrt(((2*sqrt(6) - 3)*(sqrt(6) - 2) + 7*sqrt(6) - 18)^2 + ((sqrt(6) - 2)*(sqrt(6) - 4) + 6*sqrt(6) - 14)^2) < (1.00000000000000e-10) - sage: abs(abs(delta)).n() < 1e-10 - True - -diff --git a/src/sage/modules/matrix_morphism.py b/src/sage/modules/matrix_morphism.py -index 17a1d6e290..03892ceec0 100644 ---- a/src/sage/modules/matrix_morphism.py -+++ b/src/sage/modules/matrix_morphism.py -@@ -214,9 +214,9 @@ class MatrixMorphism_abstract(sage.categories.morphism.Morphism): - sage: f((1, 0)) - Traceback (most recent call last): - ... -- TypeError: Unable to coerce entries (=[1.00000000000000*I, 0.000000000000000]) to coefficients in Real Field with 53 bits of precision -+ TypeError: Unable to coerce entries (=[1.00000000000000*I, 0]) to coefficients in Real Field with 53 bits of precision - sage: f((1, 0), coerce=False) -- (1.00000000000000*I, 0.000000000000000) -+ (1.00000000000000*I, 0) - - """ - if self.domain().is_ambient(): -diff --git a/src/sage/plot/plot.py b/src/sage/plot/plot.py -index 77cdeb8c46..e501e74036 100644 ---- a/src/sage/plot/plot.py -+++ b/src/sage/plot/plot.py -@@ -2061,7 +2061,7 @@ def _plot(funcs, xrange, parametric=False, - plot properly (:trac:`13246`):: - - sage: parametric_plot((x, arcsec(x)), (x, -2, 2)) -- Graphics object consisting of 1 graphics primitive -+ Graphics object consisting of 2 graphics primitives - - """ - from sage.plot.colors import Color -diff --git a/src/sage/repl/display/formatter.py b/src/sage/repl/display/formatter.py -index 8ce2e839d7..948207c95e 100644 ---- a/src/sage/repl/display/formatter.py -+++ b/src/sage/repl/display/formatter.py -@@ -25,11 +25,11 @@ generally, all sage expression as an ASCII art object:: - sage: shell = get_test_shell() - sage: shell.run_cell('%display ascii_art') - sage: shell.run_cell('integral(x^2/pi^x, x)') -- / 2 2 \ -x*log(pi) -- -\x *log (pi) + 2*x*log(pi) + 2/*e -- --------------------------------------------- -- 3 -- log (pi) -+ -x / 2 2 \ -+ -pi *\x *log (pi) + 2*x*log(pi) + 2/ -+ -------------------------------------- -+ 3 -+ log (pi) - sage: shell.run_cell("i = var('i')") - sage: shell.run_cell('sum(i*x^i, i, 0, 10)') - 10 9 8 7 6 5 4 3 2 -diff --git a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py -index d8ebbf4f76..8c60f65e99 100644 ---- a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py -+++ b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py -@@ -151,8 +151,8 @@ A multiple point example (Example 6.5 of [RaWi2012]_):: - [(x + 2*y - 1, 1), (2*x + y - 1, 1)]) - sage: F1 = decomp[1] - sage: F1.asymptotics(p, alpha, 2) -- (-3*((2*a^2 - 5*a*b + 2*b^2)*r^2 + (a + b)*r + 3)*((1/3)^(-a)*(1/3)^(-b))^r, -- (1/3)^(-a)*(1/3)^(-b), -3*(2*a^2 - 5*a*b + 2*b^2)*r^2 - 3*(a + b)*r - 9) -+ (-3*((2*a^2 - 5*a*b + 2*b^2)*r^2 + (a + b)*r + 3)*(1/((1/3)^a*(1/3)^b))^r, -+ 1/((1/3)^a*(1/3)^b), -3*(2*a^2 - 5*a*b + 2*b^2)*r^2 - 3*(a + b)*r - 9) - sage: alpha = [4, 3] - sage: decomp = F.asymptotic_decomposition(alpha) - sage: F1 = decomp[1] -@@ -2159,7 +2159,7 @@ class FractionWithFactoredDenominator(RingElement): - sage: p = {x: 1/3, y: 1/3} - sage: alpha = (var('a'), var('b')) - sage: F.asymptotics_multiple(p, alpha, 2, var('r')) # long time -- (3*((1/3)^(-a)*(1/3)^(-b))^r*e^(2/3), (1/3)^(-a)*(1/3)^(-b), 3*e^(2/3)) -+ (3*(1/((1/3)^a*(1/3)^b))^r*e^(2/3), 1/((1/3)^a*(1/3)^b), 3*e^(2/3)) - """ - from itertools import product - from sage.calculus.functions import jacobian -diff --git a/src/sage/stats/basic_stats.py b/src/sage/stats/basic_stats.py -index 16a268a02c..5fd244e93b 100644 ---- a/src/sage/stats/basic_stats.py -+++ b/src/sage/stats/basic_stats.py -@@ -183,7 +183,7 @@ def std(v, bias=False): - sage: std([]) - NaN - sage: std([I, sqrt(2), 3/5]) -- sqrt(1/450*(10*sqrt(2) - 5*I - 3)^2 + 1/450*(5*sqrt(2) - 10*I + 3)^2 + 1/450*(5*sqrt(2) + 5*I - 6)^2) -+ 1/15*sqrt(1/2)*sqrt((10*sqrt(2) - 5*I - 3)^2 + (5*sqrt(2) - 10*I + 3)^2 + (5*sqrt(2) + 5*I - 6)^2) - sage: std([RIF(1.0103, 1.0103), RIF(2)]) - 0.6998235813403261? - sage: import numpy -diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx -index ab4c05de3a..60f0dc549a 100644 ---- a/src/sage/symbolic/expression.pyx -+++ b/src/sage/symbolic/expression.pyx -@@ -622,7 +622,7 @@ cdef class Expression(CommutativeRingElement): - sage: x^(-5) - x^(-5) - sage: x^(-y) -- x^(-y) -+ 1/(x^y) - sage: 2*x^(-1) - 2/x - sage: i*x -@@ -3621,14 +3621,14 @@ cdef class Expression(CommutativeRingElement): - sage: repl_dict = {b_0: b_0, b_3: b_1, b_2: b_3, b_1: b_2} - sage: P = precomp.substitute(repl_dict) - sage: P.expand() -- -2^(-b_0)*2^(-b_2)*2^b_3 - 2^b_0*2^(-b_2)*2^b_3 - -- 2^(-b_0)*2^b_2*2^b_3 + 2^b_0*2^b_2*2^b_3 - 2*2^(-b_0)*2^(-b_2) -- - 2*2^b_0*2^(-b_2) - 2*2^(-b_0)*2^b_2 + 2*2^b_0*2^b_2 + -- 2^(-b_0)*2^b_3 + 2^b_0*2^b_3 + 2^(-b_2)*2^b_3 + 2^b_2*2^b_3 + -- 2*2^(-b_0) + 2*2^b_0 + 2*2^(-b_2) + 2*2^b_2 - 9*2^b_3 - -- 2^(-b_0)*2^(-b_2)/2^b_3 - 2^b_0*2^(-b_2)/2^b_3 - -- 2^(-b_0)*2^b_2/2^b_3 + 2^b_0*2^b_2/2^b_3 + 2^(-b_0)/2^b_3 + -- 2^b_0/2^b_3 + 2^(-b_2)/2^b_3 + 2^b_2/2^b_3 - 9/2^b_3 - 18 -+ 2^b_0*2^b_2*2^b_3 + 2*2^b_0*2^b_2 + 2^b_0*2^b_3 + 2^b_2*2^b_3 + -+ 2*2^b_0 + 2*2^b_2 - 9*2^b_3 + 2^b_0*2^b_2/2^b_3 - -+ 2^b_0*2^b_3/2^b_2 - 2^b_2*2^b_3/2^b_0 - 2*2^b_0/2^b_2 - -+ 2*2^b_2/2^b_0 + 2^b_0/2^b_3 + 2^b_2/2^b_3 + 2^b_3/2^b_0 + -+ 2^b_3/2^b_2 + 2/2^b_0 + 2/2^b_2 - 2^b_0/(2^b_2*2^b_3) - -+ 2^b_2/(2^b_0*2^b_3) - 9/2^b_3 - 2^b_3/(2^b_0*2^b_2) - -+ 2/(2^b_0*2^b_2) + 1/(2^b_0*2^b_3) + 1/(2^b_2*2^b_3) - -+ 1/(2^b_0*2^b_2*2^b_3) - 18 - - sage: _0,b_1,b_2=var('b_0,b_1,b_2') - sage: f = 1/27*b_2^2/(2^b_2)^2 + 1/27*b_1^2/(2^b_1)^2 + \ -@@ -3809,7 +3809,7 @@ cdef class Expression(CommutativeRingElement): - - sage: x = SR.symbol('x', domain='real') - sage: (x^3)^(1/3) -- (x^3)^(1/3) -+ x - sage: (x^4)^(1/4) - abs(x) - sage: (x^8)^(1/4) -@@ -3872,7 +3872,7 @@ cdef class Expression(CommutativeRingElement): - sage: 2^(x/log(2)) - e^x - sage: 2^(-x^2/2/log(2)) -- e^(-1/2*x^2) -+ 1/e^(1/2*x^2) - sage: x^(x/log(x)) - x^(x/log(x)) - sage: assume(x > 0) -@@ -4816,18 +4816,24 @@ cdef class Expression(CommutativeRingElement): - sage: ((x+y)^(x+y)).match(w0^w0) - {$0: x + y} - sage: t = ((a+b)*(a+c)).match((a+w0)*(a+w1)) -- sage: t[w0], t[w1] -- (c, b) -+ sage: set([t[w0], t[w1]]) == set([b, c]) -+ True - sage: ((a+b)*(a+c)).match((w0+b)*(w0+c)) - {$0: a} - sage: t = ((a+b)*(a+c)).match((w0+w1)*(w0+w2)) -- sage: t[w0], t[w1], t[w2] -- (a, c, b) -- sage: print(((a+b)*(a+c)).match((w0+w1)*(w1+w2))) -- None -+ sage: t[w0] -+ a -+ sage: set([t[w1], t[w2]]) == set([b, c]) -+ True -+ sage: t = ((a+b)*(a+c)).match((w0+w1)*(w1+w2)) -+ sage: t[w1] -+ a -+ sage: set([t[w0], t[w2]]) == set([b, c]) -+ True - sage: t = (a*(x+y)+a*z+b).match(a*w0+w1) -- sage: t[w0], t[w1] -- (x + y, a*z + b) -+ sage: s = set([t[w0], t[w1]]) -+ sage: s == set([x+y, a*z+b]) or s == set([z, a*(x+y)+b]) -+ True - sage: print((a+b+c+d+f+g).match(c)) - None - sage: (a+b+c+d+f+g).has(c) -@@ -4836,7 +4842,7 @@ cdef class Expression(CommutativeRingElement): - {$0: a + b + d + f + g} - sage: (a+b+c+d+f+g).match(c+g+w0) - {$0: a + b + d + f} -- sage: (a+b).match(a+b+w0) -+ sage: (a+b).match(a+b+w0) # known bug - {$0: 0} - sage: print((a*b^2).match(a^w0*b^w1)) - None -@@ -5009,7 +5015,7 @@ cdef class Expression(CommutativeRingElement): - a^3 + b^3 + (x + y)^3 - - sage: t.subs(w0 == w0^2) -- (x^2 + y^2)^18 + a^16 + b^16 -+ a^8 + b^8 + (x^2 + y^2)^6 - - sage: t.subs(a == b, b == c) - (x + y)^3 + b^2 + c^2 -@@ -8392,9 +8398,13 @@ cdef class Expression(CommutativeRingElement): - sage: SR(I).arctan2(1) - arctan2(I, 1) - sage: SR(CDF(0,1)).arctan2(1) -- NaN + +infinity*I -- sage: SR(1).arctan2(CDF(0,1)) # known bug -- 0.7853981633974484 - 19.012501686914433*I -+ Traceback (most recent call last): -+ ... -+ ValueError: power::eval(): division by zero -+ sage: SR(1).arctan2(CDF(0,1)) -+ Traceback (most recent call last): -+ ... -+ ValueError: power::eval(): division by zero - - sage: arctan2(0,oo) - 0 -@@ -8656,7 +8666,7 @@ cdef class Expression(CommutativeRingElement): - 1/2*I*pi - sage: SR(1/2).arccosh() - arccosh(1/2) -- sage: SR(CDF(1/2)).arccosh() # rel tol 1e-15 -+ sage: SR(CDF(1/2)).arccosh() # rel tol 1e-15 - 1.0471975511965976*I - sage: maxima('acosh(0.5)') - 1.04719755119659...*%i -@@ -11687,7 +11697,7 @@ cdef class Expression(CommutativeRingElement): - sage: a.solve(t) - [] - sage: b = a.canonicalize_radical(); b -- -23040.0*(-2.0*e^(1800*t) + 25.0*e^(900*t) - 32.0)*e^(-2400*t) -+ (46080.0*e^(1800*t) - 576000.0*e^(900*t) + 737280.0)*e^(-2400*t) - sage: b.solve(t) - [] - sage: b.solve(t, to_poly_solve=True) -@@ -12163,14 +12173,14 @@ cdef class Expression(CommutativeRingElement): - - sage: (n,k,j)=var('n,k,j') - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) -- -(-1)^(-j)*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) -+ -(-1)^j*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) - sage: assume(j>-1) - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) - 1 - sage: forget() - sage: assume(n>=j) - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) -- -(-1)^(-j)*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) -+ -(-1)^j*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) - sage: forget() - sage: assume(j==-1) - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) -@@ -12178,7 +12188,7 @@ cdef class Expression(CommutativeRingElement): - sage: forget() - sage: assume(j<-1) - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) -- -(-1)^(-j)*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) -+ -(-1)^j*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) - sage: forget() - - Check that :trac:`16176` is fixed:: -diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py -index da6f0eef42..4bd65ef572 100644 ---- a/src/sage/symbolic/relation.py -+++ b/src/sage/symbolic/relation.py -@@ -895,7 +895,7 @@ def solve(f, *args, **kwds): - sage: (r[0][x], r[0][y]) - (2*lambert_w(1/2), 1) - sage: solve(-2*x**3 + 4*x**2 - 2*x + 6 > 0, x, algorithm='sympy') -- [x < (1/6*sqrt(77) + 79/54)^(1/3) + 1/9/(1/6*sqrt(77) + 79/54)^(1/3) + 2/3] -+ [x < 1/3*(1/2)^(1/3)*(9*sqrt(77) + 79)^(1/3) + 2/3*(1/2)^(2/3)/(9*sqrt(77) + 79)^(1/3) + 2/3] - sage: solve(sqrt(2*x^2 - 7) - (3 - x),x,algorithm='sympy') - [x == -8, x == 2] - sage: solve(sqrt(2*x + 9) - sqrt(x + 1) - sqrt(x + 4),x,algorithm='sympy') diff --git a/pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch b/pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch deleted file mode 100644 index ff1dcd22acf..00000000000 --- a/pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/sage/tests/py3_syntax.py b/src/sage/tests/py3_syntax.py -index e564860b48..86ab3725f9 100644 ---- a/src/sage/tests/py3_syntax.py -+++ b/src/sage/tests/py3_syntax.py -@@ -179,15 +179,30 @@ class Python3SyntaxTest(SortedDirectoryWalkerABC): - sage: py3_syntax = Python3SyntaxTest() - sage: py3_syntax.test(src.name) - Invalid Python 3 syntax found: -- File "...py", line 1 -- print "invalid print statement" -- ^ -- SyntaxError: Missing parentheses in call to 'print' -+ Missing parentheses in call to 'print'... - sage: os.unlink(src.name) - """ -+ -+ # compile all given files in memory, printing all errors -+ # inspired by the py_compile module (but without writing to file) -+ script = """ -+import sys -+import importlib.machinery -+rv = 0 -+for file in sys.argv[1:]: -+ loader = importlib.machinery.SourceFileLoader('', file) -+ source_bytes = loader.get_data(file) -+ try: -+ code = loader.source_to_code(source_bytes, file) -+ except Exception as err: -+ print(err) -+ rv = 1 -+sys.exit(rv) -+""" - cmd = [ - 'python3', -- '-m', 'py_compile' -+ '-c', -+ script, - ] + list(filenames) - process = subprocess.Popen( - cmd, diff --git a/pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch b/pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch deleted file mode 100644 index 42deef4eab0..00000000000 --- a/pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7419e0246230594ebfd5e7a2fe6b80d67abfc98a Mon Sep 17 00:00:00 2001 -From: Jeroen Demeyer -Date: Tue, 20 Mar 2018 10:40:41 +0100 -Subject: Fix sphinxify doctests - ---- - sagenb/misc/sphinxify.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sagenb/misc/sphinxify.py b/sagenb/misc/sphinxify.py -index 4f76d41..15623d9 100644 ---- a/sagenb/misc/sphinxify.py -+++ b/sagenb/misc/sphinxify.py -@@ -47,11 +47,11 @@ def sphinxify(docstring, format='html'): - - sage: from sage.misc.sphinxify import sphinxify - sage: sphinxify('A test') -- '...
\n \n

A test

\n\n\n
' -+ '
\n \n

A test

\n\n\n
' - sage: sphinxify('**Testing**\n`monospace`') -- '...
Testing\n\n\n\n
' -+ '
Testing\n\n\n\n
' - sage: sphinxify('`x=y`') -- '...
\n \n

x=y

\n\n\n
' -+ '
\n \n

x=y

\n\n\n
' - sage: sphinxify('`x=y`', format='text') - 'x=y\n' - sage: sphinxify(':math:`x=y`', format='text') --- -cgit v1.0-1-gd88e - diff --git a/pkgs/applications/science/math/sage/patches/sphinx-1.7.patch b/pkgs/applications/science/math/sage/patches/sphinx-1.7.patch deleted file mode 100644 index c67b8942e28..00000000000 --- a/pkgs/applications/science/math/sage/patches/sphinx-1.7.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/src/bin/sage b/src/bin/sage -index 397f30cbed..3fc473c343 100755 ---- a/src/bin/sage -+++ b/src/bin/sage -@@ -980,8 +980,11 @@ if [ "$1" = '-rsyncdist' -o "$1" = "--rsyncdist" ]; then - fi - - if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then -+ # Redirect stdin from /dev/null. This helps with running TeX which -+ # tends to ask interactive questions if something goes wrong. These -+ # cause the build to hang. If stdin is /dev/null, TeX just aborts. - shift -- exec sage-python23 -m "sage_setup.docbuild" "$@" -+ exec sage-python23 -m sage_setup.docbuild "$@" Introduction to the -adics -+
  • Introduction to the -adics
    • - """ - debug_inf(app, "???? Trying intersphinx for %s"%node['reftarget']) - builder = app.builder -diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py -index 4f76d4113a..8f426b5989 100644 ---- a/src/sage/misc/sphinxify.py -+++ b/src/sage/misc/sphinxify.py -@@ -47,11 +47,11 @@ def sphinxify(docstring, format='html'): - - sage: from sage.misc.sphinxify import sphinxify - sage: sphinxify('A test') -- '...
    \n \n

    A test

    \n\n\n
    ' -+ '
    \n \n

    A test

    \n\n\n
    ' - sage: sphinxify('**Testing**\n`monospace`') -- '...
    Testing\n\n\n\n
    ' -+ '
    Testing\n\n \n

    x=y

    \n\n\n
    ' -+ '
    \n \n

    x=y

    \n\n\n
    ' - sage: sphinxify('`x=y`', format='text') - 'x=y\n' - sage: sphinxify(':math:`x=y`', format='text') -diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py -index fda76a4174..d3413239dd 100644 ---- a/src/sage_setup/docbuild/sphinxbuild.py -+++ b/src/sage_setup/docbuild/sphinxbuild.py -@@ -207,7 +207,7 @@ def runsphinx(): - try: - sys.stdout = SageSphinxLogger(sys.stdout, os.path.basename(output_dir)) - sys.stderr = SageSphinxLogger(sys.stderr, os.path.basename(output_dir)) -- sphinx.cmdline.main(sys.argv) -+ sphinx.cmdline.main(sys.argv[1:]) - finally: - sys.stdout = saved_stdout - sys.stderr = saved_stderr diff --git a/pkgs/applications/science/math/sage/patches/spkg-scripts.patch b/pkgs/applications/science/math/sage/patches/spkg-scripts.patch new file mode 100644 index 00000000000..4d37998b288 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/spkg-scripts.patch @@ -0,0 +1,46 @@ +commit f02714d4aea80e17cb8df62bab75d7c1a1b61a8e +Author: Timo Kaufmann +Date: Mon Jul 9 18:26:18 2018 +0200 + + Don't attempt to create dirs when showing pkg info + + The script dir cannot be assumed to be writeable after installation. + +diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg +index f3e02aeae5..190d558ad1 100755 +--- a/build/bin/sage-spkg ++++ b/build/bin/sage-spkg +@@ -167,14 +167,6 @@ if [ -z "$SAGE_BUILD_DIR" ]; then + export SAGE_BUILD_DIR="$SAGE_LOCAL/var/tmp/sage/build" + fi + +-for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS"; do +- mkdir -p "$dir" +- if [ $? -ne 0 ]; then +- error_msg "Error creating directory $dir" +- exit 1 +- fi +-done +- + + # Remove '.' from PYTHONPATH, which may also come from SAGE_PATH, to avoid + # trouble with setuptools / easy_install (cf. #10192, #10176): +@@ -563,11 +555,13 @@ fi + # Setup directories + ################################################################## + +-mkdir -p "$SAGE_BUILD_DIR" +-if [ $? -ne 0 ]; then +- error_msg "Error creating directory $SAGE_BUILD_DIR" +- exit 1 +-fi ++for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS" "$SAGE_BUILD_DIR"; do ++ mkdir -p "$dir" ++ if [ $? -ne 0 ]; then ++ error_msg "Error creating directory $dir" ++ exit 1 ++ fi ++done + + # Trac #5852: check write permissions + if [ ! -w "$SAGE_BUILD_DIR" ]; then diff --git a/pkgs/applications/science/math/sage/patches/zn_poly_version.patch b/pkgs/applications/science/math/sage/patches/zn_poly_version.patch deleted file mode 100644 index 92ea4303e47..00000000000 --- a/pkgs/applications/science/math/sage/patches/zn_poly_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py -index 7ff4f21675..1d72168833 100644 ---- a/src/sage/misc/package.py -+++ b/src/sage/misc/package.py -@@ -350,7 +350,7 @@ def package_versions(package_type, local=False): - sage: 'gap' in std - True - sage: std['zn_poly'] -- ('0.9.p11', '0.9.p11') -+ ('0.9', '0.9.p11') - """ - return {pkg['name']: (pkg['installed_version'], pkg['remote_version']) for pkg in list_packages(package_type, local=local).values()} - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index c97785c574c..735f8495f9e 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -3,17 +3,20 @@ , fetchpatch }: stdenv.mkDerivation rec { - version = "8.2"; + version = "8.3"; name = "sage-src-${version}"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0d7vc16s7dj23an2cb8v5bhbnc6nsw20qhnnxr0xh8qg629027b8"; + sha256 = "0mbm99m5xry21xpi4q3q96gx392liwbifywf5awvl0j85a7rkfyx"; }; nixPatches = [ + # https://trac.sagemath.org/ticket/25809 + ./patches/spkg-scripts.patch + # https://trac.sagemath.org/ticket/25309 (fetchpatch { name = "spkg-paths.patch"; @@ -26,14 +29,7 @@ stdenv.mkDerivation rec { sha256 = "14s50yg3hpw9cp3v581dx7zfmpm2j972im7x30iwki8k45mjvk3i"; }) - # https://trac.sagemath.org/ticket/25328 - # https://trac.sagemath.org/ticket/25546 # https://trac.sagemath.org/ticket/25722 - (fetchpatch { - name = "install-jupyter-kernel-in-correct-prefix.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=72167b98e3f64326df6b2c78785df25539472fcc"; - sha256 = "0pscnjhm7r2yr2rxnv4kkkq626vwaja720lixa3m3w9rwlxll5a7"; - }) ./patches/test-in-tmpdir.patch # https://trac.sagemath.org/ticket/25358 @@ -43,27 +39,13 @@ stdenv.mkDerivation rec { sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7"; }) - # https://trac.sagemath.org/ticket/25357 rebased on 8.2 - ./patches/python3-syntax-without-write.patch - - # https://trac.sagemath.org/ticket/25314 - (fetchpatch { - name = "make-qepcad-test-optional.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=fe294c58bd035ef427e268901d54a6faa0058138"; - sha256 = "003d5baf5c0n5rfg010ijwkwz8kg0s414cxwczs2vhdayxdixbix"; - }) - + # Unfortunately inclusion in upstream sage was rejected. Instead the bug was + # fixed in python, but of course not backported to 2.7. So we'll probably + # have to keep this around until 2.7 is deprecated. # https://trac.sagemath.org/ticket/25316 + # https://github.com/python/cpython/pull/7476 ./patches/python-5755-hotpatch.patch - # https://trac.sagemath.org/ticket/25354 - # https://trac.sagemath.org/ticket/25531 - (fetchpatch { - name = "cysignals-include.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=28778bd25a37c80884d2b24e0683fb2989300cef"; - sha256 = "0fiiiw91pgs8avm9ggj8hb64bhqzl6jcw094d94nhirmh8w2jmc5"; - }) - # https://trac.sagemath.org/ticket/25315 (fetchpatch { name = "find-libraries-in-dyld-library-path.patch"; @@ -75,9 +57,6 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/25312 ./patches/pari-stackwarn.patch - # https://trac.sagemath.org/ticket/25311 - ./patches/zn_poly_version.patch - # https://trac.sagemath.org/ticket/25345 # (upstream patch doesn't apply on 8.2 source) ./patches/dochtml-optional.patch @@ -106,27 +85,6 @@ stdenv.mkDerivation rec { # the last version. ./patches/eclib-regulator-precision.patch - # sphinx 1.6 -> 1.7 upgrade - # https://trac.sagemath.org/ticket/24935 - ./patches/sphinx-1.7.patch - - # Adapt hashes to new boost version - # https://trac.sagemath.org/ticket/22243 - # (this ticket doesn't only upgrade boost but also avoids this problem in the future) - (fetchpatch { - name = "boost-upgrade.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=a24a9c6b30b93957333a3116196214a931325b69"; - sha256 = "0z3870g2ms2a81vnw08dc2i4k7jr62w8fggvcdwaavgd1wvdxwfl"; - }) - - # gfan 0.6.2 - # https://trac.sagemath.org/ticket/23353 - (fetchpatch { - name = "gfan-update.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=420215fc469cde733ec7a339e59b78ad6eec804c&id=112498a293ea2bf563e41aed35f1aa608f01b349"; - sha256 = "0ga3hkx8cr23dpc919lgvpi5lmy0d728jkq9z6kf0fl9s8g31mxb"; - }) - # New glpk version has new warnings, filter those out until upstream sage has found a solution # https://trac.sagemath.org/ticket/24824 (fetchpatch { @@ -135,58 +93,14 @@ stdenv.mkDerivation rec { stripLen = 1; }) - # https://trac.sagemath.org/ticket/25329 - (fetchpatch { - name = "dont-check-exact-glpk-version.patch"; - url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=89d068d8d77316bfffa6bf8e9ebf70b3b3b88e5c"; - sha256 = "00knwxs6fmymfgfl0q5kcavmxm9sf90a4r76y35n5s55gj8pl918"; - }) - - # https://trac.sagemath.org/ticket/25355 - (fetchpatch { - name = "maxima-5.41.0.patch"; - url = "https://git.sagemath.org/sage.git/patch/?id=87328023c4739abdf24108038201e3fa9bdfc739"; - sha256 = "0hxi7qr5mfx1bc32r8j7iba4gzd7c6v63asylyf5cbyp86azpb7i"; - }) - - # Update cddlib from 0.94g to 0.94h. - # https://trac.sagemath.org/ticket/25341 (doesn't apply to 8.2 sources) - (fetchpatch { - url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/u2-version-cddlib-094h.patch"; - sha256 = "0fmw7pzbaxs2dshky6iw9pr8i23p9ih2y2lw661qypdrxh5xw03k"; - stripLen = 1; - }) - (fetchpatch { - name = "revert-cddlib-doctest-changes.patch"; - url = "https://git.sagemath.org/sage.git/patch/?id=269c1e1551285566b8ba7a2b890989e5590e9f11"; - sha256 = "12bcjhq7hm2pmmj2bgjvcffjyls2x7q61ivlnaj5v5bsvhc183iy"; - revert = true; - }) - - # Only formatting changes. # https://trac.sagemath.org/ticket/25260 ./patches/numpy-1.14.3.patch - - # https://trac.sagemath.org/ticket/24374 - (fetchpatch { - name = "networkx-2.1.patch"; - url = "https://salsa.debian.org/science-team/sagemath/raw/487df9ae48ca1d93d9b1cb3af8745d31e30fb741/debian/patches/u0-version-networkx-2.1.patch"; - sha256 = "1xxxawygbgxgvlv7b4w8hhzgdnva4rhmgdxaiaa3pwdwln0yc750"; - stripLen = 1; - }) - - # https://trac.sagemath.org/ticket/24927 rebased - ./patches/arb-2.13.0.patch - - # https://trac.sagemath.org/ticket/24838 rebased - ./patches/pynac-0.7.22.patch - - # https://trac.sagemath.org/ticket/25862 - ./patches/eclib-20180710.patch ]; - patches = nixPatches ++ packageUpgradePatches; + patches = nixPatches ++ packageUpgradePatches ++ [ + ./patches/known-padics-bug.patch + ]; postPatch = '' # make sure shebangs etc are fixed, but sage-python23 still works From 289173366b231d26b3c04674b26373a1d88f67f7 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 25 Jul 2018 18:58:57 +0200 Subject: [PATCH 138/229] singular: backport ntl error handling patch --- pkgs/applications/science/math/singular/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 98b75cd22d0..24063216db0 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig , lib +, fetchpatch , autoreconfHook , file , flint @@ -36,6 +37,18 @@ stdenv.mkDerivation rec { patchShebangs . ''; + patches = [ + # NTL error handler was introduced in the library part, preventing users of + # the library from implementing their own error handling + # https://www.singular.uni-kl.de/forum/viewtopic.php?t=2769 + (fetchpatch { + name = "move_error_handler_out_of_libsingular.patch"; + # rebased version of https://github.com/Singular/Sources/commit/502cf86d0bb2a96715be6764774b64a69c1ca34c.patch + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/singular/patches/singular-ntl-error-handler.patch?h=50b9ae2fd233c30860e1cbb3e63a26f2cc10560a"; + sha256 = "0vgh4m9zn1kjl0br68n04j4nmn5i1igfn28cph0chnwf7dvr9194"; + }) + ]; + # For reference (last checked on commit 75f460d): # https://github.com/Singular/Sources/blob/spielwiese/doc/Building-Singular-from-source.md # https://github.com/Singular/Sources/blob/spielwiese/doc/external-packages-dynamic-modules.md From e82c26af9b79af018b12efcbc0713d8197579383 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 25 Jul 2018 18:59:14 +0200 Subject: [PATCH 139/229] sage: don't pin singular --- .../science/math/sage/default.nix | 11 +- .../math/sage/patches/singular-4.1.1p2.patch | 274 ++++++++++++++++++ .../science/math/sage/sage-src.nix | 6 + 3 files changed, 281 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 014a1302147..712b127cf19 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -119,16 +119,7 @@ let giac = nixpkgs.giac.override { inherit ntl; }; arb = nixpkgs.arb.override { inherit flint; }; - # update causes issues - # https://groups.google.com/forum/#!topic/sage-packaging/cS3v05Q0zso - # https://trac.sagemath.org/ticket/24735 - singular = (nixpkgs.singular.override { inherit ntl flint; }).overrideAttrs (oldAttrs: { - name = "singular-4.1.0p3"; - src = fetchurl { - url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-1-0/singular-4.1.0p3.tar.gz"; - sha256 = "105zs3zk46b1cps403ap9423rl48824ap5gyrdgmg8fma34680a4"; - }; - }); + singular = nixpkgs.singular.override { inherit ntl flint; }; # *not* to confuse with the python package "pynac" pynac = nixpkgs.pynac.override { inherit singular flint; }; diff --git a/pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch b/pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch new file mode 100644 index 00000000000..4c8df92904e --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch @@ -0,0 +1,274 @@ +diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py +index 9d65c9fa6c..a028bbe719 100644 +--- a/src/sage/interfaces/singular.py ++++ b/src/sage/interfaces/singular.py +@@ -654,7 +654,7 @@ class Singular(ExtraTabCompletion, Expect): + + s = Expect.eval(self, x, **kwds) + +- if s.find("error") != -1 or s.find("Segment fault") != -1: ++ if s.find("error occurred") != -1 or s.find("Segment fault") != -1: + raise SingularError('Singular error:\n%s'%s) + + if get_verbose() > 0: +@@ -1079,7 +1079,7 @@ class Singular(ExtraTabCompletion, Expect): + sage: S = singular.ring('real', '(a,b)', 'lp') + sage: singular.current_ring() + polynomial ring, over a field, global ordering +- // coefficients: float ++ // coefficients: Float() + // number of vars : 2 + // block 1 : ordering lp + // : names a b +@@ -1157,7 +1157,7 @@ class Singular(ExtraTabCompletion, Expect): + sage: singular._tab_completion() + ['exteriorPower', + ... +- 'flintZ'] ++ 'crossprod'] + """ + p = re.compile("// *([a-z0-9A-Z_]*).*") #compiles regular expression + proclist = self.eval("listvar(proc)").splitlines() +@@ -1183,7 +1183,7 @@ class Singular(ExtraTabCompletion, Expect): + EXAMPLES:: + + sage: singular.version() +- "Singular ... version 4.1.0 ... ++ "Singular ... version 4... + """ + return singular_version() + +@@ -1562,7 +1562,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): + elif charstr[0] in ['0', 'QQ']: + from sage.all import QQ + br = QQ +- elif charstr[0]=='real': ++ elif charstr[0].startswith('Float'): + from sage.all import RealField, ceil, log + prec = singular.eval('ringlist(basering)[1][2][1]') + br = RealField(ceil((ZZ(prec)+1)/log(2,10))) +@@ -1750,7 +1750,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): + + # Singular 4 puts parentheses around floats and sign outside them + charstr = self.parent().eval('charstr(basering)').split(',',1) +- if charstr[0] in ['real', 'complex']: ++ if charstr[0]=='complex' or charstr[0].startswith('Float'): + for i in range(coeff_start, 2 * coeff_start): + singular_poly_list[i] = singular_poly_list[i].replace('(','').replace(')','') + +@@ -1992,7 +1992,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): + sage: S = singular.ring('real', '(a,b)', 'lp') + sage: singular.current_ring() + polynomial ring, over a field, global ordering +- // coefficients: float ++ // coefficients: Float() + // number of vars : 2 + // block 1 : ordering lp + // : names a b +@@ -2072,7 +2072,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): + sage: R._tab_completion() + ['exteriorPower', + ... +- 'flintZ'] ++ 'crossprod'] + """ + return self.parent()._tab_completion() + +@@ -2358,7 +2358,7 @@ def singular_version(): + EXAMPLES:: + + sage: singular.version() +- "Singular ... version 4.1.0 ... ++ "Singular ... version 4... + """ + return singular.eval('system("--version");') + +diff --git a/src/sage/libs/singular/decl.pxd b/src/sage/libs/singular/decl.pxd +index 4b658c4807..d863740419 100644 +--- a/src/sage/libs/singular/decl.pxd ++++ b/src/sage/libs/singular/decl.pxd +@@ -170,7 +170,7 @@ cdef extern from "singular/Singular/libsingular.h": + + int n_NumberOfParameters(const n_Procs_s* r) + +- ctypedef struct poly "polyrec": ++ ctypedef struct poly "spolyrec": + poly *next + number *coef + unsigned long exp[1] +@@ -630,9 +630,13 @@ cdef extern from "singular/Singular/libsingular.h": + # return p*q, destroys p and q + poly *p_Mult_q(poly *p, poly *q, ring *r) + ++ # polynomial division, ignoring the rest ++ # via singclap_pdivide resp. idLift, destroys p,q ++ poly *p_Divide(poly *p, poly *q, ring *r) ++ + # divide monomial p by monomial q, p,q const + +- poly *pDivide(poly *p,poly *q) ++ poly *pMDivide(poly *p,poly *q) + + # return the i-th power of p; p destroyed, requires global ring + +diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx +index 2a8d9ae021..aeff53af6c 100644 +--- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx ++++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx +@@ -190,8 +190,8 @@ from sage.libs.singular.decl cimport ( + n_IsUnit, n_Invers, + p_ISet, rChangeCurrRing, p_Copy, p_Init, p_SetCoeff, p_Setm, p_SetExp, p_Add_q, + p_NSet, p_GetCoeff, p_Delete, p_GetExp, pNext, rRingVar, omAlloc0, omStrDup, +- omFree, pDivide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, p_LmDivisibleBy, +- pDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy, ++ omFree, pMDivide, p_Divide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, p_LmDivisibleBy, ++ pMDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy, + p_IsUnit, p_Series, p_Head, idInit, fast_map_common_subexp, id_Delete, + p_IsHomogeneous, p_Homogen, p_Totaldegree,pLDeg1_Totaldegree, singclap_pdivide, singclap_factorize, + idLift, IDELEMS, On, Off, SW_USE_CHINREM_GCD, SW_USE_EZGCD, +@@ -1693,8 +1693,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base): + if not g._poly: + raise ZeroDivisionError + +- if r!=currRing: rChangeCurrRing(r) # pDivide +- res = pDivide(f._poly, g._poly) ++ if r!=currRing: rChangeCurrRing(r) # pMDivide ++ res = pMDivide(f._poly, g._poly) + if coeff: + if r.cf.type == n_unknown or r.cf.cfDivBy(p_GetCoeff(f._poly, r), p_GetCoeff(g._poly, r), r.cf): + n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, r), r.cf) +@@ -1853,8 +1853,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base): + and (g) \ + and g.parent() is self \ + and p_LmDivisibleBy((g)._poly, m, r): +- if r!=currRing: rChangeCurrRing(r) # pDivide +- flt = pDivide(f._poly, (g)._poly) ++ if r!=currRing: rChangeCurrRing(r) # pMDivide ++ flt = pMDivide(f._poly, (g)._poly) + #p_SetCoeff(flt, n_Div( p_GetCoeff(f._poly, r) , p_GetCoeff((g)._poly, r), r), r) + p_SetCoeff(flt, n_Init(1, r), r) + return new_MP(self,flt), g +@@ -4023,16 +4023,6 @@ cdef class MPolynomial_libsingular(MPolynomial): + Traceback (most recent call last): + ... + NotImplementedError: Division of multivariate polynomials over non fields by non-monomials not implemented. +- +- TESTS:: +- +- sage: P. = ZZ[] +- sage: p = 3*(-x^8*y^2 - x*y^9 + 6*x^8*y + 17*x^2*y^6 - x^3*y^2) +- sage: q = 7*(x^2 + x*y + y^2 + 1) +- sage: p*q//q == p +- True +- sage: p*q//p == q +- True + """ + cdef MPolynomialRing_libsingular parent = self._parent + cdef ring *r = self._parent_ring +@@ -4052,13 +4042,18 @@ cdef class MPolynomial_libsingular(MPolynomial): + _right = right + + if r.cf.type != n_unknown: ++ if r.cf.type == n_Z: ++ P = parent.change_ring(RationalField()) ++ f = P(self)//P(right) ++ CM = list(f) ++ return parent(sum([c.floor()*m for c,m in CM])) + if _right.is_monomial(): + p = _self._poly + quo = p_ISet(0,r) +- if r != currRing: rChangeCurrRing(r) # pDivide ++ if r != currRing: rChangeCurrRing(r) # pMDivide + while p: + if p_DivisibleBy(_right._poly, p, r): +- temp = pDivide(p, _right._poly) ++ temp = pMDivide(p, _right._poly) + p_SetCoeff0(temp, n_Copy(p_GetCoeff(p, r), r), r) + quo = p_Add_q(quo, temp, r) + p = pNext(p) +@@ -4794,6 +4789,8 @@ cdef class MPolynomial_libsingular(MPolynomial): + sage: p = -x*y + x*z + 54*x - 2 + sage: (5*p^2).lcm(3*p) == 15*p^2 + True ++ sage: lcm(2*x,2*x*y) ++ 2*x*y + """ + cdef ring *_ring = self._parent_ring + cdef poly *ret +@@ -4821,9 +4818,7 @@ cdef class MPolynomial_libsingular(MPolynomial): + if _ring!=currRing: rChangeCurrRing(_ring) # singclap_gcd + gcd = singclap_gcd(p_Copy(self._poly, _ring), p_Copy(_g._poly, _ring), _ring ) + prod = pp_Mult_qq(self._poly, _g._poly, _ring) +- ret = singclap_pdivide(prod , gcd , _ring) +- p_Delete(&prod, _ring) +- p_Delete(&gcd, _ring) ++ ret = p_Divide(prod, gcd, _ring) + if count >= 20: + sig_off() + return new_MP(self._parent, ret) +@@ -4866,7 +4861,7 @@ cdef class MPolynomial_libsingular(MPolynomial): + sage: f.quo_rem(y) + (2*x^2, x + 1) + sage: f.quo_rem(3*x) +- (2*x*y + 1, -4*x^2*y - 2*x + 1) ++ (0, 2*x^2*y + x + 1) + + TESTS:: + +@@ -4888,7 +4883,7 @@ cdef class MPolynomial_libsingular(MPolynomial): + if right.is_zero(): + raise ZeroDivisionError + +- if not self._parent._base.is_field() and not is_IntegerRing(self._parent._base): ++ if not self._parent._base.is_field(): + py_quo = self//right + py_rem = self - right*py_quo + return py_quo, py_rem +diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx +index d5439f7f08..ad20ebcca0 100644 +--- a/src/sage/rings/polynomial/plural.pyx ++++ b/src/sage/rings/polynomial/plural.pyx +@@ -998,7 +998,7 @@ cdef class NCPolynomialRing_plural(Ring): + if not g._poly: + raise ZeroDivisionError + +- res = pDivide(f._poly,g._poly) ++ res = pMDivide(f._poly,g._poly) + if coeff: + if (r.cf.type == n_unknown) or r.cf.cfDivBy(p_GetCoeff(f._poly, r), p_GetCoeff(g._poly, r), r.cf): + n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, r), r.cf) +@@ -1193,7 +1193,7 @@ cdef class NCPolynomialRing_plural(Ring): + if isinstance(g, NCPolynomial_plural) \ + and (g) \ + and p_LmDivisibleBy((g)._poly, m, r): +- flt = pDivide(f._poly, (g)._poly) ++ flt = pMDivide(f._poly, (g)._poly) + #p_SetCoeff(flt, n_Div( p_GetCoeff(f._poly, r) , p_GetCoeff((g)._poly, r), r), r) + p_SetCoeff(flt, n_Init(1, r), r) + return new_NCP(self,flt), g +diff --git a/src/sage/rings/polynomial/polynomial_singular_interface.py b/src/sage/rings/polynomial/polynomial_singular_interface.py +index 9331169f8b..f753610fd3 100644 +--- a/src/sage/rings/polynomial/polynomial_singular_interface.py ++++ b/src/sage/rings/polynomial/polynomial_singular_interface.py +@@ -81,8 +81,8 @@ class PolynomialRing_singular_repr: + sage: R. = PolynomialRing(CC) + sage: singular(R) + polynomial ring, over a field, global ordering +- // coefficients: float[I](complex:15 digits, additional 0 digits)/(I^2+1) +- // number of vars : 2 ++ // coefficients: real[I](complex:15 digits, additional 0 digits)/(I^2+1) ++ // number of vars : 2 + // block 1 : ordering dp + // : names x y + // block 2 : ordering C +@@ -90,8 +90,8 @@ class PolynomialRing_singular_repr: + sage: R. = PolynomialRing(RealField(100)) + sage: singular(R) + polynomial ring, over a field, global ordering +- // coefficients: float +- // number of vars : 2 ++ // coefficients: Float() ++ // number of vars : 2 + // block 1 : ordering dp + // : names x y + // block 2 : ordering C diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 735f8495f9e..56723be9a8e 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -96,6 +96,12 @@ stdenv.mkDerivation rec { # Only formatting changes. # https://trac.sagemath.org/ticket/25260 ./patches/numpy-1.14.3.patch + + # https://trac.sagemath.org/ticket/25862 + ./patches/eclib-20180710.patch + + # https://trac.sagemath.org/ticket/24735 + ./patches/singular-4.1.1p2.patch ]; patches = nixPatches ++ packageUpgradePatches ++ [ From fa34f6d41c42d9e199e61aff55ddb0c5056be7fc Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 27 Jul 2018 00:10:35 +0200 Subject: [PATCH 140/229] sage: don't pin pari --- pkgs/applications/science/math/sage/default.nix | 10 +--------- .../applications/science/math/sage/sage-src.nix | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 712b127cf19..7caec03c03a 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -156,15 +156,7 @@ let # https://trac.sagemath.org/ticket/22191 ecl = nixpkgs.ecl_16_1_2; - # sage currently uses an unreleased version of pari - # https://trac.sagemath.org/ticket/25567 - pari = (nixpkgs.pari.override { withThread = false; }).overrideAttrs (attrs: rec { - version = "2.10-1280-g88fb5b3"; # on update remove pari-stackwarn patch from `sage-src.nix` - src = fetchurl { - url = "mirror://sageupstream/pari/pari-${version}.tar.gz"; - sha256 = "19gbsm8jqq3hraanbmsvzkbh88iwlqbckzbnga3y76r7k42akn7m"; - }; - }); + pari = nixpkgs.pari.override { withThread = false; }; in python.pkgs.sage-wrapper // { doc = python.pkgs.sagedoc; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 56723be9a8e..44a0c22d2b3 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -53,10 +53,6 @@ stdenv.mkDerivation rec { sha256 = "1k3afq3qlzmgqwx6rzs5wv153vv9dsf5rk8pi61g57l3r3npbjmc"; }) - # Pari upstream has since accepted a patch, so this patch won't be necessary once sage updates pari. - # https://trac.sagemath.org/ticket/25312 - ./patches/pari-stackwarn.patch - # https://trac.sagemath.org/ticket/25345 # (upstream patch doesn't apply on 8.2 source) ./patches/dochtml-optional.patch @@ -87,6 +83,7 @@ stdenv.mkDerivation rec { # New glpk version has new warnings, filter those out until upstream sage has found a solution # https://trac.sagemath.org/ticket/24824 + ./patches/pari-stackwarn.patch # not actually necessary since tha pari upgrade, but necessary for the glpk patch to apply (fetchpatch { url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/dt-version-glpk-4.65-ignore-warnings.patch"; sha256 = "0b9293v73wb4x13wv5zwyjgclc01zn16msccfzzi6znswklgvddp"; @@ -102,6 +99,18 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/24735 ./patches/singular-4.1.1p2.patch + + # https://trac.sagemath.org/ticket/25567 and dependency #25635 + (fetchpatch { + name = "pari-upgrade-dependency.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=6995e7cae1b3476ad0145f8dfc897cf91f0c3c4d"; + sha256 = "1dvhabl1c9pwd9xkjvbjjg15mvb14b24p1f3cby1mlqk34d4lrs6"; + }) + (fetchpatch { + name = "pari-2.11.0.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=7af4748cab37d651eaa88be501db88f4a5ffc584"; + sha256 = "13f740ly3c19gcmhjngiycvmc3mcfj61y00i6jv0wmfgpm2z3ank"; + }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ From e550e5d0c7455a76acacddd8ef284aa41d02effc Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 29 Jul 2018 23:01:10 +0200 Subject: [PATCH 141/229] lcalc: apply c++11 patch --- pkgs/applications/science/math/sage/sage-src.nix | 6 ++++++ .../libraries/science/math/lcalc/default.nix | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 44a0c22d2b3..c18adc7fae9 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -110,6 +110,12 @@ stdenv.mkDerivation rec { name = "pari-2.11.0.patch"; url = "https://git.sagemath.org/sage.git/patch/?id=7af4748cab37d651eaa88be501db88f4a5ffc584"; sha256 = "13f740ly3c19gcmhjngiycvmc3mcfj61y00i6jv0wmfgpm2z3ank"; + + # ntl upgrade + (fetchpatch { + name = "lcalc-c++11.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa"; + sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb"; }) ]; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 6bbd43b0c84..e55244b2a59 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -57,6 +57,18 @@ stdenv.mkDerivation rec { # based on gentoos makefile patch -- fix paths, adhere to flags ./makefile.patch + + # (fetchpatch { + # name = "default-double.patch"; + # url = "https://github.com/dimpase/lcalc/pull/1/commits/0500c67b6aa1f492715591669f6647c8f7a3ea59.patch"; + # sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vla"; + # }) + + (fetchpatch { + name = "c++11.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; + sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; + }) ]; installFlags = [ From 834a24e0ff8c18b773879b79c1c5e30f518a79b0 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 29 Jul 2018 23:02:38 +0200 Subject: [PATCH 142/229] sage: don't pin ntl Now possible because of the lcalc c++11 patch. --- .../science/math/sage/default.nix | 25 ++++++------------- .../science/math/sage/sage-src.nix | 1 + 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 7caec03c03a..712c5fe8622 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -24,7 +24,7 @@ let pybrial = self.callPackage ./pybrial.nix {}; sagelib = self.callPackage ./sagelib.nix { - inherit flint ecl pari eclib ntl arb; + inherit flint ecl pari eclib arb; inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; linbox = nixpkgs.linbox.override { withSage = true; }; }; @@ -45,13 +45,13 @@ let }; sage-env = self.callPackage ./sage-env.nix { - inherit sage-src python rWrapper openblas-cblas-pc ecl singular eclib pari palp flint pynac pythonEnv giac ntl; + inherit sage-src python rWrapper openblas-cblas-pc ecl singular eclib pari palp flint pynac pythonEnv; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; sage-with-env = self.callPackage ./sage-with-env.nix { - inherit pari eclib pythonEnv ntl; - inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular giac; + inherit pari eclib pythonEnv; + inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig three = nodePackages_8_x.three; }; @@ -106,31 +106,20 @@ let }); }; - # https://trac.sagemath.org/ticket/25532 - ntl = nixpkgs.ntl.overrideAttrs (oldAttrs: rec { - name = "ntl-10.5.0"; - sourceRoot = "${name}/src"; - src = fetchurl { - url = "http://www.shoup.net/ntl/${name}.tar.gz"; - sha256 = "1lmldaldgfr2b2a6585m3np5ds8bq1bis2s1ajycjm49vp4kc2xr"; - }; - }); - - giac = nixpkgs.giac.override { inherit ntl; }; arb = nixpkgs.arb.override { inherit flint; }; - singular = nixpkgs.singular.override { inherit ntl flint; }; + singular = nixpkgs.singular.override { inherit flint; }; # *not* to confuse with the python package "pynac" pynac = nixpkgs.pynac.override { inherit singular flint; }; - eclib = nixpkgs.eclib.override { inherit pari ntl; }; + eclib = nixpkgs.eclib.override { inherit pari; }; # With openblas (64 bit), the tests fail the same way as when sage is build with # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use # openblasCompat. - flint = nixpkgs.flint.override { withBlas = false; inherit ntl; }; + flint = nixpkgs.flint.override { withBlas = false; }; # Multiple palp dimensions need to be available and sage expects them all to be # in the same folder. diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index c18adc7fae9..e027dccf0fc 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { name = "pari-2.11.0.patch"; url = "https://git.sagemath.org/sage.git/patch/?id=7af4748cab37d651eaa88be501db88f4a5ffc584"; sha256 = "13f740ly3c19gcmhjngiycvmc3mcfj61y00i6jv0wmfgpm2z3ank"; + }) # ntl upgrade (fetchpatch { From e875678f8ed34256300cc65e63aae641495572b5 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 26 Jul 2018 12:31:47 +0200 Subject: [PATCH 143/229] spotify: 1.0.80.480.g51b03ac3-13 -> 1.0.80.474.gef6b503e-7 The purpose of this update (or downgrade?) is to switch the spotify source to one more reliable. The current source only contains the last few releases, while the new source retains all old releases. --- pkgs/applications/audio/spotify/default.nix | 51 +++++++++++++++++---- pkgs/applications/audio/spotify/update.sh | 49 ++++++++++++++++++++ 2 files changed, 90 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/audio/spotify/update.sh diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index b8495465db5..04bdff3c813 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,13 +1,18 @@ -{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }: let - # Please update the stable branch! - # Latest version number can be found at: - # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - # Be careful not to pick the testing version. - version = "1.0.80.480.g51b03ac3-13"; + # "rev" decides what is actually being downloaded + version = "1.0.80.474.gef6b503e-7"; + # To get the latest stable revision: + # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' + # To get general information: + # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' + # More exapmles of api usage: + # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py + rev = "16"; + deps = [ alsaLib @@ -49,12 +54,20 @@ in stdenv.mkDerivation { name = "spotify-${version}"; + # fetch from snapcraft instead of the debian repository most repos fetch from. + # That is a bit more cumbersome. But the debian repository only keeps the last + # two versions, while snapcraft should provide versions indefinately: + # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512 + + # This is the next-best thing, since we're not allowed to re-distribute + # spotify ourselves: + # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { - url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "e32f4816ae79dbfa0c14086e76df3bc83d526402aac1dbba534127fc00fe50ea"; + url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; + sha512 = "45b7ab574b30fb368e0b6f4dd60addbfd1ddc02173b4f98b31c524eed49073432352a361e75959ce8e2f752231e93c79ca1b538c4bd295c935d1e2e0585d147f"; }; - buildInputs = [ dpkg makeWrapper ]; + buildInputs = [ squashfsTools makeWrapper ]; doConfigure = false; doBuild = false; @@ -63,7 +76,23 @@ stdenv.mkDerivation { unpackPhase = '' runHook preUnpack - dpkg-deb -x $src . + unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml' + cd squashfs-root + if ! grep -q 'grade: stable' meta/snap.yaml; then + # Unfortunately this check is not reliable: At the moment (2018-07-26) the + # latest version in the "edge" channel is also marked as stable. + echo "The snap package is marked as unstable:" + grep 'grade: ' meta/snap.yaml + echo "You probably chose the wrong revision." + exit 1 + fi + if ! grep -q '${version}' meta/snap.yaml; then + echo "Package version differs from version found in snap metadata:" + grep 'version: ' meta/snap.yaml + echo "While the nix package specifies: ${version}." + echo "You probably chose the wrong revision or forgot to update the nix version." + exit 1 + fi runHook postUnpack ''; @@ -75,6 +104,8 @@ stdenv.mkDerivation { mkdir -p $libdir mv ./usr/* $out/ + cp meta/snap.yaml $out + # Work around Spotify referring to a specific minor version of # OpenSSL. diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/applications/audio/spotify/update.sh new file mode 100644 index 00000000000..114245f6d46 --- /dev/null +++ b/pkgs/applications/audio/spotify/update.sh @@ -0,0 +1,49 @@ +channel="stable" # stable/candidate/edge +nixpkgs="$(git rev-parse --show-toplevel)" +spotify_nix="$nixpkgs/pkgs/applications/audio/spotify/default.nix" + + + +# create bash array from snap info +snap_info=($( + curl -H 'X-Ubuntu-Series: 16' \ + "https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=$channel" \ + | jq --raw-output \ + '.revision,.download_sha512,.version,.last_updated' +)) + +revision="${snap_info[0]}" +sha512="${snap_info[1]}" +version="${snap_info[2]}" +last_updated="${snap_info[3]}" + +# find the last commited version +version_pre=$( + git grep 'version\s*=' HEAD "$spotify_nix" \ + | sed -Ene 's/.*"(.*)".*/\1/p' +) + +if [[ "$version_pre" = "$version" ]]; then + echo "Spotify is already up ot date" + exit 0 +fi + +echo "Updating from ${version_pre} to ${version}, released on ${last_updated}" + +# search-andreplace revision, hash and version +sed --regexp-extended \ + -e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \ + -e 's/sha512\s*=\s*".{128}"\s*;/sha512 = "'"${sha512}"'";/' \ + -e 's/version\s*=\s*".*"\s*;/version = "'"${version}"'";/' \ + -i "$spotify_nix" + +if ! nix-build -A spotify "$nixpkgs"; then + echo "The updated spotify failed to build." + exit 1 +fi + +git add "$spotify_nix" +# show diff for review +git diff HEAD +# prepare commit message, but allow edit +git commit --edit --message "spotify: $version_pre -> $version" From b723af3174cf6055065a164a8a9da89b48c09983 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Aug 2018 08:31:05 -0500 Subject: [PATCH 144/229] libtorrent: 20161212 -> 0.13.7 --- pkgs/tools/networking/p2p/libtorrent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 87cf6d172c0..9c6f5eec11b 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "libtorrent-${version}"; - version = "20161212"; + version = "0.13.7"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; - rev = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87"; - sha256 = "0y9759sxx5dyamyw8w58dsxq7bmnn57q7s2f4cw2zln2pp5gripw"; + rev = "v${version}"; + sha256 = "027qanwcisxhx0bq8dn8cpg8563q0k2pm8ls278f04n7jqvvwkp0"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = "http://rtorrent.net/downloads/"; + inherit (src.meta) homepage; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; From 2d7e6b79dc627a8816448aaa21919490c22ebac2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Aug 2018 08:31:43 -0500 Subject: [PATCH 145/229] rtorrent: 20161023 -> 0.9.7 --- pkgs/tools/networking/p2p/rtorrent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 6ab462ac5a8..658739c93aa 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "rtorrent-${version}"; - version = "20161023"; + version = "0.9.7"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "226e670decf92e7adaa845a6982aca4f164ea740"; - sha256 = "0cxyakc09bn6wjfj42gh508hc62awx825skzacpizx2bqs6v7xvb"; + rev = "v${version}"; + sha256 = "0a9dk3cz56f7gad8ghsma79iy900rwdvzngs6k6x08nlwaqid8ga"; }; nativeBuildInputs = [ pkgconfig ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = https://rakshasa.github.io/rtorrent/; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; From 9ef1406a9918f3414d081563ba34084c5e187a58 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 4 Aug 2018 16:01:44 +0200 Subject: [PATCH 146/229] signal-desktop: Allow overriding the spell checker language (#44456) Thought this could be useful for others as well. Unfortunately it will also override the UI language. Example usage: environment.systemPackages = with pkgs; [ (signal-desktop.override { spellcheckerLanguage = "de_DE"; }) ]; --- .../signal-desktop/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index b7066a501a3..459bdf98b1e 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -3,9 +3,24 @@ , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, udev +# Unfortunately this also overwrites the UI language (not just the spell +# checking language!): +, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" +# For a full list of available languages: +# $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' }: let + customLanguageWrapperArgs = (with lib; + let + # E.g. "de_DE" -> "de-de" (spellcheckerLanguage -> hunspellDict) + spellLangComponents = splitString "_" spellcheckerLanguage; + hunspellDict = elemAt spellLangComponents 0 + "-" + toLower (elemAt spellLangComponents 1); + in if spellcheckerLanguage != null + then '' + --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ + --set LC_MESSAGES "${spellcheckerLanguage}"'' + else ""); rpath = lib.makeLibraryPath [ alsaLib atk @@ -68,6 +83,7 @@ in stdenv.mkDerivation rec { --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop wrapProgram $out/libexec/signal-desktop \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + ${customLanguageWrapperArgs} \ "''${gappsWrapperArgs[@]}" # Symlink to bin From 6b0bed4f01cd9ec9d89cef2bbe5c504d92901c3b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 4 Aug 2018 15:20:51 +0800 Subject: [PATCH 147/229] firefox-devedition-bin: 62.0b10 -> 62.0b14 --- .../firefox-bin/devedition_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a581f3f48fb..eec00d399bd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b10"; + version = "62.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ach/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ach/firefox-62.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "d28ef8bf25a809eac59456ae1952cf2f0b3f2e9d3b610b91d7bb263e206e24bb5c553be46c450d7c71ce16f0b65d559796e430b9f0700cee953c891088ea13b2"; + sha512 = "da8d3b8da37ddc7e4be14cc620e0961d81da6ee5dc30726c042bfd788df26897e68331a581ed01920f39a77fa913f4844b5a7660e02799bc067aec9f0a25d63c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/af/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/af/firefox-62.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "3967402c97db66c917ba06f6d2514ed6cdf072a34eef3b6a47c3751f8ebd04c80dfe6586abc7c5430a573fe0375761b448f5d60a062dbf6a3d2f84700924f2ea"; + sha512 = "51b63bbddaac26f1f68298f874e063da760312eda8c2b42b8a090809aa75ea13dead3c6893f860603651ddf585baaf598a25f24bdd539902f046d02c3d821841"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/an/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/an/firefox-62.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "1aa485381ada3fab9df3a925bd143742976303576df3d30a7ef095b12628f9d0eb8bd21152dbfbb6d73d2f4e4c1364c3481e9b96a3a003b802c618aecd1237b5"; + sha512 = "de8e4c5fcb5502ae3cd3eb4e44b668c9702c7cd51e8bc5c41a5384f984c7745ca3612f4b528cb0d01eaca2f52e82ff76b3e6bae764f61a2e96603f6a1f66ad74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ar/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ar/firefox-62.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0c7ae9d3de5710ea08ee80610a3e7b0ed5cd89d1bddf3c64b478a10f2250286b20ea062c663ec5ef92a5e8c3af9432929f47f1b2c760d1222aa3eacfee3f3979"; + sha512 = "7fdc45292c3f5e37c13cb350be5c49d13eca7955bd0157578c7fe67f566d72ba9be70191e3f5e967301923a6d12115f3e369f00564518b2c114757d0bf9e2cf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/as/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/as/firefox-62.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "662f4a0a78329e80c9eb466308839036091f31b1f258b5eb5df31f3dcc7b6d0d6986d506392dec30f822c69fc207e5669e77ffdf26c7b7156b42a73e155b65ee"; + sha512 = "3bf37c6b179a263a0db7e18a194d86aa66b735e313bfe9d21e3d71d2d16d5d490c13c2feb6cbf64bf3fc7a38a42a6ee0dfde30595eae24b8434273d8b0de93aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ast/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ast/firefox-62.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "ca0b3d4722075dc6ebef171bc36e1b4e9206bce04c8fdb1d038b0abbc120671a2ef4d6023bea627f0c99fbffcd999b70634de90e1b51c518d8642892545c29cc"; + sha512 = "570f407929ce9a7562cc83b96d7ce430aae47b06c2ba76a6abab468f1399078131b30b1492dc0f156e3a578f4bbbe82bfd1ead03d61f7242e9928394865a6c32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/az/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/az/firefox-62.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "b981b720cb776a8e83953f8e4dac7794c981681d8e6da010f0afcb7e90df5884058349cc6a12d4f5a360cf7f9067b87afbe862842f0ad016697999bc3d94ad82"; + sha512 = "90e03b55ce56605f336e33dcfd0946dfc9e3070c11beb73ab2cf56c4876f40d189b9ff7b221765d362f4021931523b6820264367f3bcc23d7f3ed741e8c3d371"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/be/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/be/firefox-62.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "a7bd1f001152e4ea8a887e685b126bfb4dedc7a30270128d535eedc04dbd489a3d6117ccdd8893f5753b7d5227d4731cbdfa1f7bc292712ea2634006aa55d6ab"; + sha512 = "3e129ac99041031a182c7f6c0111d4ecb44e870cdf718bad3073bd9fcc8da99e4ee3cccc5ed97bf468b398b5b5a554618291417fd2fde87cdf3e48925b519a4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bg/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/bg/firefox-62.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a6b5f4d3aa3db7be416f4bb604a749c8118fcdf5d3bf01cc57dab87c874f0f52412658c9f509c2d09100f4cdf7f5b446d11fb45bfea2d25d4e65276f3257ddfd"; + sha512 = "aac418365d09bcffb1ec5f501091d07e6f14d26c44af8abe9d630f9985b46ecedc67084da83b57bcaa42c5af3053a9d05344d341f911f8bb8f4046e364469333"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bn-BD/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/bn-BD/firefox-62.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "3cf7f43ca3fcb538cc28c9ab7d3d6441f15123a1f3275cc81b1dec1007012a970d18ee52e8b8781568247c5a854aa78bc316656dcaef48edb11c7b6c99874bc9"; + sha512 = "c06f2b032a60ad2e26d8847349e0019a87cfc74b7525914d3d1181b2a229ed2426c228729aa2e08acf54a8c99d07b647e0ea0d341f297d6b6dd94a4013f2ee60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bn-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/bn-IN/firefox-62.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "0ebaa8740a3c215ee275c7ea7669ec4bebbfa4a20f46ef4bbb81b51362fecd72fa1d16bf7e58822024b59934f478699114ca744657aa523d90bff6655b776e5e"; + sha512 = "fad4be3a483ebcaf2555b4753aed76dd03c45172a206b30d7c37a9d5943dc6b21739131c8eaff0e56bca7f8896f261d4a6e0902af51693e75213d9145562efa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/br/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/br/firefox-62.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "288ca47c3f89b6fec2312bd254e2d9aa4469a79a767b2fdd9787a7dcf9af589d17a8353a1260a773df63069628b69e916c2bf76c85076f123667f932b16d04c3"; + sha512 = "65eae886ec548ccae53b6d6fc45181acb6c76b0376481c5103a3bd902b83a7175f5bdf88cff75bc06ceb48483dd33bcc9f09db0f92af66d9de09305469f4a000"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/bs/firefox-62.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "1099fa298f51a7f65dc585f0c777c37f49df0b6c1a18265d0f7460fcbe52e791a9ee8af2af37901f3d73c6acfe919a37966deb4ef5399f59f2ae66563a02ca44"; + sha512 = "f23cb86e13c3fd8d6a972d590dc8f40847a9f4d486afb6a574f5377989f66b50745fd31be9a661e61c9a4baa408f04a64897c7e6aee756bcdef7983def8a552d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ca/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ca/firefox-62.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "775203aed14e61aed84e15ace9336799873804eee4907ff924a994fe8ba99d4e49960dc1543c4cd70c4fb805ec1474a657c14791ac8322a7d59c824887aa2f7e"; + sha512 = "c353548ac0c7ce880fd51399a0534b17f6cb2273970560af0fb124425ae166aa75abad71d2080e92495164f34692c42be06456c74c93a43136df34c74fe0c7b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/cak/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/cak/firefox-62.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "addc8fc89acffe5ed37f011b2ef9b3f1fcb815e2e0f2b3f944ab460688c99e54c92ddc35719e56770be3426d9380e33c2bff834fd3b327427efd20d8fa3f83ab"; + sha512 = "f252e303170253f14d5e7294537b8c593e04ed7e9051b1fccd7446dc08e56a40a6c346203f1299e2520b2c4ed5a5346b31f9dfc3b20fa7dba5b63330302ebcaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/cs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/cs/firefox-62.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "33c038620535a829a445de6f1b9f9d09e4d6078df3c9172c9ce59a27ad99f7416976fead6ad5071f11fd4fb626b36dd269f072c293dac7fae59fa65c1514e95e"; + sha512 = "cde134afdbd319201662f2c9ad6a3afc81f6c83db48a97b0914dcb4b09ac4ae46484e225aa058824cffdf8d1f0690b015fbb08d5d6782d5f068b8c5affa3db00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/cy/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/cy/firefox-62.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "5355af8ce344786f3a81a7cb53a316cca445eda21b7d905cd4602436ce3d3635a0e99f1311c47014e95875deb50c7bfefbfe3efeceb3faf57e7276f95aeab723"; + sha512 = "999d2b629c8f39c738531ea1996b3877e89ed46102690d24876f42b9ef539c00e1920706038a74d9bb2b0d973f3b2903f28f694422b4827d03206db9b2f806a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/da/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/da/firefox-62.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "11a3139618cd5e822b467df2c1e4bb79caed748bdeb724dc29e6a4d94f6fa75d8434b219a3ce5128f70ba841cd30a8c21516840d7743be9f9015dc919251184d"; + sha512 = "7620db3c22a37ea1291f4ed1ef700f771d2e3bcccaca8b0906c2cc694ea122c5eeb7fc4d85c570e94fb3929839f7058507d3f7c9dda36e64f3f3eb3e3b8445a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/de/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/de/firefox-62.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d4a45db4c07f5fc353056c18493ea5a09957899bdd98a3f00878e82b981385a460aff29b2c66b4b807228a729bd4d810a7fd38cfb6866ac2e19f8187f0763588"; + sha512 = "c20e28674126764d28248d3caf94046a0d9335cbfd85c8412bcbee4c94f6157f87251519b6ac784ea96e3abdce217f5710c8c854a446d19e6ebb07fa357a1e8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/dsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/dsb/firefox-62.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "80e5f2192f0b4c7449bec3bacb15cea21f4afc2360c5860c76be29e65ad7894915f03b1bcd719d228ed7f66cdbeb3d20867dc9cbd4acdbb16b7afaddd56c3887"; + sha512 = "02ca65f58a425a354aa27b851af9d166c1a5efd988290e87ad328446756f5d9a70ca92a0275552e40774c90d898bdc9dc90a865f0ef02ac3945ad75742f22d1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/el/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/el/firefox-62.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "3dc1eee7205d63c7788b1152f0632621e8f85c1f23e154119ac7106ebcb75c807f6f9c534519e1822f7c5c3fa58067f9c5814d60fd1c045169248e189cfca323"; + sha512 = "642333ee1ac53626d944c3667d873f47fdb04bc63b821ed8c4f4d0e6496c85ccb0cdeec5d5b83cc6639db9ca123b5d9bed46299432d70e273179a29f92b2e231"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-CA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/en-CA/firefox-62.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "fe145a9519f1eae0099903e609bce27d59461e3760a9fa11ad9cb5b8b32e2377d014d7f56d275305669313cab3c9085901068ed30355dbaa5a988c9af1e28ee8"; + sha512 = "b2cb5bc6b3c5be7b70a6453aba64e631918c03a9b5110d5ed63df36b42c479318dda42275bd115b305c2f783bf555a64f40cec6189640eec38a0774aecc23509"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-GB/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/en-GB/firefox-62.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "7afe1eab3f574a7c25230bfb09ea1d341b6cccfaebb36a659a5f7a1b3c5d6fe2ebf4bb6220cd8aa12159a67ec2cd42d0425c1aae4c5b672b542cd08a473efb79"; + sha512 = "fe89e1b4d98edf5eded72822cd4c911476cfa4340e5fe22c72f990432662d1aa9c3c678407b0a8e98c0143375523b4679e3b8d69391380fac4f59111b639e997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-US/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/en-US/firefox-62.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e0840f4e92de51086ec442a048adc62d5222a83e9ac6e5b3833b76c71a8559c764c7d44aa7e1aed24a1f58a3f2e71cdfe866b329b855d3c9f51d69537ab6e9f5"; + sha512 = "37a73820c04df7c280e53a8da4abfa3a1a069f865ea39c0b17f8ec8872f94f5afd377c1bc6c8d04ea847d8d802cb397c3f430588aecdaff92c805099bdb953a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-ZA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/en-ZA/firefox-62.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "7784aa459edc544cfbdc61f8e66832e29aba98883b818e5c304210618a5047dd775109a95d902a9c336c6a1011e0d414f02c43dd7e250d83b096758f2fe42a4b"; + sha512 = "fbe75e53c330a231bd8c48db991a231fc8cb89f7a27ff02abb81bc68d45cf966e38b6613327a1492d7d4c1924e392a23bcd2f0a9cd4dc5d34d4667b048df5c90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/eo/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/eo/firefox-62.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "cac7d6e5ff4c5a8c82220c59c835b2852bcc7d6ca257f1c0956fd89c5cfe57da36bdeec124beb413102490c1c1ee135e5d218c14d4b3b5465bfaf75dbb112a78"; + sha512 = "f8cbfa7f2b0bc6d3e3fba67664bf1624ac413ea167bf34d7107a5b5488d56c17abc3b2aa593d623b174855770bd3b35639672e5196ad623a03eb524855901ed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-AR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/es-AR/firefox-62.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "84393d5cf5cfe1c0acb7a37048b169b526a5147adfb66f48a288689af06e33f1b8fdee9c01358b1b71105ef5a10f953b5a364b8b4b576969a068a2badb13c6c8"; + sha512 = "b9548f8b2f7a63505dd7b96384d2d53f49320de3811032e963eff6dde57416b82fdb677e10117012068cf449f0e62de48fb44fa1e58d46ab6845d2bd21b542fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-CL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/es-CL/firefox-62.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "eec6a5281fa9ab6fe4066fc7a33ed8a0358dddd627a4e93da4341fc00a56c3a059137d51e56393f3414d9f882dd0a6e6806e43d6bafadcf9e6c19ee11b7153c2"; + sha512 = "990140a1967af715bb056ded14b78cfd42275f79feb3de0a480ce1dc452183a25c4fb54e47f20a91112a33654efd063e4689c0561b126a52458bda73f5e109f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-ES/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/es-ES/firefox-62.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "6b3cd6cc4fee12f2b57853a8f7bcc76f8efd38a78ca93aea98b8e455517aae0ff5223edb54c4170cd80264d3c64d4ea5c9d3a06fd4636a9471123587884ccc34"; + sha512 = "b8a62e81f023f9f3dbf8059948e214588412f4871624b37c125f1d4cb8e6c6be53d500035036d3ea3b2140d8210a17458dc5bee3c0a66415a2f126f5469e315e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-MX/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/es-MX/firefox-62.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "762f2c4418e00e53aaa91cc1a58d2dbd457c98a2f0b04f460907fa568adf2872ae894127544fa52c16d532e4ae0ab07b8074f42943fe0c1b95f2e7fef9548404"; + sha512 = "8d9ab08db6289e3309adf60e7c81dfe4a300d94811b947215b1ba92e41fa5e0ce812060cc1c64084b5c03f91d27900115e553c7a0a0f4706f817a8410de38a1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/et/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/et/firefox-62.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1ab50a62a06f3a27f22d38d846dd1f7ce4c606a0be5ec0f842ba5567c550ff4154e7aecc7e308118acea9fe8dfbe3b26b99286ade100247647b67e13595f1dde"; + sha512 = "062d218673949ecf5dc02f5ba719f42ed79a76421f469c0a2fb4c60a0c25c4ad6b77ed0c8492a2f844a7805371ce56c0d9528fc3d08f7e8ab643ba0a71f84835"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/eu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/eu/firefox-62.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "834179706c0d4db08810e5d2a5d5b5353c61b359e10e472d488e099417714486ce9388ca2bf15ba20690ded330a876802ca9b7b702e1976ea872ee9b96b9d21b"; + sha512 = "cb0b2cae511f082c17c75608057a44721a3a8c5e76b8beb027c0d36fcf8778527d9b9389a07073e7e4261e4baac65712da4dabb3260719ffab95088751c494f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fa/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/fa/firefox-62.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "a8376236472b3296f858f28c3120d68fdc9505c594bcc11e6514d9255c965777228406f4a0d40314b32bf826416bc6bc86ca72034b10c4bd28599b09abe72c3e"; + sha512 = "0cc019ec53d3ce079d8ef420a90478085f73eb13fad4fbf946d9d04067c647ffa2f065262c4765dde16e9e91b97ebd2c75d81d5d8e7844399365cbc3c775d74f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ff/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ff/firefox-62.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "fef251c6e44bab8d943b532a2e1e45a8e72df7c4bd260adbd2551748f10c1b7fc008695469e43c4c97ff8ba887cc9f65a5ad87f0f538a980988d6f6c3bbb4ed1"; + sha512 = "9711355f8d94bc180164afd8749a4ade9ab8bdd1897ec877e67a5ec5aec762ae70f75dff7852d0081f629396fbb01e4c5a6f4cdaa98834277f9eb43257328987"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/fi/firefox-62.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "7a2bf7d18eeac44cd2660eeba46e0d5b5c85ed6fd150504e6bbc2e072ffcc7272672854bd37992c9ba33c91dac6cf0b7a2bb32065066c7c4e1c4373c91de624e"; + sha512 = "5d5da424e85b257bc29c91789d125c980343007c568fbb761f0d6f1ebbce30d6bc4a5efd9bd7ecae29d02bc9b32b47c40074287c4fc11c769360617f2c8dd278"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/fr/firefox-62.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "987bc98b79d3259b1c36b8231d47c07e7c5619d5d9a3a794f28c213fd9a8540b9642f7745496dc4a4ffbb31c7e6615cd6f721c571a874eb3204840e2530aea17"; + sha512 = "082fc3fa8a2afebc3cfb14890aa541bfef2b50d23704b0212f08e60db63e809b6282de149be485615f7833f72ccb55ebf7cb53c3ce6d1d37d8dbb8d74002ecb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fy-NL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/fy-NL/firefox-62.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "99b909e532de6761f94adf995e9de48026af4300fb79f34d2744c677d8df6d363b2627ea64db6fb00765fb283157a0ee7cc2ed6939e35a0db0d72ef98b5beba2"; + sha512 = "368fd4347865d4bd809f4882feb87831e92eb5c9f50837ba00b78b378941891867c1bb1bcf41620ba98d0724cf0a849d4ef3a82db86f3a86eb715c58f025520d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ga-IE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ga-IE/firefox-62.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "61e6601a3bc092af06e4ca128f1fa0083cb0a7d62f1bced70a44bb3d526ee2cf440ea6663e072801c2358904e3232e310c9ae1d6610aa1021597ed26e9412a0f"; + sha512 = "35642a6b785cc145c8bd8cfdaac7e445b4aaf82a125e34314d9e4672d3d0fa5999a135efa87e419c99e3469c119ffcc63724b8b75557337ebd02b568f9d9ff1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gd/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/gd/firefox-62.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a57ff205a6050fa7dcfa3784a84e7c09f2b5e790d24dbf84001b5ed9b122a8904c02268a88389f7a8adc611c8b6ffb86fe07db99ff2993336668fcbb9fa366e4"; + sha512 = "e39f5eaf47fdc5c7623356a440136b52c8c89079710cdd2fffe2aba2fe2c4404df706b688d0c53c3beeadbf3c5ebf50ba2cf4df497b283616e38a78c5118e31c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/gl/firefox-62.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "664687f45af86c5c50990775c0c98299eae4a2388e2034390af32419effaf21437f36e1b776795e3747f582d4f9f2979c1901c189ff1500123626cedac2ca5fd"; + sha512 = "ce2e74b38f272f1d5f5a8bbd90b6cdf2452e62f558c5cece5e63f178c61db78d94972490a75ba9f4e727e231fb3a5680b892825f0d56c94a1cf865ddb5e7b6d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/gn/firefox-62.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c7bf83d4167fda83cd6c8e3e8ee67d2ac83bac1cd66176f8fb4e5d6ca089fe74a01163cbd32907d54ffd31e9871392dfa864b49608a81753eebecc24dd15ee53"; + sha512 = "eed29d1667d1e75b1ff231a77c198943d0eed8db17deaae773af3a7494f11316d4120f8727a53dc0918b72057fbbd15f44ef545696ef9341bac7c3fdbf3769de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gu-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/gu-IN/firefox-62.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "635ff733faaf7f73e2cae9c82ca6c8a3544ee50963ea8a6d66a27c362ef0f9f33a7898b1aa71f4cc35dbea36c4822deaaddc62bf4dbfb3a196c82810cfc1971e"; + sha512 = "c8985d4daa507f89ec78784ad39646a546de4b7f95b951b041273e7dc267bc4e2a5d72e0a2506ac7630d69b85f625a6e49be6c6f0491216e75823f399f2ab83f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/he/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/he/firefox-62.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "365f23c6bd1d925b86a7defcb1f79582cdb55b45cba3e57854bb20d0f9d81e64d80a8ba59f17c133b2786a8e6db64ea5ed66a7827ee5d7af2831274649108617"; + sha512 = "5198fb6201b4fb90c9d614caaa0e51b818ad56e30808084b06677d3cb6013808a156cc30833422a50023c150eb277c7935205e0da7417ea0a2502b938ba136de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hi-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/hi-IN/firefox-62.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5b461a1914318e4c677ffb90ce1f1e7ebec0ee71844d752b79bdb9c96112566f434593d6109ad5ac718563993a3858e0f23ae8261aadc46914cc00d2021cdc60"; + sha512 = "507a696ec6d5013e8347435fec39437409e76ac54cf749d9413c39269314ca4cc051dd34bc25ca3167cab888b21fe89326806739274a8d95d76fe8c56ddc6cd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/hr/firefox-62.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "163112f8f46bf50824cea46f9321c01f9f56e961cca8c75d9be1bf62cb1d02f70fc8ac0099b1c5ba4c78c921b99014f56a863ae86628bc45d550820b5cd610a6"; + sha512 = "82bfc9366fc9bd9101f31f038aad2cf102126149dfc42a0132c784c95f7e426c5782bfa3bff84c8bb38d2f687448a068300ec9e2a9e732c41cdf29ad8e928f57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/hsb/firefox-62.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "69824e25b1fc093107440b9bc01afb3f6e2928743c13c600175a899476594ee07b086b1a2d0c18cd045229494b191b77777291bf05d8718c6e555cb7c3c68e88"; + sha512 = "63c26511d8c8b6dc2586227cb5788804958a8d3a877cbc707e68158d7a0e41f6b23a4f9c4e0e51e02f450c433ecce626b576d751b9c8075964abada7cbbcca1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/hu/firefox-62.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7998a6468aa4d2a023cf824b10ea49340a4bdaacc103cb028b5f86e2e0ee7c75caabd3e219ea31396f4618bd7e053b5138315e5813da88d7730cf50b95f22d25"; + sha512 = "bd0f9a8616fbf72d193ec2e54126d7384d76e799f687ab3959602ca298b6af8cc326818863e35e60c1b30103e6de358846c93e98cfe272754efe0a9454c4c513"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hy-AM/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/hy-AM/firefox-62.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4598605812207c90494836756ec3f40658518b4f137ea1f3428f77cd8b108bbf5b3c9a904268613cd4b5deb5d1841989b02fcfd4046b592b8b686e9b7853a6fa"; + sha512 = "9a577d16446d1ebef30d7d00007a82483a5c93b08d634f9b7bb4921990b79ac3ae5179d70f8c94e11fd707848d1b4abfeb153f53af0590b94277e361383c5fc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ia/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ia/firefox-62.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "be2c99b0b6300137a207be27e4874fb2996b76872fc2a7e0825925629c132a6e2941994279bf5d5e6f9ffabf9121385675cf2d1fb1e4e080e60774f020098e02"; + sha512 = "8bae5d44789789b14eabb7c2abbd268af581956681c9a48336eb9a1e7060ba34e8568a46d7cdbd489b8fe70e97637dcbb4663fc617537c1e11f5905c3190be8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/id/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/id/firefox-62.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "8fbc33a87be306df37db45604e0c5bb4c489436b38d61a33d75cfa1d69779c3edcfb32809daa4515a0631b795d9fe6896aaa31bbd32b9c406a556487f27e8051"; + sha512 = "5fa0054a2a04a2a32b068867041a465345659e62b2d187f6f11c38c0289a0d2d5b10ffb0af19dc9eae9370c6eedd43216d03f45bec5688c76dc64c7130ca2ff9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/is/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/is/firefox-62.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "3b574f1c3667da198e9de638fbf07f595c1dd8eab7deced07f0163d18468c443e4e630e9bb3f53c906ec50805363ef8bd2c349fc58cf1e7b9a498341b7ab66ea"; + sha512 = "56b9367b3647af4674e6d0e4cae13ed4248fd956f1de61eae575f85a38ef3d34d23275248f34ac756a66bcaa364abfe32771be2652197a9aa845e751e87b4f5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/it/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/it/firefox-62.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3dce20ed69a821bc734ee0c187ce76fce142caccc08f66f6031f99c8dac2da8b0f8f23a65eba3110fd3b596ac78adf2dd47974838757db7c73b27efd728ec556"; + sha512 = "9d07ac498d1d8d7b86a0ac3501aabab822dcbc31bd702c37355f47b91483038a46db9c45aee876012f4b0367643788b05ab378372b693ca0d2b41154beadddcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ja/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ja/firefox-62.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0174ea6eca444ccd1c2de27585aae9e4ae7edeb569bcc3d3ce6b54c49b7a8b58eb235403f197c99855561b070b2b6afc4a66665bef36fc69537fe903a4a5940a"; + sha512 = "e95d2d62bbd73a7f4b12445ad38764e02bc16a8c71158b0ebb4e88a64026008bb7a125ef156d3fe858629bdc9c1c3b7ad89ef3f46dfd2abe6201bbdbdffcf7fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ka/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ka/firefox-62.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "170155e9c64f6261ba6f6d292ef1f503c8966b49630215e14c6c61a9033bdcfd6b595ecf638212811628631e36e3cc4664867a817c78aa2e0f38e63077be831c"; + sha512 = "f87742885270371ea6e0a40257e44b667b77a9d6c189674556decae76ffb873be86cabd671c1f0d3a8e3f14383ebe4727d299b386b1947563b499f17ae0b0875"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/kab/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/kab/firefox-62.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "9f69e7e09848e423cd4103e40e5aad4458d33e6d978c4b00fc867544908c436a6aeeb9d41948262dbd97ce3cf018a71cb6d5a3d32742e2c3bafcb52107784de0"; + sha512 = "41734cda51fe6da8d6d6d8d8552e34fde8106750556e78dbeafee004280df058389f07e6c7419b019e2a2847d8bb30f2fed7117c567c8caa2eccddc84d2ef7cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/kk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/kk/firefox-62.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "3f22f9712e42fa10da04baab8960a03fd7f479ec6acae0cd37bad04b52fb919aeaca30e8a5a074c9763e1b48d69310f27ad8bb7d8168a836919b0313f9b864d4"; + sha512 = "69f58a96a9b3e09a36e02049233384cabb7773e2b186659b28736ff44fb4b7e3f4c0242a1a5e1fb3304f2dd2d8ccb2d651be974a7cea5a713ef387a240bad1c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/km/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/km/firefox-62.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f6d1b176db8d1022f2189b24cbca3c47a70dbf44542db310549364da9f442513d77530842118e187b664ab3335bee20171d66551d30927c8ac02d45d4d361601"; + sha512 = "c885ccf11b06a08dc5d908c30271c434dfd3cf9009fed046f10bbadae4601ef7ff55393ccdef08d9bc763b89ffd88ac8412301c4ba4a81c557fd07b04625ac39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/kn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/kn/firefox-62.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "bf648187df56f207b720ae53c484e81046b8899e6047ac482ff5a8b937096a0991834a2416a1fd0560236079c25393f9d2171da15bdb7e6cc6bc320ea44e5b85"; + sha512 = "5299e96b7d99af641de426353c3022c52f3636a1f0b0608daab830bf0a87d7399723276a625d85fb4f2cfed85e5d81645638977cd266f8988f03506b4c752a55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ko/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ko/firefox-62.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "9de51912d21abdb2e857a545d647c4f83da421796bccd6a8ac6095ca33a9dde1b0cff62f548f734fc7510590f8a29c0e2146ca2ab0745f8095a2f787cf1f6072"; + sha512 = "2386b75959d6dccc5c50b64a62dc5d3967ac5434e496c22ca4d1453b50efa3a4f0689f3b63efd56fd59dd507c424f7634a8639fcc7f415a03cc62aeadacc3799"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/lij/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/lij/firefox-62.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "40c47f9bfd0a005f740d425e0a31e7676b2a6001bd0e27948e237bb1f0b087d808c1db836fa06ccf002b4c24e21ca7aa30dfa6dd07cf9a9995c746f73ace7a2d"; + sha512 = "014351018dcfef6a499bf4f672543419f83c662edab8b7023bb4f5fd140c1ba2b3402fc8f574c85f0f8fd2642067b9a8dc4aac69b78c6fa4b8b0b278adcae470"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/lt/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/lt/firefox-62.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "9f5c7410480474c3053aec0c88fb0afe5528382b0e6d8a1a53d9e7a6ff3a0dadfbc3a52212f86686910da7d8c000254dbb30f320a93096bf973ca974e44d7882"; + sha512 = "4dfff68a0b2a055f397c25e788ba094a0245f7b536504b90be85f3b3f8a2161ff39789f1089f52f332f3985c46114d6118deec60e92340fc8a97c8a0108789ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/lv/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/lv/firefox-62.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "daef12bdd690a9dba14f71c5dfbb074eea26e842b526c2d48638872522a1da06d3c486aafd0713caadf1a41be6bca2609bb38282010b1de8db65002e5a427cdd"; + sha512 = "8f4a87a42b1cc990904c1ded3df40cdcdcac2d6472795cb4aa19640655708f3a7490ff830b38d6912894060848e8cb2ed5d51f6b48a9c4091862d9eb1af0a161"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/mai/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/mai/firefox-62.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "d0be68142b8b640b829899da1103a82c7d05dd310f8aef55f38dfb83b8c080b366c4431a16fb912c2a890ac2b76f1c3812ab91444d8f00ca70b0a07b3bfff778"; + sha512 = "c7d44c729482f4eb59504fa42598d3e80e7b9791c07a15f342d9cb7e6fee5202f4a871daa27d70a2ca6397f696112e270779ce6572f61fb927d9a7e303391cd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/mk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/mk/firefox-62.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2c813aa382885e2d06aea8e4bf10f0d2582c733285a82216a490ab8ec26fba17a15b9b0280ad33f7cc18e33226b77b6c7d255a3dc00a2fc4cb0764fb7075f6e6"; + sha512 = "b9c238419f45a67b5855412e60a63871fdc8d8477661c8f2f4b4b44c6036dd11d3023ed50b0cb4e558a3f063d081fb1ca56632f076f85d26fd49bf6169c4183b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ml/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ml/firefox-62.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "1a325a8034278cae28602a77b64b2ca33d4dffeeb7408fff2e9097cbf04e11ee98c07ebb71bb963e039d4cd7436ee6dd2bc2134505cef573231509371ad5ff39"; + sha512 = "403bfec378306f312bdf9ccb5312699550cb584edb8fa9fa2ff83b1cb491e559c145d13e023fd61265f3b4f25d93a4e94315006dfe2bd1e83bd8aa7f84ac3afa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/mr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/mr/firefox-62.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "a8eca8c9b7dc76f055d701bd564d17efcdcc82c1b2274231e7d0652ddcd97655dd2c8cca1fc49cc280a7e537d7e463e33483c093ddbbfeed2adf250f77d60d05"; + sha512 = "c6ddf4530eb185ae8e99513c62ff6d2b15144786eeaf22e8f1a9bd8535c73eeddd3469a774976149322ee9d91afc7b29c7331948d27aba0a7232f768bdba5391"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ms/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ms/firefox-62.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "071c9078dd840aa6baa97f6ce0e9f6706998d03ce544d7813755ce217d31a3aa436361156e19cf343824b6ab56275b0d0c15f49390af7f061238102dedc2b782"; + sha512 = "33fb10c9ec5f2460fc004708165a2be73864b1986c000783c3a6902157a122993ae12a0f6daed1efe1bf72eaa0faf45196338cecb8f44a18393579a29672dbeb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/my/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/my/firefox-62.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c27c3f020b510cb05b9dcbd94209a759fa15107d6c81d0cd7f9b1935f01c61a760a1f6f0b29b133268598c20e85fbe27baf3e74f137619671300036500fc6da9"; + sha512 = "6fd8ddb3e82dff825e0d02e17f09800ec5cde223a0e75c52205db607b9748d33087d7f127711b78e43182bbebf183c2fa7c91a98ed2ce293b953e81f585d0656"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/nb-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/nb-NO/firefox-62.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a136c0ae01187558c46848ea5b6d30442493189d8b380bcd60a12f17134d9259424cd5479e164efaaa840b43b355f4da2912d65c15500dbaa70195c5ee25674e"; + sha512 = "7c88eae52534a7b68fe73b8876f0272642b11e9fb6de496fffb10bc4eb3810d944a2e566cb4a2c26dffec82320c0d3f0b2f32b933f1c44f00be1e2c3d98546d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ne-NP/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ne-NP/firefox-62.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "7e22f58ebe1b99c50fb84f216f1506dcd20d4a8d094b8b6787f26f9b44f86496eb68f8463694890a3cad3f491468bf1f2db6aa347446999ec67e598c4d608677"; + sha512 = "26e2434a0eae8d5595d671c5a853ea6c34651b62e55e026f1ddcc9fec687289052a03a13578194a34f845bce044d17e43ee0ccfd687b1172940aeaae893f0e25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/nl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/nl/firefox-62.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "18e138ffdea50531c30ca75377c3e241954e7ab7be5b4d81c4042a0c523215b570391c3ac75e7e860ee0b26016bdc201a76bc198526d7bd2c96637d633aa48dd"; + sha512 = "7ebc12d4c28c9fcef08fed90ee3d922f3e874a246960c84303f5f950f16d3d6b7474fcac78dfa9b9215ddd8672324dd205bc463b80820a3fc9af2a1070fa19c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/nn-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/nn-NO/firefox-62.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "7da8c3c9c1f13cf635b1d70836b507983fcde4a50a54fb6781e3f50f4cfda2d38b10bfacf27e74ff501643c9eb93722ba88ef08c938bddb85848b2821727c378"; + sha512 = "b6004c56b6fb6923d3afbb9a632f586c7b89c1d0dcecf4b3938cba26943b2051462a39c11ce54fc46e60586c6fc1816c8e5cd277e0ec090f6507d1ddb081a32d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/oc/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/oc/firefox-62.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "47e0b6176db5b5c97051316ddb1d67694534aa3d4d2a84ae68581e23667ac1fd4774c7010fe63961ca8780c7f799ddfd2bd959a83ef57894737336cf6f7bde98"; + sha512 = "952e25abd8a5fe477e274e590c359e80feb14f9ce2cc113620d460b7ad74f0e1831b83805dd0f94d51255db0b9c747eeb3e62545af2c28a738c527d3e4b89559"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/or/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/or/firefox-62.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "501990e922eebcd108ceddd5779d55852e5d6dae0fa4525a86066096d44ac84e6e09886a8a099968c541a5916a14e59a4c683b9faddf28606606c10af38120ab"; + sha512 = "83d269396c2e3e90e88cc4995ecd92cdba3fcfdb1391ef3e2a191386cb9cf259dbab347665ccc93a2b84dd7662d13e7dd8886896903a7bc1bf4ea2f31c2db401"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pa-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/pa-IN/firefox-62.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "7b22e657f393d34e9612c680b7ae3aadb85e03575e2839fbd75c06aa4577fc57ad4891ff080205ec2da4d303fedac7fdb67774f06c91442a629e5ef863edc58b"; + sha512 = "69939d5950fe1830f8d6ab9aae52134b3656d608a38062356fa3d582af7dcd2fe40b7a88a6c5f612ec6b588ad3f683f933844f567ca26868866d1c02d4708acc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/pl/firefox-62.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e77995d8427a651f405389662503a6bdb6ee93247f96ee925e214d35859da88f5fa355a9a247d5d8a2536f3b0d962a2ef103f03e8b97423548136c4de2095136"; + sha512 = "12b7f93e83c04f998e46e50eeb1372427e410aaa5f2c376ab84714fce98c674fb20076ba8f4f8252ca98498fafac47f09f835e9a1ff5abf7dab9dce644b00afd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pt-BR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/pt-BR/firefox-62.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "bf562ee1a588b6bb97282aaab54d6f60d130e1012db226a805f4cf54a8b2bc6d0dbf37610faadacfffbdff0d50714e83413a5433336e0425fc70c39802b92535"; + sha512 = "5e40c7e0ac52ce0e7248cae5aa36f899e1bb21ef3387917d4153f68238bfda66983a11b354e815f6d7688ca2128275f47b044374f8630f93d86a176a72d7a71b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pt-PT/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/pt-PT/firefox-62.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8beb3d7c5e5466da9a182e75bacf0ff0d512cb7b6d2b109721e595e289b292e11a71471abe8591f5f5167bd8113e7e64d5f4ff1c0827f56de82f01d67e9068f6"; + sha512 = "c49cd72d9f4c7c6d5981e1a38be8f0fd744d88e12e95c7cd3882dc4c83d111b13e906ec4e5d8b3f8bf28c57e7ddd3356d82aeceac73aaa51e2950dc250c8cae4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/rm/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/rm/firefox-62.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "197fdf8238d86fb62c9f5f70a2683c978c3eabb4aeb0a2f06db6c62f2e062158b28062bcca8d5ec871e3bda6a8ea05039a2281734108a898358bb9239a69b34e"; + sha512 = "55d62df14754bacb0e5831c2c0a7facd9946a7ea26c226f98bd7d17c63957386ace27e2e0fb12405d680828a30892544bf1798de4e25eb9c4527dd238b388e91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ro/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ro/firefox-62.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "bbc0b871e9ad5a9af2474062bda1eea5b45a5cd715167eb33cca748c27d9c5ad2c3a56df2e4091f691a24b6863447dd0c8e8d2dc808dd7f90a811edc164cf7e6"; + sha512 = "a3b38179529d21d057240cf96e818ff2c8a785d4ea37eb21906573a00610c14c9d685e26fb37323bf16dd9266c1fe7818cc5e2e9571dcd9b3cb60255fcce5131"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ru/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ru/firefox-62.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fe7c5fcc41d40a0c890dc6b59411a757c3bb849c81c1c4113c053028c42612a5575277400f1e1d93dbf2be748b1ebd0c5063deae8edc76bb5f7234e3d46fe949"; + sha512 = "793c6c3df14c71ecd680213a3e0b8044642d0da624a3a0f32d1956607db6eeceaf52235eb65975cb58c779b6d14c18a235f5c690e6d5b0565102184087f434e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/si/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/si/firefox-62.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7d34ae2573d004f8f140607e9991c55fff98babaf6aec74fac6f3bd3f34aa2ca41c82354c5a935429dc3b7e95f2c1472b3715b2d5931b30ebc4fb01e37f18f27"; + sha512 = "cb9ef1a38a62d63ea4a1b6356eeefd4d6e6df925b4b38d831d57fb61491508590a3e8e8e459d263b781576baf75a88dc89edd47de15999b3b84691f1fbfe9426"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/sk/firefox-62.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "8e281cee72a2066af4c1237f919fa523893957180f0bf21ffb5e0fc10531487a08e179181e62fae7d273269c0ed936a6e2f206bbf4e06cda80507de76d4282fc"; + sha512 = "db99f5639bd99c24f3720a698ca6f0da869bb34b6bea8904a9536dec502e8225865b17698da1d951bcdc1c8779f821b2c1559ca8a7bd532f16a0935443837daf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/sl/firefox-62.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "dbb1bdf377df73f72b5e329fab94f3c10a8108e5f60b74c025c6373c593a37b7946e20b035111fa25b69e424d8a9adb6ceaf07d0d5a0163c89a5c3016ba09ac0"; + sha512 = "f8bd344058ad4d9cf41b982ed5c373f75b09d43377917141e2fdd99eefe5817bacfb87792df320407834309ac9f194efa7331b1fe821ba8ad80274be8e506ad6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/son/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/son/firefox-62.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "de0a93df81ef58eb79dc61f2ac641f7ef06c0dbb1ab273b0b244312731bb4ce80907bbcfb10f59fa1cdb94f712499ac708baa224beab7a11ad8313bee8291e44"; + sha512 = "600d4b3c6254d3e6dae17874b933e0a4baa392c8e348db6501fd16b0508bdcbf3febb0bfc319cfb74851ad1b22e4b603928f2d70e6654081f56aec27af39a04d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sq/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/sq/firefox-62.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "274ad7363cc5c03672c3a0e4f50382ff1229018f316143e50871bd0a0ffee5d02996981dc376520f558f42cd0696ac334654f10e579cd1139cfdde12014bf3c5"; + sha512 = "044c1e6746f85346e22ff257673518b1e906325098936e003335d2d96f306db6e0ad65604727ab0bbfd5f116bca75f4b25af9e17ba2f453025a7c67c61073ad2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/sr/firefox-62.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b6febe826fabd153bdb5d66c0cc6f65eadd69d5b0137467861c24f5d9b87a1abe24f1a1d58ad2480d4cb151cf61731faff5d8cf47ef69c02ffd8b8d57b3bfdc0"; + sha512 = "aa3bd51ab2a4f7bf16c69914333aa7378a6dcae97953001eab273abc6102dc190a540c429afc70dacce51e56ea9b92e5e6424b5dd86713dbd18f947da6fb0f94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sv-SE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/sv-SE/firefox-62.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "69fb65b14ce8a63452172e970aaceb41a7559061efdd7379154962198541366dc55190dbae81080d74eb5b2236cc74c77c15bae3cedb12a0437558e10b730ca1"; + sha512 = "f52ef271335fbef42611b516ec8190e1b7cef184f4b02d919fb72b43ff965db40dcb67b229e8cc6586fe6fcc313bd87e340e46b75750ca89a5dad71b442d950b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ta/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ta/firefox-62.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "25d5725cab0dad6d67f08fc9ab694045672d5ac497823fec237dd68d1e626639558222e6293177df503c19e9c297ed22273dda60283e80985c2ef9ccffd16360"; + sha512 = "b8d9528dcd92feabd4484fdfcca811ca281b521fa2b29307960cd8eb86ec17096518f39b63296b60245aed791251b72902cf2117400ccd5ba46c506924b511fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/te/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/te/firefox-62.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ba95efcda55fd6c6cf5358bbb24bd61d4f57f2103a38eae3289be00bcd36ba0d451cd9e4bdf00dfadb86abf9376ec202d53be017ae47c97e29ae05b11e4b9c22"; + sha512 = "48be6e6775c2347ecf86bda9a674a7300354e1f594604b2617223deeadf8bf7840e73f1c7862b13fbaa4603639545a816ffe81a8084de83fabe48a8d09c64fb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/th/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/th/firefox-62.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ef08a290c0b6555c5f80ac162f1233588e579cb32cc09c9a6f86c90c62814a67db37bc496a52f6490ea6de2addf6601fb225ad98ffc99180d16f1587735e1e0d"; + sha512 = "414df3da738c8f24eef5650543662e8bac8681d1dbd983c272334022528f9330af529cffa2c1fcf90954c4a2d359028cc5940f99f3d6ab394a9746ba8e26e47b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/tr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/tr/firefox-62.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "337f8a7fa73712c03e4bd78a86f0acd5e8fe50c31cfab0549db1037606a538ee0881c8036d1709e554dab14643f89ecf83fcf86fbac5ba2bbb60c73c06a66508"; + sha512 = "08c48f21150eb9048834a7534d910f2217a966f363f902901f59c9381a9ef88672c78043d8311df0e51cdc9928773b09b4e613178eaff71645b15a2678f04305"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/uk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/uk/firefox-62.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d45c5eb136282a0be9a96081804d25f717dfd210c57f64aa84ce5a445fbac3b75e271ff41d865f7e3ca3356e6586062259e097b1e4dcfe7e6e7566ec592b905f"; + sha512 = "d1faca8b0f1566631a12861386a80780b0002d25d599631477786a5e46fe8bd3c1a59ce1730d01add17d8443aeaf8c6773f919e6862f1dbf381f3f91f747c06a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ur/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/ur/firefox-62.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "092def4266f697f4bd01765aa14d2a260fefa8cb7083771133d48238bd4e5ab13a901fe2d175f6c38814d74ee5236452fa7e49fb7d203501bddc210c3af7ba0c"; + sha512 = "e41e1d662cc5b2eebd6d218cdbafb5c363f86d9e94d89cc1b1f9ff57df8695eff46e8090d977252fae53e13d0ed3bf537ea45cec2f4b354521b3dd9a4d82354d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/uz/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/uz/firefox-62.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "9b459458fb94ca2946fa5e461c3d2770b00a45cc11a17cbc7d01799871e4478e94fb55605eea23d42cfd0494defb929f0ef6faf043f53e227cf140fd1ba0e0b8"; + sha512 = "c272b1c1fda633f9b7b550cb824f5fa717e09f1348b9ccb43e35e5f413a689a080b582aadf3008df2bdd93477061db7c6a0796c9fda7aa8acdd3bc62007dba06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/vi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/vi/firefox-62.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "75a257e23b377f096d4d2f6900e1a0ee3aeb3952b513fbc39d5ef771337c8639f4f076c98af6b7719b396684a876f5407c13a6b9c17af4ede7c7919dcc3541db"; + sha512 = "e728afd5bb26c37b3dd10022bc1a80a8ce9c466e1e81e70cd7649eeda610cdc3d32029ee6f9ea17fad5c74e47d0254858baac5af0237b9118de6545d11b9abe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/xh/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/xh/firefox-62.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "a3898ff8293e78ae37eb017c16d7b2b01a2b5108ed674303505cdcd088d13ccd5891435bc128624317a7cf4b917072cef9b56cdec75111f2d7027bf42fdcff26"; + sha512 = "3b80b2e33e285e5ac465340ed41da7409afcec0fba8c00d107d8d6e4817f354d0616a788986967b221a889c90956a037b93c7b7cdc09bd20cb77ff6bfd997d13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/zh-CN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/zh-CN/firefox-62.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "28afc83cc294430582ba0e7400c72f0596c15a9a8691a8c068dc2473fc86528beabbdef64ed56098e510474675e61d7b6d4616422a9f67f6e7e930c11e550247"; + sha512 = "c1ce4868c80836235b6f162480bd3ed153ac0db27f67a054818e615972f8d0d375f3d275a9aa69a54afcfb5f7ef4b50a07698e68fffde0a883ff859ef2b60e25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/zh-TW/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-x86_64/zh-TW/firefox-62.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "3e25f27060906e4ca1c06627019a45ffa09384fcc3b3f20450138e9984cf9d29d410e67083566b58b3e99a15b8b7a05bd0716cb797bd3958f1b0105066030590"; + sha512 = "b3d816ad232b1152eedea352a181b5d9b6fb9c8c0cf082c4cf165d363fcebb2f01a7e1a9d32b2f21db6569fcb3ec3e5bbeb2b3bac92587abded293d37ce6d8df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ach/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ach/firefox-62.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "45db81de89d4b8f6eed856b6ea00531de1879a1c61425482e7eef65fb5eeb5614e894078d8216d98f097e1c3356c6ae62d12e4c9c4a17d2ae0cd026c0a13898f"; + sha512 = "ecdf15574faf3eba0fb5f92f28bbf297e186988b2230fdabb049f0d39fb4c09397899c7b50b15c469ed52a1295a01f5d1f8186cd5a9bbf22558652cdbce26b0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/af/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/af/firefox-62.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4aa9ecbc712372716a98460523e463e6144f88cc5ebca2d2e102ba1c78107dc9b287471a383ea7c55b4b0d1930501ec69202656346c7279e5c15ea32e3ebb5a3"; + sha512 = "86afacf172ff70b451acccc5982edd6bca67bad1bc64c7addc10f6c6c89789f9b3cec479760b9a43a6115dee733247880a2c6efb22e45e8a5f38a216d7c46e4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/an/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/an/firefox-62.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e7c69de522160378f75ae339b62dfee2c8391247cd83b5b2b43974e7659dba131c954812e4ea55608f01f4f024ea8f8bb37d2bce95ddefb8e50ed73b006acc0f"; + sha512 = "493059f80ea4f45e7b413085eacf0da31d179d5fe7d185d5c1bf947ef01d1136c2e1267326435666aff8f296cae9408d7f609b659393732554bd307f641c2bc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ar/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ar/firefox-62.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "184c608d477ec5f2fbfc547aac6e5863208d92b1de0cc362efd68b5ae0d414141a904c9ed7efa53f0946d934a737d3ad897b6b92fe469c2aaa58aa7252ad2c5f"; + sha512 = "951dfcb5125cb0e1e7d2f50048d0b6eb6f393a1e47d43226913d1911e493c7cb2144e9ed653b93b0b864a604e8363fd3bfa9271c12f23c698498f67d00396b4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/as/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/as/firefox-62.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d11215275176c80bc479bad71e88a42d2fab7af2b92803a1c34fb80216e0d07fbb0af8350918d6192640a42186725d42b64f95e85c8822e5e0f9b208653c3647"; + sha512 = "72398d0294ef6befe52b9e6418df5a988145251add594fe4a9c1d34a0e3457beaf5c867880e7c1231a8c7a6141b19e36aa21220936e29180e99a40a15f807e30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ast/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ast/firefox-62.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "bc3b79d190a239827f52ee2bc2d5baa58da3e6827878529571e1758bace4bb2d87b59319b1760c3df2921ae620dd9566e47429f63a9c213dfe0bb2f277703335"; + sha512 = "fb6fe42bf7f22e57d6651eae2749b88f1bdda958fa30487842a5d0e0b98594cef7ab8d45380abf9c874f4948ca16e496cf3c5f7f99fce885f8f0f530064dce6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/az/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/az/firefox-62.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d009b86e540746257d691125407bdc2a16e9770da25079376591e113a7be128411ccb309ce5dd3dfc11a4e5136fba9c98452b2fe1c7642a76c17145b0b65f0a2"; + sha512 = "0b0a74d8d95103114a42978d4777d9c70135397d090cf6f8e505ad7ae67cbf860189bdd7a53bb9b11d2f4ad8f864097edc3f067b59aa5f1a860aa7efc443a778"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/be/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/be/firefox-62.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "490362f86b3ef01b9cb28aad1ef57f32e4f843a7d5d9c5cc57d803c3571abdfb348082cbc9b5615a1b47f2192ee2041ba62ec28babf96c1541ef633fe1bb794d"; + sha512 = "b5c0735170a8feab3d949c7392a876a9b6e54806b8b24e65e8ec27ba93bacc4e887f1550e73737f447abe8af2f42ff8144eadd0f8c73c1f4a0a7494ac2416d5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bg/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/bg/firefox-62.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "8b8d36783808a0a1edb8fd27d163eea9605a88f1949dbae9ca9161b172ca5fcb11a4d127a8e1e321bd4c5879aee5576ed1b2ace46ee47d528eadda56022a1fba"; + sha512 = "05150987459039a1180825b27bdc7d5c1016b79c7f2f6335c4a9fbdb875cda1371038baf4aa7ec21b45eb2e5780fd9372d2ee9e9163ba378e2dc9bf0299e494b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bn-BD/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/bn-BD/firefox-62.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0e57b4f8760e1747e71c550df26da448ea2db0ded608ef1ef1ae80ed9d5d03b26bf4c221f078aa04481445841bb90032ddad48d03f36910653c1b3c64978c18e"; + sha512 = "f44f94a95411eadb39b427e5af4972e5a4cfb97cbe4801c6e58c0ef092e609882a655586018f8f1e80bd7e97b36a0cfc058cc2a58171e1b45d400de8c8a0e11a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bn-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/bn-IN/firefox-62.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "3300e0a5f742001006d7e30ee6ac50a9a2fa4554248ff2b29349ddd993d1c7a85852b6dc311b0869edfdff564f5442ee1ceed033452933c36fadb155407e981b"; + sha512 = "304926ad48d41c47063642482926ed6dd2dc9b87d55592259ebaf83a0d04bb52ea8b2bfe6a9db2e6e473305e0ced2157b7c954025658115e0aefb54e4e4a847e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/br/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/br/firefox-62.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "da396f23f2ab91c05d85fa0099133a95edb4e05700b0e08d5ba240a38d4efc20ef6769fa3a0ff5de2622d1dcdb381a264db6cdc90dc3434672223220f6e45ce8"; + sha512 = "b2386332e0aa98de026b2671cb4f36463a71a7bfac7ee83ab962a41c52f9c88b6e57c05b51ead87c37e06f819f75319482738c9a636626ca1bb30dafe3909b0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/bs/firefox-62.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2e68d37451290d73e04d6a5bfd192b399cad78844ae667228aa18b77c08da3ec7cf785fbafd5ea490a3bacefdd97df81a55c9e944d8cba6d5f3a67a257d319cd"; + sha512 = "117ada9109691c84cf1fbad414b277cee3056b3d9be182b0f8b7de03e15c49c90d0440c902ae8145c81368d42b7191f8752dc107b0b166b021ef1bb895144910"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ca/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ca/firefox-62.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ded10aaa1d983d636f7182622a29c1837f51ab27146660139858608ffc9caf0c6f5b836434b1cb1d6d837188cb717d75b1bc69d73c77859fac9c705193939e06"; + sha512 = "eeb3baf8f9069f02a276c3ed964f2e8f7131fd90803893fb06d9f83e9621c8c3a5d6b55af2a06952042e4b54589900448baee3fadb8f4edbf0cfd64e28a7307a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/cak/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/cak/firefox-62.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e4e5ef06ce826d5318aa4ff3b7c89ad88b68785e14eefd4bdbea01c38c5fc1eb43286cf33225b344a6c665ac8ae264b4155fae8d3e14123704575da4b7382219"; + sha512 = "a30d323f1358386299041ea61a420600c188cacadbcd18c00cf3e2f6fc5a1341ae5f7a6fa32d7fb720a551f779c1ef26f6c46c71a9939b2032818baabab916e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/cs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/cs/firefox-62.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f142fbdeca019d1d5d012d9046514cadee3e81eb444c5d44d8ec83a9909ffb4837b0f219ea1190d06d5794e38e15121b33e7ce832a58b564d2703b7776cddd9f"; + sha512 = "d0b6267b7512844f2b7d39c2197dbe7002dc41cb1250de886b76b177d617fee56038e6e7714e8e456d9034beeae09dffcbdb5464052db42975beed7149dc599c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/cy/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/cy/firefox-62.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b0e41b3b2282b60821db2015979ba228dc32118c001473f6758633ec27acb817f097a985fcf782c81c7035a8d29c77eeaff2b217183979163fbb1bd83b6fedfe"; + sha512 = "754f97d09a5e1bc89777b01939b77884e915ce11870066f6465f4e468d1d81b1caf1b8c5fd83015fd7e3455ffe45e1e64044d1184f78e8b22b54aed320284bbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/da/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/da/firefox-62.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "176b7033a988ffdeff54fc738b60505af089a6e43a38434b66e0405894b7b6cfd019cb98807aa24e168273978142a31bb5b744ee6e88cbbdbeefa715baa28f36"; + sha512 = "e7a84f66676b6939ff3452e60fcec5ebee953333638818f7cd0214f54ace1ae4ec4d506eb9023800b6d33ef8c59bd528fe510d84722de97ce164617ffb442d1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/de/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/de/firefox-62.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d1d01695f820f9779c9741cf7fc5d8685bffb6e0d0439d37408f946229d78aa3852adcb5f24f8382300f232c157ab2bd44dcf99affed9295aa7e271aa135ed09"; + sha512 = "4d4f06581198b49d14506cbbd2b2dfac30d3131c1c7ddd67920d0befca0c78f8d16634757e06cec3399ccbcb02e69453b300042d98f6c2fb2bfbae1e9c2a0b7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/dsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/dsb/firefox-62.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "640efe3fe993feeb58be649bda72186279108c08a68ea1c0258186ae48cd8397a8edb5cc3678360168e17f2c78c8c3e7f45edca0a28f43ae572bca817efb3ec4"; + sha512 = "e8928400891b82fb094f91c11b22d45d3c5204f48f17fa7bcee724635c9e2eb61f7e04ba5a933490fe3c118ab867e14d19a7cf60596a03a3d2d747959fa69581"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/el/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/el/firefox-62.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "993563f872020e49c5c12ecd03322d54f449f5161506d0669d80338133b1a2f5a12ebf6938dc9aeb89dae3dc589cfc3a80a9da90f40932b9fb02698827e4c426"; + sha512 = "b99c4aee9f2bd9463410b23d6b8bfdbbc51b03d9a565abe3b399b83e58fa393db77dc5f03a24f5d2ca5caeef5a47431379f7c004b28b15f93b23b865b551bd05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-CA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/en-CA/firefox-62.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "02c617c9603a19d27acab55a5e9bb742d30bfca3db737897d50e9d8a8685487b0600db1dce1769a680fe3dce64dca107a31b904222a534e02df8cf51df92b31b"; + sha512 = "d8fddd987ee3fb740a615e22a6498e55614560285e101560921d487da5aed89bb277ab291720f661e048e54569a58d0c980241d5e1a5fe3c3f62d178b8b0089c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-GB/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/en-GB/firefox-62.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e096f0b92e79caa3f38bc805e838f18ae43880235bd409bdc53e545bf73ba27731fe1bb1e0baf1ad98c6f726f29e253368c47e69925145db388170bba6deab26"; + sha512 = "c5392c77820c6105bb0536c7f1c8a1d4ab681e432ad94cd71f859232d89a2641db9e70658f0763a5e94c3b6fa5bc475e08aaccbe0cd3f4676702795516ec5626"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-US/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/en-US/firefox-62.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f29ad64c1eac9314c06a8873fac9425eb0a038e5dd2570f4d1a24d8ef071201f5cdd0ef6280eb3ac790f8c5c55bac3fc177ef8004b979909f4c7949e42d82846"; + sha512 = "9333610db0377271c18816833dd7ee830767c44fcf61357bf7d6f684f7f84eb1d5792f89e87dc7db25f18a537ab3a8eddef61f5ef9f990c3413e723a6b09cf0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-ZA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/en-ZA/firefox-62.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6dea9ee48c0d4ece3d9e1054f873acb78cd87150a3e21eed3cab89d2ee8cee58fe752167a2fc4ebedd630a345fc59a2d735d1c451c7b0537f5a8d5a7cf4faf30"; + sha512 = "5e03ba5dc2f0e4bc52d947cb64d29031e9b5950307511df64a2bf83dbc024ace25b7dd57a3e00e548c8d4a82cfc3b953967b1f18b415c0ae057b526ed787327d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/eo/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/eo/firefox-62.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "699106f53dafd9d8b9c8c72e7c2c58418e83333b40a884d12506db2703b159fcecfa3adbd65ae27d4f71ba0ad608ab1da134ae59f2ed6d3091e01ef01a64f7b1"; + sha512 = "ad845f52ce35a0e3a06b74ec5467b10ff488ec94e4e01030d25f58dedfec692e99869719d54787f92012bb9b15d68d8a049b7596e746c1a2a8fdf0fa6f99719e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-AR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/es-AR/firefox-62.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "34b9a99f25124039e2702efdb22e067e9484c1c9a01256a78293d11147796a4caabaa0f14b8002d1fc5169bf08fbd02a0c0ccd8ab42c9dcd30247e1e016d3be9"; + sha512 = "a2ed3ee096e886115f75a9baf049727ac7591d0087e30a91314eb4d99ad05d247f5c807d4670f0501711361a984e1336ef45a2e2c952d5893c2ea4747224743e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-CL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/es-CL/firefox-62.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "eca27fe26595efa9610eb7ece6665c610f720177fdac8b4fe5ff55805995b9d0b48f0b43c71ea9a546da88959020e4e3dfc035515b0c63a19cfe1ed980406fa4"; + sha512 = "9d0e83a245ee79654f5825c08d9d45c19720765d085f224809ad01ae8dcc90a5e17b9b8963b1dd803dfa9ff21df82702cf0c12eb0ce551b63a2f55e1686aff76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-ES/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/es-ES/firefox-62.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "da1471d3f979ece98eaf437bdb1bf153c1d05266b41b8a54aed3a78a30647eb476b154a87d0f0969231ca11747a00468c3d5759de24442eb1c2e3d49a85916ec"; + sha512 = "8a71ade92eae94f4d0b2ee7816d93cc8d5662b95025804f1dcb65a80bdf5adea024351d747658fe28e891576229b94b53e221cb742b4e9a9b972441f3b6eda5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-MX/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/es-MX/firefox-62.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "e16025fa517bd2a670c8a7f3bf2d5f05e8efece75ea8ffedf88f5e0e728d18b6c4041c399da501d2cb0824a64e30503ab71a3fea068d30037fba47d494ed0ad5"; + sha512 = "51ea91279ebd82930d35f5244c276c1f3ebe31debea6c916349aa95bf42aca2fbfee4a3d07f240e219915a52f476899b0316c2cd0575ccbc0eb6c02147f78e4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/et/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/et/firefox-62.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b7029f56f0f7d6d70ebbefbc1f406c75fb1f0617eaeba8864012738921b18675c752ad2863f177d26a5949a718ebf82699ff4bfbeac8fbc267578cdabb8369b9"; + sha512 = "3f75060e06c0b67a4a2c3d1e7146c6c40f6be9cad33be33573279a3de4f572456dd6514da0876a5a1833b6f27ccb98dafb3833a06f25b42b559a8b5b44e8fc77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/eu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/eu/firefox-62.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "4f2972f199cde9802742cc7275c7e9df1848f04de4e5500db5c09522948b4a3ad027614783939d71d7b6d5c003af2ddf4411d391e8d391282a2cfde48790db82"; + sha512 = "b7e05f5e3e9eedf174e9de26e48ff6885e4bd0575694a33c555cc13335c93a0ab65d01707b114f206be0bad988c1eb7515d0bb11f05cbdd94fe6d9bb07271bbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fa/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/fa/firefox-62.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "10d54de8b66459b1085d0cb04c4448086dce730b8af1c8a31d340c15662f206d1fcdb1ad09bf6744515cab6fb8db69185a2cca9f3fdd438fd57b249b76e9a7fd"; + sha512 = "d81db1e39c60abab55b8d7caf3b67e4bcbcd174db28cedaeddfbea0f9ac58a8e7aa543e5a09d77f2d43e87338b1c2b87584facbf667297889e0c1555b9b8fbd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ff/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ff/firefox-62.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "ec98734be92fcba4764d61a0674577ac388f8252ec62a8631cf66ab4eb88e8a1af2ee3157e0cafbf97c59a48d90443f0a8781183999da713dea2a7d67f816ee4"; + sha512 = "4184f840e9955f7025db38500981bf5148334f933531925bffbe4946dd160d0bb0d8aa61f9069e5abdad7e7ddef05aa4e397fac506f6030e4bb51248e618ec15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/fi/firefox-62.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "0a9c899263a068262d8f4d0f666c43f8b06bc6dd9377be27b88ed1920af42eba98df4b491de5d980f54f43193ec6ab13b8cc91df95d6eecbf755930f49b1f4b4"; + sha512 = "1d07ff210cb4ccb3041fad107ebaff013fff6676f073926be3a905c066cd8e2b5541ccf5033bc92622856157874db773b95b3d07d1d7bba90a4f559fbac64078"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/fr/firefox-62.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "bc23a2b13d8cef1b92c73e2fd647a670db5933a4e93a53d2bb7a5814d6fd420a5cc41984b6adcb9863e1f9dbc451c9442e0663f096a707f947f0420bdd6924fd"; + sha512 = "34e3e2718e3a201b87f99c71c990003c56542a139d92ab5a0277adba227c6f2e5352b9f623ea22cce2ee4e4f9b7f32b7df4442f763676b98a04de283d0bf5934"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fy-NL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/fy-NL/firefox-62.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "e154036b3b4f42de8d880be470caee5fca4a393c469189fa59c9bfece9b9a2b1fe9f32a65c77c47f8260d5ce0ccb81e1bd0f43ddf98bbc608e76db446fd1be40"; + sha512 = "d9284a1f45e2b193213f859f0e4dc2efe5545da8b36491bd29c57fdd4001661363af64d41fd4e9b4d604ad0ae04569a6e25bca29a5893e787288a0f7b3eef7ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ga-IE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ga-IE/firefox-62.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "3483257b21b58172c086c291d77a3c651e07d62b0823832d5d8e1f48fcb9d0d3a7c35df29e11e346380e78d6463802765ab1009ed4e64d7e0f4db1e4beaa6419"; + sha512 = "62fd330a344db2a723a465c15849c31dbd1797880857e42d18b8efd9e3bd1d57844c27b201050165be17c4065a32eb2528456d62b6c1e397a6dba4c8c50285d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gd/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/gd/firefox-62.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "de877d65e07d38d7b30bdbd3be409797b22cd29b3ed49138257ae008ee022655a3082a82f469ae99a2e8bbb3d4787c35377aa383f43da9d3cbc978a6d73c9bf4"; + sha512 = "6435f0d11ac06231856b20b46dada3914791d09e4373c21d5b50953cdea6d229169f20c2be7cd057c78b5acee69ce55c549d218a94abc6cdd1ba4064c0cf88b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/gl/firefox-62.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "37c29b7e014b20c93733adf75bdd4a427d89d8d0589e26bff48a94c4bbfdf3867dad8e6df0803afc08206c62f6a6952d46332e62258cfd2956416b4be29a3a5c"; + sha512 = "f94371441674e1d45e7e7e476f3a0314344bbb581483f738851157f7b5b3b067994bfccedb9f709ce6520aa9fe2367085e99eba56535c663bf48a21b9dfbcbb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/gn/firefox-62.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5931414b6ee32a5b8e2d3730067b16b924ef93a40e93170592ec66452311dd9d50a79a73f26c143e3ab9ed06ecf8b341fd035445ec95199340dc64a10d9df3d8"; + sha512 = "4b0ec3b4e84a2e0407ff81f6a72430c2cc2e498bd1c460f327e374737ca933d5e612ed021ac2bbae8a1d0cd2df251a2183ceb8b7e8598846144172f1c8054b35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gu-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/gu-IN/firefox-62.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "80bcf83c93319688123fc4256eb1346bca6d307ae9c87d0427eabecb006897d73c1fea677e33d1b9b4e888427116c2f1a8df60c47465becfe4a947e081b8d5ac"; + sha512 = "62470d9b00487e2c36c96c177e622086fcf20185566c5725a3a763130e82d883bab7ef544733a693c8813b101ca8bad19d9d144db7611c36df737e4a1d945f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/he/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/he/firefox-62.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "05c03cec4ecbf529244f19823cd00e0829e830e4c23faccd750fb1f239ea155b74670d315b8f1d94ed692c62f0c41fc30a6c051ab0410f84f408cf399dbc2225"; + sha512 = "169719debd65a70afd7591cd0c5a601b822ec2440e063d5b5fd5cd1edd1e525ea98b574e7f2b114abc9baa96a696a96392f909b4806cb01e75dd82dbffbaff73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hi-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/hi-IN/firefox-62.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "92655f6a715fdc11cfb65f78bdf330e7f1bedb445db81069ba14a6baa1bd8494042ea837fa3e4f8f738d9758e3e7b9fa54122e7aa063ddb629020646fe4a8dbc"; + sha512 = "f954cc4c071588f4227fac505662d1dd49a506fc4450d6fd2eaa47c97742a3cf675d0191c6e7ef3b3d87f6c89961539d049785b072564334c1303badda37d22b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/hr/firefox-62.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b87544de15a28f2fe7ad4c9b9f41b4bc1ecb679ede72b28d6dee37717f7c72343949691bad30ef3259680d21c8bc302e5a63f346e1714a8b3f7dac07051a3afc"; + sha512 = "e8abf2436d0e46eb84cf964897a2980d2e03ea883d17759a0d164981fb4b4fa36d04954c0bd18a22c39497265db342e62ac6beeb21f49aee57f011dba4d74880"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/hsb/firefox-62.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "003c07ea6f748a2c98a8f4846484be4f49bd4e0541467c766eb00728c79a9e72441b8b426b20f1a6c84fa66c5c7d5b6d4903b92b5cf15236567610f6d9249816"; + sha512 = "0def8973694bbe22f535de8e4d99521a45b369a0f4677982e7f2b0502e77212ca51697d3829d77658b226d884d1a8da1c5f21cbbfce22838329c9f2e82d285f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/hu/firefox-62.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "177bc5d4653f8c2f555a7d8f8998a7433b607ff6e90d65f107ab2b40ee5349f96302ce63dd352c14e23f399d6a815fc0da6e52260d8d196daf4752ad8ad0e183"; + sha512 = "2df9a763464afdccd7e96f16a4daec302d9ce8e2b398d82f95d78d394a51033e6e725af4f5c288506f4d97e376b9d74db8e93da667a7a51fe55205927debe66f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hy-AM/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/hy-AM/firefox-62.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ed449aeeb3708c335b62aaf5ce19c6f0e510505dec97c10642d5a1eb9b9befa6afe8fe14ea8e8027d0588643ff37b8a08694748fa7486b47a8aa20d841f41996"; + sha512 = "6a53d7ebb9333ae95757282656fbdce782deed954e7f68f3a10448c03ccbd6b7e02822272bbc3520cfa5c5c2b9736948fe3bce94aee19fda58115ca7264fee8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ia/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ia/firefox-62.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "caef9f0f146be66981c92dbfcee6c3198c361183940fcf8a82dbf69572e0b53209ae9823bae5d4727ca63f5f28dea0fef15c810d1b5a054b12f912f83d23aad0"; + sha512 = "b5ab70b5618dca56ec75840b31f419dcf00a3f85195cf26103d5672c978ef1a17eea38586c8dd7305463ad3ec5d46ee331cd7d7a0cf7855e7bf557dd508313b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/id/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/id/firefox-62.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "2baea66a7b8a9f43b3160130c59ec8e0b5d80832b4a79147185b6f632dafa53b9206c1824fcd2fa167efd4d9e24929ed56bcdaf75e453ccf5e2e24d638e37253"; + sha512 = "c12a6ef2c45e02cafd1b3231200e5058f0d11f424357ebc64435570aa4768dfff7d7a7b45d1689e98213add53bb8234dc612f4ac0eff515622682c5901c882ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/is/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/is/firefox-62.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "a2ab5f55bc7494b546f28e6d322d180b30ee0ac4af6151b9b1ec6bf228be0ce569177bd503e0893bf065b120d697e1682de5d36e3f47967abf03e2d6d1f80899"; + sha512 = "525989cbf6713ca83818d5b8801d54c88e2294e26afb60f80f6eb87e1d85bfb6bc935689434cfbf9bf8933bd51876a6528ed608af8c7df587c57881ca80afc54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/it/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/it/firefox-62.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a4d4fd7470dc71f17fa4c7e4b9f4342bf44ca318ece327ad4e8e45bbb4a972d5401da5313e1b60b7f7c847a1115239f62f962afcc1f509faa1df90f44f2118da"; + sha512 = "2bfe68602dd5ee72eb9d5f09fb74ede50612f00c5c32beefe9c07621e188bf2d3c0ea127555e6ac6dad07980c02bd7e8886b82e37d33d9bdcdacf0f3a2b8c472"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ja/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ja/firefox-62.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "db130fa050eed1c2e413c93ee928f5f3d9acf0f749cc29eb54b3dc2c676bc1a138fc14da9ffd7d261fadbfe3f9611229c3f7a7421c69feda7811258c93ae96b9"; + sha512 = "b4c8ec9cc8e436def0962ccf3314aed62315ae08eccd5031962cc1c0db6a7d5f475f75f485cd7a30316e8ebc1ae58e82811537f8532283ded12d7fd9872f2f35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ka/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ka/firefox-62.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b20d5c5cbab48dfc924c1415ee25c3b4c5be6070797352bd205529786ae0b2b08b68aaa1d8314f7cc93ff29e865407e48f078f9a5010405b52c2280681d06fe1"; + sha512 = "83de26625dabb5ac2be164f32d6d3a78a03e7edd4557d3d68cd933fb454f5553a0d9b260eb226160bbbd6eaeb7cbeeef1fe92ee2fd76502b04892628d0e475a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/kab/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/kab/firefox-62.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7b48ac5dd887a7dc0c69025853e9af79776a92fdbbe8e357b996e2869827f78af1bd4a5ff6c380cc9b1f82192421e8f09da8fa9c2641a44e8c5c16f7a55f699f"; + sha512 = "5de82c8f4b38981dfdb69c26370a3882a7daecbca21f5a48e9a326d0fbd619758156ce5fd0015c28ec94c79b3982b4b69325c7086006f0454f2279066d66312c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/kk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/kk/firefox-62.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "4e82ce00c4627ed3af79c1f83e02e25012603e17d8f45ad7a9bc6c89483017c9e4f6b97a4b7cf3cf46f3611d6ee66eb9757b9b40ccbe9d3eed0fb0119e630dee"; + sha512 = "9f374d24bf2c684ee97d79ba998a63e4f3273108e643fd253fbb8286e36ffd714293822bfc7780d6fa65ba6806b2a3116d3e96211564d84772a6835ad43eeea1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/km/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/km/firefox-62.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "8a99eca4f7dd7c82e83e01d36160737d325d949fc423aa64abc1dffb82a404047c97512a046190c601b27236f48ab878df3858bd8d57bb0fbdaf9927abd269d9"; + sha512 = "af56e1d8c9888dec1ea95247fd30bc8a50f844d7ecf68fc424b82116615f34a0f0c48ea2b967d19cb156dd401419b84152ce3129c23050064ae9c94f3cc839a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/kn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/kn/firefox-62.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "798a246bd5ea6d8478b72d5105b43150e3754ad97d886bf1facf6469c44e1045d86fef9d7fc6ed66598cf9f8cc77e278d8cb04ead39afda5e280abdc5174907b"; + sha512 = "6f87de964ac3d97896d1a318bda32fcb72dafaa2661d9a13e9b5bb9495892a1a541fefa5c5be0e804ab972eb9436b1e0b2a8d7226253f2ccceafaa350177ba9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ko/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ko/firefox-62.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2245df3c930f4d5754c83a6d50ac2af03c3a7a312907f00d12a2a555a4b3ca7678a2ae39b8166bfd2bd547aba4aa3d20bd4c6b4e3624d2cf73b59ffcebc24e8f"; + sha512 = "759161eb35b81cbd2032db75efd9b8810708f2c3634ef5a8a3322276b6f3ea1020aaebb04d0294b46312c430541ac9ed95801d2457f85cdedd19f9fbfb151078"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/lij/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/lij/firefox-62.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "0c4e948e1cd3aa773fcb38ff0399280a4dbc5c3f27751d1eb056e5d7157a4aaa00b7f437c45a9ad1ce566aad6831fdde7974d788dc336c8b79da095d44a52caf"; + sha512 = "e7bbe584600d363bddf407b8dc57ea6ea02423af67694a7a6658c59dc2fe40cfd18acba9cce54dfe612624c2b41d02f3028700a70256379ecdf8570fe93d357d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/lt/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/lt/firefox-62.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4115192841dd74ee49e5e8b28dc877e144b7b517141ad0919146d196abd822a4ea379544fcfb5ba457facb799913c381c7314e8a4f8acb1b2cc46fd0f787e604"; + sha512 = "58317a8be00a623d9fdc6b1ee1116d8c677fef0385c82bcc253c09c3921800ff3dc7fa0b0243736edd4a8a4d40072921fd6b83e1b812df9dcd90c1e89e41061a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/lv/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/lv/firefox-62.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b85f86fd806789849bd4bcea933578f70b38c8cafb9c52f6112cce1b3f4196291adfe03052cfd51e76ed8705df07a6d16776cb9de6d29bf8dec4eb77c24a1003"; + sha512 = "ebe7f0602eb76d00e6405edfb5cf1dc8f2e0e6577522156f023d58d832238ac90a7e73d50dfeb84a2408efdfcbb8b1e723f9a99f779ade6fed1a8237a9ab25d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/mai/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/mai/firefox-62.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "069c073c8a2fd77c7a6de72b7b689e5e1d1596284bee7a18c33c55080b2d1382edde21c704fe45048f879ba8ba71b662470463b28ed67f1334f54f246399cee1"; + sha512 = "a44c2cafbed21f5270eef1fe3c0e9f52b79277a343bb1e7f3214f4b63a01578e3350899b9296258a798a5a830ef142e357092c41f90aa20e4371b2375aff90b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/mk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/mk/firefox-62.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "d231cfe0e07ec369d7c69f3b2e25dc68798a614fb316b3accdf9ed3dc34b5482f504a550efba19f131ed6710363fda72751adf837a36324a13fb55662cb941e2"; + sha512 = "340a731956d6ba6e9556409367ac173d02aff222563d73994e495cbfc25c8820aabd779ba5e07d410dbb6ab804f7a91d71fc71edf59fea520fc9d9a5e5fb2904"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ml/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ml/firefox-62.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "3516dcdc5a7d7f5426c4326bdcc0c33f7c4f7fec85dbf8e161640322c6463c64248ea97f8314a1b9e1ca482cabf669bcb0b576892ca6bca941e829759ccfd068"; + sha512 = "19ed8e63ecdc75d7990a29c9085571af1cdc03528ce8900940ecf54c093ca053365adf6ddbd1d18af1026eff68d08e1dd093e74e10743971f840063e38d9073d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/mr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/mr/firefox-62.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "17dfdec17f967569109d94062935bcf0481011b42642a009d76888d7318a297adc8359408db1e1be815eb4421f4a64a30a3c9c5b9cbcdcda4be24c5a2e052655"; + sha512 = "f0d1a22225ac1c47d29cf60ef8cd569d13bbb9c815e6c50f73b58166889899b64561591e38da5ba38369d6e07c058c7ceddc35c313bd43ddd003c4895edb83ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ms/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ms/firefox-62.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "cdb4c9a805421d996d66e42cbf5c4189f3a1806fe27cd6cbe7d677dcc0f18841630bd73083de17273e20f130a3a381a65a4c1e267b6e204c0115dec8c6e50646"; + sha512 = "064b80cb7e3b398de2264b5f375aacc125adb2ca5f807006ba03e23a815853383b2ae21d4bb77dd1dfea77fc483812ce8795273a48798fe1e28602a1ef936b56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/my/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/my/firefox-62.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "81ba5089c9eebfcd1a16dfca14aae2d1f2cad3e2937808938d818e995b2d6ef62063d08372b31cf980464c0d7b80fe87e7115d8e9cba0ead5a4981404ae72266"; + sha512 = "7096b722581176d10c7efa801a09a726ae5f0b28364dbc8bf32c4f1cf5808bad63c534125d8669033ca3bb3cf7810e0dde8bbf8a72c7f8e04b2775bcc6c6b19f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/nb-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/nb-NO/firefox-62.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5234f60af1fca63d501df28f570089b133e6659bacf875b2f977ff555971d836493392fdba1d187edb796616bec9538a158d01b72f06d8846a6b1f53ace61afb"; + sha512 = "1747946fb1d11fa31f7c8a4cdf15fab0bff8e5229546dccd6e7a15f5212fae5cec7432a413f4d5de603eff92894fa85559f3a35e97ffbcb38f2d07feff8c05e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ne-NP/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ne-NP/firefox-62.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5bfa1ee81c81c392f2c221ca691de094eca2abbfa1970b972a7db89f9cb9a95187f95aa96ab6a0ab7f9cf0c9d9cf52bd476e8b54199190371f45405dbfaad198"; + sha512 = "6afe69d30dd0b79845db89b1d29e1a78da6901608ee0f3a7306cc5adbd3caf469db0e48ba81f0e1753522de4858d0ea4f767d8849f9045436ee239e58d24f37b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/nl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/nl/firefox-62.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b1f0fb4a09a6895ebca561d587afef654f371f706678204cda0b67b3764d8e41629205999cdcef36fdcb786d6128a3df5947c265b461bc9427e6416b2dfdf5e7"; + sha512 = "6219bf73aa42045e6885dc27f8c795c10f5a56a2fea65a2d2a7ce93a86de71a88c310e0c81d8550e01dc80265332534666140bdec5f1679fa7c0935c8100864f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/nn-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/nn-NO/firefox-62.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "679f9a69b1ac386e92b1b1324fb12e4766f7876321d2eceb33d5d7e6244c70b7780491748699599da944223e17c5a1542986779acef26da5215d4b2e2408d2c1"; + sha512 = "40bbd7c8801fc3c4ed76bf51f571f19f0dc1e3e1c7a11177ee049b72b4ede1f0df446dcfc378fcec94966b8b8b1f1cef4d35282dad63c8c0e64ec89dfb1807b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/oc/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/oc/firefox-62.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9a446b70e7676c2d9ccf8d3dbcc203570a9421a771cc274cb271ed35a769c854a3c61caffbc5437d9e26e562d80784f01384215d2dda37de6da1b5fc617bb198"; + sha512 = "acbe237a8c4eb611da8214392628c135e911de43b039b6f59ba7b31a7b5dca230f9964980ddef8d6d402818f0669b15f0ef26eba0222e8fca18e1a231c8d978d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/or/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/or/firefox-62.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ddb1141d2312d663c3c4470bb1dfa2ac4171ec18aaf7fb8a3722ea627d571814b0f81495c28d95643547eebc012be816497bc632d650811c32a1f046aee6d7a9"; + sha512 = "c9341d2f2a53c30aecc5bccc88d4676d113681d734e8f4f04cab25415022881604aebb63e6daca1078a49bd7bc9780a5872d5771a74030b5ca16e5a52144e525"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pa-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/pa-IN/firefox-62.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "4a8d82235af85a526e6f1035016fbea9e4cd89d82d9734d092fcf8a19e0aaed591f5a493f0616f0c892b02db7738193bb5aca2c4112d59062286bbdfd3d5e22b"; + sha512 = "ed04efa14fb5fbc0116784fbb8b697e26ced6c9f84c0c36238bc6e076ef651b2cad8969e4372662980ec40d5c70bf2b38bdc12ea2d718d1832979863dc5796ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/pl/firefox-62.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a7fc6a43a7995dd08bc84d67c776fc45616d469d2af4a62948a910c4728af0242ff9fc70cde7bc0b1c64b71f97c4239ca45e3a1069eede8de92098bc97f93cf9"; + sha512 = "d415b2f084ff1ff0abe81b5c79f71348d2c907abe5620b68da6af756b37c677690a3e6be5a50f102c59d59c6ef694a98a44356698021273ee1645dc119a505ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pt-BR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/pt-BR/firefox-62.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d3d4c9ebb1172fcd3c20cbed28dbb14b115fcb68bc817c396f8a26b143550fc1562aaa65442e609b091b94b26225f9021b6981b4863d23be97076a98fe092db8"; + sha512 = "91abe27feac815e505a5a1a179088f1c8f6c2d26b50ad9d692769af79873d94615c64b640a5e5518010ad79be22b44691e8568f310ff141015627886ce80015f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pt-PT/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/pt-PT/firefox-62.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "89620e4ddbc92a4a35ccb408574abbc7dcf02717f0c22e2febf71a1b498fe93377fe959203acb0d46cbced9a2a8d63ca4d72adaf151665e58c29c38f157ea21a"; + sha512 = "aea1a760470b1f34a3bbf078bc393a8e6037e0afc4c5779fd75c683cdab9c972122520786dbbf26d990fdbdd6c075e040b0b35f4a22ed85e9a8bb41a22c8e512"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/rm/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/rm/firefox-62.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "85960d1395a5c3d12dda25260c6a4719eb7705ce5b7e66f384424272478d3fbe129984addf005a35c08a0735759b07f8984fe13d378f11a8c3d8fac5714ce049"; + sha512 = "efcaaf35cc3ae7d4684f47a1477b43aa7037ffcef2183205689a2fe0262f02eafc34003600b5c42a45cc5fed13786c953a5f10548eaed25f9a48d6dfe7f608f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ro/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ro/firefox-62.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "f443b0442b5a9e512cc08e51eefec6a49cec0ca1e154de4e1c4d973498da28d8435ceeb1e89634cae5e373f6af2f4f8e4df2f4683bfc53318d47ff254b084b5a"; + sha512 = "9f61ea898ce0419daec09f0448ea1fdc6622cd8f0bb054112851c82ee439adced57af85efd477c0d24ede9d681e482af31369979451bad65a9dea99dbe65a746"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ru/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ru/firefox-62.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d24a276fce83acf32eb3c067a102f51e75fb351eeeeb7e1bbfa4e533c33f8ac8ebe128e2baefbed9162d3bcf64852b88acb0775414c129ff7e66d64901fef215"; + sha512 = "34502456ec26b2d2164476667e673b277c5cf30fd8e1241facf55eec5c18760e99fad530a1922a40eaa15f0107c6bef9ed219c2112b1ce623d22089aab73fab6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/si/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/si/firefox-62.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2f025bb5c5e550ba9f10200bf1a56d5a33f6c80aeab5b9937596a3b19ea0b094affe8734ae4252e5f2a3ffa50ff437dcdaec44754312e1cf34f4b317f86ec72c"; + sha512 = "87b86db83b1d60fc7de351ec553e44185b69b1846bb92066d950bd77582bcd1f9270e1e3bef263bfca225ed6f508d89d359582244bba1f0231f7838907401a80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/sk/firefox-62.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9127e226fdaba68cac0fd0e8a977f3ef85e8cacd31d7021ea1a9e30b39acc11b0e4c3d78db2fc09b596e5de7806ef74fb48c3de0ea6e6c5c7c3915133e583ef8"; + sha512 = "420e2f8d860d4afd3ac18bf0d9e1294c72a70af16c6435b5396a855cc60162107487410cd591fa93a9c91e3b0b933dad8cfaac0fa2ceddc097141c3c66e21185"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/sl/firefox-62.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "112f6ddef9565c7065c9c47c9b412940fdbd5bb4606ff2ead622eb536943ef42d9c2a1791357f02da797ac7ad73decad3e6aecad43366cb6e69fadb7706d931c"; + sha512 = "eb4441a87f7cfdd91fe6d8cba19edcb86a8f6de7e53126b9b29d88488829172424452d3465be0d85ad1cb7a55ec8d9c64d2efacfa6dcf915799a53b3820312ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/son/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/son/firefox-62.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "de9531b0f128a8d9c33e3c25f67ef78977053b84abeb482a39008c06f96b08c2f3fa699313ad68c1d8e1f29147bc00cabdc30efa7d15dff47a7db9252c9fb568"; + sha512 = "22ae1c5d0a1c780fdacbb90d7be943c1ad06f4dfc1c9df2e55b2c44aee6356cd384769aa2f3085cb0cd97acfbcd9141f58f2128ae8f4fbe82a741e6a6712b5ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sq/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/sq/firefox-62.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5bfb920fad1399e7e1c3287ef38175b901ea230261863b45e79850a2d1e2b779dce89dde073e76f7da474f1a1cd1f09aa9ead8fbbe5caeb763a9d0b683c4fbf6"; + sha512 = "05f45bf2990d1b8e230a890b49802300964cc346844b0f8672bac4a4c8591ee8d4889b4432b5cdedd34f7c83ac099d167e6d1b7c0d259df33935ed5b1aea093e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/sr/firefox-62.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5ee7e8cc7752c48a1de329c65753bafb6df0b7cf8a56534521a85b132f41ce0836ef0163b17104a7132eee38a5facc2a5f9de7aab31677b33726def9be4662ae"; + sha512 = "9d432e4540bd613c014ecab716ed2ff02694dc120133621a0a2e230a9cd6a6fc0f210667a6ddc09b1b7566c957beb1e049a14dd972339adef3f7c401d18ed88a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sv-SE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/sv-SE/firefox-62.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3fbaf21aa3d1e4e8feade93d015eecc97a50d6dec6e3aa487d450f53348297d1c48e38cd221282fc6ab4fb00fec099962225406ac89329519ccaed588a75ef88"; + sha512 = "34fec55bd47cf55ef0877e91fcf62125c277de7755c0a0991cd4d79acb3b1b56f732a79d9bdfeab8f4f3788187fd63f459f453576f7ff988581816584c0a5fef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ta/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ta/firefox-62.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0dd9331f4ab4c35559551d433ecd1a2ea2ef917d1b04dc8b727a77540318100337b73a4500b0ccbfb24fa853b2749df5c74820af794a9579423e9aaa4b62a71f"; + sha512 = "d92e0f051096dc1d2c21051fa805ce20e43c70ce68260f78565f2f506ad02adfc349996af4d64dd797f7b6961a344a90e7c686f857100ea8c4f6ef26c6d1f769"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/te/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/te/firefox-62.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ddf351df58fdfcca150012fb033055ef0b3e5175b587dbe9a1ad92144c5170f765c90cd8b8405aac85b7f16da1f4bfbf6316eaa8f45144397a06a11aa944cc75"; + sha512 = "e3f06f8a71ecaee56a7c0441758eb4f43d940b8a85699631229c64add60599d3d686e9d6db55bf2fe2b8b1fedeadf4d0cf729f3b9ca96094e9422b0077683a5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/th/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/th/firefox-62.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "d838e1ba30654631926a16ac3b8fec40989da3a0ffb95ae59990f9a22cf560e30222941777241c94b5cce9336f073df1d5a6472003481b36ac514c6ae12376be"; + sha512 = "fb948deeb85930418bcfc41b445dbf448afca16711c37382b07202119aff770375a632f465e2e4dfe5367fd833fc6a8a5a4ce582b4eae39c09ca11293b7deb8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/tr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/tr/firefox-62.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3925df8ea333c2a9bf1c3e5fc09c5d6d662aa2644fd34f81f94221d895514989fe1e35ef3b688cafc13229744e3c8f6e2af08c5d08c10ee2544418195cbe3221"; + sha512 = "de0a8aabe221ad6bcdc5f023a765f0af78002e9b266a7371b21ce62478007cd0e1e0ff6fbced9054a2d9439c9aad0571ec48c2f58281acecf5e598b2978798cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/uk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/uk/firefox-62.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "ee80ae9b0332432a9afeac420484cb0649a0ea947fd869835c41973ef82c10ec1c469105efad08f6a6bba56f0fe7fa27ecdb8fa939fe210902f3dfe18fa6ae4f"; + sha512 = "8041a47fb53ac91bdd702a4b77cab9c4f171ba202eb9f587cb2d9910ab1a6e3b631fbc03a93dbd935d024410db2d5438118c76818da0a8aadd10704fd445a1f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ur/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/ur/firefox-62.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "fc7f6bc1d948a3572ff3aa169858b0bb1b63c9dce3128cb4f55177e45f17554813e2a65daa4f7ff1a2c870022535ac556f98ac28f58490d5914abcaf8bb9c7ec"; + sha512 = "d2b0f990f29b00a77093e3cc30cd03d2f83bd82d7246aa8f4dec2e8fc325c9dabb13b02014ddf55b52963a10ed9973b12fad58703d9544936560ec0ce736de99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/uz/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/uz/firefox-62.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ee9f587298401f6895503c109e735cb73bf60ef85891a189dc27dcb752b9c40d9b91e9bc943aa6d393be80575a90ed6f1dd1b181590133173735f71ffb517546"; + sha512 = "4fe7543f8346abf4880ae86d2dea9515cc9c5275ff402239ecf2400bf76d37079c66584c34a13b690c43bb432e19610169ba4605406810a55758b50b16aa6e94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/vi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/vi/firefox-62.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "8a871f77be68b897cc5ac78a8f83984954f16b55459ab46ede1f970cb912ba7c0326de9c39ce1847bcb41c1eaf032707ad7dc8754f7c6c7520551ab8ab7c98d0"; + sha512 = "7d7627ee7403e297fb0dccd4833807941846532fcf42d2235d0e80feca4f1d9cff74f6e715bf758b0a0a3952d56b3f9d25c3123ee8110ad4b08168df0dda031a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/xh/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/xh/firefox-62.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6f592662d17b121d0b8d7dd25441b9c948432ab55ffc2f8e34415e9eaf75e97ba707bcff00afbba84d1b664e69598897c3a4595332b14e533378eaf52dc830c1"; + sha512 = "0031e3080f1effdb659828479ded927152239781064242d48752a45cd6eaac6d3cc5736d5eadad6310955425d90cab790415d85541324c1566ca119060f3e57d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/zh-CN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/zh-CN/firefox-62.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "f69ed795a4262c4288a2942845caaab66375d9db4d955fb22535862a29b18217e8f8bedb2ffffeade15f5276e8a76bbac2f0c0ae31b7851b20c696ed1b8605bc"; + sha512 = "52c9149f86c860dddf31dad70c0287b72c3eafa0f6d6ab86c7f40e7b3aff7d11c37678bb39d8c339118ae1846af152a432875e124a727c06b25d3f8ffe07db80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/zh-TW/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b14/linux-i686/zh-TW/firefox-62.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9834484be2696bc4caba686dd4a87bc2a15a1c6125468d570cc1ac837ec111e2fac22b04f6d2226ba705c04e69195e95258848ba9ef0711fc2cbdbb1521302b1"; + sha512 = "1dd72bcb1d5e84c0f49e585b949a342a29173b437818be60b8e34000da6c85f35d838e1cdc58210d9f494b4d2d89c73d1788eca0e2db2f55dcf4d81eac3d84f9"; } ]; } From ffcaaedf7510c27a89f1f0bc205ced60f431adbe Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 4 Aug 2018 15:20:59 +0800 Subject: [PATCH 148/229] firefox-beta-bin: 62.0b10 -> 62.0b14 --- .../browsers/firefox-bin/beta_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index f217d853f0b..0ded6ca4c94 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b10"; + version = "62.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ach/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ach/firefox-62.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "141e5f280b13c1440012f6b796cc361e3b5a29bd3301a18ee13ca4b860e21b8c5ff8e6640cd2c57c577d4f4ba3922bd89d96dcd9dcde8f7090238d663604461c"; + sha512 = "b2f8ed7231fd1e3ed6530a6458c4831c636b21011e532d90b5b72116d1537b569ea08340e83ace86ffc2d4fbc15ea706b6fd989b265d8da74f43effb86b66192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/af/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/af/firefox-62.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "dec1fc688e936e24e390436d881eb2adebede9eede6ec5b15c7732413d7eaf545d5f93e5515f4e216aea8ee26d5ada2f02ab8f45fe045669659089839a3d2de4"; + sha512 = "fc3d6e21f1650e107a2974107a96e1a3f0d338a3fb11a4550aee4147f4ccebc055497b02e30658cd8e34d2971a50b27d645bfdc497b7534af3680e6b2d025281"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/an/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/an/firefox-62.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "3c25a7ca65184198ae3618047fc9f7592164367926492da6839e50ef2f72866bade1f44e9991fa817503b1a6b02a5d7400339ba330018e21f6fe863f6b7f389b"; + sha512 = "2fb2c2acd46e9405928ae90125edf41c59b30cb786a0273732a3529e9ef23dd7d179c832a68937acf05a602578c8c568ef9aa0fd535f77cedfae09b611292258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ar/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ar/firefox-62.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7d7edb00be607d01ed2e4dd50027b2839e4abeb26a89b4d85a2581545c8cd43002ec116e2073ffeaaf98b6c76fe185ed836e49aff2a2bab6f2e486dad55bf5da"; + sha512 = "841a0eb8feb42a09bfd2c4145f9742533bbc7de3b0a79271be43a30bd3933f03f8d2ea0bb381937a5963ce23417ebfd50018a14002672bd403f4d86a41e107b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/as/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/as/firefox-62.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "0a8d24f7c1b67b97d511f545a108dcacad9a1c1ec5004a1f1f6571551c52c14e9f98b341a61d4a13e6e26490a3c74fcb1608ab9dbb260d5f1e4d421fc71bfab9"; + sha512 = "9cbd161fa8cd987387a48e4587b6b9e109f2ebc0ff68d104a235e0a02af0df65f82186657f03d88b3ee2e6956452c97ff63622dda19cbb8164474783b438a561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ast/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ast/firefox-62.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5123dcd2f0d4dafbedf3efdac669ed9f3837e092d53f23a6b4802b83e8f61b401f03e41911645125138bd09da1c3f575c053b86cc27bad78ad49dedebaa79ce6"; + sha512 = "e352479b16a20c8de5cad7d7483235f15f5a2aa14256d2a8f880083553c49b3926750c4d9383f781e04113e054623cdcae88fe3a1bf744ae66660d89c50aa666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/az/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/az/firefox-62.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "aef97cda7e502651e88fa2099d39420da38ba06093516946223940fb18ea0fe52e0e5c83d1a7234003d70280320c40a83bd7e4a3329dd5c92e7b97144d884595"; + sha512 = "8ad214e95cf493a9544fa587d8c790054470f7c5abeeffc11d7c8a0bc77438fabde6b3add423ff1ffe5a8db4c54b10419fd242780a6ac145c3b0513a0cac1bff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/be/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/be/firefox-62.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d6e04dce19047627906d38362012de87f6f64f919de2f1d23e60d4c686d1a7434290710def14a2cf3e932876949f64e74be3de1ab5318ef1a6118d32b916850a"; + sha512 = "145adec7ea9af6c35b0b3a98839b96b9a7525adcff14beca171470877f2e6e2948b4f82a299e7e46939dde27a742705007be3b09f20b3767eb49f4c18697f135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bg/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/bg/firefox-62.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "8f2fcd0777da4d0bebee0151fcef871db78512cfebfb1ee3bcabf069e14134ff56734fa784fee12160f8a2ad3d12bb4f524b831169a916713b5ba5ea1324ce3a"; + sha512 = "1ca43d1945f1a1d4fa2823ec2489fa54ec0002698529942d884388ed9ab75662fc0ef12a2ce0dbc5e773186dcd0cc7f0fefca8f42c3946bd17acf919754ba9a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bn-BD/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/bn-BD/firefox-62.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "63e81570ab71eaf477a661f7f6484de53ac7200395ce2ccaac7b73d6f28f73abda7f4c100b6c65da39e075c0d63f7e3a3636832d0469a252c9aee1cc5e36ba95"; + sha512 = "89535f73b7c53e79fa6f83736ea7f74946b41bb7bb3c628dee362d84212618b0b53b9b68dbdf3d9468181877696ce83461e3ed29d7a413e069227cf412d42340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bn-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/bn-IN/firefox-62.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "011c335a62dd7cdcfe1000f616bdc7b826437e09134b1773c5380d05d68b6e32f33ea0ea7d75b132a6098d676c5326ec33f35f5ae6acdf125e5cf607f803718f"; + sha512 = "021855aa955cc6c166318466a78aa4fbd31ba4d792db603db49b2af19e2494d46286d0bb1c0707122ae53317c2093527065c83db4943995255ff8f7f27cdb83b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/br/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/br/firefox-62.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "a3f052252ab65fb284ade27c67ef55eeb7bc0f78a8a8dca539e356617fcd3144946c55c08eae2aa09a8337cf3ec2063f21e2d976248b647ae26cc159bdfc9e83"; + sha512 = "b60bfaf65e6c2da0d97d53c619e345affffa6980620d2d72388d890587b8f5ab3a06707c783f72b58ef04e15de168a27cbeb0c33fd593871282f2fb38898baea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/bs/firefox-62.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "30473eab751e7af94478b9a79af008a33a1a7438c85db0f46d96a5848a707cd511a82d67c91bd4bfdfb473c6bf8228ee0375ba58395c82b56b6b4fa5a714d3d0"; + sha512 = "6fd1c5340e8772538ab4678e5ff99525e12da56959116cfdafd427da8d7d9ca17ce91652bd2c714c171b25abe1295acaee79c2c7c5c68311c83d861fa899b51c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ca/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ca/firefox-62.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "424486171233702a57601d16f1706175bbc4d32bafb7786a4d01226ff16c1da0a7f3df08343c317e9dd2da3f7aa4ef65e3545265271f7303b65e35deda0a8d20"; + sha512 = "5fd83248adba2fb6e2581ccb6189fa68b6beb517df3ed6a5ac839dbb5aee5f59e193af76e1ca31475570a81042d2442522f442b094bf3e83447bc59de9228147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/cak/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/cak/firefox-62.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "0ee06e265f188696f0f73047cc1b8b25df9e4d6940b6d907d9a8cbd241dfcdbb75013a7f9300d29b07144a92ad509d87637807f19d1235c4886d5ff4ccab5fc0"; + sha512 = "f860174039af2224f02420fc7846b7f6a179ab4ae3cf0af6fe4b0b9dd38fefd23a84f596facb68c5c9cbcecc2b2f6ba59d8f19459263c3cc65c61ef665df7c7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/cs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/cs/firefox-62.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "50678ddbcd6064dd2295496aac5ff3e8e563531163fea9dad4c25601c755680ddb50c06f5ca038167c0f8af0d6f003cd578eea90314d8f7628b5057f7a9631d5"; + sha512 = "fd0f33bccab87be09d41d88955d2231f290ef907044e969b6822a7e64665133b7b16865288b0b14e6623b134e8a9cd28ed5b946a89271b1b29ef738d47514f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/cy/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/cy/firefox-62.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "6a3b71137b1a11824fbcf5e1585c12edf8f43fa25b725bdd0658336c9f89c7c8b73b0598165b22b28be77296d889fc006c4bc13a505fa9716296775a95cfc1fc"; + sha512 = "4a2f10fd719fc0f94f188a5b6b87e44546b81d67a7e5814b20b788ccc78cb359f28e69820ef8a14d57e0d7a7f73fa993b3a603a0761698aa50fa10d1e1e5057c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/da/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/da/firefox-62.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b86d5c201bef12e50cad61046f15c06c0641e686134ab1d698147538a766bb01081f1430afe509a7fbdecc70daab983175151968639078df6af1cdae2f92a01e"; + sha512 = "5a7ff771499189323d5bcf0209a0dd26fbdcfb4b3ae2cd9eaac7ef42486582db7975effe23eb0fac719ad2b3b7f02ef2aebdb81d2b12d17bb406725e3b9b9746"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/de/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/de/firefox-62.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2d3abad249aa1e20f45a448f66a515debefcd410be48a952be46c8a75b8ec7afff528a9353fb3ed11497891d2646df3edc5be8bb231bd2e41c24da4598ccf377"; + sha512 = "c69bfba7aa6893ce72c017a49a770de39dea27b00b6459739d7001000b65f496263ebaaa7bbc8dfb96a09c4b9ffc909721af6872d4e1c884399d2a9e082a60b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/dsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/dsb/firefox-62.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "1648fceab23c77fa0fc39b95e0cc52f501a82ea1bc5f3feaa431ae8ea934db155bbde0dba32802c2233422c230befb1062a959a37b73343cff73712faa047c7c"; + sha512 = "cf1f0db44f876d38a22e82a8dabb37e83f5c6e41f9c980f1d1a16c525ef9dc247dbd271429caa62cba65fc93bd23770e0b80f1369b50b836f8e809abfc7428f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/el/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/el/firefox-62.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e6158fa1919f6929a3ca870ffa85c372f78e9d0f949d61852d7c12a5876c257b853dfb709983297a139d61a47a6de8ccbcdd770898a5db924b83ceb102295fd4"; + sha512 = "010e6bd3ae67d500ccbcf3604c11007e86a6a98ad96b5ac50f3a752ea3d1987301ef2e3a4acb4b46f7e7476dfbc0e8dc37275f33807de2cab2af1b4198687da6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-CA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/en-CA/firefox-62.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "2212ea13768d65fbc05341e0e1763874aad3731b35f342289e82bb9de1f539044049a0c66b5b94be6daec35993671ee8c1e06e4097c0f22ae9e6561b0baeba29"; + sha512 = "d01c01923d800e6c20c2a8c41ecc2b6112ed50b7e72746b7b634fffa8beb8b030976d6d02eb25bad71eab411c2fdb77d3b54a7de39c6610c0a32194a5191f3c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-GB/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/en-GB/firefox-62.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "09405b6e4cefae4cd61a9cdc05f5b69584771c4eeb5a211ae278ad7b9eaf67ff493c62065e5ef4544abc3ed509c53c665163bc5fbb3cc95eecf09df1f6a222e6"; + sha512 = "810984cbb9f97174bd2ac08acb19f999d75d77e99ce439b8990f8632641231c9e36eacc824c56fa653d4ac806240c71c2e05c8bdcabe72aff0c06c27c9371c5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-US/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/en-US/firefox-62.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "69208896166416d4e9dcb528053d7bcad796912d564c3b6a265dee4425eaea910a14fde18dcac8dc615f5f4477c1c62bc500bd50caafe53022238097bbf2312f"; + sha512 = "4e20e98e2d75db156c78b3bc879be1c979b77e1f42d4dac6ca0b78a39c07c46e71fe97bdd36e7e6c197f888705f4445bb88bb9bc135159d7a802b86399112904"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-ZA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/en-ZA/firefox-62.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "00c6f274b35b38e68bd8745437e73458851145fd5a5797e8e90d11a9f8d373e0832e337ec4e77cd76ec5713a97b3d7e8a400d65c91f60b704881ce410d4305ab"; + sha512 = "7ea0951139b320994402d508e80d65e0e1bad7cd0f058b07141aff5837a34da90c8ad00544fe9173f912d90ce58e15db645e58ac1ae25c724e19fd1ae824596a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/eo/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/eo/firefox-62.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0d5ad1a42c1a95bb7c7025bd41ef1c8edcbb30f8ac97894e6881db4249fcaff4c1fb4b669d5c201e871af15087fe1155bb769af5c99851127f240d694e8f8f6a"; + sha512 = "487f947f2f15bd54b34d5aa0d18a3dfa1bc4ed6a4a5ff7badbf91b1ad8471a3b61746e3d359c8e683d749a46b2255d57dc550a5542890b236bc87f3dbffc61f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-AR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/es-AR/firefox-62.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "290d020b458546f2c70098555d0a76eb49acf8c8f57e2ee64d3eb640a503af2488cfd7d6a99d033993d742c030c15385d6cd111267bb4cd8d40d277e6f34fd43"; + sha512 = "2bdce008b41cbd6804e8c5e6fabf69bf26b581cbdfdf0ec74eef345230693d160a1ce0b1555ee4f79cb0fc17a4068ffed1d433eecfb4649d478915ad83ba3f32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-CL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/es-CL/firefox-62.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "a258208143404590fbf367f554169f441a3e626dd100e9145de0d3777f7598fe2f404a945bcbeede4743535763d19c619a221b3774004327e315a61e565f7a28"; + sha512 = "39547a9f684cd707c2c1c0eee6a324c0caa3a58896128e33494ca96d71d3ba44e070e28edde48ce6442126c44525429714f7fbdb1c579f48a51b91baa4aa2389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-ES/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/es-ES/firefox-62.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "daa7a7f23935aba9b156dea9597d65386b95146a47872ad74213c188360eddb03b630b143866b37e6ffae7f271dc72a27f0d84c71c6cf73c48aaa686696416f6"; + sha512 = "f6a7ee71c174571933c5d2c2dc0f5c2d65c57d2f3ff3e21ca2f7ea140c1376e1f4a5605f81a8a28ac3bf58e23b296d92fdbb29973edda25508f67a4650336f92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-MX/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/es-MX/firefox-62.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "208d9d9a53ffb8daf32a35e3500765a2c700847afa70dd355fff2c6242165ddd35b0044bc8512bd5fc4ddf8a8422a109833f8bcc15f0b6349464984126094749"; + sha512 = "8c092f385345005ffa93333f16c895882e6c4911b7ae129d91a281698ac8f9fb50ade047539c88a852609d855fb544accaa1e05a76bf09c8a82c4be50299cb02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/et/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/et/firefox-62.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "6e68b76b140b2823d5bbca1c6705b2f71b01cc66c6296e28674e85f8294d6a663e27d2e2f92a150be5f79457e7b542963fce45b0146323f736c221eebf199dd1"; + sha512 = "5f9c86d6a230a03a729a30bda5a519513f5762e6a746b7bfde371a0761a4c1ea18ad781793205f4909950d9d7d020ff823fab6db93f96f726bfa0849ab6a2a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/eu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/eu/firefox-62.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f916ae9cb531aa5bd217ede28bf09495c989f8e833d66562fa2cfb9e26edc600fbbefefd59aed117dbc0e292ebab5bcf62b39aee6daff37050353945a7602309"; + sha512 = "d2c23cc2b6e0e1bab0e6c1ebe28aae860fea4d33700e40c808b1da2dfa1a79331c59ff9ee8129f9bb1721e230f8a0287567eb00e82fd9f95bc91ecb65089ddac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fa/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/fa/firefox-62.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "0e9b6e7c98a91d90b885378ca7281124f9b53b2e139d6238d75da1e118358703dcf882261cf2c85350c372f5439e629dfd75fb1759138fd69fe63ddc0b09e4eb"; + sha512 = "cd6ca466d4cb9e6f8354d9cd4170632785a18a99070bfbf1ef16775afa86b08c60fda74f1283f824a7bc548787a6bbe56fb5698587c09892ad5e11498ae3f4da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ff/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ff/firefox-62.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "02c6cd4956391a935d663393ea1af8f97721e5417d0747b3b0ede403e7376503a4628bf600ad7849b289fb6e6940e5f0ab048862b1f20d4d8f7a593d6abf9d18"; + sha512 = "a01e612337d001cd85793fc8d0377781c657b1c05c54db86fad147365c4aa049885392bfda2523778887f23d34c1d13d3e359e60bb0d1a52c5c238c974342411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/fi/firefox-62.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a0baa3de6c78bf8acb655c0b30585abdf4a886945b7e97389e80eb3372fdeee4e01c0c376508bafbe7727bc6df8058472616afa395f79535b67763d8f2559ad2"; + sha512 = "04bd9a513e950df861f1d81965b165ce1357c13a79c32c87a8467d63cc90ea019614f3a555487c2789bec15fd5fee81847f4e20e890ed5a880aff894f8e720f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/fr/firefox-62.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "0c9e076c1e7c563cdca8aa80cd097cd2b232276fb14ed56b28ae56ebb26f8d5ca1c720784b44dad860f0b86f17fc2c53888d59b0aa6495c2d8cbd82703c0db9a"; + sha512 = "07440ebb0c8f98bb9fbcead42493aebd76b76886ca5a48ad748565953aa131de9c1e3a40fde032fbe1b726e166a5b1f292212a0c6c2e1beb8f0b40730185940d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fy-NL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/fy-NL/firefox-62.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3c262e88505932ef95d45530d822e1331ba63a8a7f54f04bf17f3a53bf28bb91ee42ff76318a582f58227b61ca1ca9c1780da9a257c5a51a0494ba59467a33b2"; + sha512 = "c45a3a7eb3624029172c9d80f0f565621cf7f553c56cf8d68c71446b3b9966c74013c86c4063ec526d9d3179c21301fe1cef51198f3d6c82a0a30d61af997d3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ga-IE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ga-IE/firefox-62.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "9baeabfd553b98b4c53ba02a58524b2c1ec07cce92b9e51edabc2583d3ad8bc525376b2604330bcb6764bc62830dacf641e3de82916a6df0003ee0b52072f46c"; + sha512 = "ec881458637d2f41b112e5d9b4121e25f6fae362c4f250aa931dc7085a80973c24e6ef215c7c3b1043701f902aa182933610fa9e20f43d7152a7bb716f703fdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gd/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/gd/firefox-62.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "16b07a0f348b58448c9646d0de7f8d686838dc74caf87184dfe395fc1ce5b1a887c57caa3da2e3bae21a52d283f3929362b826925b62ca757ca4acb80ddd9ad6"; + sha512 = "be9b5a3f3cf5d24491fa3a41e82d3f0ebfa840a588f75340ca7428b9e870583e1e8a97b957eff131af28a2da0d091257f0a55c57e42ea9f8ecf21885093224fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/gl/firefox-62.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "230b7144c19a1536efd264952797be74e6f615aa5a25a648e03dd8f47dcd50f1bc9b22708d7ed3a4cc10d3364cd043c57860b9c1a152b83d67439fb238b81e5b"; + sha512 = "f59656428f9f681799c5fcdbeff54e437dba664c5dc9098b0b1d818df360075617d347d5677624b9e6831c6c4c8ddc55ba160a3543726983d0d39dee4551db64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/gn/firefox-62.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b917ea11cf2bbe49367259eec378a4674eab86c926b89d090137056dd459d8d2c7670a9733eb4b0d4e0fd6166ba58854c4eba190a1d99a5376b390a945195cd7"; + sha512 = "2037a091cea614268c3d12d389333e2a8018a73d027dd992cd97e1d2f92178308380c087047ff58040bc829bf47eb01f877407bc67bbb72baf92d680e2dd657c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gu-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/gu-IN/firefox-62.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "339c69eee74cc48d3aa0c04625cad84ef564c56f4471230a737d126fb77e15a08e7b98dde625cea4225b7e95f75b2fb1aa7ba4f8a005ed3518a2949638c739b0"; + sha512 = "44342a1e47bc8ef3660f4cdcdc83f6549d4dd3fb2f6cd97d2adbf12835b3b0b9b1ee58628a2d92f71a32a22e301a5143668cbff24759e6ab17bee8b2736c11fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/he/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/he/firefox-62.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "f04d05f5808f194a8a2d675e88d255aed01f6e6b91f90e6459b896cfc6a9c9af3cbc669274a07bb8ece0d401786090f05e0a762812ceb0005a4f28345d4bd32e"; + sha512 = "d0b96156d934839d2155ce4aa9e5c17a77258c4e3d840ac3db005b9cf12d5f3703e09690b239122298d9b639a0a7beab5473ca1dcf23581868e237b361e2fe2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hi-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/hi-IN/firefox-62.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "d8204c6e70710e5ec4944d59609314ee8bf8e0a54ac637aa63ffe15e5b5fad215f6af8f3fdc7ef3765e72a70559dc8c5b5b7cd7d31c0445c64e5c9b401fa29f2"; + sha512 = "138a7c93737d3e73f70a496c4fdadb6d050d8c65169d96bc96d9c252f763ef3bf498dd09fb457034d7ae9c44b062ad98d40fdf687f55a1adafebe9a2ff495dd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/hr/firefox-62.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0628e53b0b88bb8cd959391c1d071772b0bd07f7585466fa8a8b0a5f6be63b880a904c9c8a8f059a0a287546594a532365756fc5d6ddf302aba8c70e3d9f26cd"; + sha512 = "d31de5787021c37ff52c759c7d7a78f7d150f972122bc3c58dedb98cf5cc95a942aa7e326b604387cab2a9064b9ad6f2d9cb1f4681621dc4e0f5ea3ee0e2a3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/hsb/firefox-62.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "853e05c9ef13ee2d8c8739cd0d5173ea45747d9e85820343f292fdedd7ec3aa0894cf33d3d3787109fe30fc3bbb25d5ec0149a5905c7ae9ef81a35ecc69b5a8a"; + sha512 = "49f0fabb87a9b1651d800f0b6d1c9722becd854a1d870c7cd90d2f012caa3e16e69ed6fdc5e534d56928b72ddd2f7a3206c25ec1fe6f5b7781288e5732f4b296"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/hu/firefox-62.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "cf3d52618cf17aef06158d7843253b3933a727ef40ee2cf0d68635247aea8bac30b0d3a13b962382155857026bc1ee41bf08edfc5d359241d9292bfb60917142"; + sha512 = "76721e6cac02a5e724213bb035776574f79b0f6a39b53684f68f5bc9257cc34705554875b621c476978361c45507730906b1c455417e9d40233739758a52fd57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hy-AM/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/hy-AM/firefox-62.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "9d17bec7877c2f9d9d3760549398d98547ff8b9401ad562a38d904b87bf9fa19c42099f15c12376e87ef0c6d0e11bf4549fcd1d404e45c898278aa5a115ef691"; + sha512 = "4fb3eef7acb7017231ea5803caf12e4b4aa4c4dfd51ba90f1c02a1e78bae8200b3378b129349859d5a5e3911257eeddad32f5a45e337cd77b573e4e1cdae928a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ia/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ia/firefox-62.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5fe3b888a35a2efc32ebd706254537cbed9e6d97856f1010728aa1ca4bedcbcfe05ad4c6bd6a69d7bad4a88013f0aa5c722be3cc32f0d623f9e6275368d80e5b"; + sha512 = "b48e83d16b99f009ddc8303eb5fdbc0bd464ef1f30c2b32ecab0321557be03320f87a6c8e916c68a7e32589aa4edbb1d16f3a2cf2b89a1f2684bb2e9d26a0bdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/id/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/id/firefox-62.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a24db960cf6146b98af16953103c88296affb340368cf11f2c16f2d9c3ab65a93d7b288e1d643070e6b68ccf80be7386748b9ff5696f5e4ecefd3f66b9f538a8"; + sha512 = "a2b576cb99013989c9003730bbf3454185a8354dfd00f6e0e925dd57615d251fd873d0c84d8688896dbbb0f180b9fb9b28774de8737195d808d5bd531273cf29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/is/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/is/firefox-62.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9c89abaf1db0aacf4199638cf5b5a4c07b955b5350e4f084496f9cecbd5d0060b4e2d1d4dbcfea7bcdc02d1ad356bb4aa49ad167861911f7611e72fc51c520d5"; + sha512 = "c1da1f41e3dcb0c128c053f6f2d9d5e78f181a1c89790c213989bfbf3c247e990b2acedea933f8610cf53c7e82a3a66ef2970b75087ead3c02d6c057fb275aec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/it/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/it/firefox-62.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5e04b44e4c479bd9cce19de826c92a0824ed48517dc18c5061bfc9e04192705de281adaab0207261835be423eec28659fa87a0fb1b5da2eec379d5b75215d0e0"; + sha512 = "48efb19f2cb9c23400f81d175643213c32e35252d24a6128d7102c38ca96675574976a869867f8cd0db5036288200fba31d06f103716542e25d6cd5d9d46feac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ja/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ja/firefox-62.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "150f257a0ce943546589cf97c9acc3536e3eb34d7cbdd47924e3d3889cd7ad88ce6ca175851eb3d9201ef3aff7795f8027ee31dcb163f06e186bd36ea9d6ce6d"; + sha512 = "19c0e17fdd880d4fc5ff2ca467e5ef4f70e66dd336f7d166f20120fd221eed2173d40e2f9a2937d09b76917c2913bf7764185e54439f8b26a0835ee163ec59e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ka/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ka/firefox-62.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9b7ed329a473077fdae2faef685b0e45123cff6629a1f205645150eb6a1fd00d2559b82835b04f061340489ea46ad2e8056da49870db3e561efd4efff002499c"; + sha512 = "26cda491ba912ee68c09cc346817dc17b2258fc463772bb67fbc460811e8c916c595f37b7cb28f2d63bbcaa7499e97347570c020d7c4bb737a535ea54fd2cc91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/kab/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/kab/firefox-62.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "df5f981d1d689e62bdf1eedfefe5b83750fb289e4fcfcff83b7656a4ff422a03125021efa713385a03547e27caa16e07af731ce118d7145a7a622a29dbef4158"; + sha512 = "9140bd417c9202830a96cf97fa23642ce142143dc1c72e64af2a325deec1d977629423e95839877383a2a5cfeccb3ed46d1f9e4b9786816fce9602b458337cc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/kk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/kk/firefox-62.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "3ca6c1b04223dc2faa6e978897f398cdb87c9621c1f9a35b7d160d6071c1fa776434feceafc743d6efd280c966d5ac462f6d51284c81a15acf4111dd6c49b326"; + sha512 = "66217822bca59445189479df14d9a8e92274fa78e052794a0efa19cf7c0b07459207225c3be9c2de3c369ec0da7e050e090c8d0990fb390ec7d93534bdbfe385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/km/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/km/firefox-62.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "e23f125394069cb6a02f9c24324bbbfba9bca8e04a29840704c9fd100745a84151db0b09d6792560a29680d6c5543fd446affbe34ba1cd73f06225a1a799cf5c"; + sha512 = "9431417150af9361a3ab018e92f055523db5acd560d489602d7dc48054bc502c85042b880ee7502cf7f8ab5093f88c3deb0b4ed72f29b2a922b6337f5b7f68f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/kn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/kn/firefox-62.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "15550f601fdda8166140ab74955ef870e597b7e6fec72571c1e3b190f7a19856fce6bf90c9f233d9a90bef709d3eb54632e788a86f3b14186353bbfefe183ca5"; + sha512 = "9f4562d889c62acbb070c055275c355214dc2c9ac9df2321fbd0a55a18613c38c5e632347b105fa6dcb20c60fd9fea06a6b481e685a6f2b820ece62456f837d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ko/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ko/firefox-62.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3ce50f80908e80decdb6e71bb89b7d9a4ce3dfedbe5785efd4f7870d1b2c46da7c660ecee2b6532741222da3502043b8a23e96ca31fc9f9a3098182173571325"; + sha512 = "bd2499500abe90eb186d62ac143459fb760b46f3bc77693197ab8b067fd2836fe93817214663df275992725afff71fb351e878a2a595293316e6e72480ef2654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/lij/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/lij/firefox-62.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "55405f1cccbb3bf8b9f554a45a7d9270e1e7766ad82b202cbf733b95ae88fd77452a3bac476122dd4c149fc76c5e59d9a14a53fab7b9669adc10f1fead679388"; + sha512 = "19c4ef854c94db700b7e9c4f579d1aa91962d8ee75d8677a12364a094f574fd3ace7c9717a4bbccd2ab96fd76f3663fc5be0c1b7d9bc2b7400658a6379a15ea3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/lt/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/lt/firefox-62.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "d7ea10bca7bfc0d4de8e4c21d8e1c409b03921cf553bfb5ec6bdc51f9a8864d271f58d96af33bb657663e9aaf6f00882ffc225da555eab52605f625b18db01e1"; + sha512 = "8d36889cb3d1d96e04af1b3ca3c2eea287a059fda5b19c55eb622763e14e2d471d7747685952a317352062bb2c2f08159b017d290052146567ee4df335d87c0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/lv/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/lv/firefox-62.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9e54689a8302723ad301687dcca888317892f0f03a9e2b6640e9ded1cbef4618d263119a956836ed387c926e3bde6463266f47f9c656df86941728b12c0ae546"; + sha512 = "61c467dd3d67a17861b35e2c2004b1c115aec8c7859589495adabb5a0aa9da0d8e672ca4aef39bf5a0d4e3daa8baa57c0f4019fb19b772793cfd6047309794d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/mai/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/mai/firefox-62.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8411e135b81863bd49d76e68565ccb1240ff383b0fe0bed835af204c95374f6c5bbe14716f1e5dbdb9dc5bd3e2d5e003c98005f2e7c93cd85c38b85dc4b93895"; + sha512 = "92670613c9cb84c59196710ed3f8a45c81f4cc1b91df0f996d289cd4af606aea6d18b0a0528fe2220cc2614e1e417ae951ee4e65cc48ff5a64c781b0ea1860c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/mk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/mk/firefox-62.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c426bef4210a9dcf67644e67f4e316a6547a5f02716030c8688564de2993524564178a36e964f159022ba007c95d85ab697a7f718b932b1c2d88a699cad14a77"; + sha512 = "f47fad56e39c1e97b594c22bb8dd6e607d8b0dcf4d1992cf5ac74940709e361382709faa08630355150e6c3b2d324f4f76354b67c34980e68dd70de135c5d921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ml/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ml/firefox-62.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "47b2afd069a86270a7a227286997d75a50ab83e56e36e310252dd8a7b20b3a6cb34aeea379550d695c01b627e5265579a4b75f267cafba20badb1332fbc258fb"; + sha512 = "fbac9fd1fed364442d7d50722d23d7951a8c770b783b4e3b57fd6dde760cd14ef238376a98e8d79e5eb4622cfa0d8a140e4d45b667c0ce9b51a9953c1f3f1352"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/mr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/mr/firefox-62.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "72d65a3ba9e39a30d15b79b241b76a9ffcc2c03ef1942067c4a5947250610ab289926e9a0e3b8ee4903164bc07e31c8d548abefdaeed696ca0c5fbac401f341f"; + sha512 = "e792001270fc3f335dc97d9aaae2b7cb5a62ec32637c65e0566eea0e559d08f3328a60b0e74725a6aeae0211d666e787b9723e2ab326da9fd7894c6af65c10f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ms/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ms/firefox-62.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7bfc29f2f04395a8bbac0bb0df647769ca8fdb5d24411b66204a2fc3b03df380977b2bdc07e62cc9cee9bc15cfdc637166706505712fdcab644d08b19324b62e"; + sha512 = "f50775e2eb2625c31d68d1f62fa27f15ee8b80cdf07bbf15905cb7dd7b8800698d6166d8d666f354a8ac2fe033d5f680cb666f6d325fb6d91848879fdc6216b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/my/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/my/firefox-62.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b7b0ac4fd8c577d3208dfd99e68f491c7292e320da4be5e69d87c35a7289ef85937743ddf94b94ea29956859caa61b2926221a523c28a6502b170f9a53756598"; + sha512 = "36013973b45250946ecf98ea07f6bbec62ab8dd740b6c4c16ac142177d9e63c9e9181f9a53598dd085286696f14c48f55df1b7b6d4bd32f48971c0639fb5627f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/nb-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/nb-NO/firefox-62.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ebc6b1f6559f8f2af68116b1439d5cee695991d458234b36afd0621e9ee98d4361ef5e9dff4d8b5c3721756a16857de7bb1928e99767fcf374ebb5478e69b9f0"; + sha512 = "1e9b654c01ce1b0fbbf3e60839d68b1ee036b333c6636da36317e5e24dff1a3c4265e2d08387062f5006e25a4f3e5f1d7f64558f69efa66d492ab10e36447cb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ne-NP/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ne-NP/firefox-62.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "148c56f85858815f8f3206f2cea2915c46bf2cec601fe7355517474d10bf6f087504d43f80aac83171c867ac4ee7b2a83e19cfa515dacbde56a1c36ca45c7a59"; + sha512 = "6315ba2f17ee086ceff4a5e8fb22aa4d6e71fd3a7aee0f65ae5782cd16d25b4dd82f7bbbd5d390fe7c2e394d922e3a293cfc6aa3bac86ac43640c3e289e08209"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/nl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/nl/firefox-62.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "59e18eae1b625b74d1f6c51bd2e3d5c790521f4fe64d81448b7a2260b02b8e40c69f1a681002a1307adf0e725f30ca027e761ab055f0463465a264bccfdc5b97"; + sha512 = "2a485fe1e90c4c177b00d0eb9f9a9eb85ddbb3aef9855a4b488f089f28f09d5357410dab86f062f753f6edc9d5a19541c1fbe5d34f9693b3d9129fa6432305ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/nn-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/nn-NO/firefox-62.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "59bc40dd5c0c597ed2b5c65b6a911800f90faf6e1576ee3d62ff26caa6aa91673e7f8e002fe65cac1030ba4b5f3b00d22e362d06556b7124cde5a41213d4dd1a"; + sha512 = "c46fccf172459e5768e3c0367d87616c025648bef4198cf40ad635a36275814a817b11a5a3932900f8bf1cd5c2795699f47af71fea7122579a163c8a444aad7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/oc/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/oc/firefox-62.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "487132fa97faa3fd152261e94c0d5d2c7ddd05051b437fdb1ad586e75fac5072369f4f6fbc3109f00cac5cc9aa99b96300fce3536d364b916f080f98da27139e"; + sha512 = "5344a17d3de222e76e08a3528580bd9599ff8b62d15f08bfac5a977ca1de837e6d6ce8ea5e961fd9e2b50b5ac30f09379ba4f0da2b5b8a186b126daafe60c2a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/or/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/or/firefox-62.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "83f19eb17c6bd977b244be27ea374335be1ddabba084ca4a44a6a89bf1beb0b6bc52c196d66e39c947e8ba756ee52c1b0f157afa1dbe907b9009c4d404399c18"; + sha512 = "b64ec4fbbfab124744338c20a1f6899ebdbbc176eecaf9461e05133e24c1b444d88f2659a548afa4898dd2ff0b0f470065515ebc4cd0fbd0947d225893ba1dfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pa-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/pa-IN/firefox-62.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d9a61327cbb8a7a497421a2a00174d1e8d1989dec9c10e50f4b1c17e935b82d6871949dd6fd35506c5dedd6d729c968650a3d25a160da32b9d20111b5b63893e"; + sha512 = "4f1bdd0215afc7cb5c6f44e0741b975e19b082e4125035b5cea0e5492f0e107ce63fe38415cf535deda98d95aebc5b8cb04356d979b591443ed718919d4fc8b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/pl/firefox-62.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "848187b6f530ddf5f78de17974fedf3662e2f03dbcf7f5f47a0d0ca6507ecc6764242c5a727bb39a728e4ca54b7aaea27492fbb5a0670c2186f5ad581ee9f1a6"; + sha512 = "7149a1a2908ec510619f882b2b6c17479a48bc65e1c8606b67e99e0a3c406667f43135ff2abcc74e5151bb9dbe39d492511997b713ae2b29a2bc7eb6446dc08a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pt-BR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/pt-BR/firefox-62.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "bab7b0b13a4b2e0be7ccf4fdfd35edc5829af8ab661a52549a511644da78ad220d2bc57be0d2193f3d9365476bbdc38cf55a42e774bc113fec26f6ca60dd31b4"; + sha512 = "59b3e9944b271bf1dce5007ede76d49c4620ec3e6756274622c74e14d7fb192e55d15417a89dc5d031ed5236b0fed1650e0d3c0db2f79f817d2ff34dedeeee0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pt-PT/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/pt-PT/firefox-62.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "848e886a84a3df7e1ea0a5c4e5fa9910112524d4f30034feb5587467cd4ec9dca2d89e680a95564534dbd3716c8105b772c9b463e735ccdd365cdec80649f525"; + sha512 = "9c0264645b5ed426cdd9d644bcfadd1b59f39585d4268d5c86e3013321bb9c195c98011c6c36fb454c995417fff4bd7d7d7206b7abf1bf750fa0ca5383a6fda2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/rm/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/rm/firefox-62.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "dfc0c340c66c66f3b20e44f3cd58cd2c829f8c99fb08658c02c13e21092734803256e39e4dea41f26d681bec91448338fea39b1fe44e5c459626ae3f2b330cc1"; + sha512 = "2b23a56cdb7ff0d08db2184cf03bef8ad7297dc3bef81796d6454d46786ca508614d66496ce3b9305f37f67687884f4bac9d44c15fbbe2bb032995c9def2354e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ro/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ro/firefox-62.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "b245f08c080d108b15ecbbbc50726099987971a5514e9973835c43a84acc718e014e46eb6c384eed19193b253b69c3bf053ae6452c5c6c036162c9989ce62e40"; + sha512 = "e4297a173ce54732cc1153f2e19d5dff576b261ba00494546d2240fbeb79c1d8375d05b10c78c0495432246761103c2a67a81980025e3822cae84e7ab62f307a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ru/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ru/firefox-62.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "72f329ccffdde5e17d47d44d49342b7bb6e0d635672b61af01d4e06d7e3a6dea7a84775caf6443f48bcd706815cce4c98844cf15a9a376798a99bd1061b01560"; + sha512 = "db0db90be42a656ea6841495cfb2796d9d2f41aa1f55e243db01738127d774a0e610f684ca71198249ae830ddc7522feee96939941859427d5258ce834147da6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/si/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/si/firefox-62.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f9441776e6a09f7637c5f482c80ba95fee10812214cbabd737cf2a791434b1bdbc5effcb3d1e0a91f7f6b4accaeec097ce80652c4ca0237bcbec2632c425f8de"; + sha512 = "0cf491fcbc7596ab6f3835510e199d73913d5873da1a31eee04de14a00dea421a9a73d72ae3f09d9e841e0e0f90b89afdd8f550599488652dc15ceb76822d741"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/sk/firefox-62.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "06b07da3df2ab84f1ecb1364c847e883d36f2269d09d8265d80c24036ef8fe141b7456e649924505f8114b26143490cf956807800f03850a538fba1c43885add"; + sha512 = "4bce5f9d2323f2b6d627d0cc5633918cc01e8ac026e63e6dc8652a106fbfa32ca6fec842d0b229138b60408f6959fb22a92ee7a4049f37b2ed5bcaad27955270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/sl/firefox-62.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d74d17ec500e8c65509b97ec30ec3e14f31accd4cd50804de0774389c84a859a8c15cddd53ecf2ea89b864951ddea43f54020f40f2bd33fc77911afa878869ca"; + sha512 = "edf682b9a40047dbd0f1ff5b0d71741332148e2701e05346b701a0b10b56a8b3fc3c65016b71f4fb6f30ad040ceea558d457dc7aceb3104f40ac66dfd52248b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/son/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/son/firefox-62.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c5f347218ae3f5f41e7323099a5b9aa9535df6a88e9d5b5cb1d9c1c64fd2370575c47ccd1d67d599003002e9fddea1a640e04d19d1bca05669baa83739ad1843"; + sha512 = "bf5bde63bc0f87f044b0580bd6f9c63ed21990a4d0df0777c3fb20851498e6500deebed6e66f39dac73123c3bf1cb4a6827afc1b66b398b4e3046172758773ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sq/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/sq/firefox-62.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "273f8f45ca61978de31451f53ac2759a1174cc4fefa8c5e10f1307f8a91a6939ce339b1ea56dc4b7f394789f46418a6a0dfcd174b7020c66308ae32ad4d74971"; + sha512 = "5cd30675610f982dd3cc09dff55c2bf0ef727599d86ab06eca338ab7d520e87137b5b4cc25137d9c6dcfb644d59729e4baf9c2980c99530eba533255e9052e16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/sr/firefox-62.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "33c79d802d4d9537743ecfc54c477261dcfe69952b418070bc7c0e40bb8f253127a6bc8a1b001c99d406f18261ac4f65454d373962203352e6828764b5017b5d"; + sha512 = "2128b1bd6605ac8b4207980623f0f8d3e0313b329faba3597b3552a6ec6a7b40ad88cd5522a13c79c5123c6a425006c08259ab55d33773b0b231a5186f5b5ea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sv-SE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/sv-SE/firefox-62.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7cb1ace78d0f8a4dbc6425fa3cbcf141e63b595dede03f81eb2f4408c7aaba20ebf869790918ea7849c8edb415ddcc6d12a02c41e6f31c40d4bc37867c982c00"; + sha512 = "b8d0a505c78d61488b090da9d98dfe670c05e5a675c86b2d7c85b1b3e3489112dfb0a5e26901032800b8eccfe537f7b543e76384a1222a3e6a78a46e0a242c43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ta/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ta/firefox-62.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "4011c45ff581eec5c4db22a487f1de1b027b7d40dd133cffef892e3f1dfc817d1b9d06c46c1ada6a3f0b9a45bfa628621eff562d05265bb6adf4a3a8cc4627f9"; + sha512 = "c8b97fb14ecec268d33aa5e7d52215a3f65e4fdc22cbe36cb528a9cec43268f911dbd43ce71c51be8cee90beb8437365866689bea1e95c05a3e5b05b03bf1230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/te/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/te/firefox-62.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "a060d98fb193fff7f44eb5f21077baecaf0f0658d49474cac2a8e57809403cf7b288e8b590af5f23b160e2097fc8b09a92fe9aba0edf5b5482e6056577c8a1f0"; + sha512 = "a783e8ca22d21851a2b956ed5324b9976438dd09ace79262c376b35ce5775ce29d8acdfd63ec98581d6d936f0e6b8de80c22eaf35ad449f40f386fb303429549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/th/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/th/firefox-62.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "c059806bc61111639ff803f342e9e3863561c8e89a9a075e107f5672d46bfe73f98355c0c5c4376550addbd89e9958375413e4e8cd4dd244845f08f936121de9"; + sha512 = "b4615cc63ed9ae4f1c61493b76ee10ffef9bfd3c7c1a78d865e8b2df1b824cd34c934ce220a35357710e5c7b09ec22892f3fa7b60f7d0cc4347f31e52c28663c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/tr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/tr/firefox-62.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1630209404ac8eddfcc831eb485f63454ca6336a87268d7cef8923e54d2922be004e7ebfd1251a42b98be170d1831edf5360d7918629668b3eacd955ede8c8de"; + sha512 = "01a07a4d64c6f6089128375d23cb1596fc6d92b487e377d39da0afdc0d34409f3d04094f9efbca8cf5185a64d33fda9a23be5b4e3013409a0ea2d6a8db6f9a8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/uk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/uk/firefox-62.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "cce5824503a866959ea24160179b24eb56511eee9a2905c08f1fb48379cdbc450554d4f432d37e649248cf75bb411d8e37de0dbaffeb172b417195b037584253"; + sha512 = "e675c65f54011b9345dfa74d9d503d749ea26f2648fac5a7bdcdf8ef4649b8a46e6b5930bf09bbf8fec96e12394566e18c524bc74753a174ee546aba8a3d684a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ur/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/ur/firefox-62.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "ed0f789dca473901e00aba562c633eb1bd53d83e91a17a4943079832b22e77825ce50fe4c347ea1534c3a017837ea3f4c4d4bcb028af11db3149a886db435104"; + sha512 = "89808ea1b6c7d578020face2ac109aa5448da11b53456ea8373548ee77d75fa0024a0aff72cff1ceceb2c59f386ccfa27384b03aa024146e2e4e69a6e09dd059"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/uz/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/uz/firefox-62.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4ac79e3f3f5fe2a5bc86577847e7e227baec60d69e34eb0b42c4cc0561b9d3cb020ac64c865fb282fd3b308a0713e8d63342c19fb46c4b477709850062b7cebe"; + sha512 = "c529119efa1224c847a020dcdb5b86791bafb421367d9c14a53dbc1d1d786071dd73a4cfea06a718bbbe966307363bd35ba274c67d5fc6f4e09e55da0467d345"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/vi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/vi/firefox-62.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "af9b5197c345481597b7af1c7600ea07d2604d0dac93b2cd87db1e70fbf5833ce579cf8e89e13f28ebfc3106f993964e2a8314934121038de5444736c68cd08d"; + sha512 = "cf8f6210cbc781496350cda7155f8b4fb601e4a086b600a9688c95a6890337a65984e2f9d966303bf5ddfe55f6f6383c514f200ea5097b73d47e0304d7ff389d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/xh/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/xh/firefox-62.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "38218acbf09ca1aa67d0bd9897e1dcaa27e13ce6eaa0b40bf94df25e17e7259bbadf6fa58a86977f6e05d7dd344ee38be4d14ca2a10653188c9de8e3b950f472"; + sha512 = "09684b5efce0ff84023e62e364f6adeacb27ab477af6488037df7538cf874e8fc4b8eabca6b37aa6bd09d0d68a015d0f65055c9f6d941797ffca68f9a31de9e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/zh-CN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/zh-CN/firefox-62.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a69df7a6883535f84e67240b07530f4fde5f40a3ff526914f0e13d02ddc31297708aaf3f75f4283570fa31136fa8bfb179ec2b5110c2588c7f662ebae27845f6"; + sha512 = "ed3485d04b07bd2d9e6a62e09dcf65e08b7c35f8cbac274aca563c60a8765eb37b9f3bbec7555b2d3ebb13db500916b6208796fc1ce8dc28ef2408032ebf9ffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/zh-TW/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-x86_64/zh-TW/firefox-62.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "63440f9ead6d1dea97761a8ee3820da2b9bb99a91ea862124a81a7f5a9115f865b449729d748aa3f078ca85057382602216c3935ff63d93013d383699c8e820f"; + sha512 = "1dab4d9a68a2967cf4ced75c0e03ce1d08f91bcd57f8c4edefddf48c75a2ddf275b14ae7f8ad502502adfc3a3e3f5609c5949c738d00ad4b11811921990fbbf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ach/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ach/firefox-62.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "bfe0baeabd282fd3cd6a1b4dc69c888c58ac0c4f2caf7842af844b9e13c2b5467ff0748c836b00d6eee338a74891e1bdab7909e6142d0598417889104bee0b78"; + sha512 = "ed536fd9966bd41964eef2aa3d28e6e0e26d3c76e2206681167f7ad0d3d4af75ebf82022c1d9ce02ab84485ab1ceedd8df36a292fe7ddbf989fabab82b7181a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/af/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/af/firefox-62.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "ac652cbbfc3a6b7173af0bb3abc142024c3d62f12cb2877d24897231b3576fb4a27ee25f78b4ede5a960c2b870a801990910650bbd725c5fce68ac6239e575ce"; + sha512 = "146c8f6e67924addc58af23e8b0b5c3abac444809ee71a4c2405630e3c451ac6956ef5c27883959b64d802a71b21fc9913576585a950c9e9535e1e96d47e330f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/an/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/an/firefox-62.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b45b34e7ff3bf73258c2b26bc613d9748d179df9366ca0f74702ff7fc5d5e7eff6df4f00ac0d7e0e37f68fa15cd6c4b61dadc16e86f7d563ef890ef502193d8d"; + sha512 = "9978651e290ae85286dcc32ebf2e45508ca52aea7b83a5ca68c49ebcbf3c2fe96d69e5017894732504020f248245eecedba97cd146412a116234f95d1c9b573d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ar/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ar/firefox-62.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "8c0a69b3d5edb1a5829c6a3968497efda942f9e5c0fb314af85f192b32f671eca6283c590daff428029fef5de8be0febb262036bbad0df64df5f07a268e7beb9"; + sha512 = "d1973d48bc7b56ecd3c2549f2038cfa2d3051b3a4fcb5576cee78a68eccf1268396a671bee9a208995df96e370275dc32ec084be9f506bbeb681172ff37af9bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/as/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/as/firefox-62.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d2cb19ac615c36a74177fd565afbe2c451727b66ef09c5c9fe9ac4a45b249b009e33c0684bf0c497b2474899b59899c11bea275b0f03d57d12b14d0dc685c10d"; + sha512 = "c2707088ff4430f3aa2d09f32c5b978a34cb2826c7cc3b0a21ff367ac2bd124942b445e73d4e7ea39feb533bfa5b6a3d6fd8db63f93442bb527afe2cc8778e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ast/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ast/firefox-62.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "90b0c69503bcc24cf082a8c6aece55dfc4ef0567c4f4fdda084376f5216d2165b441a6160208c307383211ae191a5d4b1dab4129d5176338a0101790976d9b35"; + sha512 = "d3b896436935a75922d9c4330f4148109c3d552b49132f2f56e43d684482b8e83da183b49f3ab6f9f55d629488c3df57794bbd8db4e6f7b5caf4534a746f8980"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/az/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/az/firefox-62.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4cb4bdd55cdb65a3b989a01cceee343f7962889802801d6a5c42b8125b1db5e5127da33d73b9013d97a5dba4cf495528c857b5bd2439da0e0b636d0b3ab81fd4"; + sha512 = "a9dfb189256df97d9d5bab19501ffc860c3d7f71cc9ffd88bd90f2f2f775d060934287ebcc5f52601e28f854e3bad9399a86f997ec0070932231eda14af6e0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/be/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/be/firefox-62.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1d134ac3f604bdf5a70888d40192633701294fee6d1441469cb51315d6a06308f9c35848d7629c5703e6533f0c3b6d2665a15a2f97eef55cc713c171cf8596f9"; + sha512 = "1c241b53fcc4f16d6e200a59ec250a365b28969325d219e3bce1b8767811361e9d5f1e103e7a7987f35dda0693b2ca2c92780d70b0744d7712be7ef913905a79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bg/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/bg/firefox-62.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "805779852caec7b5700568fb422162b3adb4c68dc8f3e1457766877355c34f4c0bb6f5032b5e20adda8a99db8bf0385bfc1442feaf624fca24f5b6741bd0fbff"; + sha512 = "0ac963b52c76bf4e8425cd25379db5c13474edec47479b0d1c28694ed6b22a9d45fa28ad58f6311aed30e5c8bd2f836cd0792a0649140b187b03f3c30897d735"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bn-BD/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/bn-BD/firefox-62.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "2bb5382a81c1f26bbdf9ac224fb132cf0384231f0bdd3e4f428deda1f61acc2dbdff79125adbb7b13f1f13d2b0ee6c0ded37b1303aa58a87d98e1cbb7e80fe02"; + sha512 = "f8925f66edb85c108c2005100628ea279e8b28322ef92239cf1d96a89dba1036c18205744e8055816b9a0be7ccbda726ba2e33e3d57af7259cd1672a68f94c6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bn-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/bn-IN/firefox-62.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5f3fa574a1f81cd3567db4da19bc1925abb137febb65da56dc18535c22b270f193877c8c486df02c547454b72b0b72c5b0cb42c26ffa7c3f072bd5b6eea542af"; + sha512 = "e6de9869002661a7d177623d670854c405818872fbab33f3c99929762bc9cc745ca9b98f5e1f97ce38ac91afe765e7c86da4cff73fda799e0d845a99641d64d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/br/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/br/firefox-62.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "53b3cfb12ff230336f96af103b2b18b676b2283d57601a97883de941f1bdcd0b05451cff96c345d5bd2491fd3be98478ee0b797bcffa50ebff54706f84de761f"; + sha512 = "3d2277110e062909857da353cf95d220b1d0c756b772b88c75de0e19233477d66d9a21911dfb714ca9f70254a3d0260c4659e037c3a1d17796d9695f1dc79fc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/bs/firefox-62.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "aa61f35cf869d383a0752c7502e94a03f24b1f9460fc0af950bc30d02c7a48e0bec4f21e6336e4ab897fcb566faaa79c56dce2f29b4c66a280bb61ac4a16c97e"; + sha512 = "071c5060a0bdfa587563f2b2df44fe4e6f9c23dfec93d3933234543ed7b89d3bb61d62c1c396177722b681648a7041a17d0ab6fd198fe573f067ddd712f06e91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ca/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ca/firefox-62.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a3b69bce98be7ffe94f7850bbd10ea8bdd7480579f2382616f3d4b491cbc88d0b74f0ba84ee36f407bf6ea1de9849ecd182d5486470be2cb23723e26da11c2fe"; + sha512 = "fecdfe856d9b9730d0abe9a91712972388d2ff1098a9ddaf0b5847475899f436ca49ebd0d4b8c65ab9400366e5bbb668129d40896cb2948d95f7eaca4e43dc3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/cak/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/cak/firefox-62.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "1e2c63f40827a00416e663ff601a4414f0c2f0123dfd53af4f74b0d9ae82b1805ce124511107296abedc95d921e306f8a5fd516f669fb4fa3a41bf0619654ecf"; + sha512 = "7fc92c5ed3564910235624675c5747060c31f8d36a527a9ea76d9fb28bf59563c4fd8104d9cfde0a3c68aa20803d8f8c356c93785e958c0bb64045becf521581"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/cs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/cs/firefox-62.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "cab4ad092fdea3ff0e109493a21723e36bdc33e508195a53ea1a1f047dcf6dc3428b94f58fe5f00c87baed398fe02545b13c6852f8b15cdb777443793d7d0f38"; + sha512 = "83ab5571948c5c3cf37158d3b85989810eb962412b4326541a3bdfdfb45d76f1f736d835044ff5484a8f0062ff692de600c3984e93a107313f1e1df649d803c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/cy/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/cy/firefox-62.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "c70d0ef9d6ec38cd2dc5029436b9125e8ccb44a8da340bb24094b5d39b56a70c9583fe13379ed82c95ebf3a547886a22e89cbe9ab125ed0765d7998519b95695"; + sha512 = "ee194f855ce351c3a552ce5a03b361dc76b62f158f5d6d08b42bc87b77fcf82fef819c8ea77ba29f44daaea9e395906927b41d344487b309a8912a3a9e92933d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/da/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/da/firefox-62.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a0f75c5b3615fa714360f436771f0a05a6afda2d9375a8392fbc87b5f2db25dea1f70e3dbcc4ad7a4298ff63c7a86bd1ec7c9fe37289b4135126859b74ee887b"; + sha512 = "b5a5f00e423eac90041209ba942519ef9a38643819d0de7e37896ef19682f1a3b5a5328b7d454a24fb619a234c962e43cc913b63ca6a42596011412381d9fa72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/de/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/de/firefox-62.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "14b60dd4e8e0e53d250ab42fda33ab7c5c46699538015d055956db97ec6c3424b92518f44fc7b620293425811326b4cf22d1f8108bd60137ed31268a913a3f9d"; + sha512 = "2bfe57c3f070594eebbb5c96a17eb60ea3371ce8fed97f483c47500a7aba535fb2692c2e5013293baee269ec2fb925d1eed195501357e102377e53ab61dd8628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/dsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/dsb/firefox-62.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9ab7752b05496b35efed2e32630c883d5c760f579c8733b80c3e5d3c6dda958856ff33997f5dcdf1e34276fea1784762aecddb64cfffcb2dea8b0c09e4ef5ca4"; + sha512 = "902de4c1b693ae76a1d406d0fa3e9513d2dd105ed6f5459b900b4ae17d777f99e21cecabe4c2c3349f5366420fded49699a0d6b120dcae2a558ce88757d81e6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/el/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/el/firefox-62.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "26eb2c42b5b70309e0c039e67005fd45af08eac5f47d016179571f30288e5083c0aa5b099a9c6bde611fa3b064d9bd4b81af16618d516cab45d09f914661332d"; + sha512 = "1d638efe999dbf2a8cb58802da9ec5c985ce50cf1a24d2fb38ee886fbef2269576976b3ea1581647ce2009fb166be4ebe835eb44e9a21ad8a8c2e3ad7238d0a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-CA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/en-CA/firefox-62.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "dcd8853c17ccec0b6db65d1fd950ae669a260a3860fdf128853af2358d1e59e968c470a0e1da087730d6a5808648ca0e9a7d922cd8478cc10dd5e4a1fc15c268"; + sha512 = "aa66a5f0b75356a8bdb7e0ca6b8fcfdda6dccd60e8708bfd74d365245560ea50c51f57ef346bfd066d6364255b1c79b7c24cc4f4c3aba0a23af9585b482d7698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-GB/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/en-GB/firefox-62.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "58bc4d24bf787617c9adee99046e1991572a71ad742ab0912b49c8b9c393472b17f959d0fd155c51e26510020a1ba71f1126200802a8eb29930741a067d5cf35"; + sha512 = "d1deb40d9f21c9b285a1fe4088abfc1eb96c0001f767cb28e7dd3b57c189244119343bd73d599c00eb0a4b89f516ad490b37b7e93e590703e90e833293964530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-US/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/en-US/firefox-62.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0dee04349296fcc57e3c8438d61e38eb9909833e2a5125e3ce9b13210d8158a732b24c9149ba20132bd4b07f9b75986c58a379b22497d1148cfa051ddcef6f44"; + sha512 = "d432a53313a5714cc999d3caf3bd9c0d9028b93c5e84601947a3e65c1fcce96fbdc232d16f0436820e50833f725365338db66b152001deb5c5c2358729f75004"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-ZA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/en-ZA/firefox-62.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d75b85d0b16786658c7c81386ada836abd5956850d878369c08a9aa1075a7d73167ee1be3d740dd5730f72bd6859982be56acef898d67ef3431fbbe7b2180b2a"; + sha512 = "530dce84154a0dc9d4712727e72050f2dbd00160c84cce8f92fa47943d907500bdee9e7b2be78699db81d2f781297e07f088bed28d04c4f38450b0ad3704d95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/eo/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/eo/firefox-62.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "24505cc22b65f389071ccf9deaf5694a931f9fdef9e3e0a139fdf1b7343b16873b6f9941a3194ee113e2f0aad2efeaae425da62e0e0e9f02a31771d3090c20f8"; + sha512 = "247d3c00e423ea76e2b0ebb8358427feb4b0cd03050005dbee99653915ed76d006036293ac01561a2089e1e00f8c460f0d98fab1e6d6018aff3583e2d685bbad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-AR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/es-AR/firefox-62.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "84597be9df488f0f269b93f54412880662b507bd9eb42fc71ef8d2029e69f25da5592e39b529ac8c94496a37aceffd292a05e38ac51ebbd242d6afadb9d7ef3b"; + sha512 = "ceab3af65f57c5b851876de49177e6d996f39caeae9280c216ef855ffa3d1f8dbd2ff74a087ac1942a5d4b042a726ef6e440e2e12088f8faf268e409e16ec7c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-CL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/es-CL/firefox-62.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e67eeeaefa96bd59159cdc95ba7eab27144c38434530cb4b25949016b9a39aa09e451c4199450fe1976981f354bcf7724865e28938964904d652e76fda4f35e4"; + sha512 = "d18a4b2f7d5d8b3e0cdd89f83db21e403acf9353e893595e716e081a4366756bbd7a8f45d7beab159bce1b2cbe3d00f61ac884372d302440aeac72ab414dc1e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-ES/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/es-ES/firefox-62.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "535a9138633d8cc5362e7f42394252e95b332d6ee35515a0434aadb58b0b7ff359e1e2b7ba7c5b682a4f11f3361534e83b3f10fc7bcfe766b8ebc54b61b08ba4"; + sha512 = "7fbfce97a89670199d9b1479a9a5563adad90ff6b1f86ade6f2d6eaaf4772ee599df817fcadb6e412b5080e1ee7abd4455d974637fa90dc0fff395722326a711"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-MX/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/es-MX/firefox-62.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "f7d0bdd4afe35f01ab01c1b846ca66814e83a11155c110f08fd03418649bf478996f15b8d7990aa3d77f2fd4e2f3b2b516b8e1c34f304e105c05a35989b9880b"; + sha512 = "f6d613302d70e1deb49ea2562c368ea0dec623dbe4c30092d42ac43e0d890542e041afd204fd1094822198c78319d488b9676645ce9497504154586e621f177f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/et/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/et/firefox-62.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "8ebf14e8e31f602889a6022989934e1842d7f3c8b2682ecbd86890fc9c3f2acfd8992a7b2a3dd2ed5a4e0854622c0041e0c4630f08afe800b67254dcda2a1db2"; + sha512 = "92c9ce2fc6fb4d3a5a6915d8398d4790b138853eff1a82005addb034ad95ec7d075b0e4d8b399a8b08184ceb54d258147fc0fa76fe66930648f88ef942183c19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/eu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/eu/firefox-62.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e247421a99dce2fb9a1b6ce1ac11a3e9427dcf56b83719e73a894036319af7404b856e70b5170c0a9cce1bbceb99e9aa3d47310a5f0bdd48afcba0023d77d4a6"; + sha512 = "108b341d27641871b196d208b106a676474e272b6fae15a1a65c0992dd48d4fb7e583560dca7dfb7f47655a91a79ea8c496bc5abfd532318618959d0eedd6891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fa/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/fa/firefox-62.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "c9e134eb933bb3b176e229748233cb840c690720e932fd00877e0c1cc374316c02837acdcf132e687e00da50c922545bf643e37fbecd37a2493738987e36d98c"; + sha512 = "b1d7f7d167537cb590d800c5c834e9d6bebe697300d9ce85a1588751df0baa01a7d0ec9521071a20e2da823f75f5c13c957cd42e1a47382ffb9f46f532d9aa82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ff/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ff/firefox-62.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3f574d2aef865fd60b0a8e2c51144c27eeac6ee9258a6e97587ba3f38c8fc0759e636d6ce023a48ed6136f6b06a913633278534c3b8bf2b9c82ba86c696a2b61"; + sha512 = "f1a9dad9e090cc3e9cc7fdec0a56c7c0fecec9a485b0f572652285d3896e30e334108be1061eaf20e717c3e60d109cd071b3ed049c52fb5d3f390b3f6e73a00d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/fi/firefox-62.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "12cd6a2918e9f27867fc49d763a24560ec80b57093669ae5604118ff940fa772a63dad46b9fe4c88486b4e465a4d63a312a9734137095f232980a29debcc08ec"; + sha512 = "8e5d2bbdf413cec2e8fbd31df494f07d800baba19cb36be72999af72bddbcdfe8ef89753fa36a22588cd15e12eab985dda784615c0f1b07de755a24f4ecdaa96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/fr/firefox-62.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "273a2724765f6484d9712e58e24640f4c286f209f1869f696f43eb219a2b474cadcf151b5af72acdbef0446cf345fd8633bcaf0d20d8ce43a7e3e27b735ff371"; + sha512 = "e69c972a155eb30d5a2bf16cdc6230ed4b343048c985853b43fa27002d2789b2d1c6fef683e96468820ad77be36f92abb0dc8f8b79206354de858602ec36cd4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fy-NL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/fy-NL/firefox-62.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "dd9e0544a454208c49260f03b1016642d05efdd89aa8e58e5cfd2d2ba2ecebdfa4faca8ac225a0072ab0995673dcbd736ba178a04da11bb790f2a82bb2bd5c42"; + sha512 = "1e90bf49ccd6aafe0834b55d4f6988b180f2e629fa22b29ea6d555ad74989b94127a2acf967f0647fd8276b055c2414d2b6938485439477f74f9e9e1428327d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ga-IE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ga-IE/firefox-62.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "88abfe08ac9d415f21ec61d54242fc8b19c45ce549f1a09ee76c8bc3fcc3f69b29fb03f1892b52e924c5087e5f835e5f0b7e10cbd829b484d98fb1cf2e4a16a8"; + sha512 = "a4eb5d1e8a89103a4102f1f666918e92429b73371778aa10dc0df428c69ca33aeda395d4d44be256911a77b8bc219593dc2bc0265b4a99044c64643f5b69502a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gd/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/gd/firefox-62.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3a56f21e53bad283b76f7ad6ded6aeea44f06e2694f078a39d8bd898f3965eebf0330f7a0a09adc37a0fa39e2a123108c8b7e3942c6fc1c402eb29ed8acf021f"; + sha512 = "8407feb5845d5ddfb0dcaf632e0a06476a94c55c7f3a34c7305b3c9a5ccd7b3e2f50a6b87b4344c9aad940b19724b875590ce13b0ed0064920d697be21d8de8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/gl/firefox-62.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d393d86f05975163609c1b878d0d9a88398147788c5e4c943502ae0b892bb6a7677a32d66275dd116ae9fe6a2c8e205530b255c004b63d24ce985700b328bd6b"; + sha512 = "e668e58a60af41005a7faf56a14c8d05fd8a5bd30e51d0062cedbc92bb733efb13ac48cf193c430de73b16c21ea421a691ad66bfd0e3e391dc660a6aaa14ad0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/gn/firefox-62.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "39b50c156f561436af31f728770ba114c02c4006a078453b9e5716d4973d1bd8a470e6184344715d77b3b9c978d23ce41d86cfb958d26efdf505cdafdfd42359"; + sha512 = "7b9f1ca75d9e53007c3458717e3cefd59bc51e47966b40f923af2edd896042a3f3dcb71b75de0a1958c560ea78eca70b1a0fd8b93cf4e1ca7d4fb2bfb13e0584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gu-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/gu-IN/firefox-62.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "886a9c9ed15c04766e14250a244f10abc6ec35d65d81a7b89226425df7abcdf0654b23d1fb03fc94a4d38c7370ae16617142995510ab9cc91142e1646f9f4458"; + sha512 = "f34785d37efad0df07a6111fe706bba1534bd48e135549a25938cb834e1ca4a7cffe793a8f42b7dc1bab4cb2014f67a28dd989f5b72b7cce6b33d2b1137fda07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/he/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/he/firefox-62.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f09f8b374e34cc117978f1293e1216774ee6981f00b0e1754cacf9de52c693bc0196be1a5cf3e8063d69bd9784892edbc3a38b6ced06633c9cfa99eb12be76ff"; + sha512 = "d3a4596edc283c09a952b948722616c264b1d28cd857517d3b7aa164c427f31364e46b9d7a1eaa21a4f49a1a16bbfe50c0512e8f06dffdf7cb3e605067a8887f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hi-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/hi-IN/firefox-62.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "c60c4bed569222f1fefe97f519edcfb3098ee2769addc6233da16c9ea49b5192e5672adb72a12de0deb00dcfb033f4e48435f9048e27477caef749cdb14bbc06"; + sha512 = "17350812826e42e4b627f30b0a6cb51a3b79f581e34fa2426a3c34963734523b0115186537d9d57cfe160f671e3dce2e0bb2fe9771b6da70aaafbd9a12988d45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/hr/firefox-62.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "826c3a6727894b521ef6a5960e4fadb230b51c1518872b1d9bfd99e6b975431bac992d183060d031c378644112110809faeb92d2d26aa9326a2ea327d7513d08"; + sha512 = "ad41978a91e79ce8b8bf5f0a428ece2bb639bc32bc868a5e045561e8dcde5e909138e0389a992ec9a55213e903edb536d6e35f1d452c97234e2831fb6f797a0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/hsb/firefox-62.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "df9b791279f5d0ffafc48489095c7847f003f007a19e77af996fbd6ddb19fa79ecb8a9d07bd98821516dc85c78ba7c628511253311176e8a85581d28c7fe52db"; + sha512 = "07c272ac7433d246943138fe6f6cbe44f38b39f2f8c6670201a0ce255ad6b77e10229eaa562cb48e7c240abf3cc6030f9940a4830900e68b4777c312ece49ab3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/hu/firefox-62.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "f8751b0908d220ed6444c2ad6fa5a2070ae843190bdeff9db1f032a260a1b5e752703fc4543e91a67df0b12cf62a7af22804b74f1004cfc4bbbe6be4f28c446a"; + sha512 = "3a37dd82ddcfa5e2d0debf2b87cf904295c36d4cb0140b7b0f1d76e7df4934bfaf1224451f4954f2c7a65c1c921a742266af776ff81a9a0997513fe44c71c36a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hy-AM/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/hy-AM/firefox-62.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0eee3e6e29c408a1e14da2c89c5f14f19b0d2edf8ef914d132b94ed9685a09c3de2908c8ee0264eb2564b466cd8779a58a0fd4eff38a2a8ae73191469ce327d1"; + sha512 = "6f8003d9c143cb58a9609cb36aeefda2bada612d395a01394eab040b20f9748d58194b9b62e2abc17e59a653f2145f5ea1a9e217b2d9e90d897ab3e134a8548b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ia/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ia/firefox-62.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3ec0feb25c12cba1c1641b5e91d79318f81c1fc635e32fd3ffeaef6acf0fb55d2c5c8fb6917175ca0ea6534a74469cfed283565c94a1d5a87f69ba70f9d25a98"; + sha512 = "12154ae51bd9e5ae303d0f2bfbee765e8094a89015e1a1dd093b91fa927a438da954dae30526e9cabcfaca86ab7c646caddda407b139640f6ca06c968f88ef64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/id/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/id/firefox-62.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4cf4521fa259ffda0b71bff3c01a1296a22da00844e3b357a2df2442b9129ab19027df8eb766ae2197d8cfb7193fb8cf49cb6baf4f32ee9b0264c85763a1cb0a"; + sha512 = "80ec1f1f77db0fd6a340834fd9f2183a114f477eb4c52930a0c70bea25198fa4dc690bf772dd4d1adc29ded5db9c583583dfabd931eb746148754b6de82718f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/is/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/is/firefox-62.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "921260f5dac381ac51ea859515e7016f3528c9e985c09566c06342d225614878cf25eed6dd74ffba9d108d9cbcaea7c44852d3010493d7586ce34ed1e0312315"; + sha512 = "d3a4599637a26b11990f261e53586bceb6d9168f8255985c0840420273ad72ae3aded3ab651d5773e395a6cabde552e60ce1d1a5e5eb81339089692d7a22ac6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/it/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/it/firefox-62.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "31edbc72aa5088466f49dbf28efe97484000cc7cac1d84c14fb22af3aa551f378df04c8f08683b5a1a690e6fc7d6c061db3ceb639fc94ca6d91245de252bbb79"; + sha512 = "241c3f44e6df189bbe7f2bba2ee5a25d00fb391a8e3c1c1f94615ed7469265ff71f14530f550947582a79ad862d024d635ad53465ce8eec4bc4116b15d47bfbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ja/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ja/firefox-62.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "db1ffa1be437f472100f748bf09f2c7d8fd82554cc04c7b95bfdae5903c69b1421eb4b35d67e7fdab9dcac6780322c1cfc55fd70fa12dfa55980c2344e49218a"; + sha512 = "4dcf8f26ed899d08762501067edbdf4e850423a6e2d82677e28f8bf64888734f21fb34b6f9e154e3f7eedbdb7b734661c14247e152dc1530c1ac6d00b429b6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ka/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ka/firefox-62.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c0bf7cf8fd9a89871ee57b3b56a1c648f89cf59425bbf8d95e9b41a13040b06f714a8fe2cfc99379473ff925ab4eeaaaa618685843e7669c9a92c66adf9957fe"; + sha512 = "aa411a3c484bba37b65ece7b5822fc9fbba669862552769eec6321ece3c6574a5fb7b7af58c72c9a18026ed278f0005c688a5ce59dbdfdd550af535f13aec122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/kab/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/kab/firefox-62.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "69853a72eae2a40490f5005cb7666586025eb481f0be8a5b2aaa66f10b1bd60d66185b34a24b76932b0f2b551a79a832aa3cf7997ea08f038e9471bf9310f838"; + sha512 = "6e2654d169dfdf574d98cb709b4afee9df41a3d05f4d656894d948d502f69fe3b30f109b9a3719b277de82bdfd065d83e280c2c5344b2a2354d172716f1097f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/kk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/kk/firefox-62.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f5605483a35424d0658d3fe662c1c50371924a3e51dc3761c2a0cd5a91266d95421d2ede9f5cc0d6af93fb6ef2abd8a15aafb0bbba724c37241c4b3b16eedade"; + sha512 = "c63d039688ec548ed3eb736ca109238d210fea74f9361defce0ee4637b11a7a2a0dd74634f18bed36d958c5af4516f02ae93e0a29b8fafa175e42c5dc38c2eae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/km/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/km/firefox-62.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c1c48e1982a1961755a336e804bd1b40ced909808557d4afb3cd53761fcba2183afef6c91c408ab53adbbf39861438a7f3ce728323c410889d2568f90f4d1ec3"; + sha512 = "61d968ec933da006456c7b30020d52c3080d3ba6bf3b6d2727b9b294f8d36b165ff73fdb4ec1c8cca5d88f48f14211e5f14084af0b06dd918d76d294df5591ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/kn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/kn/firefox-62.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "947d68caabde62361d7b4e5efb1550d963c3d6795d45301aadd36d31952bc5445e6179b5db6a26ede685216ede369b2f486e8945fb573d71962569554d1b19d3"; + sha512 = "54ff4b48ed61fc1a138ea6aab09af04c4364a78d2658ca6ffdd425a3918c46bec6120cf96d70f7287f9645061f5f21f92345339e47138791e5617b0fafc4064a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ko/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ko/firefox-62.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "86e0e12d63d3acfdcff623492da49ebf7a405556fe57289622910097847f8d64adffbe27bdd2de9954431af7a4516feb692a4f9c0e79c46ae1eff8b301e36870"; + sha512 = "ca4f3e1dead36792708201afb1a33a7c612dd1fefd1d7cf9bfa33ed923884bb736187ee6c2eb331f3dac5b5ff79b52f1f480a930395e2d92b3b86310ab93c14e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/lij/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/lij/firefox-62.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "2b726e938679f36f4d6fceae5f12ba746468b6f4cff03e29c1f7d52ddcac75d380fdc8d780b46be2d2a2581ba83278fdb233e9b91e42a0f68e3d0ed784e59b67"; + sha512 = "2b52352a43ceb44a443412f1cf0bb7ea4af6fe13a579ab94ec22486ad96a6df1e6db487fb66ae864b3e26ceea13bc229fc6ac8c601ebf60c0abf9b71af3b6a40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/lt/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/lt/firefox-62.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "49c991aad99f32c3f1901af207ce62d8a2a4445fdc5d6b06ba47e2da64bac7e99af80a330f03ad65210a636230b1099fcdbc0b526665f4a8657e529b1c3be102"; + sha512 = "d44724f79f7fe42e165a3b776dc23ae1a119c7d8282a06d5057066623d52b2816a15b9d174b579ff94b5770ae885630a9147fe544eca6089c8d76a72a9368487"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/lv/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/lv/firefox-62.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "01344f2ac444d9d7d87da48335d3ec7e4456e61062c3b9ce9f398be2fbe16aa9ddb01709358642b7f69ba0a6d987093e07022d25f66319d2b1e2b56a2ba3865f"; + sha512 = "a2ae3d5059639d1e119b4ee54e8870b5786de15385b35f5f53f8c732ffb6e5a2688f3b7c047a039fda5fcd408280b891f4afd7fefdf485f600fff1780c327c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/mai/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/mai/firefox-62.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "95693deb31f66f6d8303c0f34bc003903322adf8563d19ee0918eac00c83cfac7911d9b11c28bf7eaa5b8b1b08f8a90cc248a8639f655978cd9589b313aaca83"; + sha512 = "6141319790a70e164878793c0d42446b4dd572737b394dd356d01e9cdffb92caa2cb7a89acf184add6176aa62e19f7cd9b2a9e358123a308be0e8aecf72cd289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/mk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/mk/firefox-62.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "26cf1ce58796e570317e693b30658e3b423f2ba2a1e3614c3ecfce0b0de8aa224cc1b6c6cbac161763bf0ae8d3594b856ed15a6a40bf1f159f7d5869178eb4aa"; + sha512 = "b9727123275bcd553ac36491f7a82dbbcaf124f04d91f3c4f2a864c9cbc50a7f643ad819901c635b316811df21bfcd2bb478b9501f6fc308c0cb3b9cdb19dbe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ml/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ml/firefox-62.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "c835c1f3776cf34d0fd5f626f61b57b70a200215800634010fcb758c9ae11df9f989c618682e85bc04936f83b105b30cea39a9cd350c6f9d6364f2a268a56b4d"; + sha512 = "ffb58fd2a23a177db2a286937b97c250bfb999009dac189f83b1a1b0667919f26d726fb13aa9dd0d94b0c0596cb7f47950da9aed76bee42ef01f93f898b3d1b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/mr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/mr/firefox-62.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d63731ce8920ffab15c23b477e9bbfe9d4fd8b6202f329f333c557111a21458aca6fb2d6573bdb5c83c258092603ab105e43a5c8f890586fca7346ec5d468ef7"; + sha512 = "b17a16ba1e6ebddfcc205990dd78fc0c54b302a73fd99370cf13f545e481859d750a256acb1b170e2f08cdde8ccd1c28782d14bccd0609795169d0eb653b2c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ms/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ms/firefox-62.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0a592487eb0aaafb37b8d2a27cd9f7a1fffe215b5a04595dae25f2cb8f309fa17ab1f642be2bc640eeac55a301ee75c5e7a25b10b3b193ebee361ec9e4829b39"; + sha512 = "efbcb8bf1b3bc799a44be6ff1476631091018bbb68355ca37af2eab436bed63eae51568f824e52318412dd6fe56d662333320254024bc33ff1fe48ded761d792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/my/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/my/firefox-62.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0c4b2c54893d3398bffdae9a3c0cd6c61bb23b11b9984849facd9b17221b065e4527289ece0e1ffa731dd9d6cd0f8c75ec884c47bf41c072e72251b33eb4fa17"; + sha512 = "83198104ce9699ccc1f638784568f981034ca5690b65ea9fe47f03ee0db2be34b68396179b6728da27c9a9728c2d6f6f4cbb4a7182cf08220567203aaafe18d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/nb-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/nb-NO/firefox-62.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b1bef0780fd17e0e6ae543c23c6c9fb89c500b0668b30c4596cf340d2fa5bd2663bdd683b18aa02de8f7945b84a23d9b43e71b60a5b6b6142996062e72e20df5"; + sha512 = "827a7e69b1aeb931aeb137f2d083cf4c3af8350f98b5f1663d5b975b314ab9960271b970b26fdc37a362a53bf5cb32df9b620d357cc9b79327291eca6182fda9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ne-NP/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ne-NP/firefox-62.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "e80503ec40fe25c43b622e4542f6a011d2101a8cbe9452b2ff17ec584422e3f3e0ce962b441efd929c764d69c0ee2a8f8bd56d62bfd3ec89c6bdcb1cbe66d12a"; + sha512 = "191e49c56422486d0fd9bfc3d003db1396b13b9b1bfaf78e0c4f0520d7b11e905ed450fbc281e4e7bccba3be61c2f35f5ccdd4fa81d96aa835f244f95d8a9387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/nl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/nl/firefox-62.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a3aba8b75413ef60a379f58a4456ac5ec9e67c3b5a591b05f86252bc12901140a5e84975cff07475b3fa03fc65f1141e13c9538d1071a9c39d919c484d36d636"; + sha512 = "0f36eda39ac26e5df282ec1eefa15aefe54fb4348e2a0a1c36d90d55f410fd2ef0291ed52161784decac2dba708c887e854f2e6cbee0a223bf37eb21565bb293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/nn-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/nn-NO/firefox-62.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "79e5bfb8a3db4c22097e3c7edc71578da7db59a64f66f9598f3c49bc619c83aa94652d9fdecd2021696c22e2301235cd9d83ed0000f48d30ae2a1be7d0fa5aa3"; + sha512 = "c56db951182a03a0e705393214b63cc53de8bca6ef259355bc459ec2b9f03cf07808b07572c4d889dea7f3564e63f77e0edf7e3afe6fd0c0ee9be71345a8a6e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/oc/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/oc/firefox-62.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5405154cff12e11f5cca920e5120661884185f1972c2bcb79a61be5ff49dc2359876e9b18ffaf6ec4429bd13f787b047ff83f1b0061d6bcbe94f9add319a7f71"; + sha512 = "2a905ddd650ef5b21ad7861daa62960f468caa7763efb9fd0b19c5702a68bbb71c9a5711ed62ed459c4997bd8a63a304b1e699f323ee3deeb6d36e44e70e9b60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/or/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/or/firefox-62.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "c3ae13e279b9443418307e34f25a0bac54844d70edaae6d7e77a370197f2fa82608a0f666ad7d6f59830ac7f0425c7818992ab4dc62ed44979b7c774e82b115e"; + sha512 = "7e4df2008c6171b31552c53ca13d9a76fe4707778b43a8a16fb76a11dee50ea7be83796404dca48b8288b3621f7b9c6552b31b81a586f4545d92bab4421a4b5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pa-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/pa-IN/firefox-62.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "aa91fa31a4415d50c8f3b73520e4bfbbc4e520c632af1b7b8b7b45e9bbcba1f29d2a18df87c2296cb0c6471741e75bc2b4044c0e1c361400b51c20c6a0baae66"; + sha512 = "f5a8ba4ec19a4d614556bddadfb4b65629cb6f8d99d9cc832df8be92ee22974ded90f34084b16497cb6d3e1b1a701b3143bdffd535d2fb59b3a28e6605df0f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/pl/firefox-62.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f655ed4d8bb895b9e966aaa4f95eb6cb9a450daac31a164ff0a8107f87a460a40fd9fde913613f7099b601a003862c33e2af0eca0eb75936bc767f0afd826b7f"; + sha512 = "fea0d07d39cbd75a4e16329998fd0c4ece1da006aea3c86347be153c6c880127e0ec425011c201e88ce3d99398c76c465d9d436d796984eaec4b38053eff061f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pt-BR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/pt-BR/firefox-62.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "1f2102b4b6e57d75b9cebf0669ded9f3e88de67b545cc95a7a38408330006dcdfaf206b792f16e94c6374e722baa77733e64255eaa6d94662df0352852978d50"; + sha512 = "7898403f37263b90416aba181b8059af729a19bbcfed750d7d5bb662e19c4b53616c205e4d59f2742c3c103b30d694fa4717839d623be9903f4e9a8ae831211b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pt-PT/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/pt-PT/firefox-62.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9971127f170ebe9549680fbb22ae1ebdccfa52ced00b5afd20d14c552f3c5b12754b00552986eb1a658515960bf71cdbaf5f85fbf9dfcc059ab713814460630c"; + sha512 = "cbac5e8896f2a92f82847197d30a24713d7e479129c82bbef2f8f401e77ba61e1c4c2e5638540c254f0788b67d5d5963a68567905a569c8e33f9992da548b8eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/rm/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/rm/firefox-62.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3c7f660809598f80116f8081d7a7f3e1455739e65b99a28a707c3c93a7dc2d0023327c5fbf9bb0a8f484ad640b53fd9356a8e0fdfc5d3c9ce4f3c54ad47983a8"; + sha512 = "496a00b842355c342630f9a7c4523c7bc0b86807beaa2a7af608e96189676e4ef120a64b491dd191eceb226cdc12ac6cfe87ce895411cfce90a908a3c5254b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ro/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ro/firefox-62.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4752405e671d48899d9cc306555d40eb2eb5eadad2228777232c7c12d26dac1dd60eb66758df012fa5fa58366df65bd33513eff02ab7592b35ce605dc2201ab7"; + sha512 = "87870e2b7bcd221f75f060d69d8ea603f1e7fb96b43f8caebcabc014f63721894fcafc7f7bae2ef5bf66eace16c774d6c5e6142ecaf46b4eba6bf0df29f0f000"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ru/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ru/firefox-62.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2dd94e26837bf9f52d80480069674d54e7851999f89d36940249475e7262eb66c2f88b6776b0e798a45236930ec4eabcd818b9ff5186ab4688959bd4c120e8fb"; + sha512 = "b426aa28d8c456d91c508a9e25cd33dcfe244732a9e351b7ca4c55ac611e4a72a8bcfb40c9f3d4a60c57e0edaf6cbbe35a0df41f6f3d7a99c19a875fadd87bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/si/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/si/firefox-62.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "788f0eeec94ce2506522eddc9ecbb4d1873003fa6813dfc419819d3b957844b81af98f01d686d94bc2d5ff28d075a999a54caa27b07ba05b3707edd9b4b967f9"; + sha512 = "edda9129c035977398c29fa5333b69b997e6a97e324354edc6037b4cdc5d5c62f6122479f1b7662a64c3e1fb9efa877fc5186b87732c5598b5d98a8e15e4cce4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/sk/firefox-62.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "84aa33cd0306c6a8353b71dae4528752639f408866c446b03ff8afb58842d39cd3fe268d9c3209d1a5ce73a2168eebe307e4b82b11043066f39c67f526afa53e"; + sha512 = "13d6175796804bf7b92475739282a0865e0610f05bf44aca6f8669f27443b5c936fded3b4b8b0eb4732fb3783a7ea3b7a8e7ecdb9007938740052e5c950d9a85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/sl/firefox-62.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "39ded81264e7a0b5f52953130deabfac540778cdcc08cc9d0f24429d69ff6805a9ee0a853f49f235c8df84093936df8907daf77ca5c2cea62b20bc210e9d8756"; + sha512 = "d9cabfd23d96db68f925887ec43ca7ef6e8088fcce0d5dcf236dbd30894aa17f44ebe11f4386f81bfdaa7ab5e1edca2acb2d6e7afc2f53e5970386365cba7924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/son/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/son/firefox-62.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a3fb3ec97d4367e27cffb76c457440a5727b67829afb1a419e02c18b039921c66ad8db96b56ca37488b02c67b8cdbf5db211d03bfeaf65401a84cced13ff36b8"; + sha512 = "169c538ab1663ec914f8f3379fb428bfdca8c78effcb509053931d97251e9257ba65d605a211ce1e92ca41443d303abf1e82be286d932ae178b6057bc255f5bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sq/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/sq/firefox-62.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "8723521c46a18d0c1649d2a0af7702a854e12249323390d65638424fca7dbe72bcee4e9c8150bdace09ed2f587db2e02024f5fea645c933a945590ecd20e8c48"; + sha512 = "3b6a0c39a91723696764282b763ee053d083fe27e851212b60f8d3b3682771f93673a631e05cc40b432c56ea01ddf70a0d8b0f7ee0076f4bdb6e05e55eae8649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/sr/firefox-62.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c70b6a7cc124a930bbb2bf74652232b64d05bc87c625e49b94d1d9b52be85aa56c8a0ac8a2bdf50b90ea41a74728c19ce5ed3d9fb11b96be29bff437883401f6"; + sha512 = "72641d7a1d5c129bd1d5afa68b866d0f28023e0d1ed8671231e72b4502b4e788922c9b154b83162bc5e54e41eeaedd027e58862cadb251634a11fa6f164b584d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sv-SE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/sv-SE/firefox-62.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "df9e5518ba53314f8bf3e99914c2d36e1e3b495e0333ddaed3bfb5c16a75ce2a83369a1247c2c7f14a774ab0ba0bdb92ae1ee4f25314c68f7f6e3dada4a10b8b"; + sha512 = "468c9eb51744390ba7a3fd7beef02771c900289e08de6f4b3e47d1d25ace36cf1d98d7842a1cf3824b4f426a96c355e9bed8d29402282d17d50769f70d1aa932"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ta/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ta/firefox-62.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d9ef63ac6c8159cad45147ab8bafcc73577a111715741968050c71ff33d12c98d94189a93b461b75e63c0679fc9374c9f997aac5fe3398c49d3e5318f3fce0d1"; + sha512 = "a6397e99080d870922c962656652a342de755086ebedf4515b107d8be024a8cd5509ecd96737f0200e338871c73689fa3ba056bb004155d89153e2ecc9a34c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/te/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/te/firefox-62.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "5edd9666d324f3cbb915761aed91e3be5d297ce5ca1e77c793f1bf8d8535083eaa36537fe9ace89ab1084879cbf351f77780d998349092a4333a34a0231938fa"; + sha512 = "a70340e6cdab9c77b367797ea34e37fd39af4d1a630c054c7db0bd325740b71cdeca434bc305803dbf0fcc145391b17b192a7ea967cc3361db6bdfd961e97f38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/th/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/th/firefox-62.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "96d6be5f3dc67e0839e1afff60e3bc756fbbaa04adf2e3dbc743f94dd039dd3d6fbb0a14dbfbd012138580fb32de7f485ce0b1782d43e24551bf4620c246d18f"; + sha512 = "3f84e76b6ad095573f54178e3408cb0204e079ab28fc595375597575c3180b8da9f737b50ae5863b3f00d977d25e400167a32c06afb1b56ddae2a40a5bd33ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/tr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/tr/firefox-62.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "7e57727f21316822b4f181cf722cca3e7df7499a4b4cda2fb0e0df2eb7f00a236ff9e2120f64a244ef9c329ec2bbf739a067f0828f4a3f2086497ab9a72918da"; + sha512 = "2b4846de6d4b32fd37ea105375df20577ec13ccc5922905d0252c0421a793d4b36464a0f494cd6d5b984340836a99192b7e708492e88f87d8cee718daee5a0de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/uk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/uk/firefox-62.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "aafdc6666a206f6945e73221efc0273f95495f447c1f7375ddba78a04656ef9e84f683fc8ac392f6de711628f34712e0e0d31032792dd8a45f71f8188d5e65c8"; + sha512 = "6c746513a01ebd30eec163cf77d3c4ae9f3736dec010f4db530c32d7f1b4e2072850e0cd69344d597c03fcd8d6f96547324c7d55d5ef3d4e087392700dae114c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ur/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/ur/firefox-62.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a47e557b6846abf57bcad9dc67ddadc91f2a37043a8727dee96e8425de8f76625749522b7764144028bf080508a6821b1a6ae0b9691fe92855cd7d34c2fa5165"; + sha512 = "3de6ce39114d511f7642c2585e9aec0f450c1e3b17117e6a8808532a3df10b8067f259f8e575f1b48a7c9122ba998aa48cc3b17f9c2fb028f12c4811a133dcc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/uz/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/uz/firefox-62.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "a44789be262632f69d12c4f18680c2a4601cb3cc5ee1cce704906860a3fb1f2306b40d59ed551a90d81ff094665f525e37c557b70b61e4a49c32a23a4ba99fd7"; + sha512 = "638d8e49710d415a4f56c911783d486e30559030e6e82c0d3e3234f27cdef806bb78a3fcefde43b2c7905ab9f5eee5ba4b84f4ecb84564e12e55aa276e05d0b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/vi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/vi/firefox-62.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5be10d54271606b06174bd2035f4be33282c1ab69eceea095c49d537cf67e3e6e918ed604132a131dd783e5787efcac9a0dc3eb5f301c1d2dd1cd0bf52d63a48"; + sha512 = "372e8f4966d827657eb8240ff3ce0dd73cc53c20ca7215f936029c06f45a9f8e7c7d7a24982844caae66ee669ea350b3aa9c5de3340857a493f2397e5b12a769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/xh/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/xh/firefox-62.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "4e9753d9d416ceaa9b7fb6d3d191739f1e9e095dcb4c20227a851aa0b6a7ac21297d3ccac1a52abf0c5226b9b20702b9ba2d363137fd6c9f44ffbdc497f9d441"; + sha512 = "379d5ac367ea324f724980bc84ce553356d78af622c889bd553574df8683f4b64e0e021d4143be0839965a174962d2116cd3f35bcfd13074df19573afc050a7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/zh-CN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/zh-CN/firefox-62.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "b87f0e013ea58a15b001fcfe5b41b7adf33d51490fe96fdb85570dc3be6dc66f514def826cb8469a7517b532bd241e79276774f7e47676cc632f36150259da79"; + sha512 = "68cbefb528ed507218752a9aeaaf929e1d55e2dce55240386634a870d245de8706f441c3ee82c39a535bf2a17b6be92e635b26394d624c4c254fc7570480bc0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/zh-TW/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b14/linux-i686/zh-TW/firefox-62.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "4a7a366523294ecddacdab2aa863f06eda275fa31cf5ddfbbebd5cb740399507185134c3950a24183da89f87a6cfffe54e2c934625b384084a424ce150e864a5"; + sha512 = "d79c5431e4db23b52ead1bf6911b91c6672edefda033a20bca2ccbecff2e72afc2355934f5963dcb4f756a71c877dac09913b926c37415845b40bed63ce349a9"; } ]; } From d8652e9fc292abf0962dc7229bf26574a7803e11 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 4 Aug 2018 09:42:44 -0500 Subject: [PATCH 149/229] foundationdb52: 5.2.6 -> 5.2.8 Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 7c7da361246..be17bf87899 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -148,10 +148,9 @@ in with builtins; { }; foundationdb52 = makeFdb rec { - version = "5.2.6"; + version = "5.2.8"; branch = "release-5.2"; - rev = "refs/tags/v5.2.6"; # seemed to be tagged incorrectly - sha256 = "1q3lq1hqq0f53n51gd4cw5cpayyw65dmkfplhsw1m5mghymzmskk"; + sha256 = "1kbmmhk2m9486r4kyjlc7bb3wd50204i0p6dxcmvl6pbp1bs0wlb"; }; foundationdb60 = makeFdb rec { From 6b0451c060f93dc5dd4f21778ea1dab1c8144c56 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 4 Aug 2018 09:45:49 -0500 Subject: [PATCH 150/229] foundationdb60: 6.0.3pre2446 -> 6.0.4pre2497 Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index be17bf87899..200489fda98 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -154,9 +154,9 @@ in with builtins; { }; foundationdb60 = makeFdb rec { - version = "6.0.3pre2446_${substring 0 8 rev}"; + version = "6.0.4pre2497_${substring 0 8 rev}"; branch = "release-6.0"; - rev = "dd5481fb60ee1652986b2a028b31dcbb6cb171b5"; - sha256 = "0mhlb728badk1h3410jbhy7f48m3jjnjna26wwyw5680xz72d6dm"; + rev = "73d64cb244714c19bcc651122f6e7a9236aa11b5"; + sha256 = "1jzmrf9kj0brqddlmxvzhj27r6843790jnqwkv1s3ri21fqb3hs7"; }; } From 3f0decd822ea64d249ca500f664ebccecd042f17 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sat, 4 Aug 2018 13:28:35 +0200 Subject: [PATCH 151/229] squashfuse : unstable-2018-02-20 -> 0.1.103 --- pkgs/tools/filesystems/squashfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index b3d8d70f0e2..d7d917d5e9f 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "squashfuse"; - version = "unstable-2018-02-20"; + version = "0.1.103"; name = "${pname}-${version}"; meta = { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vasi"; repo = "${pname}"; - rev = "3f4a93f373796e88f7eee3a0c005ef60cb395d30"; + rev = "540204955134eee44201d50132a5f66a246bcfaf"; sha256 = "07jv4qjjz9ky3mw3p5prgs19g1bna9dcd7jjdz8083s1wyipdgcq"; }; From 39ab7a07787bf3d6cd99d8e13a1a0bb527b95a2c Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sat, 4 Aug 2018 17:24:52 +0200 Subject: [PATCH 152/229] soulseekqt: 2016-1-17 -> 2018-1-30 (#44460) --- .../networking/p2p/soulseekqt/default.nix | 46 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index e525c564c50..44e434aa8ee 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -2,41 +2,59 @@ , fetchurl , dbus , zlib, fontconfig +, qtbase, qtmultimedia +, libjson, libgpgerror , libX11, libxcb, libXau, libXdmcp, freetype, libbsd +, pythonPackages, squashfsTools, makeDesktopItem }: with stdenv.lib; let libPath = makeLibraryPath - [ stdenv.cc.cc dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd ]; + [ stdenv.cc.cc qtbase qtmultimedia dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd libjson libgpgerror]; - version = "2016-1-17"; + version = "2018-1-30"; mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit"); srcs = { - "i686-linux" = fetchurl { - url = "https://www.dropbox.com/s/kebk1b5ib1m3xxw/${mainbin}.tgz"; - sha256 = "0r9rhnfslkgbw3l7fnc0rcfqjh58amgh5p33kwam0qvn1h1frnir"; - }; - "x86_64-linux" = fetchurl { - url = "https://www.dropbox.com/s/7qh902qv2sxyp6p/${mainbin}.tgz"; - sha256 = "05l3smpdvw8xdhv4v8a28j0yi1kvzhrha2ck23g4bl7x9wkay4cc"; + url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz"; + sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6"; }; }; + desktopItem = makeDesktopItem { + name = "SoulseekQt"; + exec = "soulseekqt"; + icon = "$out/share/soulseekqt/"; + comment = "Official Qt SoulSeek client"; + desktopName = "SoulseekQt"; + genericName = "SoulseekQt"; + categories = "Network;"; + }; + in stdenv.mkDerivation rec { name = "soulseekqt-${version}"; inherit version; src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); - sourceRoot = "."; - buildPhase = ":"; # nothing to build + dontBuild = true; + + buildInputs = [ pythonPackages.binwalk squashfsTools ]; + + # avoid usage of appimagetool + unpackCmd = '' + export HOME=$(pwd) # workaround for binwalk + tar xvf $curSrc && binwalk --quiet \ + ${mainbin}.AppImage -D 'squashfs:.squashfs:unsquashfs %e' + ''; installPhase = '' - mkdir -p $out/bin - cp ${mainbin} $out/bin/soulseekqt + mkdir -p $out/{bin,share/soulseekqt} + cd squashfs-root/ + cp -R soulseek.png translations $out/share/soulseekqt + cp SoulseekQt $out/bin/soulseekqt ''; fixupPhase = '' @@ -50,6 +68,6 @@ in stdenv.mkDerivation rec { homepage = http://www.soulseekqt.net; license = licenses.unfree; maintainers = [ maintainers.genesis ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90576e34da0..5474ef98e58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18407,7 +18407,7 @@ with pkgs; inherit (pkgs.vamp) vampSDK; }; - soulseekqt = callPackage ../applications/networking/p2p/soulseekqt { }; + soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; sox = callPackage ../applications/misc/audio/sox { enableLame = config.sox.enableLame or false; From 0274e724813e4f9ff7b3db9f3238b7ac757f4788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 4 Aug 2018 19:38:22 +0200 Subject: [PATCH 153/229] exiv2: bugfix updates - use upstream branch with backports - backport two fixes missing from it yet --- pkgs/development/libraries/exiv2/default.nix | 40 +++++++++++++------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 7f5f1903517..b549c74540c 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,11 +1,15 @@ -{ stdenv, fetchurl, fetchpatch, zlib, expat, gettext }: +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, zlib, expat, gettext +, autoconf }: stdenv.mkDerivation rec { - name = "exiv2-0.26"; + name = "exiv2-0.26.2018.06.09"; - src = fetchurl { - url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz"; - sha256 = "1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7"; + #url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz"; + src = fetchFromGitHub rec { + owner = "exiv2"; + repo = "exiv2"; + rev = "4aa57ad"; + sha256 = "1kblpxbi4wlb0l57xmr7g23zn9adjmfswhs6kcwmd7skwi2yivcd"; }; patches = [ @@ -16,20 +20,30 @@ stdenv.mkDerivation rec { + "/sha512/${sha512}/${patchname}"; sha512 = "3f9242dbd4bfa9dcdf8c9820243b13dc14990373a800c4ebb6cf7eac5653cfef" + "e6f2c47a94fbee4ed24f0d8c2842729d721f6100a2b215e0f663c89bfefe9e32"; - }) - (fetchpatch { - # many CVEs - see https://github.com/Exiv2/exiv2/pull/120 - url = "https://patch-diff.githubusercontent.com/raw/Exiv2/exiv2/pull/120.patch"; - sha256 = "1szl22xmh12hibzaqf2zi8zl377x841m52x4jm5lziw6j8g81sj8"; - excludes = [ "test/bugfixes-test.sh" ]; - }) + }) + # Two backports from master, submitted as https://github.com/Exiv2/exiv2/pull/398 + (fetchpatch { + name = "CVE-2018-12264.diff"; + url = "https://github.com/vcunat/exiv2/commit/fd18e853.diff"; + sha256 = "0y7ahh45lpaiazjnfllndfaa5pyixh6z4kcn2ywp7qy4ra7qpwdr"; + }) + (fetchpatch { + name = "CVE-2018-12265.diff"; + url = "https://github.com/vcunat/exiv2/commit/9ed1671bd4.diff"; + sha256 = "1cn446pfcgsh1bn9vxikkkcy1cqq7ghz2w291h1094ydqg6w7q6w"; + }) ]; postPatch = "patchShebangs ./src/svn_version.sh"; + preConfigure = "make config"; # needed because not using tarball + outputs = [ "out" "dev" ]; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ + gettext + autoconf # needed because not using tarball + ]; propagatedBuildInputs = [ zlib expat ]; meta = { From 9958868dfdba2b8c7602ab06444fadd2ae7fa2c5 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 4 Aug 2018 20:01:53 +0300 Subject: [PATCH 154/229] nginxModules.sts: init at v0.1.1 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 9f2cd319f0e..864e08beaa6 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -215,6 +215,15 @@ }; }; + sts = { + src = fetchFromGitHub { + owner = "vozlt"; + repo = "nginx-module-sts"; + rev = "v0.1.1"; + sha256 = "0nvb29641x1i7mdbydcny4qwlvdpws38xscxirajd2x7nnfdflrk"; + }; + }; + upstream-check = { src = fetchFromGitHub { owner = "yaoweibin"; From 9100091f3fc94a6431d376e6f3bf4f87fa995acc Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 4 Aug 2018 20:13:33 +0300 Subject: [PATCH 155/229] nginxModules.stream-sts: init at v0.1.1 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 864e08beaa6..351a4c77487 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -215,6 +215,15 @@ }; }; + stream-sts = { + src = fetchFromGitHub { + owner = "vozlt"; + repo = "nginx-module-stream-sts"; + rev = "v0.1.1"; + sha256 = "1jdj1kik6l3rl9nyx61xkqk7hmqbncy0rrqjz3dmjqsz92y8zaya"; + }; + }; + sts = { src = fetchFromGitHub { owner = "vozlt"; From a5674cebb9813ffd0b5cf048648d770ca1128afe Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 4 Aug 2018 20:15:37 +0300 Subject: [PATCH 156/229] nginxModules.sysguard: init at rev e512897 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 351a4c77487..c41dd5931d8 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -233,6 +233,15 @@ }; }; + sysguard = { + src = fetchFromGitHub { + owner = "vozlt"; + repo = "nginx-module-sysguard"; + rev = "e512897f5aba4f79ccaeeebb51138f1704a58608"; + sha256 = "19c6w6wscbq9phnx7vzbdf4ay6p2ys0g7kp2rmc9d4fb53phrhfx"; + }; + }; + upstream-check = { src = fetchFromGitHub { owner = "yaoweibin"; From 29b3e115413724384c8b01eaab7372ca9838c2ca Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 4 Aug 2018 20:22:42 +0300 Subject: [PATCH 157/229] nginxModules.url: init at rev 9299816 --- pkgs/servers/http/nginx/modules.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index c41dd5931d8..ddce996cb95 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -261,6 +261,15 @@ inputs = [ pkgs.msgpuck.dev pkgs.yajl ]; }; + url = { + src = fetchFromGitHub { + owner = "vozlt"; + repo = "nginx-module-url"; + rev = "9299816ca6bc395625c3683fbd2aa7b916bfe91e"; + sha256 = "0mk1gjmfnry6hgdsnlavww9bn7223idw50jlkhh5k00q5509w4ip"; + }; + }; + vts = { src = fetchFromGitHub { owner = "vozlt"; From e0de8354b9f09e7919b01fad97975d5040c67a0d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 4 Aug 2018 20:48:31 +0300 Subject: [PATCH 158/229] nginxModules.lua-upstream: init at v0.07 --- pkgs/servers/http/nginx/modules.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index ddce996cb95..0501bcc9e58 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -94,6 +94,16 @@ ''; }; + lua-upstream = { + src = fetchFromGitHub { + owner = "openresty"; + repo = "lua-upstream-nginx-module"; + rev = "v0.07"; + sha256 = "1gqccg8airli3i9103zv1zfwbjm27h235qjabfbfqk503rjamkpk"; + }; + inputs = [ pkgs.luajit ]; + }; + modsecurity = { src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity"; inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ]; From e103ad48ea1c0f9f2a87dcd634973f2c0f3bb7ff Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 4 Aug 2018 13:55:23 -0500 Subject: [PATCH 159/229] f2fs-tools: 1.10.0 -> 1.11.0 (#43715) --- pkgs/tools/filesystems/f2fs-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 321259292ef..20e1853a3af 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.10.0"; + version = "1.11.0"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; - sha256 = "1254pd254l1hxkzkkzqmzc0j9vywj2wddg9apqaixjninj21jrbc"; + sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 5a43f6ffeb9e85982ddc8f0c4a2f4dd9bfca4da7 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 4 Aug 2018 20:55:59 +0200 Subject: [PATCH 160/229] graphite: make systemd create /run directory for us (#44392) --- .../modules/services/monitoring/graphite.nix | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index cdfd746bc5a..cdc98b407e9 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -57,12 +57,6 @@ let --nodaemon --syslog --prefix=${name} --pidfile /run/${name}/${name}.pid ${name} ''; - mkPidFileDir = name: '' - mkdir -p /run/${name} - chmod 0700 /run/${name} - chown -R graphite:graphite /run/${name} - ''; - carbonEnv = { PYTHONPATH = let cenv = pkgs.python.buildEnv.override { @@ -412,18 +406,16 @@ in { after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { + RuntimeDirectory = name; ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PermissionsStartOnly = true; PIDFile="/run/${name}/${name}.pid"; }; - preStart = mkPidFileDir name + '' - - mkdir -p ${cfg.dataDir}/whisper - chmod 0700 ${cfg.dataDir}/whisper - chown graphite:graphite ${cfg.dataDir} - chown graphite:graphite ${cfg.dataDir}/whisper + preStart = '' + install -dm0700 -o graphite -g graphite ${cfg.dataDir} + install -dm0700 -o graphite -g graphite ${cfg.dataDir}/whisper ''; }; }) @@ -436,12 +428,12 @@ in { after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { + RuntimeDirectory = name; ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile="/run/${name}/${name}.pid"; }; - preStart = mkPidFileDir name; }; }) @@ -452,12 +444,12 @@ in { after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { + RuntimeDirectory = name; ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile="/run/${name}/${name}.pid"; }; - preStart = mkPidFileDir name; }; }) From c48111767360ce78643af0e30addc8f846744656 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 4 Aug 2018 19:06:35 +0000 Subject: [PATCH 161/229] nginxMainline: 1.15.1 -> 1.15.2 (#44431) --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 5afd73c8868..ecde2430f52 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.1"; - sha256 = "0q2lkpnfqf74p22vrcldx0gcnss3is7rnp54fgpvhcpqsxc6h867"; + version = "1.15.2"; + sha256 = "145dcypq8dqc5as03iy1ycwifwynq9p4i8m56fn7g0myryp0kfpf"; }) From 7ab9e9b15b4cc9d10c49b195ad0c6c338c7403b2 Mon Sep 17 00:00:00 2001 From: Judson Date: Sat, 4 Aug 2018 12:56:55 -0700 Subject: [PATCH 162/229] (simp_le): (0.8.0 -> 0.9.0) --- pkgs/tools/admin/simp_le/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index ca0e16c1185..9d7e7c8c8d9 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,17 +1,19 @@ { stdenv, pythonPackages, bash }: - + pythonPackages.buildPythonApplication rec { pname = "simp_le-client"; - version = "0.8.0"; + version = "0.9.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0nv9mm99rm8i9flgfgwvmajbsxb5rm162nfxlq3wk66bbbyr6y1i"; + sha256 = "1yxfznd78zkg2f657v520zj5w4dvq5n594d0kpm4lra8xnpg4zcv"; }; postPatch = '' # drop upper bound of acme requirement sed -ri "s/'(acme>=[^,]+),<[^']+'/'\1'/" setup.py + # drop upper bound of idna requirement + sed -ri "s/'(idna)<[^']+'/'\1'/" setup.py substituteInPlace simp_le.py \ --replace "/bin/sh" "${bash}/bin/sh" ''; @@ -20,7 +22,7 @@ pythonPackages.buildPythonApplication rec { $out/bin/simp_le --test ''; - propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy ]; + propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy idna ]; meta = with stdenv.lib; { homepage = https://github.com/zenhack/simp_le; @@ -30,4 +32,3 @@ pythonPackages.buildPythonApplication rec { platforms = platforms.all; }; } - From 4c2c12da20c668c43b943e125bcb4f2eebc24267 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sat, 4 Aug 2018 22:21:17 +0200 Subject: [PATCH 163/229] caprice32: unstable-2018-02-10 -> unstable-2018-03-05 (#44462) --- pkgs/misc/emulators/caprice32/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index c0c3b40f6b6..42b8e5229e9 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { repo = "caprice32"; - version = "unstable-2018-02-10"; - rev = "53de69543300f81af85df32cbd21bb5c68cab61e"; + version = "unstable-2018-03-05"; + rev = "317fe638111e245d67e301f6f295094d3c859a70"; name = "${repo}-${version}"; src = fetchFromGitHub { inherit rev repo; owner = "ColinPitrat"; - sha256 = "12yv56blm49qmshpk4mgc802bs51wv2ra87hmcbf2wxma39c45fy"; + sha256 = "1bywpmkizixcnr057k8zq9nlw0zhcmwkiriln0krgdcm7d3h9b86"; }; postPatch = "substituteInPlace cap32.cfg --replace /usr/local $out"; From 87069061c51f5d1ec015ad7613812cf6161feeea Mon Sep 17 00:00:00 2001 From: Kyle Lacy Date: Sat, 4 Aug 2018 15:25:48 -0500 Subject: [PATCH 164/229] plex-media-player: init at 2.14.1 (#43839) --- maintainers/maintainer-list.nix | 5 ++ .../video/plex-media-player/default.nix | 86 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 93 insertions(+) create mode 100644 pkgs/applications/video/plex-media-player/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab555b19b9f..119d5b15764 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2094,6 +2094,11 @@ github = "kuznero"; name = "Roman Kuznetsov"; }; + kylewlacy = { + email = "kylelacy+nix@pm.me"; + github = "kylewlacy"; + name = "Kyle Lacy"; + }; lasandell = { email = "lasandell@gmail.com"; github = "lasandell"; diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix new file mode 100644 index 00000000000..7386d95d0c2 --- /dev/null +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchFromGitHub, fetchurl, makeDesktopItem, pkgconfig, cmake, python3 +, libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras +, libvdpau, SDL2, mpv, libGL }: +let + # During compilation, a CMake bundle is downloaded from `artifacts.plex.tv`, + # which then downloads a handful of web client-related files. To enable + # sandboxed builds, we manually download them and save them so these files + # are fetched ahead-of-time instead of during the CMake build. Whenever + # plex-media-player is updated, the versions for these files are changed, + # so the build IDs (and SHAs) below will need to be updated! + depSrcs = rec { + webClientBuildId = "56-23317d81e49651"; + webClientDesktopBuildId = "3.57.1-1e49651"; + webClientTvBuildId = "3.60.1-23317d8"; + + webClient = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; + sha256 = "1a48a65zzdx347kfnxriwkb0yjlhvn2g8jkda5pz10r3lwja0gbi"; + }; + webClientDesktopHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; + sha256 = "04wdgpsh33y8hyjhjrfw6ymf9g002jny7hvhld4xp33lwxhd2j5w"; + }; + webClientDesktop = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; + sha256 = "1asw9f84z9sm3w7ifnc7j631j84rgx23c6msmn2dnw48ckv3bj2z"; + }; + webClientTvHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; + sha256 = "0d1hsvmpwczwx442f8qdvfr8c3w84630j9qwpg2y4qm423sgdvja"; + }; + webClientTv = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; + sha256 = "1ih3l5paf1jl68b1xq3iqqmvs3m07fybz57hcz4f78v0gwq2kryq"; + }; + }; +in stdenv.mkDerivation rec { + name = "plex-media-player-${version}"; + version = "2.14.1.880"; + vsnHash = "301a4b6c"; + + src = fetchFromGitHub { + owner = "plexinc"; + repo = "plex-media-player"; + rev = "v${version}-${vsnHash}"; + sha256 = "0xz41r697vl6s3qvy6jwriv3pb9cfy61j6sydvdq121x5a0jnh9a"; + }; + + nativeBuildInputs = [ pkgconfig cmake python3 ]; + buildInputs = [ libX11 libXrandr qtbase qtwebchannel qtwebengine qtx11extras + libvdpau SDL2 mpv libGL ]; + + desktopItem = makeDesktopItem { + name = "plex-media-player"; + exec = "plexmediaplayer"; + icon = "plex-media-player"; + comment = "View your media"; + desktopName = "Plex Media Player"; + genericName = "Media Player"; + categories = "AudioVideo;Video;Player;TV;"; + }; + + preConfigure = with depSrcs; '' + mkdir -p build/dependencies + ln -s ${webClient} build/dependencies/buildid-${webClientBuildId}.cmake + ln -s ${webClientDesktopHash} build/dependencies/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1 + ln -s ${webClientDesktop} build/dependencies/web-client-desktop-${webClientDesktopBuildId}.tar.xz + ln -s ${webClientTvHash} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz.sha1 + ln -s ${webClientTv} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz + ''; + + postInstall = '' + mkdir -p $out/share/{applications,pixmaps} + cp ${src}/resources/images/icon.png $out/share/pixmaps/plex-media-player.png + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + + meta = with stdenv.lib; { + description = "Streaming media player for Plex"; + license = licenses.gpl2; + maintainers = with maintainers; [ kylewlacy ]; + homepage = https://plex.tv; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5474ef98e58..0562667f70a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17887,6 +17887,8 @@ with pkgs; gtksharp = gtk-sharp-2_0; }; + plex-media-player = libsForQt59.callPackage ../applications/video/plex-media-player { }; + plover = recurseIntoAttrs (callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; From ddc4235279a51da977f77fdd43d958b2b81bda49 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 4 Aug 2018 22:44:01 +0200 Subject: [PATCH 165/229] elixir: fix 1.7 build on linux --- pkgs/development/interpreters/elixir/generic-builder.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 7d3c6476131..b4e1cacfe26 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -40,6 +40,8 @@ in rm -vf rebar ln -s ${rebar}/bin/rebar rebar + patchShebangs lib/elixir/generate_app.escript || true + substituteInPlace Makefile \ --replace "/usr/local" $out ''; From 2ce2f721b8239701b312558fa1efe62f2f0ef479 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sat, 4 Aug 2018 23:59:33 +0300 Subject: [PATCH 166/229] ripgrep: 0.8.1 -> 0.9.0 (#44473) --- pkgs/tools/text/ripgrep/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index aa41e7b7f60..f70f0f3d75b 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; - rev = "${version}"; - sha256 = "1h7k9ik723qzplwl0a5i0anzdr115wwklfgp0n11p4k2ckh7nygn"; + rev = version; + sha256 = "089xffrqi4wm0w1lhy5iqxrcb82ca44bxl8qps4ilv0ih91vxwfj"; }; - cargoSha256 = "1gld93dxfm4vyiz1b43smbdhxmyzdk2236ksp8vw1zb1yyzn83nf"; + cargoSha256 = "1wsw7s1bc1gnpq4kjzkas5zf2snhpx9f6cyrrf6g5jr8l0hcbyih"; nativeBuildInputs = [ asciidoc docbook_xsl libxslt ]; From 0bc6225bb4c5993a721bbf4df1983618d1fc618a Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sat, 4 Aug 2018 23:05:42 +0200 Subject: [PATCH 167/229] cadence: init at 0.9.0 (#44281) --- pkgs/applications/audio/cadence/default.nix | 65 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/applications/audio/cadence/default.nix diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix new file mode 100644 index 00000000000..87dbb310995 --- /dev/null +++ b/pkgs/applications/audio/cadence/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchurl +, pkgconfig +, qtbase +, makeWrapper +, jack2Full +, python3Packages +, a2jmidid +}: + + stdenv.mkDerivation rec { + version = "0.9.0"; + name = "cadence"; + + src = fetchurl { + url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz"; + sha256 = "07z1mnb0bmldb3i31bgw816pnvlvr9gawr51rpx3mhixg5wpiqzb"; + }; + + buildInputs = [ + makeWrapper + pkgconfig + qtbase + ]; + + apps = [ + "cadence" + "cadence-jacksettings" + "cadence-pulse2loopback" + "claudia" + "cadence-aloop-daemon" + "cadence-logs" + "cadence-render" + "catarina" + "claudia-launcher" + "cadence-pulse2jack" + "cadence-session-start" + "catia" + ]; + + makeFlags = '' + PREFIX="" + DESTDIR=$(out) + ''; + + propagatedBuildInputs = with python3Packages; [ pyqt5 ]; + + postInstall = '' + # replace with our own wrappers. + for app in $apps; do + rm $out/bin/$app + makeWrapper ${python3Packages.python.interpreter} $out/bin/$app \ + --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \ + --add-flags "-O $out/share/cadence/src/$app.py" + done + ''; + + meta = { + homepage = https://github.com/falkTX/Cadence/; + description = "Collection of tools useful for audio production"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ genesis ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0562667f70a..b6f4a14932e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15269,6 +15269,8 @@ with pkgs; avocode = callPackage ../applications/graphics/avocode {}; + cadence = libsForQt5.callPackage ../applications/audio/cadence { }; + milkytracker = callPackage ../applications/audio/milkytracker { }; schismtracker = callPackage ../applications/audio/schismtracker { }; From fb26b73f1108e852b225107728f5e36ac00f48ba Mon Sep 17 00:00:00 2001 From: Judson Date: Sat, 4 Aug 2018 14:21:19 -0700 Subject: [PATCH 168/229] simp_le: Restricting to platforms.linux --- pkgs/tools/admin/simp_le/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 9d7e7c8c8d9..5ad73d1ce7a 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec { description = "Simple Let's Encrypt client"; license = licenses.gpl3; maintainers = with maintainers; [ gebner makefu ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 7f57ebd2c4d9e39eadc4d908ff53976cce49e22e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 4 Aug 2018 17:37:34 -0400 Subject: [PATCH 169/229] libunity: init at 7.1.4 --- .../libraries/libunity/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/libunity/default.nix diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix new file mode 100644 index 00000000000..3d3764e9258 --- /dev/null +++ b/pkgs/development/libraries/libunity/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool +, glib, vala, dee, gobjectIntrospection, libdbusmenu-glib +, gtk3, intltool, gnome-common, python3, icu }: + +stdenv.mkDerivation rec { + pname = "libunity"; + version = "7.1.4"; + + name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz"; + sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij"; + }; + + nativeBuildInputs = [ + autoconf + automake + gnome-common + gobjectIntrospection + intltool + libtool + pkgconfig + python3 + vala + ]; + + buildInputs = [ + glib + gtk3 + ]; + + propagatedBuildInputs = [ dee libdbusmenu-glib ]; + + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + + configureFlags = [ + "--disable-static" + "--with-pygi-overrides-dir=$(out)/${python3.sitePackages}/gi/overrides" + ]; + + NIX_LDFLAGS = "-L${icu}/lib"; + + meta = with stdenv.lib; { + description = "A library for instrumenting and integrating with all aspects of the Unity shell"; + homepage = https://launchpad.net/libunity; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ worldofpeace ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d151eadf4e..45acf3cf2d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10097,6 +10097,10 @@ with pkgs; libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; + libunity = callPackage ../development/libraries/libunity { + inherit (gnome3) gnome-common; + }; + libdbusmenu = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; }; From aa79ae0c6425fa673401e845493c99e717ad4a69 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 4 Aug 2018 16:15:20 -0500 Subject: [PATCH 170/229] foundationdb: install python bindings Signed-off-by: Austin Seipp --- .../modules/services/databases/foundationdb.xml | 1 - pkgs/servers/foundationdb/default.nix | 17 ++++++++++++++--- pkgs/top-level/python-packages.nix | 12 ++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index 51fe9ae3f91..1f60470aa3f 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -295,7 +295,6 @@ only undergone fairly basic testing of all the available functionality. individual fdbserver processes. Currently, all server processes inherit all the global fdbmonitor settings. - Python bindings are not currently installed. Ruby bindings are not currently installed. Go bindings are not currently installed. diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 200489fda98..265255c2f78 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -88,7 +88,7 @@ let separateDebugInfo = true; enableParallelBuilding = true; - makeFlags = [ "all" "fdb_java" ] + makeFlags = [ "all" "fdb_java" "fdb_python" ] # Don't compile FDBLibTLS if we don't need it in 6.0 or later; # it gets statically linked in ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] @@ -106,17 +106,28 @@ let installPhase = '' mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb + mkdir -vp $python/lib/${python.libPrefix}/site-packages - cp -v ./lib/libfdb_c.so $lib/lib '' + lib.optionalString (!lib.versionAtLeast version "6.0") '' + # we only copy the TLS library on < 6.0, since it's compiled-in otherwise cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so '' + '' + # C API + cp -v ./lib/libfdb_c.so $lib/lib cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb + # java cp -v ./bindings/java/foundationdb-client.jar $lib/share/java/fdb-java.jar + # python + rm -f ./bindings/python/fdb/*.pth # remove useless files + cp -R ./bindings/python/fdb $python/lib/${python.libPrefix}/site-packages/fdb + # symlink a copy of the shared object into place, so that impl.py can load it + ln -sv $lib/lib/libfdb_c.so $python/lib/${python.libPrefix}/site-packages/fdb/libfdb_c.so + + # binaries for x in fdbbackup fdbcli fdbserver fdbmonitor; do cp -v "./bin/$x" $out/bin; done @@ -128,7 +139,7 @@ let ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent ''; - outputs = [ "out" "lib" "dev" ]; + outputs = [ "out" "lib" "dev" "python" ]; meta = with stdenv.lib; { description = "Open source, distributed, transactional key-value store"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e68c11028ef..4913e533f29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17554,6 +17554,18 @@ EOF })).python; rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + + foundationdb51 = (toPythonModule (pkgs.fdbPackages.override { + inherit python; + }).foundationdb51).python; + + foundationdb52 = (toPythonModule (pkgs.fdbPackages.override { + inherit python; + }).foundationdb52).python; + + foundationdb60 = (toPythonModule (pkgs.fdbPackages.override { + inherit python; + }).foundationdb60).python; }); in fix' (extends overrides packages) From f42f0a1c48de7df84b3220bd72ecd3eb2b85e5a2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 4 Aug 2018 16:56:05 -0500 Subject: [PATCH 171/229] nixos/foundationdb: show an example python script in the documentation Signed-off-by: Austin Seipp --- .../services/databases/foundationdb.xml | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index 1f60470aa3f..0b305c3fdf1 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -12,7 +12,7 @@ Maintainer: Austin Seipp -Available version(s): 5.1.x +Available version(s): 5.1.x, 5.2.x, 6.0.x FoundationDB (or "FDB") is a distributed, open source, high performance, transactional key-value store. It can store petabytes of data and deliver @@ -26,7 +26,7 @@ exceptional performance while maintaining consistency and ACID semantics services.foundationdb.enable = true; -services.foundationdb.package = pkgs.foundationdb51; # FoundationDB 5.1.x +services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x @@ -70,6 +70,41 @@ fdb> +You can also now write programs using the available client libraries. +For example, the following Python program can be run in order to grab the cluster status, +as a quick example. (This example uses nix-shell shebang +support to automatically supply the necessary Python modules). + + +a@link> cat fdb-status.py +#! /usr/bin/env nix-shell +#! nix-shell -i python -p python pythonPackages.foundationdb52 + +from __future__ import print_function + +import fdb +import json + +def main(): + fdb.api_version(520) + db = fdb.open() + + @fdb.transactional + def get_status(tr): + return str(tr['\xff\xff/status/json']) + + obj = json.loads(get_status(db)) + print('FoundationDB available: %s' % obj['client']['database_status']['available']) + +if __name__ == "__main__": + main() +a@link> chmod +x fdb-status.py +a@link> ./fdb-status.py +FoundationDB available: True +a@link> + + + FoundationDB is run under the foundationdb user and group by default, but this may be changed in the NixOS configuration. The systemd unit foundationdb.service controls the From 606a260f3be16a76472b09d60716bd90b1e76258 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 4 Aug 2018 15:02:57 -0700 Subject: [PATCH 172/229] renderdoc: 1.0 -> 1.1 (#44474) --- pkgs/applications/graphics/renderdoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 9a21d457a83..99e250e9e4d 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -12,14 +12,14 @@ let }; in stdenv.mkDerivation rec { - version = "1.0"; + version = "1.1"; name = "renderdoc-${version}"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "0l7pjxfrly4llryjnwk42dzx65n78wc98h56qm4yh04ja8fdbx2y"; + sha256 = "0kb9m1dm0mnglqyh1srvl0f1bgjghxzbqarn0xfqw49wphqwhmcd"; }; buildInputs = [ From 0254ae4e80f9bf659430d2ec3e452ccb049ce2fb Mon Sep 17 00:00:00 2001 From: Jesper Date: Sun, 5 Aug 2018 00:05:48 +0200 Subject: [PATCH 173/229] netdata: 1.9.0 -> 1.10.0 (#44472) The web_access.patch would no longer apply. It disabled a check that required the static files for the web UI to be owned by the user the daemon runs as (not root, so it doesn't work well with nix). Besides updating netdata, this commit removes that patch, changes the netdata service config to set the "web files owner/group" option to "root" and adds a test that checks that the web UI is being served. This allows the web files to be owned by root without patching. --- nixos/modules/services/monitoring/netdata.nix | 4 ++++ nixos/tests/netdata.nix | 8 ++++++-- pkgs/tools/system/netdata/default.nix | 7 ++----- pkgs/tools/system/netdata/web_access.patch | 20 ------------------- 4 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 pkgs/tools/system/netdata/web_access.patch diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index eefddf5a206..edcaa10d969 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -14,6 +14,10 @@ let global = { "plugins directory" = "${wrappedPlugins}/libexec/netdata/plugins.d ${pkgs.netdata}/libexec/netdata/plugins.d"; }; + web = { + "web files owner" = "root"; + "web files group" = "root"; + }; }; mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config); configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig); diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index c56506ba287..eb45db6f04c 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -19,8 +19,12 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $netdata->waitForUnit("netdata.service"); - # check if netdata can read disk ops for root owned processes. - # if > 0, successful. verifies both netdata working and + + # check if the netdata main page loads. + $netdata->succeed("curl --fail http://localhost:19999/"); + + # check if netdata can read disk ops for root owned processes. + # if > 0, successful. verifies both netdata working and # apps.plugin has elevated capabilities. my $cmd = <<'CMD'; curl -s http://localhost:19999/api/v1/data\?chart=users.pwrites | \ diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 7bb98e8e80c..6f86647f4c7 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: stdenv.mkDerivation rec{ - version = "1.9.0"; + version = "1.10.0"; name = "netdata-${version}"; src = fetchFromGitHub { rev = "v${version}"; owner = "firehol"; repo = "netdata"; - sha256 = "1vy0jz5lxw63b830l9jgf1qqhp41gzapyhdr5k1gwg3zghvlg10w"; + sha256 = "02spfisabjkkgd9fairldlf84n83vbv2xafg0g5jrpfa972pjl9r"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ zlib libuuid ]; - # Allow UI to load when running as non-root - patches = [ ./web_access.patch ]; - # Build will fail trying to create /var/{cache,lib,log}/netdata without this postPatch = '' sed -i '/dist_.*_DATA = \.keep/d' src/Makefile.am diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch deleted file mode 100644 index ae4d29185de..00000000000 --- a/pkgs/tools/system/netdata/web_access.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/web_client.c.orig -+++ b/src/web_client.c -@@ -302,7 +302,7 @@ - buffer_strcat_htmlescape(w->response.data, webfilename); - return 404; - } -- -+#if 0 - // check if the file is owned by expected user - if(stat.st_uid != web_files_uid()) { - error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid()); -@@ -320,7 +320,7 @@ - buffer_strcat_htmlescape(w->response.data, webfilename); - return 403; - } -- -+#endif - if((stat.st_mode & S_IFMT) == S_IFDIR) { - snprintfz(webfilename, FILENAME_MAX, "%s/index.html", filename); - return mysendfile(w, webfilename); From 1e1c7c88a5699e3b2c061f63e5c358cac6a461c7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 13 Jul 2018 15:52:49 -0400 Subject: [PATCH 174/229] appstream: gir is default true --- pkgs/development/libraries/appstream/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 61ee182ce62..8623fbde898 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dapidocs=false" "-Ddocs=false" - "-Dgir=false" ]; meta = with stdenv.lib; { From d279992fc605d5f4aa63a6ca5d543524f757270c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Jul 2018 19:33:23 -0400 Subject: [PATCH 175/229] appstream: add vala --- pkgs/development/libraries/appstream/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 8623fbde898..264bc0e7345 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection -, pcre, itstool +, pcre, itstool, vala }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 - gobjectIntrospection itstool + gobjectIntrospection itstool vala ]; buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dapidocs=false" "-Ddocs=false" + "-Dvapi=true" ]; meta = with stdenv.lib; { From 1ef8646a7322380e02194a7dd26869185c348eda Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 4 Aug 2018 16:16:15 -0400 Subject: [PATCH 176/229] appstream: 0.11.8 -> 0.12.2 --- .../development/libraries/appstream/default.nix | 17 ++++------------- pkgs/development/libraries/appstream/qt.nix | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 264bc0e7345..5e4218852e5 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,36 +1,27 @@ { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection -, pcre, itstool, vala +, pcre, itstool, gperf, vala }: stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.11.8"; + version = "0.12.2"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08"; + sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb"; }; - patches = [ - # drop this in version 0.11.9 and above - (fetchpatch { - name = "define-location-and-soname.patch"; - url = "https://github.com/ximion/appstream/commit/3e58f9c9.patch"; - sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 gobjectIntrospection itstool vala ]; - buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; + buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ]; prePatch = '' substituteInPlace meson.build \ diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index beff83f2365..c5a251cd5f9 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "appstream-qt-${version}"; - inherit (appstream) version src patches prePatch; + inherit (appstream) version src prePatch; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; From 5d95f474d8856d40ba19ef30b3db4c2f9c0da949 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 4 Aug 2018 17:25:42 -0400 Subject: [PATCH 177/229] scour: init at 0.37 --- pkgs/tools/graphics/scour/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/graphics/scour/default.nix diff --git a/pkgs/tools/graphics/scour/default.nix b/pkgs/tools/graphics/scour/default.nix new file mode 100644 index 00000000000..11932aabe0b --- /dev/null +++ b/pkgs/tools/graphics/scour/default.nix @@ -0,0 +1,23 @@ +{ stdenv, python3 }: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "scour"; + version = "0.37"; + + src = fetchPypi { + inherit pname version; + sha256 = "05k1f8i8v7sp5v39lian865vwvapq05a6vmvk7fwnxv8kivi6ccn"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "An SVG Optimizer / Cleaner "; + homepage = https://github.com/scour-project/scour; + license = licenses.asl20; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45acf3cf2d3..56a82812e0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1456,6 +1456,8 @@ with pkgs; parallel-rust = callPackage ../tools/misc/parallel-rust { }; + scour = callPackage ../tools/graphics/scour { }; + s2png = callPackage ../tools/graphics/s2png { }; simg2img = callPackage ../tools/filesystems/simg2img { }; From 4306bc070e0240f278ab4bd5428dc82c9ba2a4ec Mon Sep 17 00:00:00 2001 From: Edmund Wu <22758444+eadwu@users.noreply.github.com> Date: Sat, 4 Aug 2018 18:23:22 -0400 Subject: [PATCH 178/229] yarn: 1.9.2 -> 1.9.4 (#44477) --- pkgs/development/tools/yarn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index bf8dbf671c0..dae90569a90 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.9.2"; + version = "1.9.4"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0bk006zs1bk6nwj9x07ry314fgxi21sk79h1paljbs6yzrv62h4g"; + sha256 = "0lxncqvz66167ijhsi76ds2yp8140d9ywn89y5vm92010irsgs20"; }; buildInputs = [ nodejs ]; From da6cbc3a445b689e0dedc51fe43387e1120bc8b6 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 5 Aug 2018 01:24:13 +0300 Subject: [PATCH 179/229] gutenberg: 0.3.4 -> 0.4.0 (#44475) --- pkgs/applications/misc/gutenberg/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index 8ab84022181..186475e2cd5 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, CoreServices, cf-private }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }: rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "1v26q1m3bx7mdmmwgd6p601ncf13rr4rrx9s06fiy8vnd0ar1vlf"; + sha256 = "1i2jcyq6afswxyjifhl5irv84licsad7c83yiy17454mplvrmyg2"; }; - cargoSha256 = "0cdy0wvibkpnmlqwxvn02a2k2vqy6zdqzflj2dh6g1cjbz1j8qh5"; + cargoSha256 = "0hzxwvb5m8mvpfxys4ikkaag6khflh5bfglmay11wf6ayighv834"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; postInstall = '' From 01eb4cd70e9545ec8f45e519333fe67f3270517c Mon Sep 17 00:00:00 2001 From: markuskowa Date: Sun, 5 Aug 2018 00:25:33 +0200 Subject: [PATCH 180/229] rtl_433: 2018-02-23 -> 18.05 (#44453) --- pkgs/applications/misc/rtl_433/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rtl_433/default.nix b/pkgs/applications/misc/rtl_433/default.nix index 819c6c9391a..7097dda3574 100644 --- a/pkgs/applications/misc/rtl_433/default.nix +++ b/pkgs/applications/misc/rtl_433/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }: stdenv.mkDerivation rec { - version = "2018-02-23"; + version = "18.05"; name = "rtl_433-${version}"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; - rev = "51d275c"; - sha256 = "1j443wmws5xgc18s47bvw3pqljk747izypz52rmlrvs16v96cg2g"; + rev = "18.05"; + sha256 = "0vfhnjyrx6w1m8g1hww5vdz4zgdlhcaps9g0397mxlki4sm77wpc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 221583478973b4de74f14d1063a314aac337daaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Aug 2018 01:17:38 +0200 Subject: [PATCH 181/229] simp_le: use python3Packages (#44476) --- nixos/tests/acme.nix | 4 +++- pkgs/tools/admin/simp_le/default.nix | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 6d728b387e1..c7fd4910e07 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -12,7 +12,9 @@ let ''; }); - pythonPackages = (super.python.override { + # Override certifi so that it accepts fake certificate for Let's Encrypt + # Need to override the attribute used by simp_le, which is python3Packages + python3Packages = (super.python3.override { packageOverrides = lib.const (pysuper: { certifi = pysuper.certifi.overridePythonAttrs (attrs: { postPatch = (attrs.postPatch or "") + '' diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 5ad73d1ce7a..f5be7719d0d 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,10 +1,10 @@ -{ stdenv, pythonPackages, bash }: +{ stdenv, python3Packages, bash }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "simp_le-client"; version = "0.9.0"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "1yxfznd78zkg2f657v520zj5w4dvq5n594d0kpm4lra8xnpg4zcv"; }; @@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec { $out/bin/simp_le --test ''; - propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy idna ]; + propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; meta = with stdenv.lib; { homepage = https://github.com/zenhack/simp_le; From 9104cf1276d39c297ec39dd534ea9299621e4399 Mon Sep 17 00:00:00 2001 From: Imuli Date: Sat, 4 Aug 2018 23:05:50 -0400 Subject: [PATCH 182/229] maintainers: add @imuli --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 119d5b15764..0abe185ebac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1689,6 +1689,11 @@ github = "imalsogreg"; name = "Greg Hale"; }; + imuli = { + email = "i@imu.li"; + github = "imuli"; + name = "Imuli"; + }; infinisil = { email = "infinisil@icloud.com"; github = "infinisil"; From a6e17d6f1171426331f5a3d4b448eac4af6e5fc2 Mon Sep 17 00:00:00 2001 From: Imuli Date: Sat, 4 Aug 2018 23:10:43 -0400 Subject: [PATCH 183/229] idrisPackages.quantities: init at 2018-04-17 --- pkgs/development/idris-modules/default.nix | 2 ++ pkgs/development/idris-modules/quantities.nix | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/idris-modules/quantities.nix diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 25f8dba00b0..0368c00d123 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -153,6 +153,8 @@ protobuf = callPackage ./protobuf.nix {}; + quantities = callPackage ./quantities.nix {}; + rationals = callPackage ./rationals.nix {}; recursion_schemes = callPackage ./recursion_schemes.nix {}; diff --git a/pkgs/development/idris-modules/quantities.nix b/pkgs/development/idris-modules/quantities.nix new file mode 100644 index 00000000000..63cc2184504 --- /dev/null +++ b/pkgs/development/idris-modules/quantities.nix @@ -0,0 +1,22 @@ +{ build-idris-package +, fetchFromGitHub +, lib +}: +build-idris-package { + name = "quantities"; + version = "2018-04-17"; + + src = fetchFromGitHub { + owner = "timjb"; + repo = "quantities"; + rev = "76bb872bd89122043083351993140ae26eb91ead"; + sha256 = "0fv12kdi9089b4kkr6inhqvs2s8x62nv5vqj76wzk8hy0lrzylzj"; + }; + + meta = { + description = "Type-safe physical computations and unit conversions in Idris"; + homepage = https://github.com/timjb/quantities; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ imuli ]; + }; +} From b246709f1b6b14a10fdb9ea21df2c93ce2116e4f Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Sun, 5 Aug 2018 00:13:36 -0700 Subject: [PATCH 184/229] tmuxPlugins: add fzf-tmux-url to the list of plugins --- pkgs/misc/tmux-plugins/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index b29565d01ec..6d8a5a40c16 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -100,6 +100,15 @@ in rec { dependencies = [ pkgs.fpp ]; }; + fzf-tmux-url = buildTmuxPluginFrom2Nix { + pluginName = "fzf-tmux-url"; + src = fetchgit { + url = "https://github.com/wfxr/tmux-fzf-url"; + rev = "ecd518eec1067234598c01e655b048ff9d06ef2f"; + sha256 = "0png8hdv91y2nivq5vdii2192mb2qcrkwwn69lzxrdnbfa27qrgv"; + }; + }; + logging = buildTmuxPluginFrom2Nix { pluginName = "logging"; src = fetchgit { From 25cfc9812ab656abb0a03ca7ff905ce5e5f8956c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Aug 2018 10:03:31 +0300 Subject: [PATCH 185/229] pythonPackages.mozterm: pass pythonPackages.six --- pkgs/development/python-modules/mozterm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mozterm/default.nix b/pkgs/development/python-modules/mozterm/default.nix index 358b21893fa..c7f2b4cbc34 100644 --- a/pkgs/development/python-modules/mozterm/default.nix +++ b/pkgs/development/python-modules/mozterm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six }: buildPythonPackage rec { pname = "mozterm"; @@ -7,6 +7,8 @@ buildPythonPackage rec { # name 'unicode' is not defined disabled = isPy3k; + propagatedBuildInputs = [six]; + src = fetchPypi { inherit pname version; sha256 = "b1e91acec188de07c704dbb7b0100a7be5c1e06567b3beb67f6ea11d00a483a4"; From 2b6e13157f3708738006fde3d1e667b82c33afe9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Aug 2018 10:04:14 +0300 Subject: [PATCH 186/229] pythonPackages.mozlog: fix the hash --- pkgs/development/python-modules/marionette-harness/mozlog.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index ce24fd48dd4..b8d0c077d66 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "af3a3252bc58f8642a641601ba59096c22e4aa49cdc1ed4b0df2314f4f027f0d"; + sha256 = "00x28z6diw06gakb5isbfha5z2n63yyncv4za303nsgzxvlihmx0"; }; propagatedBuildInputs = [ blessings mozterm six ]; From 9ac7ec7fc77b015c49ef4698b78ce0c068b7dabf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Aug 2018 10:14:04 +0300 Subject: [PATCH 187/229] vim_configurable: enable gtk3 GUI; Fixes #44440 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dbb581e94d..2bf290b982a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18787,6 +18787,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin) libobjc cf-private; inherit lua; + guiSupport = "gtk3"; }); vimNox = lowPrio (vim_configurable.override { From 58384b1dd0363964ca4a85325b8609ecaca8c91e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Aug 2018 11:27:35 +0300 Subject: [PATCH 188/229] scilab-bin: 5.5.2 -> 6.0.1 --- pkgs/applications/science/math/scilab-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index ad0231d37b0..dacd3e73073 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -3,7 +3,7 @@ let name = "scilab-bin-${ver}"; - ver = "5.5.2"; + ver = "6.0.1"; majorVer = builtins.elemAt (lib.splitString "." ver) 0; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { url = "https://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz"; sha256 = if stdenv.system == "i686-linux" then - "6143a95ded40411a35630a89b365875a6526cd4db1e2865ac5612929a7db937a" + "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib" else if stdenv.system == "x86_64-linux" then - "c0dd7a5f06ec7a1df7a6b1b8b14407ff7f45e56821dff9b3c46bd09d4df8d350" + "1scswlznc14vyzg0gqa1q9gcpwx05kz1sbn563463mzkdp7nd35d" else badArch; }; From ad377b4cba422e3574dc535581f0aab33049ab3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 15:48:26 +0200 Subject: [PATCH 189/229] svtplay-dl: use python3Packages --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 9ba61221684..e29e799898c 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip +{ stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip , rtmpdump }: let - inherit (pythonPackages) python nose pycrypto requests mock; + inherit (python3Packages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; version = "1.9.11"; From c3266a03a895430cf991dcb2cec0b6c15f0fd382 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 5 Aug 2018 11:39:20 +0200 Subject: [PATCH 190/229] tdesktopPackages.preview: 1.3.11 -> 1.3.12 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index dab23e1cb4a..e1ced2df9f3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,7 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.3.11"; - sha256Hash = "057b7ccba7k2slzbp9xzcs3fni40x7gz3wy13xfgxywr12f04h1r"; + version = "1.3.12"; + sha256Hash = "00z4ljs4fvbk7sf8wv1v50kln26gv8q12x6q41ai9gfzkvq5f69a"; }); } From 30c822189d4a1f2db1a029652e37d6b5f059fd69 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 5 Aug 2018 13:48:14 +0200 Subject: [PATCH 191/229] sage: don't override pari Sage assumes that pari does not use threads. However instead of disabling them at compile time, we can diable them at runtime instead. As a result, sage doesn't need its own version of pari anymore. That means less rebuilds, less complexity and easier debugging. --- .../applications/science/math/sage/default.nix | 16 ++++------------ .../math/sage/patches/pari-no-threads.patch | 18 ++++++++++++++++++ .../science/math/sage/sage-src.nix | 4 ++++ 3 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/science/math/sage/patches/pari-no-threads.patch diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 712c5fe8622..7e62f0cf75e 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -8,10 +8,6 @@ let # https://trac.sagemath.org/ticket/15980 for tracking of python3 support python = nixpkgs.python2.override { packageOverrides = self: super: { - cypari2 = super.cypari2.override { inherit pari; }; - - cysignals = super.cysignals.override { inherit pari; }; - # python packages that appear unmaintained and were not accepted into the nixpkgs # tree because of that. These packages are only dependencies of the more-or-less # deprecated sagenb. However sagenb is still a default dependency and the doctests @@ -24,7 +20,7 @@ let pybrial = self.callPackage ./pybrial.nix {}; sagelib = self.callPackage ./sagelib.nix { - inherit flint ecl pari eclib arb; + inherit flint ecl arb; inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; linbox = nixpkgs.linbox.override { withSage = true; }; }; @@ -38,19 +34,19 @@ let }; env-locations = self.callPackage ./env-locations.nix { - inherit pari_data ecl pari; + inherit pari_data ecl; inherit singular; three = nodePackages_8_x.three; mathjax = nodePackages_8_x.mathjax; }; sage-env = self.callPackage ./sage-env.nix { - inherit sage-src python rWrapper openblas-cblas-pc ecl singular eclib pari palp flint pynac pythonEnv; + inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; sage-with-env = self.callPackage ./sage-with-env.nix { - inherit pari eclib pythonEnv; + inherit pythonEnv; inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig three = nodePackages_8_x.three; @@ -113,8 +109,6 @@ let # *not* to confuse with the python package "pynac" pynac = nixpkgs.pynac.override { inherit singular flint; }; - eclib = nixpkgs.eclib.override { inherit pari; }; - # With openblas (64 bit), the tests fail the same way as when sage is build with # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use @@ -144,8 +138,6 @@ let # https://trac.sagemath.org/ticket/22191 ecl = nixpkgs.ecl_16_1_2; - - pari = nixpkgs.pari.override { withThread = false; }; in python.pkgs.sage-wrapper // { doc = python.pkgs.sagedoc; diff --git a/pkgs/applications/science/math/sage/patches/pari-no-threads.patch b/pkgs/applications/science/math/sage/patches/pari-no-threads.patch new file mode 100644 index 00000000000..13b47dbdd31 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/pari-no-threads.patch @@ -0,0 +1,18 @@ +diff --git a/src/sage/libs/pari/__init__.py b/src/sage/libs/pari/__init__.py +index e451766474..77eda66097 100644 +--- a/src/sage/libs/pari/__init__.py ++++ b/src/sage/libs/pari/__init__.py +@@ -205,6 +205,13 @@ def _get_pari_instance(): + # messages in Sage. + P.default("debugmem", 0) + ++ # Make sure pari doesn't use threads, regardless of how it was compiled. ++ # Threads cause some doctest failures (memory issues). Those could probably ++ # be solved without disabling threads. But that would require figuring out ++ # some sensible values for `threadsizemax`. See ++ # https://pari.math.u-bordeaux.fr/dochtml/html/GP_defaults.html ++ P.default("nbthreads", 1) ++ + return P + + pari = _get_pari_instance() diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index e027dccf0fc..910dd27e48a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -56,6 +56,10 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/25345 # (upstream patch doesn't apply on 8.2 source) ./patches/dochtml-optional.patch + + # work with pari with threads enabled at compile time (disable them at runtime) + # https://trac.sagemath.org/ticket/26002 + ./patches/pari-no-threads.patch ]; packageUpgradePatches = [ From d5eccebda520f6f6f7b155facc343261d06461c1 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 Aug 2018 00:51:30 -0500 Subject: [PATCH 192/229] nixos/manual: wordsmithing on fdb chapter Signed-off-by: Austin Seipp --- .../services/databases/foundationdb.xml | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml index 0b305c3fdf1..f4090c49276 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -14,10 +14,8 @@ Available version(s): 5.1.x, 5.2.x, 6.0.x -FoundationDB (or "FDB") is a distributed, open source, high performance, -transactional key-value store. It can store petabytes of data and deliver -exceptional performance while maintaining consistency and ACID semantics -(serializable transactions) over a large cluster. +FoundationDB (or "FDB") is an open source, distributed, transactional +key-value store.
    Configuring and basic setup @@ -31,7 +29,7 @@ services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x The option is required, -and must always be specified. Because FoundationDB network protocols and +and must always be specified. Due to the fact FoundationDB network protocols and on-disk storage formats may change between (major) versions, and upgrades must be explicitly handled by the user, you must always manually specify this yourself so that the NixOS module will use the proper version. Note that minor, @@ -70,18 +68,17 @@ fdb> -You can also now write programs using the available client libraries. -For example, the following Python program can be run in order to grab the cluster status, -as a quick example. (This example uses nix-shell shebang -support to automatically supply the necessary Python modules). +You can also write programs using the available client libraries. +For example, the following Python program can be run in order to grab the +cluster status, as a quick example. (This example uses +nix-shell shebang support to automatically supply the +necessary Python modules). a@link> cat fdb-status.py #! /usr/bin/env nix-shell #! nix-shell -i python -p python pythonPackages.foundationdb52 -from __future__ import print_function - import fdb import json @@ -340,8 +337,9 @@ only undergone fairly basic testing of all the available functionality. NixOS's FoundationDB module allows you to configure all of the most relevant configuration options for fdbmonitor, matching it -quite closely. For a complete list of all options, check man -configuration.nix. +quite closely. A complete list of options for the FoundationDB module may be +found here. You should +also read the FoundationDB documentation as well.
    From be1124a5377e0fa328d2b1a20ecf5f935037d8f6 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 Aug 2018 08:42:29 -0500 Subject: [PATCH 193/229] nixos/manual: add release note entry for FoundationDB Signed-off-by: Austin Seipp --- nixos/doc/manual/release-notes/rl-1809.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 62aaec4ac5d..be17ec01e19 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -73,6 +73,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull'     + + + There is a new services.foundationdb module for deploying + FoundationDB clusters. + + When enabled the iproute2 will copy the files expected From d80d0bc3d21580ea1d18d6abf713257b60859b48 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 Aug 2018 08:42:58 -0500 Subject: [PATCH 194/229] Revert "nixos/manual: add release note entry for FoundationDB" This reverts commit be1124a5377e0fa328d2b1a20ecf5f935037d8f6. --- nixos/doc/manual/release-notes/rl-1809.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index be17ec01e19..62aaec4ac5d 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -73,12 +73,6 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - - - There is a new services.foundationdb module for deploying - FoundationDB clusters. - - When enabled the iproute2 will copy the files expected From 3dc65650eaf653f71ed1a6b25a0107f4edb2cef0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 Aug 2018 08:42:29 -0500 Subject: [PATCH 195/229] nixos/manual: add release note entry for FoundationDB Signed-off-by: Austin Seipp --- nixos/doc/manual/release-notes/rl-1809.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 62aaec4ac5d..5a445e30ec6 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -73,6 +73,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' + + + There is a new services.foundationdb module for deploying + FoundationDB clusters. + + When enabled the iproute2 will copy the files expected From 9f9e5d4371d37764fce2b0e1f25b8bb564d9d7cd Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 5 Aug 2018 17:20:38 +0300 Subject: [PATCH 196/229] oxipng: 1.0.1 -> 2.1.0 (#44488) --- pkgs/tools/graphics/oxipng/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 21d86f4c44b..4c565e91a4d 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,22 +1,26 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "1.0.1"; + version = "2.1.0"; name = "oxipng-${version}"; src = fetchFromGitHub { owner = "shssoichiro"; repo = "oxipng"; rev = "v${version}"; - sha256 = "0w39f0dhq9cxk25vy0wh8vicxyckvj1vmglx5va4550i3q0hsrws"; + sha256 = "13rzkfb025y4i9dj66fgc74whgs90gyw861dccsj16cpfl6kh5z0"; }; - cargoSha256 = "00nbx6n73yl4ax05pqkmim1vhy0pymgz5la1cc4y18gjbjjj9w4h"; + cargoSha256 = "0l6ad8rnifd5hkv6x2cr0frdddsfwm1xd1v56imlglsjkgz56cva"; meta = with stdenv.lib; { homepage = https://github.com/shssoichiro/oxipng; description = "A lossless PNG compression optimizer"; license = licenses.mit; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; + + # macro is_arm_feature_detected! is unstable + broken = stdenv.isAarch64; }; } From 62d0b676dd242174102cf70f1d9ff5b50a69ce96 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 5 Aug 2018 10:23:31 -0400 Subject: [PATCH 197/229] solargraph: 0.23.3 -> 0.23.6 (#44480) --- .../ruby-modules/solargraph/Gemfile.lock | 10 +++++----- .../ruby-modules/solargraph/gemset.nix | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index b8bf4315c00..54a27076b7d 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -11,22 +11,22 @@ GEM nokogiri (1.8.4) mini_portile2 (~> 2.3.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.1.2) ast (~> 2.4.0) powerpack (0.1.2) rainbow (3.0.0) reverse_markdown (1.1.0) nokogiri - rubocop (0.58.0) + rubocop (0.58.2) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) - solargraph (0.23.3) + solargraph (0.23.6) coderay (~> 1.1) eventmachine (~> 1.2, >= 1.2.5) htmlentities (~> 4.3, >= 4.3.4) @@ -40,7 +40,7 @@ GEM thor (0.20.0) tilt (2.0.8) unicode-display_width (1.4.0) - yard (0.9.14) + yard (0.9.15) PLATFORMS ruby diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index 1205b730f21..f78f359e158 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -76,10 +76,10 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9"; + sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k"; type = "gem"; }; - version = "2.5.1.0"; + version = "2.5.1.2"; }; powerpack = { source = { @@ -110,10 +110,10 @@ dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "091simr4pvxnkm472ixk5lqbnhgznvmhjpjf98ppbx1r68a4mcp3"; + sha256 = "0fc1fw9z98qd91ipsh9hdvpcb401qvkhw518s35l8a67sv4vdnj3"; type = "gem"; }; - version = "0.58.0"; + version = "0.58.2"; }; ruby-progressbar = { source = { @@ -127,10 +127,10 @@ dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1145g6x04fwmg8n51lsk7ybig31scndlj1i2i4lbrj9621bbqxfz"; + sha256 = "01lh5vibr277vhhrgk6zl09ivb262c1qpk54ahzhc40zs309842b"; type = "gem"; }; - version = "0.23.3"; + version = "0.23.6"; }; thor = { source = { @@ -159,9 +159,9 @@ yard = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08kww2m1izjq56q2va2my0x3f3f0xsg6f07b6sgb4nl0scr6y10q"; + sha256 = "145pbc0x95s6x296kh1wp5ykwy6srfcz946dgj83s35g8p52z4q4"; type = "gem"; }; - version = "0.9.14"; + version = "0.9.15"; }; } \ No newline at end of file From f5cf11b2f13bf67e01b65a9a9f0d3413190c235f Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Sun, 5 Aug 2018 16:28:45 +0200 Subject: [PATCH 198/229] openshift: 3.9.0 -> 3.10.0 (#44484) --- .../networking/cluster/openshift/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 6f836d27357..0f137a872da 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -9,15 +9,17 @@ with lib; let - version = "3.9.0"; + version = "3.10.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; - gitCommit = "191fece"; + gitCommit = "dd10d17"; # version is in vendor/k8s.io/kubernetes/pkg/version/base.go - k8sversion = "v1.9.1"; - k8sgitcommit = "a0ce1bc657"; + k8sversion = "v1.10.0"; + k8sgitcommit = "b81c8f8"; + k8sgitMajor = "0"; + k8sgitMinor = "1"; in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; inherit version; @@ -26,7 +28,7 @@ in stdenv.mkDerivation rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78"; + sha256 = "13aglz005jl48z17vnggkvr39l5h6jcqgkfyvkaz4c3jakms1hi9"; }; # go > 1.10 @@ -38,15 +40,15 @@ in stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./hack - substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/clusterup/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/clusterup/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/clusterup/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir' ''; @@ -61,6 +63,8 @@ in stdenv.mkDerivation rec { echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs + echo "KUBE_GIT_MAJOR=${k8sgitMajor}" >> os-version-defs + echo "KUBE_GIT_MINOR=${k8sgitMinor}" >> os-version-defs export OS_VERSION_FILE="os-version-defs" export CC=clang make all WHAT='${concatStringsSep " " components}' From 57d5e2b20d97775be5c3853b0a04096a36ac224c Mon Sep 17 00:00:00 2001 From: Yannik Sander Date: Sun, 5 Aug 2018 16:30:30 +0200 Subject: [PATCH 199/229] atom: fix crash on Glib-GIO-ERROR include gtk3 to fix atom's path such that file open dialogs wont cause atom to crash due to missing GIO files --- pkgs/applications/editors/atom/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 83f0f1e8222..0907c7af27d 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}: +{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, atomEnv, gtk3}: let common = pname: {version, sha256, beta ? null}: @@ -14,7 +14,16 @@ let inherit sha256; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix "PATH" : "${gvfs}/bin" \ + ) + ''; buildCommand = '' mkdir -p $out/usr/ @@ -25,9 +34,6 @@ let rm -r $out/share/lintian rm -r $out/usr/ sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname} - # sed -i "s/'${pname}'/'.${pname}-wrapped'/" $out/bin/${pname} - wrapProgram $out/bin/${pname} \ - --prefix "PATH" : "${gvfs}/bin" fixupPhase From 8a9733361e05d162e80d534543bdf79b27036e5e Mon Sep 17 00:00:00 2001 From: jpathy <15735913+jpathy@users.noreply.github.com> Date: Sun, 5 Aug 2018 14:32:15 +0000 Subject: [PATCH 200/229] ccid: 1.4.27 -> 1.4.29 (#44503) Also update the non-existent homepage and download link. --- pkgs/tools/security/ccid/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 903794622fb..0f515c51804 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.27"; + version = "1.4.29"; name = "ccid-${version}"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/4218/ccid-1.4.27.tar.bz2"; - sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56"; + url = "https://ccid.apdu.fr/files/${name}.tar.bz2"; + sha256 = "0kdqmbma6sclsrbxy9w85h7cs0v11if4nc2r9v09613k8pl2lhx5"; }; postPatch = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ccid drivers for pcsclite"; - homepage = http://pcsclite.alioth.debian.org/; + homepage = https://ccid.apdu.fr/; license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; From bb76f9a210fab5422b2d0e01c306369359eddf9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 5 Aug 2018 15:34:55 +0100 Subject: [PATCH 201/229] atom: gtk3 should be in buildInputs --- pkgs/applications/editors/atom/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 0907c7af27d..bc3f8baf510 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, atomEnv, gtk3}: +{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }: let common = pname: {version, sha256, beta ? null}: @@ -16,6 +16,9 @@ let nativeBuildInputs = [ wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + ]; + + buildInputs = [ gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]; From a3e7fc876ab7412b60ae290f360f2f32854386ff Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Sat, 4 Aug 2018 12:41:04 -0700 Subject: [PATCH 202/229] haskellPackages.llvm-hs: Use LLVM 6 with llvm-hs, don't run tests on Darwin. --- .../haskell-modules/configuration-nix.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a6cfef6f45f..3164d23ca53 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -264,11 +264,13 @@ self: super: builtins.intersectAttrs super { } ); - llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; }; - llvm-hs_6_3_0 = super.llvm-hs_6_3_0.override { - llvm-config = pkgs.llvm_6; - llvm-hs-pure = super.llvm-hs-pure_6_2_1; - }; + llvm-hs = + let dontCheckDarwin = if pkgs.stdenv.isDarwin + then dontCheck + else pkgs.lib.id; + in dontCheckDarwin (super.llvm-hs.override { + llvm-config = pkgs.llvm_6; + }); # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; From cc1d82196c4b8ac1dca0cd134659fd7f8ffd4b14 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 5 Aug 2018 16:48:22 +0200 Subject: [PATCH 203/229] haproxy: 1.8.9 -> 1.8.13 (#44487) The patches previously applied have been included upstream. Upstream changelog (only MAJOR/MEDIUM): 2018/07/30 : 1.8.13 - BUG/MEDIUM: h2: don't accept new streams if conn_streams are still in excess - BUG/MEDIUM: h2: never leave pending data in the output buffer on close - BUG/MEDIUM: h2: make sure the last stream closes the connection after a timeout - BUG/MEDIUM: threads: Fix the exit condition of the thread barrier - BUG/MEDIUM: stream-int: don't immediately enable reading when the buffer was reportedly full - BUG/MEDIUM: stats: don't ask for more data as long as we're responding - BUG/MEDIUM: threads/sync: use sched_yield when available - BUG/MEDIUM: h2: prevent orphaned streams from blocking a connection forever - BUG/MEDIUM: threads: properly fix nbthreads == MAX_THREADS - BUG/MEDIUM: threads: unbreak "bind" referencing an incorrect thread number - MEDIUM: proxy_protocol: Convert IPs to v6 when protocols are mixed 2018/06/27 : 1.8.12 - BUG/MAJOR: stick_table: Complete incomplete SEGV fix 2018/06/26 : 1.8.11 - BUG/MAJOR: Stick-tables crash with segfault when the key is not in the stick-table 2018/06/22 : 1.8.10 - BUG/MEDIUM: spoe: Flags are not encoded in network order - BUG/MEDIUM: contrib/mod_defender: Use network order to encode/decode flags - BUG/MEDIUM: contrib/modsecurity: Use network order to encode/decode flags - BUG/MEDIUM: cache: don't cache when an Authorization header is present - BUG/MEDIUM: dns: Delay the attempt to run a DNS resolution on check failure. - BUG/MEDIUM: fd: Only check update_mask against all_threads_mask. - BUG/MEDIUM: servers: Add srv_addr default placeholder to the state file - BUG/MEDIUM: lua/socket: Length required read doesn't work - BUG/MEDIUM: stick-tables: Decrement ref_cnt in table_* converters - BUG/MEDIUM: spoe: Return an error when the wrong ACK is received in sync mode - BUG/MEDIUM: lua/socket: wrong scheduling for sockets - BUG/MAJOR: lua: Dead lock with sockets - BUG/MEDIUM: lua/socket: Notification error - BUG/MEDIUM: lua/socket: Sheduling error on write: may dead-lock - BUG/MEDIUM: lua/socket: Buffer error, may segfault - MAJOR: spoe: upgrade the SPOP version to 2.0 and remove the support for 1.0 - BUG/MEDIUM: threads: handle signal queue only in thread 0 - BUG/MAJOR: map: fix a segfault when using http-request set-map - BUG/MAJOR: ssl: Random crash with cipherlist capture - BUG/MAJOR: ssl: OpenSSL context is stored in non-reserved memory slot - BUG/MEDIUM: fd: Don't modify the update_mask in fd_dodelete(). - BUG/MEDIUM: threads: Use the sync point to check active jobs and exit --- pkgs/tools/networking/haproxy/default.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 1690d3fcc3e..aa19fdb04de 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,6 +1,6 @@ { useLua ? !stdenv.isDarwin , usePcre ? true -, stdenv, fetchurl, fetchpatch +, stdenv, fetchurl , openssl, zlib, lua5_3 ? null, pcre ? null }: @@ -9,26 +9,14 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "1.8.9"; + version = "1.8.13"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; - sha256 = "00miblgwll3mycsgmp3gd3cn4lwsagxzgjxk5i6csnyqgj97fss3"; + sha256 = "2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1"; }; - patches = [ - (fetchpatch { - name = "CVE-2018-11469.patch"; - url = "https://git.haproxy.org/?p=haproxy-1.8.git;a=patch;h=17514045e5d934dede62116216c1b016fe23dd06"; - sha256 = "0hzcvghg8qz45n3mrcgsjgvrvicvbvm52cc4hs5jbk1yb50qvls7"; - }) - ] ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { - name = "fix-darwin-no-threads-build.patch"; - url = "https://git.haproxy.org/?p=haproxy-1.8.git;a=patch;h=fbf09c441a4e72c4a690bc7ef25d3374767fe5c5;hp=3157ef219c493f3b01192f1b809a086a5b119a1e"; - sha256 = "16ckzb160anf7xih7mmqy59pfz8sdywmyblxnr7lz9xix3jwk55r"; - }); - buildInputs = [ openssl zlib ] ++ stdenv.lib.optional useLua lua5_3 ++ stdenv.lib.optional usePcre pcre; From 34c2f4150bfed4a5aa48b89f3562e2fddc393cf7 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 5 Aug 2018 16:44:30 +0200 Subject: [PATCH 204/229] libbraiding: init at 1.0 libbraiding is a new standard package for sage. See https://trac.sagemath.org/ticket/25705 --- .../science/math/libbraiding/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/science/math/libbraiding/default.nix diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix new file mode 100644 index 00000000000..be650f3c3ce --- /dev/null +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + version = "1.0"; + name = "libbraiding-${version}"; + + src = fetchFromGitHub { + owner = "miguelmarco"; + repo = "libbraiding"; + rev = version; + sha256 = "0l68rikfr7k2l547gb3pp3g8cj5zzxwipm79xrb5r8ffj466ydxg"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + # no tests included for now (2018-08-05), but can't hurt to activate + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/miguelmarco/libbraiding/; + description = "C++ library for computations on braid groups"; + longDescription = '' + A library to compute several properties of braids, including centralizer and conjugacy check. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5474ef98e58..a8eb4aadce6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20500,6 +20500,7 @@ with pkgs; jags = callPackage ../applications/science/math/jags { }; + libbraiding = callPackage ../development/libraries/science/math/libbraiding { }; # We have essentially 4 permutations of liblapack: version 3.4.1 or 3.5.0, # and with or without atlas as a dependency. The default `liblapack` is 3.4.1 From aabc55e154f54ca8b5599ec6075b5b3cf1e32999 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 5 Aug 2018 16:46:08 +0200 Subject: [PATCH 205/229] libhomfly: init at 1.02r5 libhomfly is a new standard package for sage. See https://trac.sagemath.org/ticket/25705 --- .../science/math/libhomfly/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/science/math/libhomfly/default.nix diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix new file mode 100644 index 00000000000..e96ee475d7d --- /dev/null +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, boehmgc +}: + +stdenv.mkDerivation rec { + version = "1.02r5"; + name = "llibhomfly-${version}"; + + src = fetchFromGitHub { + owner = "miguelmarco"; + repo = "libhomfly"; + rev = version; + sha256 = "1szv8iwlhvmy3saigi15xz8vgch92p2lbsm6440v5s8vxj455bvd"; + }; + + buildInputs = [ + boehmgc + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://github.com/miguelmarco/libhomfly/; + description = "Library to compute the homfly polynomial of knots and links"; + license = licenses.unlicense; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8eb4aadce6..701d72d7072 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20502,6 +20502,8 @@ with pkgs; libbraiding = callPackage ../development/libraries/science/math/libbraiding { }; + libhomfly = callPackage ../development/libraries/science/math/libhomfly { }; + # We have essentially 4 permutations of liblapack: version 3.4.1 or 3.5.0, # and with or without atlas as a dependency. The default `liblapack` is 3.4.1 # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 From 8910795eee38963d97a637a159e209617c41905b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 5 Aug 2018 18:02:40 +0200 Subject: [PATCH 206/229] ejabberd: 18.01 -> 18.06 (#44158) ejabberd switched from imagemagick to eimp, which loads libpng, libjpeg and libwebp at runtime. These were therefore added as dependencies and the relevant binary was wrapped to be able to find them. --- pkgs/servers/xmpp/ejabberd/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 6a0bedeab26..1436af024cd 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScriptBin, lib, fetchurl, git, cacert +{ stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd , flock , withMysql ? false @@ -24,17 +24,17 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "18.01"; + version = "18.06"; name = "ejabberd-${version}"; src = fetchurl { url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "01i2n8mlgw293jdf4172f9q8ca8m35vysjws791p7nynpfdb4cn6"; + sha256 = "1c4h6qrckihm8v4vm52h31j5dxg7247vk374rwz41idfb25vx7dc"; }; nativeBuildInputs = [ fakegit ]; - buildInputs = [ erlang openssl expat libyaml gd ] + buildInputs = [ erlang openssl expat libyaml gd makeWrapper ] ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1v3h0c7kfifb6wsfxyv5j1wc7rlxbb7r0pgd4s340wiyxnllzzhk"; + outputHash = "1bk3yd10cq6vlgmh2qawl82m29yi5zcbsdlz17xyy76sg2ka622a"; }; configureFlags = @@ -106,6 +106,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *JOT=\).*,\1,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl + wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpng libjpeg libwebp ]}" ''; meta = with stdenv.lib; { From bf1473f5e099b57b2363e97e680b36988a5de4f8 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 5 Aug 2018 18:17:27 +0200 Subject: [PATCH 207/229] haproxy: use getaddrinfo() on Linux (#44489) As per project's README: > Recent systems can resolve IPv6 host names using getaddrinfo(). This > primitive is not present in all libcs and does not work in all of > them either. Support in glibc was broken before 2.3. Some embedded > libs may not properly work either, thus, support is disabled by > default, meaning that some host names which only resolve as IPv6 > addresses will not resolve and configs might emit an error during > parsing. If you know that your OS libc has reliable support for > getaddrinfo(), you can add USE_GETADDRINFO=1 on the make command > line to enable it. This is the recommended option for most Linux > distro packagers since it's working fine on all recent mainstream > distros. It is automatically enabled on Solaris 8 and above, as it's > known to work. Without this option, it is not possible for HAProxy to solve IPv6-only names. This option is enabled in Debian builds without any notable adverse effect. --- pkgs/tools/networking/haproxy/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index aa19fdb04de..8f72976d7dc 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation rec { "USE_LUA=yes" "LUA_LIB=${lua5_3}/lib" "LUA_INC=${lua5_3}/include" - ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc"; + ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc" + ++ stdenv.lib.optional stdenv.isLinux "USE_GETADDRINFO=1"; meta = { description = "Reliable, high performance TCP/HTTP load balancer"; From 4082e94b5c1028986d80a392c5a4a9ccae3eab4c Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Sun, 5 Aug 2018 18:19:42 +0200 Subject: [PATCH 208/229] shotcut: 18.06.02 -> 18.08 (#44463) and fix SHOTCUT_VERSION --- pkgs/applications/video/shotcut/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 0df5d42ee0e..950cd27937c 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase , qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols , qtgraphicaleffects, libmlt -, qmake, makeWrapper, fetchpatch, qttools }: +, qmake, makeWrapper, qttools }: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.06.02"; + version = "18.08"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1pqpgsb8ix1akq326chf46vvl5h02dwmdskskf2n6impygsy4x7v"; + sha256 = "1p2s4avm3bl5ippmgfzkkbb2w0xs4vhk2wbcd22g7bh1zq9w190n"; }; enableParallelBuilding = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; - qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ]; + qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" ]; prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp @@ -35,12 +35,6 @@ stdenv.mkDerivation rec { sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp ''; - patches = [ (fetchpatch { - url = https://github.com/mltframework/shotcut/commit/f304b7403cc7beb57b1610afd9c5c8173749e80b.patch; - name = "qt511.patch"; - sha256 = "1ynvyjchcb33a33x4w1ddnah2gyzmnm125ailgg6xy60lqsnsmp9"; - } ) ]; - postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ From 0a44ff7676989be29a54d3ecf0d035eb7b0975b8 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 11 Jul 2018 23:02:19 +0200 Subject: [PATCH 209/229] cddlib: 0.94i -> 0.94j cddlib was autotoolized, incorporated equivalents to the sage patches and moved to GitHub. --- .../science/math/sage/sage-src.nix | 7 +++ pkgs/development/libraries/cddlib/default.nix | 54 ++++++------------- 2 files changed, 23 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index e027dccf0fc..6cb58754835 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -118,6 +118,13 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa"; sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb"; }) + + # cddlib 0.94i -> 0.94j + (fetchpatch { + name = "cddlib-0.94j.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=2ab1546b3e21d1d0ab3b4fcd58576848b3a2d888"; + sha256 = "1c5gnasq7y9xxj762bn79bis0zi8d9bgg7jzlf64ifixsrc5cymb"; + }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index ee56b50e1da..058ee893c37 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -1,55 +1,33 @@ { stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub , gmp , autoreconfHook +, texlive }: stdenv.mkDerivation rec { name = "cddlib-${version}"; - version = "0.94i"; - src = let - fileVersion = stdenv.lib.replaceStrings ["."] [""] version; - in fetchurl { - # Might switch to github in the future, see - # https://trac.sagemath.org/ticket/21952#comment:20 - urls = [ - "http://archive.ubuntu.com/ubuntu/pool/universe/c/cddlib/cddlib_${fileVersion}.orig.tar.gz" - "ftp://ftp.math.ethz.ch/users/fukudak/cdd/cddlib-${fileVersion}.tar.gz" - ]; - sha256 = "00zdgiqb91vx6gd2103h3ijij0llspsxc6zz3iw2bll39fvkl4xq"; + version = "0.94j"; + src = fetchFromGitHub { + owner = "cddlib"; + repo = "cddlib"; + rev = "${version}"; + sha256 = "1z03ljy3rrr0qq5gq54vynnif6fn0xhn05g90nnv0dpyc3ps8lzp"; }; buildInputs = [gmp]; nativeBuildInputs = [ autoreconfHook + texlive.combined.scheme-small # for building the documentation ]; - # compute reduced H and V representation of polytope - # this patch is included by most distributions (Debian, Conda, ArchLinux, SageMath) - # proposed upstream (no answer yet): https://github.com/cddlib/cddlib/pull/3 - both_reps_c = (fetchurl { - name = "cdd_both_reps.c"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cdd_both_reps.c?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; - sha256 = "0r9yc5bgiz8i72c6vsn2y2mjk5581iw94gji9v7lg16kzzgrk9x0"; - }); - preAutoreconf = '' - # Required by sage.geometry.polyhedron - cp ${both_reps_c} src/cdd_both_reps.c - cp ${both_reps_c} src-gmp/cdd_both_reps.c - ''; - patches = [ - # add the cdd_both_reps binary - (fetchpatch { - name = "add-cdd_both_reps-binary.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch?id=78e3a61a68c916450aa4e5ceecd20041583af901"; - sha256 = "162ni2fr7dpbdkz0b5nizxq7qr5k1i1d75g0smiylpzfb0hb761a"; - }) - ]; - meta = { + # No actual checks yet (2018-05-05), but maybe one day. + # Requested here: https://github.com/cddlib/cddlib/issues/25 + doCheck = true; + meta = with stdenv.lib; { inherit version; description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [raskin timokau]; + platforms = platforms.linux; homepage = https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html; }; } From 0395260a0baf8a2969085ea9470a7fcc16188f62 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 3 Aug 2018 09:28:54 -0500 Subject: [PATCH 210/229] tex-gyre: remove unused displayName argument --- pkgs/data/fonts/tex-gyre/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index a801886350d..3229e58506d 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -34,56 +34,48 @@ let }; in stdenv.lib.mapAttrs mkVariant { adventor = { - displayName = "Adventor"; version = "2_501"; sha256 = "0qjg3x0adfppyx3x33cm07ww9i9sl88xaq07m7wfip8rmyp567fn"; outputHash = "117h6f02m1r54b4f1a98q5kkjchl5pv9ibm1jla6xrzhk2pchb27"; abbreviation = "qag"; }; bonum = { - displayName = "Bonum"; version = "2.004"; sha256 = "0qbrs98knx4h0b297c5n3vav4mkal1a95ai2dzmdc10pghfzl8vv"; outputHash = "0bid8gzwz50ylmm8jyqf9s4nfvy6cp1x34wbyrh4gyk1ki6hf3z1"; abbreviation = "qbk"; }; chorus = { - displayName = "Chorus"; version = "2.003"; sha256 = "1b0zak27fzmapwbf2jasvsd95vhnqyc92n985d1lc1ivwja1zgfa"; outputHash = "0fqifd45c1ys6y98b66lmldfbv7wjb2414fs9swicv4n7xvl3cp1"; abbreviation = "qzc"; }; cursor = { - displayName = "Cursor"; version = "2.004"; sha256 = "0ck3jm33bk2xsxp5d2irzd3j24zb49f0gnjvd1nikg1ivk8w85ng"; outputHash = "0i76835xqlkrnlx303mx63m0f4899j056c2ag2fl6p9qk8s4rskp"; abbreviation = "qcr"; }; heros = { - displayName = "Heros"; version = "2.004"; sha256 = "1fj2srxxf6ap913y5yd3dn4jzg828j7381gifs39nm5lnzmgw78y"; outputHash = "16y76ab46fxm9k8wfmwx4w0cl96yrmjywz587lyr08s0agp1v3kf"; abbreviation = "qhv"; }; pagella = { - displayName = "Pagella"; version ="2_501"; sha256 = "1kccaxs3vk93la2pz4nv05hx1x3diyla49cz4l33zifdcp2zgg9d"; outputHash = "1nnjsgplimh29502pkd19rvfg93x31svxxmx4x7h51njrx1j8qa8"; abbreviation = "qpl"; }; schola = { - displayName = "Schola"; version = "2.005"; sha256 = "05z3gk4mm0sa7wwjcv31j2xlzqhwhcncpamn0kn9y0221cdknyp8"; outputHash = "1yqq1ngcylhldrh1v35l439k72szq9m4gx6g0wh235fk65chb2bm"; abbreviation = "qcs"; }; termes = { - displayName = "Termes"; version = "2.004"; sha256 = "1aq3yqbgkc3z20dkcqyhicsyq0afbgg4l397z96sd8a16jyz2x8k"; outputHash = "1igw821m601h8937pix6yish4d8fxmz3h4j9hripf41bxsiafzzg"; From 6a1148997a1d45dda455db83dfac7d57ab5aa357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 5 Aug 2018 20:14:27 +0200 Subject: [PATCH 211/229] exiv2.meta.license: add --- pkgs/development/libraries/exiv2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index b549c74540c..f573a275aaa 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -46,9 +46,10 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ zlib expat ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.exiv2.org/; description = "A library and command-line utility to manage image metadata"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.gpl2; }; } From 4a044699ae92a5f86d992825b4d60665948c85ea Mon Sep 17 00:00:00 2001 From: Joseph Lukasik Date: Wed, 18 Jul 2018 23:27:22 -0700 Subject: [PATCH 212/229] urbit: 0.4.5 -> 0.6.0 Following https://urbit.org/docs/using/install/ --- pkgs/misc/urbit/default.nix | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index df13c15562d..41b5b3b92e6 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, gcc, gmp, libsigsegv, openssl, automake, autoconf, ragel, - cmake, re2c, libtool, ncurses, perl, zlib, python2, curl }: +{ autoconf, automake, cmake, curl, fetchFromGitHub, gcc, git, gmp, libsigsegv, + libtool, meson, ncurses, ninja, openssl, pkgconfig, python2, ragel, re2c, + stdenv, zlib }: stdenv.mkDerivation rec { name = "urbit-${version}"; - version = "0.4.5"; + version = "0.6.0"; src = fetchFromGitHub { owner = "urbit"; repo = "urbit"; - rev = "v${version}"; - sha256 = "1zgxgqbz74nsgfyrvsnjj6xxpb64mrnby7bb5qy733sy04gmzgik"; + rev = "urbit-${version}"; + sha256 = "158mz6c6y5z1b6piid8hvrl5mcqh8q1ny185gz51jayia51azmgs"; + fetchSubmodules = true; }; buildInputs = with stdenv.lib; [ - gcc gmp libsigsegv openssl automake autoconf ragel cmake re2c libtool - ncurses perl zlib python2 curl + autoconf automake cmake curl gcc git gmp libsigsegv libtool + meson ncurses ninja openssl pkgconfig python2 ragel re2c zlib ]; # uses 'readdir_r' deprecated by glibc 2.24 @@ -24,12 +26,16 @@ stdenv.mkDerivation rec { : ''; + postPatch = '' + patchShebangs . + substituteInPlace scripts/build --replace 'meson .' 'meson --prefix $out .' + ''; + buildPhase = '' - sed -i 's/-lcurses/-lncurses/' Makefile - mkdir -p $out - cp -r . $out/ - cd $out - make + git init . + ./scripts/bootstrap + ./scripts/build + ninja -C ./build/ install ''; installPhase = '' From 26875910cb53541f0ae66babcf7b2c44b37a2ee5 Mon Sep 17 00:00:00 2001 From: Joseph Lukasik Date: Thu, 26 Jul 2018 13:01:26 -0700 Subject: [PATCH 213/229] urbit: Don't use bootstrap scripts, no buildPhase Incorporating feedback from https://github.com/nixos/nixpkgs/pull/43799 Also cleaned up some cruft from previous versions that didn't build with Meson/Ninja. --- pkgs/misc/urbit/default.nix | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 41b5b3b92e6..4fa62272724 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,6 +1,5 @@ -{ autoconf, automake, cmake, curl, fetchFromGitHub, gcc, git, gmp, libsigsegv, - libtool, meson, ncurses, ninja, openssl, pkgconfig, python2, ragel, re2c, - stdenv, zlib }: +{ curl, fetchFromGitHub, gcc, git, gmp, libsigsegv, meson, ncurses, ninja, + openssl, pkgconfig, re2c, stdenv, zlib }: stdenv.mkDerivation rec { name = "urbit-${version}"; @@ -14,33 +13,22 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ pkgconfig ninja meson ]; + buildInputs = with stdenv.lib; [ - autoconf automake cmake curl gcc git gmp libsigsegv libtool - meson ncurses ninja openssl pkgconfig python2 ragel re2c zlib + curl gcc git gmp libsigsegv ncurses openssl re2c zlib ]; # uses 'readdir_r' deprecated by glibc 2.24 NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - configurePhase = '' - : - ''; - postPatch = '' patchShebangs . - substituteInPlace scripts/build --replace 'meson .' 'meson --prefix $out .' ''; - buildPhase = '' - git init . - ./scripts/bootstrap - ./scripts/build - ninja -C ./build/ install - ''; - - installPhase = '' - : - ''; + mesonFlags = [ + "--buildtype=release" + ]; meta = with stdenv.lib; { description = "An operating function"; From 93a056993f79c62f9e5e27a895462353bdd7d59e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 5 Aug 2018 20:03:55 +0200 Subject: [PATCH 214/229] urbit: clean-up --- pkgs/misc/urbit/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 4fa62272724..e356e83436d 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -1,5 +1,6 @@ -{ curl, fetchFromGitHub, gcc, git, gmp, libsigsegv, meson, ncurses, ninja, - openssl, pkgconfig, re2c, stdenv, zlib }: +{ stdenv, fetchFromGitHub, curl, git, gmp, libsigsegv, meson, ncurses, ninja +, openssl, pkgconfig, re2c, zlib +}: stdenv.mkDerivation rec { name = "urbit-${version}"; @@ -14,22 +15,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ninja meson ]; - - buildInputs = with stdenv.lib; [ - curl gcc git gmp libsigsegv ncurses openssl re2c zlib - ]; - - # uses 'readdir_r' deprecated by glibc 2.24 - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + buildInputs = [ curl git gmp libsigsegv ncurses openssl re2c zlib ]; postPatch = '' patchShebangs . ''; - mesonFlags = [ - "--buildtype=release" - ]; - meta = with stdenv.lib; { description = "An operating function"; homepage = https://urbit.org; From 76a713bd299ff9bd63880c4be25a8335f5082322 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 5 Aug 2018 14:41:59 -0400 Subject: [PATCH 215/229] sharutils: Patch CVE-2018-1000097 --- pkgs/tools/archivers/sharutils/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 907ac58d15f..292c0be20e5 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { # remaps /etc/passwd to a trivial file, but we can't do that on Darwin so I do this # instead. In this case, I pass in the very imaginative "submitter" as the submitter name - patchPhase = let + patches = [ + # CVE-2018-1000097 + (fetchurl { + url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-2+deb9u1/debian/patches/01-fix-heap-buffer-overflow-cve-2018-1000097.patch"; + sha256 = "19g0sxc8g79aj5gd5idz5409311253jf2q8wqkasf0handdvsbxx"; + }) + ]; + + postPatch = let # This evaluates to a string containing: # # substituteInPlace tests/shar-2 --replace '${SHAR}' '${SHAR} -s submitter' From e91360066e87b7b8ea9e692a80fb11f05413165c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 5 Aug 2018 15:00:55 -0400 Subject: [PATCH 216/229] antibody: 3.5.1 -> 3.6.1 (#44481) --- pkgs/shells/zsh/antibody/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 98ca9ce8f99..60304531bfb 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,16 +2,16 @@ buildGoPackage rec { name = "antibody-${version}"; - version = "3.5.1"; + version = "3.6.1"; rev = "v${version}"; - + goPackagePath = "github.com/getantibody/antibody"; src = fetchFromGitHub { inherit rev; owner = "getantibody"; repo = "antibody"; - sha256 = "0bqq59vnnm80jiqlhn7wfyzj96nkv8k9zp8i4sgcj8gvk1zq2lbc"; + sha256 = "1xlaf3440hs1ffa23ja0fc185sj0rxjv0808ib8li3rq2qfkd0k8"; }; goDeps = ./deps.nix; From ec7865cddc72f8d8940c613283b0a3b2976d7025 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 5 Aug 2018 19:14:55 +0000 Subject: [PATCH 217/229] compcert: 3.2 -> 3.3 (#44512) --- pkgs/development/compilers/compcert/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 51392e23d8c..631179c483b 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , coq, ocamlPackages , tools ? stdenv.cc }: @@ -7,11 +7,11 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "3.2"; + version = "3.3"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "11q4121s0rxva63njjwya7syfx9w0p4hzr6avh8s57vfbrcakc93"; + sha256 = "16xrqcwak1v1fk5ndx6jf1yvxv3adsr7p7z34gfm2mpggxnq0xwn"; }; buildInputs = [ coq ] @@ -19,9 +19,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postPatch = '' - sed -i -e 's/8\.6\.1|8\.7\.0|8\.7\.1)/8.6.1|8.7.0|8.7.1|8.7.2)/' configure - ''; + patches = [ (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/679ecfeaa24c0615fa1999e9582bf2af6a9f35e7.patch"; + sha256 = "04yrn6dp57aw6lmlr4yssjlx9cxix0mlmaw7gfhwyz5bzqc2za1a"; + })]; configurePhase = '' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' From 2da02088f7596237ceb84d49a18c8cad52c8efa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 5 Aug 2018 21:24:56 +0200 Subject: [PATCH 218/229] prototypejs: Init at 1.7.3.0 (#44428) --- .../libraries/prototypejs/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/prototypejs/default.nix diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix new file mode 100644 index 00000000000..a56b14384e5 --- /dev/null +++ b/pkgs/development/libraries/prototypejs/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, ... }: +let + version = "1.7.3.0"; +in fetchurl { + name = "prototype-${version}.js"; + url = "https://ajax.googleapis.com/ajax/libs/prototype/${version}/prototype.js"; + sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26"; + + meta = with stdenv.lib; { + description = "A foundation for ambitious web user interfaces"; + longDescription = '' + Prototype takes the complexity out of client-side web + programming. Built to solve real-world problems, it adds + useful extensions to the browser scripting environment + and provides elegant APIs around the clumsy interfaces + of Ajax and the Document Object Model. + ''; + homepage = http://prototypejs.org/; + downloadPage = http://prototypejs.org/download/; + license = licenses.mit; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09ee4454fe2..20199eb9fbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4684,6 +4684,8 @@ with pkgs; proot = callPackage ../tools/system/proot { }; + prototypejs = callPackage ../development/libraries/prototypejs { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; From 66742ff4956a3371363cddc9985153cdb42cb5bb Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 5 Aug 2018 19:45:51 +0000 Subject: [PATCH 219/229] biber: cleanup --- pkgs/tools/typesetting/biber/default.nix | 23 ++++++++--------------- pkgs/top-level/all-packages.nix | 12 +----------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index c9280c102b7..d19838f9ff0 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,16 +1,9 @@ -{ stdenv, fetchFromGitHub, buildPerlModule, autovivification, BusinessISBN -, BusinessISMN, BusinessISSN, ConfigAutoConf, DataCompare, DataDump, DateSimple -, DateTime, DateTimeFormatBuilder, DateTimeCalendarJulian -, EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder -, FileSlurp, FileWhich, IPCRun3, LogLog4perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils -, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate -, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor -, TextCSV, TextCSV_XS, TextRoman, DataUniqid, LinguaTranslit, UnicodeNormalize, SortKey -, TestDifferences }: +{ stdenv, fetchFromGitHub, perlPackages }: -buildPerlModule rec { +perlPackages.buildPerlModule rec { name = "biber-${version}"; version = "2.7"; + src = fetchFromGitHub { owner = "plk"; repo = "biber"; @@ -18,7 +11,7 @@ buildPerlModule rec { sha256 = "04jmsh59g2s0b61rm25z0hwb6yliqyh5gjs4y74va93d2b9mrd17"; }; - buildInputs = [ + buildInputs = with perlPackages; [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K DateTime DateTimeFormatBuilder DateTimeCalendarJulian @@ -32,10 +25,10 @@ buildPerlModule rec { # Tests depend on the precise Unicode-Collate version (expects 1.19, but we have 1.25) doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Backend for BibLaTeX"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09ee4454fe2..a706c34d5d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1607,17 +1607,7 @@ with pkgs; bgs = callPackage ../tools/X11/bgs { }; - biber = callPackage ../tools/typesetting/biber { - inherit (perlPackages) buildPerlModule - autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf - DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K - DateTime DateTimeFormatBuilder DateTimeCalendarJulian - ExtUtilsLibBuilder FileSlurp FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils - ListMoreUtils MozillaCA ReadonlyXS RegexpCommon TextBibTeX - UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter - ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit UnicodeNormalize SortKey - TestDifferences; - }; + biber = callPackage ../tools/typesetting/biber { }; blueman = callPackage ../tools/bluetooth/blueman { withPulseAudio = config.pulseaudio or true; From 8dc20dce0a18b0e76e56f20ba9cc21efbc0e09ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Aug 2018 22:13:16 +0200 Subject: [PATCH 220/229] home-assistant: 0.74.2 -> 0.75.1 (#44500) --- .../home-assistant/component-packages.nix | 18 +++++++++++++++++- pkgs/servers/home-assistant/default.nix | 19 ++++++++++++++----- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5f41dbbdfa1..0d140387e4e 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.74.2"; + version = "0.75.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -47,6 +47,7 @@ "august" = ps: with ps; [ ]; "auth" = ps: with ps; [ aiohttp-cors ]; "auth.indieauth" = ps: with ps; [ ]; + "auth.login_flow" = ps: with ps; [ ]; "automation" = ps: with ps; [ ]; "automation.event" = ps: with ps; [ ]; "automation.homeassistant" = ps: with ps; [ ]; @@ -128,6 +129,7 @@ "binary_sensor.skybell" = ps: with ps; [ ]; "binary_sensor.sleepiq" = ps: with ps; [ ]; "binary_sensor.spc" = ps: with ps; [ ]; + "binary_sensor.tahoma" = ps: with ps; [ ]; "binary_sensor.tapsaff" = ps: with ps; [ ]; "binary_sensor.tcp" = ps: with ps; [ ]; "binary_sensor.tellduslive" = ps: with ps; [ ]; @@ -225,10 +227,12 @@ "climate.proliphix" = ps: with ps; [ ]; "climate.radiotherm" = ps: with ps; [ ]; "climate.sensibo" = ps: with ps; [ ]; + "climate.spider" = ps: with ps; [ ]; "climate.tado" = ps: with ps; [ ]; "climate.tesla" = ps: with ps; [ ]; "climate.toon" = ps: with ps; [ ]; "climate.touchline" = ps: with ps; [ ]; + "climate.tuya" = ps: with ps; [ ]; "climate.venstar" = ps: with ps; [ ]; "climate.vera" = ps: with ps; [ ]; "climate.wink" = ps: with ps; [ ]; @@ -259,6 +263,8 @@ "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; "cover.abode" = ps: with ps; [ ]; + "cover.aladdin_connect" = ps: with ps; [ ]; + "cover.brunt" = ps: with ps; [ ]; "cover.command_line" = ps: with ps; [ ]; "cover.demo" = ps: with ps; [ ]; "cover.garadget" = ps: with ps; [ ]; @@ -282,6 +288,7 @@ "cover.tellduslive" = ps: with ps; [ ]; "cover.tellstick" = ps: with ps; [ ]; "cover.template" = ps: with ps; [ ]; + "cover.tuya" = ps: with ps; [ ]; "cover.velbus" = ps: with ps; [ ]; "cover.vera" = ps: with ps; [ ]; "cover.wink" = ps: with ps; [ ]; @@ -375,6 +382,7 @@ "fan.isy994" = ps: with ps; [ ]; "fan.mqtt" = ps: with ps; [ paho-mqtt ]; "fan.template" = ps: with ps; [ ]; + "fan.tuya" = ps: with ps; [ ]; "fan.velbus" = ps: with ps; [ ]; "fan.wink" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ construct ]; @@ -482,6 +490,7 @@ "light.enocean" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ]; + "light.futurenow" = ps: with ps; [ ]; "light.greenwave" = ps: with ps; [ ]; "light.group" = ps: with ps; [ ]; "light.hive" = ps: with ps; [ ]; @@ -518,6 +527,7 @@ "light.rpi_gpio_pwm" = ps: with ps; [ ]; "light.scsgate" = ps: with ps; [ ]; "light.sensehat" = ps: with ps; [ ]; + "light.sisyphus" = ps: with ps; [ ]; "light.skybell" = ps: with ps; [ ]; "light.tellduslive" = ps: with ps; [ ]; "light.tellstick" = ps: with ps; [ ]; @@ -620,6 +630,7 @@ "media_player.russound_rio" = ps: with ps; [ ]; "media_player.russound_rnet" = ps: with ps; [ ]; "media_player.samsungtv" = ps: with ps; [ wakeonlan ]; + "media_player.sisyphus" = ps: with ps; [ ]; "media_player.snapcast" = ps: with ps; [ ]; "media_player.songpal" = ps: with ps; [ ]; "media_player.sonos" = ps: with ps; [ soco ]; @@ -770,6 +781,7 @@ "scene.litejet" = ps: with ps; [ ]; "scene.lutron_caseta" = ps: with ps; [ ]; "scene.tahoma" = ps: with ps; [ ]; + "scene.tuya" = ps: with ps; [ ]; "scene.velux" = ps: with ps; [ ]; "scene.vera" = ps: with ps; [ ]; "scene.wink" = ps: with ps; [ ]; @@ -896,6 +908,7 @@ "sensor.loopenergy" = ps: with ps; [ ]; "sensor.luftdaten" = ps: with ps; [ luftdaten ]; "sensor.lyft" = ps: with ps; [ ]; + "sensor.magicseaweed" = ps: with ps; [ ]; "sensor.melissa" = ps: with ps; [ ]; "sensor.metoffice" = ps: with ps; [ ]; "sensor.mfi" = ps: with ps; [ ]; @@ -1048,6 +1061,7 @@ "shell_command" = ps: with ps; [ ]; "shiftr" = ps: with ps; [ paho-mqtt ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; + "sisyphus" = ps: with ps; [ ]; "skybell" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; @@ -1055,6 +1069,7 @@ "sonos" = ps: with ps; [ soco ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ websockets ]; + "spider" = ps: with ps; [ ]; "splunk" = ps: with ps; [ ]; "statsd" = ps: with ps; [ statsd ]; "sun" = ps: with ps; [ ]; @@ -1128,6 +1143,7 @@ "switch.skybell" = ps: with ps; [ ]; "switch.smappee" = ps: with ps; [ ]; "switch.snmp" = ps: with ps; [ pysnmp ]; + "switch.spider" = ps: with ps; [ ]; "switch.tahoma" = ps: with ps; [ ]; "switch.tellduslive" = ps: with ps; [ ]; "switch.tellstick" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 700f8ed7862..643b0d70a26 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3 +{ lib, fetchFromGitHub, fetchpatch, python3 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [] @@ -29,10 +29,10 @@ let }; }); voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { - version = "0.11.1"; + version = "0.11.5"; src = oldAttrs.src.override { inherit version; - sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918"; + sha256 = "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef"; }; }); attrs = super.attrs.overridePythonAttrs (oldAttrs: rec { @@ -74,7 +74,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.74.2"; + hassVersion = "0.75.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -89,7 +89,16 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "02wdvkcl4zjw009a5ylblk5blpf5rhlvch8vsg4cx07sj9xgjzmw"; + sha256 = "1slm2r48yh4l57wnvalin6mnk3id2phsaqpd4qy0c0ksqc61ffqk"; + }; + + # Upgrade voluptuous to 0.11.5 + # Needed because voluptuous-0.11.3 requires pypandoc + # See https://github.com/home-assistant/home-assistant/pull/15830#issuecomment-410485197 + patches = fetchpatch { + name = "upgrade-voluptuous.patch"; + url = https://github.com/home-assistant/home-assistant/commit/9ea3be4dc112fb45544fa089cb367c7f4f91b5f0.patch; + sha256 = "0wacs9aifdysw6jpz86d6cqah8spi48pwwcbydj9l8zxndzqp6na"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 4a4201b6733..864a91683ee 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180720.0"; + version = "20180804.0"; src = fetchPypi { inherit pname version; - sha256 = "4a9d570cfc1d6b0e4b914897197d6772d48aa38b10202a648e79c5fb2a6a0293"; + sha256 = "50a9e74efe2b56fbc34fba07205829e0ea77315183e85c235d177cabff3b62ee"; }; propagatedBuildInputs = [ user-agents ]; From 97ca78687a2d8bd96ee121610f3044b19e88f8a7 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sun, 5 Aug 2018 22:19:35 +0200 Subject: [PATCH 221/229] logrotate: make mailutils overridable (#44504) --- pkgs/tools/system/logrotate/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 75e25bcc673..75f60968440 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, mailutils, gzip, popt, autoreconfHook }: +{ stdenv, fetchFromGitHub, gzip, popt, autoreconfHook +, mailutils ? null +}: stdenv.mkDerivation rec { name = "logrotate-${version}"; @@ -14,8 +16,11 @@ stdenv.mkDerivation rec { # Logrotate wants to access the 'mail' program; to be done. patchPhase = '' sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ - -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' \ - -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac + -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac + + ${stdenv.lib.optionalString (mailutils != null) '' + sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac + ''} ''; autoreconfPhase = '' From 413d7f4425e3e3e1fa00becad89bb389f90b2413 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 3 Jun 2018 03:37:23 +0200 Subject: [PATCH 222/229] bluez: use python3 --- pkgs/os-specific/linux/bluez/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index b095096caa7..3882a742586 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - pythonPackages, readline, udev, libical, + python3, readline, udev, libical, systemd, enableWiimote ? false, enableMidi ? false }: stdenv.mkDerivation rec { @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z"; }; - pythonPath = with pythonPackages; [ + pythonPath = with python3.pkgs; [ dbus-python pygobject2 pygobject3 recursivePthLoader ]; buildInputs = [ - dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython + dbus glib alsaLib python3 python3.pkgs.wrapPython readline udev libical ]; From 9748d7c60ba4fd94a5be3d2c5783608e65baea95 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 6 Aug 2018 01:25:38 +0200 Subject: [PATCH 223/229] nixos/disnix: undo dysnomia rename to fix disnix and retain compatibility with previous release --- nixos/modules/rename.nix | 1 - nixos/modules/services/misc/disnix.nix | 2 +- nixos/modules/services/misc/dysnomia.nix | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 40f66ccb26b..75f02ea78e6 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -9,7 +9,6 @@ with lib; (mkRenamedOptionModule [ "system" "nixos" "stateVersion" ] [ "system" "stateVersion" ]) (mkRenamedOptionModule [ "system" "nixos" "defaultChannel" ] [ "system" "defaultChannel" ]) - (mkRenamedOptionModule [ "dysnomia" ] [ "services" "dysnomia" ]) (mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ]) (mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ]) (mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ]) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index bb3ac1ecf07..c21cb2afc3c 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -47,7 +47,7 @@ in ###### implementation config = mkIf cfg.enable { - services.dysnomia.enable = true; + dysnomia.enable = true; environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index ba74b18b697..61ea822890e 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.services.dysnomia; + cfg = config.dysnomia; printProperties = properties: concatMapStrings (propertyName: @@ -69,7 +69,7 @@ let in { options = { - services.dysnomia = { + dysnomia = { enable = mkOption { type = types.bool; @@ -142,7 +142,7 @@ in environment.systemPackages = [ cfg.package ]; - services.dysnomia.package = pkgs.dysnomia.override (origArgs: { + dysnomia.package = pkgs.dysnomia.override (origArgs: { enableApacheWebApplication = config.services.httpd.enable; enableAxis2WebService = config.services.tomcat.axis2.enable; enableEjabberdDump = config.services.ejabberd.enable; @@ -153,7 +153,7 @@ in enableMongoDatabase = config.services.mongodb.enable; }); - services.dysnomia.properties = { + dysnomia.properties = { hostname = config.networking.hostName; inherit (config.nixpkgs.localSystem) system; @@ -171,7 +171,7 @@ in }}"); }; - services.dysnomia.containers = lib.recursiveUpdate ({ + dysnomia.containers = lib.recursiveUpdate ({ process = {}; wrapper = {}; } From e97112bdc3ed8c740d1dee60fbf6288bebfc7a1e Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 5 Aug 2018 20:19:46 -0400 Subject: [PATCH 224/229] doc: Fixes mentions of mention-bot. Its last mention was on 2017-09-25. Close to a year. The CODEOWNERS feature of github, though, fills in the gap in a more appropriate manner (IMHO). --- doc/reviewing-contributions.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 673ff92d2c8..88bb1efdfd3 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -103,8 +103,9 @@ - mention-bot usually notifies GitHub users based on the submitted changes, - but it can happen that it misses some of the package maintainers. + CODEOWNERS + will make GitHub notify users based on the submitted changes, but it can + happen that it misses some of the package maintainers. @@ -376,8 +377,9 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER" - Mention-bot notify GitHub users based on the submitted changes, but it - can happen that it miss some of the package maintainers. + CODEOWNERS + will make GitHub notify users based on the submitted changes, but it can + happen that it misses some of the package maintainers. From 0ef3119c69532d783c38b22e90649b0922cfd307 Mon Sep 17 00:00:00 2001 From: Boris Babic Date: Tue, 24 Jul 2018 18:11:56 +0200 Subject: [PATCH 225/229] trackpoint: Make the device name configurable --- nixos/modules/tasks/trackpoint.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 3575a291b2b..b154cf9f5f0 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -55,6 +55,15 @@ with lib; ''; }; + device = mkOption { + default = "TPPS/2 IBM TrackPoint"; + type = types.str; + description = '' + The device name of the trackpoint. You can check with xinput. + Some newer devices (example x1c6) use "TPPS/2 Elan TrackPoint". + ''; + }; + }; }; @@ -68,12 +77,12 @@ with lib; (mkIf cfg.enable { services.udev.extraRules = '' - ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}" + ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="${cfg.device}", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}" ''; system.activationScripts.trackpoint = '' - ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint" + ${config.systemd.package}/bin/udevadm trigger --attr-match=name="${cfg.device}" ''; }) @@ -81,7 +90,7 @@ with lib; services.xserver.inputClassSections = ['' Identifier "Trackpoint Wheel Emulation" - MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "ETPS/2 Elantech TrackPoint|Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"}" + MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "ETPS/2 Elantech TrackPoint|Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint|${cfg.device}"}" MatchDevicePath "/dev/input/event*" Option "EmulateWheel" "true" Option "EmulateWheelButton" "2" From 4c45016c29ef79afde4e0b34adb94495cc1ca292 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 5 Aug 2018 20:12:18 -0700 Subject: [PATCH 226/229] Revert "mariadb: 10.2.16 -> 10.3.8" This reverts commit 00ab5c5b6af27850268e2cb29479fd54d67b5e02. The commit listed broke darwin and held up Hydra. sorry about that! --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 7c1b6cc8702..121e42f7a97 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ galeraLibs = buildEnv { }; common = rec { # attributes common to both builds - version = "10.3.8"; + version = "10.2.16"; 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 = "1f0syfrv0my7sm8cbpic00ldy90psimy8yvm0ld82bfi2isw3gih"; + sha256 = "1i2dwpp96ywjk147qqpcad8vqcy4rxmfbv2cb8ww3sffpa9yx0n1"; name = "mariadb-${version}.tar.gz"; }; From 3b490c653c7912013084ae47f3b56a0ee0fecd51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Aug 2018 09:28:20 +0200 Subject: [PATCH 227/229] ddar: explicitly use python2 --- pkgs/tools/backup/ddar/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index ce65ef4eb80..3855152880e 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub, protobuf, roundup }: +{ lib, python2, fetchFromGitHub, roundup }: -buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { pname = "ddar"; version = "1.0"; @@ -23,7 +23,7 @@ buildPythonApplication rec { make -f Makefile.prep synctus/ddar_pb2.py ''; - propagatedBuildInputs = [ protobuf ]; + propagatedBuildInputs = with python2.pkgs; [ protobuf ]; checkInputs = [ roundup ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd7deeae47f..fd084801c6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1147,7 +1147,7 @@ with pkgs; dateutils = callPackage ../tools/misc/dateutils { }; - ddar = pythonPackages.callPackage ../tools/backup/ddar { }; + ddar = callPackage ../tools/backup/ddar { }; ddate = callPackage ../tools/misc/ddate { }; From c3b1a8178b8efd669e2951d293f449958f6a56ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Aug 2018 09:36:55 +0200 Subject: [PATCH 228/229] duply: explicitly use python2 --- pkgs/tools/backup/duply/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index e8d3a2e185e..cc4785740a4 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, python, duplicity, gawk, gnupg1, bash +{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg1, bash , gnugrep, txt2man, makeWrapper, which }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" wrapProgram "$out/bin/duply" --set PATH \ - ${stdenv.lib.makeBinPath [ coreutils python duplicity gawk gnupg1 bash gnugrep txt2man which ]} + ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg1 bash gnugrep txt2man which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; From 6820e2f0dd16104961d6fc7e8e38846807159c4e Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Mon, 6 Aug 2018 10:07:20 +0200 Subject: [PATCH 229/229] mpd: don't use smbclient alias didn't eval on Hydra as release.nix doesn't allow aliases, see #44299 Use samba instead. --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 6ca33847111..82c159ebc82 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,7 +27,7 @@ , opusSupport ? true, libopus , soundcloudSupport ? true, yajl , nfsSupport ? true, libnfs -, smbSupport ? true, smbclient +, smbSupport ? true, samba }: assert avahiSupport -> avahi != null && dbus != null; @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { ++ opt opusSupport libopus ++ opt soundcloudSupport yajl ++ opt (!stdenv.isDarwin && nfsSupport) libnfs - ++ opt (!stdenv.isDarwin && smbSupport) smbclient; + ++ opt (!stdenv.isDarwin && smbSupport) samba; nativeBuildInputs = [ autoreconfHook pkgconfig ];