From d25bf8e72fe70142f66fa9144842000b756b88cf Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 11 May 2017 12:09:41 +0200 Subject: [PATCH 001/152] elasticsearch service: remove postStart script --- nixos/modules/services/search/elasticsearch.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 574f74d547a..35dae1747ac 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -148,11 +148,6 @@ in { ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi ''; - postStart = mkBefore '' - until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do - sleep 1 - done - ''; }; environment.systemPackages = [ cfg.package ]; From 64bddb3f1ed85b0f8e8c98f95efffd667596258a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 20 May 2017 21:05:16 -0500 Subject: [PATCH 002/152] manual: add "Emacs" section to manual MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives some basics on configuring Emacs within Nix. The configuration is fairly long just to give a good idea of what’s going on. I can trim out some of it if it’s not necessary. Note that there is already a section for Emacs in the NixOS manual. However, this is aimed at avoiding using modules altogether to make things easier for non-NixOS users. This configuration should work on NixOS anyway, however. Fixes #24243 Fixes #19956 --- doc/package-notes.xml | 136 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0f148f5c898..33a61f31938 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -516,4 +516,140 @@ to your configuration, rebuild, and run the game with +
+ +Emacs + +
+ +Configuring Emacs + + + The Emacs package comes with some extra helpers to make it easier to + configure. emacsWithPackages allows you to manage + packages from ELPA. This means that you will not have to install + that packages from within Emacs. For instance, if you wanted to use + company, counsel, + flycheck, ivy, + magit, projectile, and + use-package you could use this as a + ~/.config/nixpkgs/config.nix override: + + + +{ + packageOverrides = pkgs: with pkgs; { + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + } +} + + + + You can install it like any other packages via nix-env -iA + myEmacs. However, this will only install those packages. + It will not configure them for us. To do this, we + need to provide a configuration file. Luckily, it is possible to do + this from within Nix! By modifying the above example, we can make + Emacs load a custom config file. The key is to create a package that + provide a default.el file in + /share/emacs/site-start/. Emacs knows to load + this file automatically when it starts. + + + +{ + packageOverrides = pkgs: with pkgs; rec { + myEmacsConfig = writeText "default.el" '' +;; initialize package + +(require 'package) +(package-initialize 'noactivate) +(eval-when-compile + (require 'use-package)) + +;; load some packages + +(use-package company + :bind ("<C-tab>" . company-complete) + :diminish company-mode + :commands (company-mode global-company-mode) + :defer 1 + :config + (global-company-mode)) + +(use-package counsel + :commands (counsel-descbinds) + :bind (([remap execute-extended-command] . counsel-M-x) + ("C-x C-f" . counsel-find-file) + ("C-c g" . counsel-git) + ("C-c j" . counsel-git-grep) + ("C-c k" . counsel-ag) + ("C-x l" . counsel-locate) + ("M-y" . counsel-yank-pop))) + +(use-package flycheck + :defer 2 + :config (global-flycheck-mode)) + +(use-package ivy + :defer 1 + :bind (("C-c C-r" . ivy-resume) + ("C-x C-b" . ivy-switch-buffer) + :map ivy-minibuffer-map + ("C-j" . ivy-call)) + :diminish ivy-mode + :commands ivy-mode + :config + (ivy-mode 1)) + +(use-package magit + :defer + :if (executable-find "git") + :bind (("C-x g" . magit-status) + ("C-x G" . magit-dispatch-popup)) + :init + (setq magit-completing-read-function 'ivy-completing-read)) + +(use-package projectile + :commands projectile-mode + :bind-keymap ("C-c p" . projectile-command-map) + :defer 5 + :config + (projectile-global-mode)) + ''; + myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ + (runCommand "default.el" {} '' +mkdir -p $out/share/emacs/site-lisp +cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el +'') + company + counsel + flycheck + ivy + magit + projectile + use-package + ])); + }; +} + + + + This provides a fairly full Emacs start file. It will load in + addition to the user's presonal config. You can always disable it by + passing -q to the Emacs command. + + +
+ +
+ From b6534c694d3849649388df7bb6fb0a7dab9d96e1 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Mon, 22 May 2017 09:48:29 -0500 Subject: [PATCH 003/152] ocamlPackages.core_bench: init at 113.33.03 --- .../ocaml-modules/janestreet/core_bench.nix | 20 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/core_bench.nix diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix new file mode 100644 index 00000000000..83e6100f059 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -0,0 +1,20 @@ +{ stdenv +, buildOcamlJane +, core +, core_extended +, textutils +}: + +buildOcamlJane rec { + name = "core_bench"; + hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj"; + propagatedBuildInputs = + [ core core_extended textutils ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_bench; + description = "Micro-benchmarking library for OCaml"; + license = licenses.asl20; + maintainers = [ maintainers.pmahoney ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3a185bc0a10..13ece3dec43 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -728,6 +728,9 @@ let then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {} else bin_prot_p4; + core_bench = + callPackage ../development/ocaml-modules/janestreet/core_bench.nix {}; + core_kernel = if lib.versionOlder "4.03" ocaml.version then callPackage ../development/ocaml-modules/janestreet/core_kernel-113_33_01.nix {} From 2ae46bc163512b3eecb60d70866d4ff19dac82bc Mon Sep 17 00:00:00 2001 From: Lukasz Czyzykowski Date: Mon, 22 May 2017 20:06:52 +0200 Subject: [PATCH 004/152] ghc: 8.0.2 without link warnings Fixes NixOS/nixpkgs#25139 by backporting patch applied in ghc trunk: https://phabricator.haskell.org/D2823 --- pkgs/development/compilers/ghc/8.0.2.nix | 4 +++- .../compilers/ghc/no-cpp-warnings.patch | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ghc/no-cpp-warnings.patch diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 605458e7185..7463eb91e7a 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi"; }; - patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; + patches = [] + ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch + ++ stdenv.lib.optional stdenv.isDarwin ./no-cpp-warnings.patch; buildInputs = [ ghc perl hscolour sphinx ]; diff --git a/pkgs/development/compilers/ghc/no-cpp-warnings.patch b/pkgs/development/compilers/ghc/no-cpp-warnings.patch new file mode 100644 index 00000000000..90224df19f6 --- /dev/null +++ b/pkgs/development/compilers/ghc/no-cpp-warnings.patch @@ -0,0 +1,23 @@ +--- b/includes/rts/storage/ClosureMacros.h 2017-05-21 12:54:09.000000000 +0200 ++++ a/includes/rts/storage/ClosureMacros.h 2017-05-21 12:55:57.000000000 +0200 +@@ -499,8 +499,17 @@ + + -------------------------------------------------------------------------- */ + +-#define ZERO_SLOP_FOR_LDV_PROF (defined(PROFILING)) +-#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS)) ++#if defined(PROFILING) ++#define ZERO_SLOP_FOR_LDV_PROF 1 ++#else ++#define ZERO_SLOP_FOR_LDV_PROF 0 ++#endif ++ ++#if defined(DEBUG) && !defined(THREADED_RTS) ++#define ZERO_SLOP_FOR_SANITY_CHECK 1 ++#else ++#define ZERO_SLOP_FOR_SANITY_CHECK 0 ++#endif + + #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK + #define OVERWRITING_CLOSURE(c) overwritingClosure(c) + From 2e6239f6661b7f9d1f6bb8ff21ce49babecc6ced Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 4 May 2017 21:41:54 +0200 Subject: [PATCH 005/152] goffice: 0.10.32 -> 0.10.34 --- pkgs/development/libraries/goffice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index cf9ab101018..8b4103dec7f 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.32"; + name = "goffice-0.10.34"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "02b37da9f54fb92725b973875d1d2da49b54f6486eb03648fd1ea58e4a297ac3"; + sha256 = "554a75a22b5863b3b17595148bee6462122f2dbf031dfa78b61e941e3c2dd603"; }; nativeBuildInputs = [ pkgconfig intltool ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; }; } From 0de9ed92e8a14823684c99e6488678ebba4afe26 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 4 May 2017 21:42:28 +0200 Subject: [PATCH 006/152] gnumeric: 1.12.32 -> 1.12.34 --- pkgs/applications/office/gnumeric/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index fcd9f954a67..fda320dd54a 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,24 +1,35 @@ { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser , goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages +, itstool }: let inherit (pythonPackages) python pygobject3; + isopub = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent; sha256 = "073l492jz70chcadr2p7ssx7gz5hd731s2cazhxx4r845kilyr77"; }; + isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; }; + isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; }; in stdenv.mkDerivation rec { - name = "gnumeric-1.12.32"; + name = "gnumeric-1.12.34"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "a07bc83e2adaeb94bfa2c737c9a19d90381a19cb203dd7c4d5f7d6cfdbee6de8"; + sha256 = "0b4920812d82ec4c25204543dff9dd3bdbac17bfaaabd1aa02d47fbe2981c725"; }; configureFlags = "--disable-component"; + prePatch = '' + substituteInPlace doc/C/gnumeric.xml \ + --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \ + --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \ + --replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1} + ''; + # ToDo: optional libgda, introspection? buildInputs = [ pkgconfig intltool perl perlXMLParser bison goffice gtk3 makeWrapper gnome3.defaultIconTheme - python pygobject3 + python pygobject3 itstool ]; enableParallelBuilding = true; @@ -35,7 +46,7 @@ in stdenv.mkDerivation rec { description = "The GNOME Office Spreadsheet"; license = stdenv.lib.licenses.gpl2Plus; homepage = http://projects.gnome.org/gnumeric/; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; }; } From aa8018103c75df14ff7e4f424c6b30f21df080cc Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 7 Jun 2017 18:00:58 -0300 Subject: [PATCH 007/152] nixos-artwork: add more wallpapers Restructure the nixos-artwork to make it easy to selectively incorporate other components from upstream without needing to download the full package. Until now only the Gnome_Dark wallpaper was included. Add other wallpapers available in the package repository. --- .../services/x11/desktop-managers/gnome3.nix | 4 +- .../services/x11/display-managers/lightdm.nix | 2 +- .../modules/system/boot/loader/grub/grub.nix | 2 +- nixos/tests/installer.nix | 2 +- pkgs/data/misc/nixos-artwork/default.nix | 24 +---- pkgs/data/misc/nixos-artwork/wallpapers.nix | 100 ++++++++++++++++++ 6 files changed, 108 insertions(+), 26 deletions(-) create mode 100644 pkgs/data/misc/nixos-artwork/wallpapers.nix diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 5f99c2bcf1f..c043884f8e0 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -35,10 +35,10 @@ let chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] - picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png' + picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png' [org.gnome.desktop.screensaver] - picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png' + picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png' ${cfg.extraGSettingsOverrides} EOF diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 256bfb9ce3f..1733f2fd39b 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -111,7 +111,7 @@ in background = mkOption { type = types.str; - default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; + default = "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png"; description = '' The background image or color to use. ''; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index cf47aed9fa9..57a4b63e4b8 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -489,7 +489,7 @@ in sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; } # GRUB 1.97 doesn't support gzipped XPMs. - else "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"); + else "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png"); } (mkIf cfg.enable { diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 6dce6f407cd..85d31334d6b 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -221,7 +221,7 @@ let docbook5_xsl unionfs-fuse ntp - nixos-artwork + nixos-artwork.wallpapers.gnome-dark perlPackages.XMLLibXML perlPackages.ListCompare diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix index b35a96fff82..71fe32c1066 100644 --- a/pkgs/data/misc/nixos-artwork/default.nix +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -1,23 +1,5 @@ -{ stdenv, fetchurl }: +{ callPackage }: -stdenv.mkDerivation { - name = "nixos-artwork-2015-02-27"; - # Remember to check the default lightdm wallpaper when updating - - GnomeDark = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png; - sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7"; - }; - - unpackPhase = "true"; - - installPhase = '' - mkdir -p $out/share/artwork/gnome - ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/NixOS/nixos-artwork; - platforms = platforms.all; - }; +rec { + wallpapers = callPackage ./wallpapers.nix { }; } diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix new file mode 100644 index 00000000000..28bf0d40b39 --- /dev/null +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -0,0 +1,100 @@ +{ stdenv, fetchurl }: + +let + mkNixBackground = { name, src, description } @ attrs: + + stdenv.mkDerivation { + inherit name src; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p $out/share/artwork/gnome + ln -s $src $out/share/artwork/gnome/ + ''; + + meta = with stdenv.lib; { + inherit description; + homepage = https://github.com/NixOS/nixos-artwork; + license = licenses.free; + platforms = platforms.all; + }; + }; + +in + +{ + + gnome-dark = mkNixBackground { + name = "gnome-dark-2015-02-27"; + description = "Gnome Dark background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/Nix/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png; + sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7"; + }; + }; + + mosaic-blue = mkNixBackground { + name = "mosaic-blue-2016-02-19"; + description = "Mosaic blue background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png; + sha256 = "1cbcssa8qi0giza0k240w5yy4yb2bhc1p1r7pw8qmziprcmwv5n5"; + }; + }; + + simple-blue = mkNixBackground { + name = "simple-blue-2016-02-19"; + description = "Simple blue background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png; + sha256 = "1llr175m454aqixxwbp3kb5qml2hi1kn7ia6lm7829ny6y7xrnms"; + }; + }; + + simple-dark-gray = mkNixBackground { + name = "simple-dark-gray-2016-02-19"; + description = "Simple dark gray background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png; + sha256 = "1282cnqc5qynp0q9gdll7bgpw23yp5bhvaqpar59ibkh3iscg8i5"; + }; + }; + + simple-light-gray = mkNixBackground { + name = "simple-light-gray-2016-02-19"; + description = "Simple light gray background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png; + sha256 = "0i6d0xv1nzrv7na9hjrgzl3jrwn81vnprnq2pxyznlxbjcgkjnk2"; + }; + }; + + simple-red = mkNixBackground { + name = "simple-red-2016-02-19"; + description = "Simple red background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png; + sha256 = "16drprsi3q8xbxx3bxp54yld04c4lq6jankw8ww1irg7z61a6wjs"; + }; + }; + + stripes-logo = mkNixBackground { + name = "stripes-logo-2016-02-19"; + description = "Stripes logo background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png; + sha256 = "0cqjkgp30428c1yy8s4418k4qz0ycr6fzcg4rdi41wkh5g1hzjnl"; + }; + }; + + stripes = mkNixBackground { + name = "stripes-2016-02-19"; + description = "Stripes background for Nix"; + src = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png; + sha256 = "116337wv81xfg0g0bsylzzq2b7nbj6hjyh795jfc9mvzarnalwd3"; + }; + }; + +} From 96f4cac65901256c3a3388dbe491de30f65543c7 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sat, 3 Jun 2017 22:20:20 +0200 Subject: [PATCH 008/152] erlang: Move all BEAM packages into beam-packages. This applies to Erlang, Elixir and LFE packages. beam-packages provides interpreters and packages sets separately. This is in preparation of generalizing BEAM interpreters definitions. --- pkgs/top-level/all-packages.nix | 99 +++++--------------------------- pkgs/top-level/beam-packages.nix | 99 ++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 85 deletions(-) create mode 100644 pkgs/top-level/beam-packages.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcf644ac8dd..641fbb125b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5949,93 +5949,22 @@ with pkgs; clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - odbcSupport = true; - }; - erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - odbcSupport = true; - }; - erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - odbcSupport = true; - }; - erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - javacSupport = true; - }; - erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - javacSupport = true; odbcSupport = true; - }; - erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - }; - erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - odbcSupport = true; - }; - erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; - }; - erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; odbcSupport = true; - }; - erlangR19 = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - }; - erlangR19_odbc = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - odbcSupport = true; - }; - erlangR19_javac = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; - }; - erlangR19_odbc_javac = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; odbcSupport = true; - }; - erlang = erlangR18; - erlang_odbc = erlangR18_odbc; - erlang_javac = erlangR18_javac; - erlang_odbc_javac = erlangR18_odbc_javac; + beam = callPackage ./beam-packages.nix { }; - rebar = callPackage ../development/tools/build-managers/rebar { }; - rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; }; - rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; }; - hexRegistrySnapshot = callPackage ../development/beam-modules/hex-registry-snapshot.nix { }; - fetchHex = callPackage ../development/beam-modules/fetch-hex.nix { }; + inherit (beam.interpreters) + erlang erlang_odbc erlang_javac erlang_odbc_javac + elixir + lfe + erlangR16 erlangR16_odbc + erlang_basho_R16B02 erlang_basho_R16B02_odbc + erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac + erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac + erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac; - beamPackages = callPackage ../development/beam-modules { }; - hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { }; - cuter = callPackage ../development/tools/erlang/cuter { }; - - relxExe = callPackage ../development/tools/erlang/relx-exe {}; - - elixir = callPackage ../development/interpreters/elixir { debugInfo = true; }; - - lfe = callPackage ../development/interpreters/lfe { }; + inherit (beam.packages) + rebar rebar3-open rebar3 + hexRegistrySnapshot fetchHex beamPackages + hex2nix cuter relxExe; groovy = callPackage ../development/interpreters/groovy { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix new file mode 100644 index 00000000000..cd40192a3a5 --- /dev/null +++ b/pkgs/top-level/beam-packages.nix @@ -0,0 +1,99 @@ +{ pkgs, stdenv, callPackage, wxGTK30, darwin }: + +rec { + + interpreters = rec { + + erlang = erlangR18; + erlang_odbc = erlangR18_odbc; + erlang_javac = erlangR18_javac; + erlang_odbc_javac = erlangR18_odbc_javac; + + erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + + erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; + erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; + erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; + erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + javacSupport = true; + }; + erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + javacSupport = true; odbcSupport = true; + }; + erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + wxGTK = wxGTK30; + }; + erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + wxGTK = wxGTK30; + odbcSupport = true; + }; + erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + wxGTK = wxGTK30; + javacSupport = true; + }; + erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + wxGTK = wxGTK30; + javacSupport = true; odbcSupport = true; + }; + erlangR19 = callPackage ../development/interpreters/erlang/R19.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + wxGTK = wxGTK30; + }; + erlangR19_odbc = callPackage ../development/interpreters/erlang/R19.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + wxGTK = wxGTK30; + odbcSupport = true; + }; + erlangR19_javac = callPackage ../development/interpreters/erlang/R19.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + wxGTK = wxGTK30; + javacSupport = true; + }; + erlangR19_odbc_javac = callPackage ../development/interpreters/erlang/R19.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + wxGTK = wxGTK30; + javacSupport = true; odbcSupport = true; + }; + + elixir = callPackage ../development/interpreters/elixir { debugInfo = true; }; + + lfe = callPackage ../development/interpreters/lfe { }; + }; + + packages = rec { + rebar = callPackage ../development/tools/build-managers/rebar { }; + rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; }; + rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; }; + hexRegistrySnapshot = callPackage ../development/beam-modules/hex-registry-snapshot.nix { }; + fetchHex = callPackage ../development/beam-modules/fetch-hex.nix { }; + + beamPackages = callPackage ../development/beam-modules { }; + hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { }; + cuter = callPackage ../development/tools/erlang/cuter { }; + + relxExe = callPackage ../development/tools/erlang/relx-exe {}; + }; +} From 3426c88bff6988056163f147e06dcfac2556b588 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Sun, 4 Jun 2017 20:26:37 +0200 Subject: [PATCH 009/152] erlang: Generalize Erlang/OTP derivations. Switch official Erlang versions to use a common builder. --- pkgs/development/beam-modules/lib.nix | 21 +++ pkgs/development/interpreters/erlang/R16.nix | 57 +------- .../interpreters/erlang/R16B02-8-basho.nix | 4 + pkgs/development/interpreters/erlang/R17.nix | 74 +--------- pkgs/development/interpreters/erlang/R18.nix | 103 +------------- pkgs/development/interpreters/erlang/R19.nix | 99 +------------ .../interpreters/erlang/generic-builder.nix | 132 ++++++++++++++++++ pkgs/top-level/beam-packages.nix | 114 +++++++-------- 8 files changed, 231 insertions(+), 373 deletions(-) create mode 100644 pkgs/development/beam-modules/lib.nix create mode 100644 pkgs/development/interpreters/erlang/generic-builder.nix diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix new file mode 100644 index 00000000000..2d0eef09563 --- /dev/null +++ b/pkgs/development/beam-modules/lib.nix @@ -0,0 +1,21 @@ +{ pkgs }: + +rec { + + /* Uses generic-builder to evaluate provided drv containing OTP-version specific data. + + drv: package containing version-specific args; + builder: generic builder for all Erlang versions; + gargs: arguments passed to the generic-builder, used mostly to customize dependencies; + args: arguments merged into version-specific args, used mostly to enable/disable high-level OTP + features, like ODBC or WX support; + + Please note that "mkDerivation" defined here is the one called from R16.nix and similar files. + */ + callErlang = drv: gargs: args: pkgs.callPackage drv ( + let builder = pkgs.callPackage ../../development/interpreters/erlang/generic-builder.nix gargs; + in { + mkDerivation = a: builder (a // args); + }); + +} diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index e2e0151de37..3ac37b5bde1 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -1,17 +1,6 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, gnused, gawk, makeWrapper -, odbcSupport ? false, unixODBC ? null -, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null -, enableDebugInfo ? false -, Carbon ? null, Cocoa ? null }: +{ mkDerivation, fetchurl }: -assert wxSupport -> mesa != null && wxGTK != null && xorg != null; -assert odbcSupport -> unixODBC != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"; +mkDerivation rec { version = "16B03-1"; src = fetchurl { @@ -19,28 +8,17 @@ stdenv.mkDerivation rec { sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; }; - debugInfo = enableDebugInfo; - - buildInputs = - [ perl gnum4 ncurses openssl makeWrapper - ] ++ optionals wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport unixODBC - ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; - - # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense prePatch = '' - substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - preConfigure = '' export HOME=$PWD/../ sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags= "--with-ssl=${openssl.dev} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; - + # Do not install docs, instead use prebuilt versions. + installTargets = "install"; postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; @@ -55,29 +33,4 @@ stdenv.mkDerivation rec { ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" done ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = platforms.unix; - maintainers = [ maintainers.the-kenny ]; - }; } diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix index 80f524019df..fe24ad64bf8 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in ''; + postPatch = '' + patchSheBangs make + ''; + preConfigure = '' export HOME=$PWD/../ export LANG=C diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 0869285d496..3d78c6ee242 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,26 +1,6 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, gnused, gawk, makeWrapper -, Carbon, Cocoa -, odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null -, javacSupport ? false, openjdk ? null -, enableHipe ? true -, enableDebugInfo ? false -, enableDirtySchedulers ? false -}: +{ mkDerivation, fetchurl }: -assert wxSupport -> (if stdenv.isDarwin - then wxmac != null - else mesa != null && wxGTK != null && xorg != null); - -assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" - + "${optionalString javacSupport "-javac"}"; +mkDerivation rec { version = "17.5"; src = fetchurl { @@ -28,36 +8,17 @@ stdenv.mkDerivation rec { sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w"; }; - buildInputs = - [ perl gnum4 ncurses openssl makeWrapper - ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport unixODBC - ++ optional javacSupport openjdk - ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - - patchPhase = '' - # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense - substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' - + prePatch = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - debugInfo = enableDebugInfo; - preConfigure = '' export HOME=$PWD/../ sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags= [ - "--with-ssl=${openssl.dev}" - ] ++ optional enableHipe "--enable-hipe" - ++ optional enableDirtySchedulers "--enable-dirty-schedulers" - ++ optional wxSupport "--enable-wx" - ++ optional odbcSupport "--with-odbc=${unixODBC}" - ++ optional javacSupport "--with-javac" - ++ optional stdenv.isDarwin "--enable-darwin-64bit"; - + # Do not install docs, instead use prebuilt versions. + installTargets = "install"; postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; @@ -72,29 +33,4 @@ stdenv.mkDerivation rec { ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" done ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = platforms.unix; - maintainers = [ maintainers.the-kenny maintainers.sjmackenzie ]; - }; } diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 1ed9bfbd70a..0d20ae662a5 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -1,113 +1,22 @@ -{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, perl, gnum4, ncurses, openssl -, gnused, gawk, autoconf, libxslt, libxml2, makeWrapper -, Carbon, Cocoa -, odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null -, javacSupport ? false, openjdk ? null -, enableHipe ? true -, enableDebugInfo ? false -, enableDirtySchedulers ? false -}: - -assert wxSupport -> (if stdenv.isDarwin - then wxmac != null - else mesa != null && wxGTK != null && xorg != null); - -assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" - + "${optionalString javacSupport "-javac"}"; - version = "18.3.4.4"; - - # Minor OTP releases are not always released as tarbals at - # http://erlang.org/download/ So we have to download from - # github. And for the same reason we can't use a prebuilt manpages - # tarball and need to build manpages ourselves. - src = fetchFromGitHub { - owner = "erlang"; - repo = "otp"; - rev = "OTP-${version}"; - sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; - }; - - buildInputs = - [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper - ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport unixODBC - ++ optional javacSupport openjdk - ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - - debugInfo = enableDebugInfo; +{ mkDerivation, fetchurl }: +let rmAndPwdPatch = fetchurl { url = "https://github.com/erlang/otp/commit/98b8650d22e94a5ff839170833f691294f6276d0.patch"; sha256 = "0cd5pkqrigiqz6cyma5irqwzn0bi17k371k9vlg8ir31h3zmqfip"; }; envAndCpPatch = fetchurl { - url = "https://github.com/binarin/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch"; + url = "https://github.com/erlang/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch"; sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f"; }; - # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense - prePatch = '' - substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' - ''; +in mkDerivation rec { + version = "18.3.4.4"; + sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk"; patches = [ rmAndPwdPatch envAndCpPatch ]; - - preConfigure = '' - ./otp_build autoconf - ''; - - configureFlags= [ - "--with-ssl=${openssl.dev}" - ] ++ optional enableHipe "--enable-hipe" - ++ optional enableDirtySchedulers "--enable-dirty-schedulers" - ++ optional wxSupport "--enable-wx" - ++ optional odbcSupport "--with-odbc=${unixODBC}" - ++ optional javacSupport "--with-javac" - ++ optional stdenv.isDarwin "--enable-darwin-64bit"; - - # install-docs will generate and install manpages and html docs - # (PDFs are generated only when fop is available). - installTargets = "install install-docs"; - - postInstall = '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call - ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - downloadPage = "http://www.erlang.org/download.html"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny sjmackenzie couchemar ]; - license = licenses.asl20; - }; } diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 4b1e3f4cb2f..680111dbd77 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,101 +1,10 @@ -{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl -, gnused, gawk, autoconf, libxslt, libxml2, makeWrapper -, Carbon, Cocoa -, odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null -, javacSupport ? false, openjdk ? null -, enableHipe ? true -, enableDebugInfo ? false -, enableDirtySchedulers ? false -}: +{ mkDerivation, fetchurl }: -assert wxSupport -> (if stdenv.isDarwin - then wxmac != null - else mesa != null && wxGTK != null && xorg != null); - -assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" - + "${optionalString javacSupport "-javac"}"; +mkDerivation rec { version = "19.3"; - - # Minor OTP releases are not always released as tarbals at - # http://erlang.org/download/ So we have to download from - # github. And for the same reason we can't use a prebuilt manpages - # tarball and need to build manpages ourselves. - src = fetchFromGitHub { - owner = "erlang"; - repo = "otp"; - rev = "OTP-${version}"; - sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; - }; - - buildInputs = - [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper - ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport unixODBC - ++ optional javacSupport openjdk - ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - - debugInfo = enableDebugInfo; + sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; prePatch = '' - substituteInPlace configure.in \ - --replace '`sw_vers -productVersion`' '10.10' - - # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense - substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' ''; - - preConfigure = '' - ./otp_build autoconf - ''; - - configureFlags= [ - "--with-ssl=${openssl.dev}" - ] ++ optional enableHipe "--enable-hipe" - ++ optional enableDirtySchedulers "--enable-dirty-schedulers" - ++ optional wxSupport "--enable-wx" - ++ optional odbcSupport "--with-odbc=${unixODBC}" - ++ optional javacSupport "--with-javac" - ++ optional stdenv.isDarwin "--enable-darwin-64bit"; - - # install-docs will generate and install manpages and html docs - # (PDFs are generated only when fop is available). - installTargets = "install install-docs"; - - postInstall = '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call - ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - downloadPage = "http://www.erlang.org/download.html"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = platforms.unix; - maintainers = with maintainers; [ yurrriq couchemar DerTim1 mdaiter ]; - license = licenses.asl20; - }; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix new file mode 100644 index 00000000000..0127bb933c4 --- /dev/null +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -0,0 +1,132 @@ +{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, autoconf, gawk, gnum4, gnused +, libxml2, libxslt, ncurses, openssl, perl +, openjdk ? null # javacSupport +, unixODBC ? null # odbcSupport +, mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport +}: + +{ version +, sha256 ? null +, rev ? "OTP-${version}" +, src ? fetchFromGitHub { inherit rev sha256; owner = "erlang"; repo = "otp"; } +, enableHipe ? true +, enableDebugInfo ? false +, javacSupport ? false, javacPackages ? [ openjdk ] +, odbcSupport ? false, odbcPackages ? [ unixODBC ] +, wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ] +, preUnpack ? "", postUnpack ? "" +, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" +, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" +, buildPhase ? "", preBuild ? "", postBuild ? "" +, installPhase ? "", preInstall ? "", postInstall ? "" +, installTargets ? "install install-docs" +, checkPhase ? "", preCheck ? "", postCheck ? "" +, fixupPhase ? "", preFixup ? "", postFixup ? "" +}: + +assert wxSupport -> (if stdenv.isDarwin + then wxmac != null + else mesa != null && wxGTK != null && xorg != null); + +assert odbcSupport -> unixODBC != null; +assert javacSupport -> openjdk != null; + +let + inherit (stdenv.lib) optional optionals optionalAttrs optionalString; + wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages; + +in stdenv.mkDerivation ({ + name = "erlang-${version}" + + optionalString javacSupport "-javac" + + optionalString odbcSupport "-odbc"; + + inherit src version; + + buildInputs = [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper ] + ++ optionals wxSupport wxPackages2 + ++ optionals odbcSupport odbcPackages + ++ optionals javacSupport javacPackages + ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]); + + debugInfo = enableDebugInfo; + + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + prePatch = '' + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + + ${prePatch} + ''; + + postPatch = '' + patchShebangs make + + ${postPatch} + ''; + + preConfigure = '' + ./otp_build autoconf + ''; + + configureFlags = [ "--with-ssl=${openssl.dev}" ] + ++ optional enableHipe "--enable-hipe" + ++ optional javacSupport "--with-javac" + ++ optional odbcSupport "--with-odbc=${unixODBC}" + ++ optional wxSupport "--enable-wx" + ++ optional stdenv.isDarwin "--enable-darwin-64bit"; + + # install-docs will generate and install manpages and html docs + # (PDFs are generated only when fop is available). + + postInstall = '' + ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + ''; + + # Some erlang bin/ scripts run sed and awk + postFixup = '' + wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" + ''; + + setupHook = ./setup-hook.sh; + + meta = with stdenv.lib; { + homepage = "http://www.erlang.org/"; + downloadPage = "http://www.erlang.org/download.html"; + description = "Programming language used for massively scalable soft real-time systems"; + + longDescription = '' + Erlang is a programming language used to build massively scalable + soft real-time systems with requirements on high availability. + Some of its uses are in telecoms, banking, e-commerce, computer + telephony and instant messaging. Erlang's runtime system has + built-in support for concurrency, distribution and fault + tolerance. + ''; + + platforms = platforms.unix; + maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ]; + license = licenses.asl20; + }; +} +// optionalAttrs (preUnpack != "") { inherit preUnpack; } +// optionalAttrs (postUnpack != "") { inherit postUnpack; } +// optionalAttrs (patches != []) { inherit patches; } +// optionalAttrs (patchPhase != "") { inherit patchPhase; } +// optionalAttrs (configureFlags != []) { inherit configureFlags; } +// optionalAttrs (configurePhase != "") { inherit configurePhase; } +// optionalAttrs (preConfigure != "") { inherit preConfigure; } +// optionalAttrs (postConfigure != "") { inherit postConfigure; } +// optionalAttrs (buildPhase != "") { inherit buildPhase; } +// optionalAttrs (preBuild != "") { inherit preBuild; } +// optionalAttrs (postBuild != "") { inherit postBuild; } +// optionalAttrs (checkPhase != "") { inherit checkPhase; } +// optionalAttrs (preCheck != "") { inherit preCheck; } +// optionalAttrs (postCheck != "") { inherit postCheck; } +// optionalAttrs (installPhase != "") { inherit installPhase; } +// optionalAttrs (installTargets != "") { inherit installTargets; } +// optionalAttrs (preInstall != "") { inherit preInstall; } +// optionalAttrs (postInstall != "") { inherit postInstall; } +// optionalAttrs (fixupPhase != "") { inherit fixupPhase; } +// optionalAttrs (preFixup != "") { inherit preFixup; } +// optionalAttrs (postFixup != "") { inherit postFixup; } +) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index cd40192a3a5..94f3028ddb3 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,22 +1,69 @@ { pkgs, stdenv, callPackage, wxGTK30, darwin }: rec { + lib = import ../development/beam-modules/lib.nix { inherit pkgs; }; interpreters = rec { + # R18 is the Default version. erlang = erlangR18; erlang_odbc = erlangR18_odbc; erlang_javac = erlangR18_javac; erlang_odbc_javac = erlangR18_odbc_javac; - erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - - erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + # These are standard Erlang versions, using the generic builder. + erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {} {}; + erlangR16_odbc = lib.callErlang ../development/interpreters/erlang/R16.nix {} { odbcSupport = true; }; + erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {} {}; + erlangR17_odbc = lib.callErlang ../development/interpreters/erlang/R17.nix {} { + odbcSupport = true; + }; + erlangR17_javac = lib.callErlang ../development/interpreters/erlang/R17.nix {} { + javacSupport = true; + }; + erlangR17_odbc_javac = lib.callErlang ../development/interpreters/erlang/R17.nix {} { + javacSupport = true; odbcSupport = true; + }; + erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { + wxGTK = wxGTK30; + } {}; + erlangR18_odbc = lib.callErlang ../development/interpreters/erlang/R18.nix { + wxGTK = wxGTK30; + } { + odbcSupport = true; + }; + erlangR18_javac = lib.callErlang ../development/interpreters/erlang/R18.nix { + wxGTK = wxGTK30; + } { + javacSupport = true; + }; + erlangR18_odbc_javac = lib.callErlang ../development/interpreters/erlang/R18.nix { + wxGTK = wxGTK30; + } { + javacSupport = true; odbcSupport = true; + }; + erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { + wxGTK = wxGTK30; + } {}; + erlangR19_odbc = lib.callErlang ../development/interpreters/erlang/R19.nix { + wxGTK = wxGTK30; + } { + odbcSupport = true; + }; + erlangR19_javac = lib.callErlang ../development/interpreters/erlang/R19.nix { + wxGTK = wxGTK30; + } { + javacSupport = true; + }; + erlangR19_odbc_javac = lib.callErlang ../development/interpreters/erlang/R19.nix { + wxGTK = wxGTK30; + } { + javacSupport = true; odbcSupport = true; + }; + + # Bash fork, using custom builder. erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -24,62 +71,9 @@ rec { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; - erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - }; - erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - odbcSupport = true; - }; - erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - javacSupport = true; - }; - erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - javacSupport = true; odbcSupport = true; - }; - erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - }; - erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - odbcSupport = true; - }; - erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; - }; - erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; odbcSupport = true; - }; - erlangR19 = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - }; - erlangR19_odbc = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - odbcSupport = true; - }; - erlangR19_javac = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; - }; - erlangR19_odbc_javac = callPackage ../development/interpreters/erlang/R19.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - wxGTK = wxGTK30; - javacSupport = true; odbcSupport = true; - }; + # Other Beam languages. elixir = callPackage ../development/interpreters/elixir { debugInfo = true; }; - lfe = callPackage ../development/interpreters/lfe { }; }; From e88a89ad330743c6be885fef415307c9ff9197cc Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 8 Jun 2017 01:39:17 +0200 Subject: [PATCH 010/152] erlang: use makeOverridable for customizations --- pkgs/development/beam-modules/lib.nix | 36 +++++++++++++------ pkgs/top-level/beam-packages.nix | 50 +++++++-------------------- 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 2d0eef09563..ae2705613f0 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -2,20 +2,36 @@ rec { - /* Uses generic-builder to evaluate provided drv containing OTP-version specific data. + /* Similar to callPackageWith/callPackage, but without makeOverridable + */ + callPackageWith = autoArgs: fn: args: + let + f = if builtins.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + in f (auto // args); + + callPackage = callPackageWith pkgs; + + /* Uses generic-builder to evaluate provided drv containing OTP-version + specific data. drv: package containing version-specific args; builder: generic builder for all Erlang versions; - gargs: arguments passed to the generic-builder, used mostly to customize dependencies; - args: arguments merged into version-specific args, used mostly to enable/disable high-level OTP - features, like ODBC or WX support; + args: arguments merged into version-specific args, used mostly to customize + dependencies; - Please note that "mkDerivation" defined here is the one called from R16.nix and similar files. + Arguments passed to the generic-builder are overridable, used to + enable/disable high-level OTP features, like ODBC or WX support; + + Please note that "mkDerivation" defined here is the one called from R16.nix + and similar files. */ - callErlang = drv: gargs: args: pkgs.callPackage drv ( - let builder = pkgs.callPackage ../../development/interpreters/erlang/generic-builder.nix gargs; - in { - mkDerivation = a: builder (a // args); - }); + callErlang = drv: args: + let + builder = callPackage ../../development/interpreters/erlang/generic-builder.nix args; + in + callPackage drv { + mkDerivation = pkgs.makeOverridable builder; + }; } diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 94f3028ddb3..547e650a636 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -12,54 +12,28 @@ rec { erlang_odbc_javac = erlangR18_odbc_javac; # These are standard Erlang versions, using the generic builder. - erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {} {}; - erlangR16_odbc = lib.callErlang ../development/interpreters/erlang/R16.nix {} { - odbcSupport = true; - }; - erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {} {}; - erlangR17_odbc = lib.callErlang ../development/interpreters/erlang/R17.nix {} { - odbcSupport = true; - }; - erlangR17_javac = lib.callErlang ../development/interpreters/erlang/R17.nix {} { - javacSupport = true; - }; - erlangR17_odbc_javac = lib.callErlang ../development/interpreters/erlang/R17.nix {} { + erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {}; + erlangR16_odbc = erlangR16.override { odbcSupport = true; }; + erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {}; + erlangR17_odbc = erlangR17.override { odbcSupport = true; }; + erlangR17_javac = erlangR17.override { javacSupport = true; }; + erlangR17_odbc_javac = erlangR17.override { javacSupport = true; odbcSupport = true; }; erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; - } {}; - erlangR18_odbc = lib.callErlang ../development/interpreters/erlang/R18.nix { - wxGTK = wxGTK30; - } { - odbcSupport = true; }; - erlangR18_javac = lib.callErlang ../development/interpreters/erlang/R18.nix { - wxGTK = wxGTK30; - } { - javacSupport = true; - }; - erlangR18_odbc_javac = lib.callErlang ../development/interpreters/erlang/R18.nix { - wxGTK = wxGTK30; - } { + erlangR18_odbc = erlangR18.override { odbcSupport = true; }; + erlangR18_javac = erlangR18.override { javacSupport = true; }; + erlangR18_odbc_javac = erlangR18.override { javacSupport = true; odbcSupport = true; }; erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; - } {}; - erlangR19_odbc = lib.callErlang ../development/interpreters/erlang/R19.nix { - wxGTK = wxGTK30; - } { - odbcSupport = true; }; - erlangR19_javac = lib.callErlang ../development/interpreters/erlang/R19.nix { - wxGTK = wxGTK30; - } { - javacSupport = true; - }; - erlangR19_odbc_javac = lib.callErlang ../development/interpreters/erlang/R19.nix { - wxGTK = wxGTK30; - } { + erlangR19_odbc = erlangR19.override { odbcSupport = true; }; + erlangR19_javac = erlangR19.override { javacSupport = true; }; + erlangR19_odbc_javac = erlangR19.override { javacSupport = true; odbcSupport = true; }; From 1e0866e06483087059af91b7f296e0c5610f8848 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Tue, 30 May 2017 20:48:06 +0700 Subject: [PATCH 011/152] rust: 1.15.0 -> 1.17.0 Also updates beta, nightly, nightlyBin, and bootstrap compilers. Also updates the registry. Also consolidates logic between bootstrap and nightlyBin compilers. Also contains some miscellaneous cleanups. Also patches firefox to build with the newer cargo --- .../browsers/firefox/cargo-fix.patch | 33 +++++++ .../networking/browsers/firefox/packages.nix | 2 + pkgs/development/compilers/rust/beta.nix | 71 +++++-------- .../compilers/rust/binaryBuild.nix | 99 +++++++++++++++++++ pkgs/development/compilers/rust/bootstrap.nix | 78 +++------------ pkgs/development/compilers/rust/default.nix | 28 +++--- pkgs/development/compilers/rust/nightly.nix | 68 +++++-------- .../development/compilers/rust/nightlyBin.nix | 78 ++------------- .../compilers/rust/print-hashes.sh | 19 +++- pkgs/development/compilers/rust/rustc.nix | 68 ++++++------- pkgs/top-level/all-packages.nix | 15 ++- pkgs/top-level/rust-packages.nix | 6 +- 12 files changed, 277 insertions(+), 288 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox/cargo-fix.patch create mode 100644 pkgs/development/compilers/rust/binaryBuild.nix diff --git a/pkgs/applications/networking/browsers/firefox/cargo-fix.patch b/pkgs/applications/networking/browsers/firefox/cargo-fix.patch new file mode 100644 index 00000000000..bb19e9e45a3 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/cargo-fix.patch @@ -0,0 +1,33 @@ +diff --git a/media/libstagefright/binding/mp4parse-cargo.patch b/media/libstagefright/binding/mp4parse-cargo.patch +index 1dd13d2..f98b722 100644 +--- a/media/libstagefright/binding/mp4parse-cargo.patch ++++ b/media/libstagefright/binding/mp4parse-cargo.patch +@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libst + index aeeebc65..5c0836a 100644 + --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml + +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml +-@@ -18,18 +18,10 @@ exclude = [ ++@@ -18,17 +18,12 @@ exclude = [ + "*.mp4", + ] + + -build = "build.rs" +-- +++build = false +++ + [dependencies] + byteorder = "1.0.0" + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} +diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml +index aee7ee9..d7e3f55 100644 +--- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml ++++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml +@@ -18,6 +18,8 @@ exclude = [ + "*.mp4", + ] + ++build = false ++ + [dependencies] + byteorder = "1.0.0" + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c15e070fefb..8f117e1416b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -12,6 +12,8 @@ rec { sha512 = "cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118"; }; + patches = [ ./cargo-fix.patch ]; + meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix index 5205c8fc93f..93aaeb9e16e 100644 --- a/pkgs/development/compilers/rust/beta.nix +++ b/pkgs/development/compilers/rust/beta.nix @@ -1,56 +1,37 @@ -{ stdenv, callPackage, rustPlatform, cacert, gdb, - targets ? [], targetToolchains ? [], targetPatches ? [] }: +{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, targets ? [] +, targetToolchains ? [] +, targetPatches ? [] +}: +let + rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); +in rec { - rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix { - shortVersion = "beta-2017-01-07"; - forceBundledLLVM = true; # TODO: figure out why linking fails without this + rustc = callPackage ./rustc.nix { + inherit llvm targets targetPatches targetToolchains rustPlatform; + + version = "beta-2017-05-27"; + configureFlags = [ "--release-channel=beta" ]; - srcRev = "a035041ba450ce3061d78a2bdb9c446eb5321d0d"; - srcSha = "12xsm0yp1y39fvf9j218gxv73j8hhahc53jyv3q58kiriyqvfc1s"; + + src = fetchurl { + url = "https://static.rust-lang.org/dist/2017-05-27/rustc-beta-src.tar.gz"; + sha256 = "9f3f92efef7fb2b4bf38e57e4ff1f416dc221880b90841c4bdaee350801c0b57"; + }; + patches = [ - ./patches/disable-lockfile-check-nightly.patch + ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - inherit targets; - inherit targetPatches; - inherit targetToolchains; - inherit rustPlatform; - }) (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ]; - postUnpack = '' - export CARGO_HOME="$(realpath deps)" - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt - ''; - postPatch = '' - ${oldAttrs.postPatch} - # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596 - rm -vr src/test/debuginfo/borrowed-enum.rs || true - rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true - rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true - rm -vr src/test/debuginfo/packed-struct.rs || true - rm -vr src/test/debuginfo/recursive-struct.rs || true - rm -vr src/test/debuginfo/struct-in-enum.rs || true - rm -vr src/test/debuginfo/struct-style-enum.rs || true - rm -vr src/test/debuginfo/tuple-style-enum.rs || true - rm -vr src/test/debuginfo/union-smoke.rs || true - rm -vr src/test/debuginfo/unique-enum.rs || true - - # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed - sed -i "s# def cargo(self):# def cargo(self):\n return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py - substituteInPlace \ - src/bootstrap/config.rs \ - --replace \ - 'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \ - ''$'self.cargo = Some(\n "${rustPlatform.rust.cargo}\\\n /bin/cargo".into());' - ''; - }); + doCheck = false; + }; cargo = callPackage ./cargo.nix rec { - version = "beta-2017-01-10"; - srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0"; - srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj"; - depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp"; + version = "0.18.0"; + srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666"; + srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; + depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix new file mode 100644 index 00000000000..37b06555bdb --- /dev/null +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -0,0 +1,99 @@ +{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl +, version +, src +, platform +, versionType +}: + +let + inherit (stdenv.lib) optionalString; + + needsPatchelf = stdenv.isLinux; + + bootstrapping = versionType == "bootstrap"; + + installComponents + = "rustc,rust-std-${platform}" + + (optionalString bootstrapping ",rust-docs,cargo") + ; +in + +rec { + inherit buildRustPackage; + + rustc = stdenv.mkDerivation rec { + name = "rustc-${versionType}-${version}"; + + inherit version; + inherit src; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ qknight ]; + license = [ licenses.mit licenses.asl20 ]; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + ./install.sh --prefix=$out \ + --components=${installComponents} + + ${optionalString (needsPatchelf && bootstrapping) '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/rustdoc" + patchelf \ + --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} + + ${optionalString needsPatchelf '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/rustc" + + # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc + # (or similar) here. It causes strange effects where rustc loads + # the wrong libraries in a bootstrap-build causing failures that + # are very hard to track dow. For details, see + # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 + ''} + ''; + + }; + + cargo = stdenv.mkDerivation rec { + name = "cargo-${versionType}-${version}"; + + inherit version; + inherit src; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ qknight ]; + license = [ licenses.mit licenses.asl20 ]; + }; + + buildInputs = [ makeWrapper ]; + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + ./install.sh --prefix=$out \ + --components=cargo + + ${optionalString needsPatchelf '' + patchelf \ + --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} + + wrapProgram "$out/bin/cargo" \ + --suffix PATH : "${rustc}/bin" + ''; + }; +} diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 91660dcc5b3..409bf465630 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, makeWrapper, cacert, zlib }: +{ stdenv, fetchurl, makeWrapper, cacert, zlib, curl }: let - inherit (stdenv.lib) optionalString; - platform = if stdenv.system == "i686-linux" then "i686-unknown-linux-gnu" @@ -14,77 +12,27 @@ let then "x86_64-apple-darwin" else throw "missing bootstrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.14.0` + # fetch hashes by running `print-hashes.sh 1.17.0` bootstrapHash = if stdenv.system == "i686-linux" - then "8d5c75728b44468216f99651dfae9d60ae0696a77105dd2b02942d75f3256840" + then "39d16ce0f618ba37ee1024b83e4822a2d38e6ba9f341ff2020d34df94c7a6beb" else if stdenv.system == "x86_64-linux" - then "c71325cfea1b6f0bdc5189fa4c50ff96f828096ff3f7b5056367f9685d6a4d04" + then "bbb0e249a7a3e8143b569706c7d2e7e5f51932c753b7fd26c58ccd2015b02c6b" else if stdenv.system == "i686-darwin" - then "fe1b3d67329a22d67e3b8db8858a43022e2e746dde60ef4a2db3f2cac16ea9bd" + then "308132b33d4002f95a725c2d31b975ff37905e3644894ed86e614b03ded70265" else if stdenv.system == "x86_64-darwin" - then "3381341524b0184da5ed2cdcddc2a25e2e335e87f1cf676f64d98ee5e6479f20" + then "1689060c07ec727e9756f19c9373045668471ab56fd8f53e92701150bbe2032b" else throw "missing bootstrap hash for platform ${stdenv.system}"; - needsPatchelf = stdenv.isLinux; - src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; sha256 = bootstrapHash; }; - version = "1.14.0"; -in - -rec { - rustc = stdenv.mkDerivation rec { - name = "rustc-bootstrap-${version}"; - - inherit version; - inherit src; - - buildInputs = [ makeWrapper ]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - ./install.sh --prefix=$out \ - --components=rustc,rust-std-${platform},rust-docs - - ${optionalString needsPatchelf '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/rustc" - ''} - - # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc - # (or similar) here. It causes strange effects where rustc loads - # the wrong libraries in a bootstrap-build causing failures that - # are very hard to track dow. For details, see - # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 - ''; - }; - - cargo = stdenv.mkDerivation rec { - name = "cargo-bootstrap-${version}"; - - inherit version; - inherit src; - - buildInputs = [ makeWrapper zlib rustc ]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - ./install.sh --prefix=$out \ - --components=cargo - - ${optionalString needsPatchelf '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/cargo" - ''} - - wrapProgram "$out/bin/cargo" \ - --suffix PATH : "${rustc}/bin" - ''; - }; -} + version = "1.17.0"; +in import ./binaryBuild.nix + { inherit stdenv fetchurl makeWrapper cacert zlib curl; + buildRustPackage = null; + inherit version src platform; + versionType = "bootstrap"; + } diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index afab703ae5b..0d7e26e06f4 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm +{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl , targets ? [] , targetToolchains ? [] , targetPatches ? [] @@ -6,32 +6,30 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); + version = "1.17.0"; in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.15.1"; - isRelease = true; - forceBundledLLVM = false; + inherit llvm targets targetPatches targetToolchains rustPlatform version; + configureFlags = [ "--release-channel=stable" ]; - srcRev = "021bd294c039bd54aa5c4aa85bcdffb0d24bc892"; - srcSha = "1dp7cjxj8nv960jxkq3p18agh9bpfb69ac14x284jmhwyksim3y7"; + + src = fetchurl { + url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; + sha256 = "4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87"; + }; patches = [ ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - inherit llvm; - inherit targets; - inherit targetPatches; - inherit targetToolchains; - inherit rustPlatform; }; cargo = callPackage ./cargo.nix rec { - version = "0.16.0"; - srcRev = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420"; - srcSha = "117ivvs9wz848mwf8bw797n10qpn77agd353z8b0hxgbxhpribya"; - depsSha256 = "11s2xpgfhl4mb4wa2nk4mzsypr7m9daxxc7l0vraiz5cr77gk7qq"; + version = "0.18.0"; + srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666"; + srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; + depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/nightly.nix b/pkgs/development/compilers/rust/nightly.nix index d9ae8c140ab..b69dffbd8b3 100644 --- a/pkgs/development/compilers/rust/nightly.nix +++ b/pkgs/development/compilers/rust/nightly.nix @@ -1,56 +1,34 @@ -{ stdenv, callPackage, rustPlatform, cacert, gdb, - targets ? [], targetToolchains ? [], targetPatches ? [] }: +{ stdenv, callPackage, rustPlatform, llvm, fetchurl +, targets ? [] +, targetToolchains ? [] +, targetPatches ? [] +}: rec { - rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix { - shortVersion = "nightly-2017-01-10"; - forceBundledLLVM = true; # TODO: figure out why linking fails without this + rustc = callPackage ./rustc.nix { + inherit llvm targets targetPatches targetToolchains rustPlatform; + + version = "nightly-2017-05-30"; + configureFlags = [ "--release-channel=nightly" ]; - srcRev = "7bffede97cf58f7159e261eac592f9cf88ce209d"; - srcSha = "1784jvsf9g03cglwask1zhjmba4ghycbin3rw0hmhb41cz2y4q8v"; + + src = fetchurl { + url = "https://static.rust-lang.org/dist/2017-05-30/rustc-nightly-src.tar.gz"; + sha256 = "90ce76db56a93f1b4532f2e62bbf12c243c4d156662b0d80c25319211ee7d0e0"; + }; + patches = [ - ./patches/disable-lockfile-check-nightly.patch + ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - inherit targets; - inherit targetPatches; - inherit targetToolchains; - inherit rustPlatform; - }) (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ]; - postUnpack = '' - export CARGO_HOME="$(realpath deps)" - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt - ''; - postPatch = '' - ${oldAttrs.postPatch} - # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596 - rm -vr src/test/debuginfo/borrowed-enum.rs || true - rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true - rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true - rm -vr src/test/debuginfo/packed-struct.rs || true - rm -vr src/test/debuginfo/recursive-struct.rs || true - rm -vr src/test/debuginfo/struct-in-enum.rs || true - rm -vr src/test/debuginfo/struct-style-enum.rs || true - rm -vr src/test/debuginfo/tuple-style-enum.rs || true - rm -vr src/test/debuginfo/union-smoke.rs || true - rm -vr src/test/debuginfo/unique-enum.rs || true - - # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed - sed -i "s# def cargo(self):# def cargo(self):\n return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py - substituteInPlace \ - src/bootstrap/config.rs \ - --replace \ - 'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \ - ''$'self.cargo = Some(\n "${rustPlatform.rust.cargo}\\\n /bin/cargo".into());' - ''; - }); + doCheck = false; + }; cargo = callPackage ./cargo.nix rec { - version = "nightly-2017-01-10"; - srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0"; - srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj"; - depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp"; + version = "0.18.0"; + srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666"; + srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px"; + depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix index d8d0681a0c2..bdb11bd5b52 100644 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -1,87 +1,23 @@ { stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl }: let - inherit (stdenv.lib) optionalString; - platform = if stdenv.system == "x86_64-linux" then "x86_64-unknown-linux-gnu" else throw "missing bootstrap url for platform ${stdenv.system}"; bootstrapHash = if stdenv.system == "x86_64-linux" - then "1d5h34dkm1r1ff562szygn9xk2qll1pjryvypl0lazzanxdh5gv5" + then "21f38f46bf16373d3240a38b775e1acff9bb429f1570a4d4da8b3000315d0085" else throw "missing bootstrap hash for platform ${stdenv.system}"; - needsPatchelf = stdenv.isLinux; - src = fetchurl { url = "https://static.rust-lang.org/dist/${version}/rust-nightly-${platform}.tar.gz"; sha256 = bootstrapHash; }; - version = "2017-03-16"; -in - -rec { - inherit buildRustPackage; - - rustc = stdenv.mkDerivation rec { - name = "rustc-nightly-${version}"; - - inherit version; - inherit src; - - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ qknight ]; - license = [ licenses.mit licenses.asl20 ]; - }; - - buildInputs = [ makeWrapper ]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - ./install.sh --prefix=$out \ - --components=rustc,rust-std-x86_64-unknown-linux-gnu - - ${optionalString needsPatchelf '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/rustc" - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/rustdoc" - ''} - ''; - - }; - cargo = stdenv.mkDerivation rec { - name = "cargo-nightly-${version}"; - - inherit version; - inherit src; - - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ qknight ]; - license = [ licenses.mit licenses.asl20 ]; - }; - - buildInputs = [ makeWrapper curl ]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - ./install.sh --prefix=$out \ - --components=cargo - - ${optionalString needsPatchelf '' - patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/cargo" - ''} - ''; - }; -} + version = "2017-05-30"; +in import ./binaryBuild.nix + { inherit stdenv fetchurl makeWrapper cacert zlib buildRustPackage curl; + inherit version src platform; + versionType = "nightly"; + } diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index 4d1d20066b8..da52ac37ab3 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -1,8 +1,21 @@ -#!/bin/sh +#!/usr/bin/env bash + +# All rust-related downloads can be found at +# https://static.rust-lang.org/dist/index.html. To find the date on +# which a particular thing was last updated, look for the *-date.txt +# file, e.g. +# https://static.rust-lang.org/dist/channel-rust-beta-date.txt PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin" BASEURL="https://static.rust-lang.org/dist" -VERSION=$1 +DATE=$1 +VERSION=$2 + +if [[ -z $DATE ]] +then + echo "No date supplied" + exit -1 +fi if [[ -z $VERSION ]] then @@ -12,6 +25,6 @@ fi for PLATFORM in $PLATFORMS do - URL="$BASEURL/rust-$VERSION-$PLATFORM.tar.gz.sha256" + URL="$BASEURL/$DATE/rust-$VERSION-$PLATFORM.tar.gz.sha256" curl $URL done diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a693afb8b59..b05d0448588 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,25 +1,20 @@ { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps , llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git, cmake, curl - -, isRelease ? false -, shortVersion +, which, libffi, gdb +, version , forceBundledLLVM ? false -, srcSha, srcRev +, src , configureFlags ? [] , patches , targets , targetPatches , targetToolchains +, doCheck ? true } @ args: let inherit (stdenv.lib) optional optionalString; - version = if isRelease then - "${shortVersion}" - else - "${shortVersion}-g${builtins.substring 0 7 srcRev}"; - procps = if stdenv.isDarwin then darwin.ps else args.procps; llvmShared = llvm.override { enableSharedLibraries = true; }; @@ -32,6 +27,8 @@ stdenv.mkDerivation { name = "rustc-${version}"; inherit version; + inherit src; + __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ]; NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; @@ -45,19 +42,13 @@ stdenv.mkDerivation { # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; - src = fetchgit { - url = https://github.com/rust-lang/rust; - rev = srcRev; - sha256 = srcSha; - }; - # We need rust to build rust. If we don't provide it, configure will try to download it. configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] + ++ [ "--enable-vendor" "--disable-locked-deps" ] + ++ [ "--enable-llvm-link-shared" ] # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ] - # TODO: Remove when fixed build with rustbuild - ++ [ "--disable-rustbuild" ] ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; @@ -67,17 +58,8 @@ stdenv.mkDerivation { passthru.target = target; postPatch = '' - substituteInPlace src/rust-installer/gen-install-script.sh \ - --replace /bin/echo "$(type -P echo)" - substituteInPlace src/rust-installer/gen-installer.sh \ - --replace /bin/echo "$(type -P echo)" - - # Workaround for NixOS/nixpkgs#8676 - substituteInPlace mk/rustllvm.mk \ - --replace "\$\$(subst /,//," "\$\$(subst /,/," - # Fix dynamic linking against llvm - ${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''} + #${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''} # Fix the configure script to not require curl as we won't use it sed -i configure \ @@ -98,15 +80,25 @@ stdenv.mkDerivation { # https://reviews.llvm.org/rL281650 rm -vr src/test/run-pass/issue-36474.rs || true + # Disable some failing gdb tests. Try re-enabling these when gdb + # is updated past version 7.12. + rm src/test/debuginfo/basic-types-globals.rs + rm src/test/debuginfo/basic-types-mut-globals.rs + rm src/test/debuginfo/c-style-enum.rs + rm src/test/debuginfo/lexical-scopes-in-block-expression.rs + rm src/test/debuginfo/limited-debuginfo.rs + rm src/test/debuginfo/simple-struct.rs + rm src/test/debuginfo/simple-tuple.rs + rm src/test/debuginfo/vec-slices.rs + rm src/test/debuginfo/vec.rs + + # this can probably be removed when rust is updated beyond 1.17 + # fixes a warning in the test harness (I think?) which fails the build due + # to strict warnings + sed -i '/static_in_const/d' src/tools/compiletest/src/main.rs + # Useful debugging parameter # export VERBOSE=1 - '' + - # In src/compiler-rt/cmake/config-ix.cmake, the cmake build falls - # back to darwin 10.4. This causes the OS name to be recorded as - # "10.4" rather than the expected "osx". But mk/rt.mk expects the - # built library name to have an "_osx" suffix on darwin. - optionalString stdenv.isDarwin '' - substituteInPlace mk/rt.mk --replace "_osx" "_10.4" ''; preConfigure = '' @@ -120,7 +112,8 @@ stdenv.mkDerivation { dontUseCmakeConfigure = true; # ps is needed for one of the test cases - nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git cmake ]; + nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git cmake + which libffi gdb ]; buildInputs = [ ncurses ] ++ targetToolchains ++ optional (!forceBundledLLVM) llvmShared; @@ -141,7 +134,8 @@ stdenv.mkDerivation { sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs ''; - doCheck = true; + inherit doCheck; + dontSetConfigureCross = true; # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764 @@ -151,7 +145,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a4864faa6d..d807c5e36e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5724,12 +5724,19 @@ with pkgs; rust = rustStable; rustStable = callPackage ../development/compilers/rust { - inherit (llvmPackages_39) llvm; + inherit (llvmPackages_4) llvm; }; rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {})); - rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { - rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); - })); + + rustNightly = rustBeta; + + # rust support in nixpkgs isn't yet well maintained enough for us to + # pretend to support nightlies in a meaningful way. + + # rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { + # rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); + # })); + rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix { buildRustPackage = callPackage ../build-support/rust { rust = rustNightlyBin; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index db147fa9ca9..2fa9ac926d7 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-05-15"; - rev = "c73d61e84a623168a1a9bfff9c71defcc3416631"; - sha256 = "0c2f4f48bacx0lq33bjw806fq5r4nvbrxvl74n7gd2y44ldafnir"; + version = "2017-05-31"; + rev = "d85037df75a945b5a368d6ceaa7e030b67473a51"; + sha256 = "0567lfjxvbn4pb39557yfdq1nm4ssgbvzvzkrdqnx9sx5xyx7n4s"; src = fetchFromGitHub { inherit rev; From 6bdebf252c48cd60694c8f8c786d6d54ee5e1712 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sat, 10 Jun 2017 15:37:40 -0700 Subject: [PATCH 012/152] musl: 1.1.15 -> 1.1.16 --- pkgs/os-specific/linux/musl/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 54d6dbcb1ca..e37a2b9f55e 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.15"; + version = "1.1.16"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "1ymhxkskivzph0q34zadwfglc5gyahqajm7chqqn2zraxv3lgr4p"; + sha256 = "048h0w4yjyza4h05bkc6dpwg3hq6l03na46g0q1ha8fpwnjqawck"; }; enableParallelBuilding = true; @@ -24,13 +24,7 @@ stdenv.mkDerivation rec { "--enable-static" ]; - patches = [ - # CVE-2016-8859: http://www.openwall.com/lists/oss-security/2016/10/19/1 - (fetchpatch { - url = "https://git.musl-libc.org/cgit/musl/patch/?id=c3edc06d1e1360f3570db9155d6b318ae0d0f0f7"; - sha256 = "15ih0aj27lz4sgq8r5jndc3qy5gz3ciraavrqpp0vw8h5wjcsb9v"; - }) - ]; + patches = []; dontDisableStatic = true; From f6072d7b6ee8b96554cba0920bc1768e4c92adba Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 11 Jun 2017 08:51:47 +0200 Subject: [PATCH 013/152] rustc: disable lldb tests on darwin --- pkgs/development/compilers/rust/rustc.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b05d0448588..f4004c01df2 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -99,6 +99,11 @@ stdenv.mkDerivation { # Useful debugging parameter # export VERBOSE=1 + '' + + optionalString stdenv.isDarwin '' + # Disable all lldb tests. + # error: Can't run LLDB test because LLDB's python path is not set + rm -vr src/test/debuginfo/* ''; preConfigure = '' From caec2fcdd07b10fbdc4111aa3ffb11a646393f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 11 Jun 2017 12:08:26 +0100 Subject: [PATCH 014/152] vimPlugins.ensime-vim: make additional nix code persistent --- pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim | 1 + 1 file changed, 1 insertion(+) create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim new file mode 100644 index 00000000000..7d6267e9515 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim @@ -0,0 +1 @@ + pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; From 425bc07d435face36888b2f4d244e93370081156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 11 Jun 2017 12:09:29 +0100 Subject: [PATCH 015/152] vimPlugins: update source --- pkgs/misc/vim-plugins/default.nix | 315 +++++++++++++++--------------- 1 file changed, 161 insertions(+), 154 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 416262f9e1e..a56f21f31e6 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -113,8 +113,6 @@ rec { # --- generated packages bellow this line --- - - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { @@ -182,11 +180,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2017-05-15"; + name = "Syntastic-2017-05-30"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "5efeecece3f512076513e8ee1e7444157a16a77b"; - sha256 = "1dzhgmgbfh9dda72y3d5gb7zjjm2k55wd4z3wy8ixip3cp4mkiqx"; + rev = "159900a1a2d3db2c4d3757f1085f377c6e59ac02"; + sha256 = "1bq3di4kr855sma0qp6gyrrphy23hy2mn9ws5knnzicxmq5fixqb"; }; dependencies = []; @@ -204,11 +202,11 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-02-18"; + name = "Tagbar-2017-06-05"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "959f48798136bfd4ce60075d3c86c580fcf5e5c5"; - sha256 = "02v30744w2jcavwk9cjdy51ldpqylj6pgg6zavj4dni7knbnq3jm"; + rev = "87a1263f5d8b3623bee5e6036254480e668b5f74"; + sha256 = "1s6727vwrcikv9dmkl6s1c2r2r107p733j8sjjxshl68bi62ms8z"; }; dependencies = []; @@ -226,11 +224,11 @@ rec { }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2017-05-20"; + name = "The_NERD_tree-2017-06-05"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "0b84d458d607f0326b7718c92ba20f2627f63342"; - sha256 = "0gyqaz29ps9hidgnllcpwz91qac9r4xfqb43azgrydzv3j8m7lya"; + rev = "a9ab90198be0581fe961125bba3f282a666ef7ff"; + sha256 = "0qf2xjr2hyz08xalgv6yjr5rrrcxgv76sshr7d62sygg6qfsnbgw"; }; dependencies = []; @@ -286,11 +284,11 @@ rec { }; clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clang_complete-2017-02-16"; + name = "clang_complete-2017-06-03"; src = fetchgit { url = "git://github.com/Rip-Rip/clang_complete"; - rev = "b1a507fbc27ef581c966b035f52eafae773a6f32"; - sha256 = "19zs03giv8h5xmv18y9zn85sxr8akphvbscclrqhs4cf88285cgl"; + rev = "c963df1cd10463166e1245445bff27f28e89f9f7"; + sha256 = "1y7zx3ywir86mxgg86kb8z7xmxadcmv8ycc2i1y8s7jz6pv2v40l"; }; dependencies = []; # In addition to the arguments you pass to your compiler, you also need to @@ -377,11 +375,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2017-05-19"; + name = "fugitive-2017-06-08"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "d6e7e20123ef3892c041e4d9fbaf67a68b144a94"; - sha256 = "1fq3159pqwmf8z954r6vi0im790idnmgjrgh7raq8walcni72g78"; + rev = "be2ff98db543990d7e59a90189733d7a779788fd"; + sha256 = "1lkdypibsw2p45wrdcc8ambynszdcwiqyh50zhflf2slpd98iz3m"; }; dependencies = []; @@ -410,11 +408,11 @@ rec { }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2017-05-18"; + name = "vim-autoformat-2017-06-02"; src = fetchgit { url = "https://github.com/Chiel92/vim-autoformat"; - rev = "31c2de23982973737d624e6a473098af100928a2"; - sha256 = "140nl41pcac3xbw3scj9fmyrlsga4adnsgwn840nmcj1wcc287qh"; + rev = "41d1c14de27f76f400c51d45b1617319266d9f4a"; + sha256 = "0myhs5fjq9lr0ag49scdhchsifhc7djmyrx88nhsing33l4nbjzk"; }; dependencies = []; @@ -432,22 +430,22 @@ rec { }; tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2017-05-21"; + name = "tsuquyomi-2017-05-31"; src = fetchgit { url = "https://github.com/Quramy/tsuquyomi"; - rev = "cdae8ecde529019d50bdf2f25b782e9ee408a7c0"; - sha256 = "07hadplv29pm6kv3ay6w7a6nwzrmxiwn3fmllgl2vfrnqx82fknx"; + rev = "46dfcd72b9701a52331349ba0d5c7596167093ab"; + sha256 = "12rvkc3wf959siijrgld56xvfhgacglxb69z4q567fsjv3ynqnrv"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-05-20"; + name = "deoplete-nvim-2017-06-06"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "493a97d151b6b89993194b442ca5f6d5e969e9f8"; - sha256 = "1k5ziaqciqif7as4fk2hnc0r8kva3bgvx5zi11k9qg541ixz29s2"; + rev = "8bd63b7e4f9bb3cf2040724dd71cff195564166a"; + sha256 = "1jf6l5li7m4m2ijfndqgm95mpw9c188vfbsggnzp2ivcxc7bd8bv"; }; dependencies = []; @@ -487,11 +485,11 @@ rec { }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2017-04-26"; + name = "clighter8-2017-06-10"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "8b892435fda7cb32378c7e49a2064126dbb6b9af"; - sha256 = "1ixqs1id9q24wwdw1izmznz8yk68pm74336ixhs8lbj9rn8my5gn"; + rev = "c83091b35c0d09cee0d6850c91824f72a0d8c513"; + sha256 = "105a4c753n57svyz8abs5w0v2747pyfly7dzjyh6i5yraaq2g7bx"; }; dependencies = []; preFixup = '' @@ -501,11 +499,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2017-05-22"; + name = "neomake-2017-06-10"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "4979ef24fdc061a550b013daab5ef779517e29ce"; - sha256 = "0q81ig92kd3xrlh8l2gnx26s84cnb221jcqjl0fyvi09d99mfil1"; + rev = "cc916f35fa3d131b2d6529d0e47bde141d99b7c3"; + sha256 = "00kz9ny3z4j6nhgzxarj8d072k6sf4qiwgfj4ckmllq5fyb2ik4l"; }; dependencies = []; @@ -545,11 +543,11 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2017-02-26"; + name = "vim-tmux-navigator-2017-06-01"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "2fc1ed42ab580ab47c506ab0bef09f1dbb9ff04d"; - sha256 = "1mw0x3kcxvhfypzd7yj6bcknp6c5bh4zb4r9b16n1r7gplvwv8jn"; + rev = "b93e176b7150942d9f0556347d1c8f6d0b690124"; + sha256 = "1xjvx4svv1kdqmv114ghx7cfrb5kmbljlwac8bsw36rq3kyknwrn"; }; dependencies = []; @@ -567,11 +565,11 @@ rec { }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2017-04-28"; + name = "ctrlp-vim-2017-06-04"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "cbd52e3bdd388afd7accaba6e0aea754f32da271"; - sha256 = "08d6zrwsdrpjm9az5zdzdx8c27dmnc9flvsfp3ig6yz6jinvwc1x"; + rev = "019f20a6f280b875b3812ea4d03a4cf1647cd0d9"; + sha256 = "1zyl140ykjc1g7kc306f03q7xcxjzx757hphdgcb63ksql2k1f33"; }; dependencies = []; @@ -622,11 +620,11 @@ rec { }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2017-05-21"; + name = "vim-2017-05-24"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "7a4798a6d049905a71d9cb82aaf0db5d2e116f7d"; - sha256 = "1h5r85pv7mcyhczc6ijbfv46xjzxrw3lbbfsxlycx0hx8b8jfpql"; + rev = "6a5bf34193927c70b6c21dcbe1c130d2ab0951d6"; + sha256 = "1mmqrc52k133ddpxcs0mxjph4n4b856r5wbs17bgcpk95cfbspb1"; }; dependencies = []; @@ -717,7 +715,7 @@ rec { sha256 = "194qwj3glw3l9yxvd26vn10kl06v1sykqx2cznskqa3vj3z8jb01"; }; dependencies = ["vimproc" "vimshell" "self" "forms"]; - + pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; }; YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation @@ -732,11 +730,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-05-22"; + name = "vim-go-2017-06-10"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "05efdfe80f433538932af82c1f168b1af4d30b7f"; - sha256 = "19nyclwigrcxs4hzjkyj971ifm8r0q9991vcs0a4n860c66l9xhs"; + rev = "7b93bae4b08091c4d6243dafc2e040a84ea91d1d"; + sha256 = "0hrzgxlkqvlh45pvli2aqnzx58vyjhmcz6rr28cm7x8b0wf20r00"; }; dependencies = []; @@ -765,11 +763,11 @@ rec { }; psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2017-05-22"; + name = "psc-ide-vim-2017-06-10"; src = fetchgit { url = "https://github.com/frigoeu/psc-ide-vim"; - rev = "b97523df5e31d1a86cb52fb0188b87a72aa7633d"; - sha256 = "09ibx86wq24vyk8cpzlfqbwcygnr3y4qvscfjyrj8pzg4mlfpw0j"; + rev = "f5fc6aadf805ec0186efc63cbf294f251c1b2056"; + sha256 = "0syrvkbbrcxmss07sppgsg43j241fm6yqj8ii54fm51vss02qxp8"; }; dependencies = []; @@ -809,33 +807,33 @@ rec { }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2017-05-07"; + name = "idris-vim-2017-06-05"; src = fetchgit { url = "https://github.com/idris-hackers/idris-vim"; - rev = "7aeb9fc143730a4a52f2635248b5658c64696831"; - sha256 = "0pg6q16z00g3imnb7d9pb0qv8jvnjipr0shqvlmqy0917rkhlapx"; + rev = "0709927e689f4f4158661d4eb8ac6ce310cd7548"; + sha256 = "05fiamb92l7d08kxv1jk5xpqvkxphr9vqi3bfa203mjkvymd3x34"; }; dependencies = []; }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2017-05-19"; + name = "calendar-vim-2017-05-28"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim"; - rev = "7571c1792b445cce5e98fd7df53b20b98ef28593"; - sha256 = "08jxdyjy6jsrlmi7d3bwfpd1kmbaz0n7lh8cvmxh99kyymqlpn1m"; + rev = "12c06ba87f32002b3c9f34fe881bcbaf3ab1721b"; + sha256 = "02ss39227c8jfn95hqwwpgn1rvrgwib8h5h0j9rvl6x491jj98wg"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2017-04-21"; + name = "lightline-vim-2017-05-30"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "6034e639e871cb33a436508a6c6ccbe3e236de4c"; - sha256 = "0w37l1i8bfpcs6wx0h98c5b2f4kgi6b4357c0lhfmwprajh4pw7n"; + rev = "ff74d6561487d220ed9d878172d8b55a79a4c17e"; + sha256 = "0j8pn42vfc1ka6hjnfsanl98vlk2839am5d4ynz9p1j1hichiqzv"; }; dependencies = []; @@ -963,11 +961,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2017-05-22"; + name = "fzf-vim-2017-06-10"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "990834ab6cb86961e61c55a8e012eb542ceff10e"; - sha256 = "17f4vlahap3bycgl3b78drq58rdlwi8kkl3z7l9jhsxvzvdvccl1"; + rev = "cf60e546476f73514a326416916b6a98f88d8abd"; + sha256 = "11cls65zfv9gzz8qmg44q0i03hmwhqb8i53lb42vdz2bzicdasv3"; }; dependencies = []; @@ -1040,11 +1038,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2017-05-22"; + name = "vimtex-2017-06-09"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "11bcdc95ba4f201f93f9857362cfea0d99e0a0db"; - sha256 = "0qszla7x1zxm1v6l3iz14cvw5hcmb8yja6d01dr9fhlpx968xgwr"; + rev = "0ae4e776cb78ce0c18635fecd6f518e3f40e5f80"; + sha256 = "1iz87nr89wamxpg4whfqdfhp6qmfff6jjp58sjzh5q32lzzmi48s"; }; dependencies = []; @@ -1110,11 +1108,11 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-05-07"; + name = "vim-startify-2017-06-05"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "1e251fb749640b2f4e6ccb812fccf5ad3ab9fd27"; - sha256 = "178v9sqfdh51zfdm3wd4njgfm6d99ics6fa5bvm1v7gnj44zjxbj"; + rev = "53c53b24440d14d7886484ad662549fc78550c40"; + sha256 = "1w3kxvydnd7rh2fp3ra677dw11rsnmnm9bav92j3dkkb5afhmj3v"; }; dependencies = []; @@ -1253,11 +1251,11 @@ rec { }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2017-03-09"; + name = "python-mode-2017-06-09"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "73620c44c4cd036a8133f77e2f56ca8995640cff"; - sha256 = "0d2f8lcpjsrj3i21yinsncm9aigp024vi7mfy2hxhii7jcdmh8q5"; + rev = "4c426b98c2f9094f44bdbe02f43e44badfa61724"; + sha256 = "0lpd5k2j22r5wx5x5wh97mdsfyspfxf23kh241l7zbfm573r4jy0"; }; dependencies = []; @@ -1308,22 +1306,33 @@ rec { }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2017-01-01"; + name = "rust-vim-2017-06-01"; src = fetchgit { url = "https://github.com/rust-lang/rust.vim"; - rev = "732b5fcb3652f81726d5f0f5b97c9027c01f057a"; - sha256 = "0yrg0wlpc9nj5zf25vgr9zd1kwapds3f10njr0dw0wgxr7g204dz"; + rev = "b77ac8ecbd4baaa23cca612e1c9b3df5ea23da9b"; + sha256 = "07qkyils4dgl81lqifx0pr075m3mdpzifp1w5d0zw4zkpvb0v8nk"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2017-05-14"; + name = "neoformat-2017-06-09"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "269e644661655d82765ae6c0259bbf084fa1f83b"; - sha256 = "08r0hjz8dykn19rkprnh8jimj6g1p2pz0gqcj6bal84xk4qky2xb"; + rev = "a52b155f6cc2f401afb04f865b2198d47b393ddd"; + sha256 = "1a0j1k3bm9mp9d622m4kh5n9r2q4330kd0n3n9n60kmy3bnpa5w1"; + }; + dependencies = []; + + }; + + deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-rust-2017-05-30"; + src = fetchgit { + url = "https://github.com/sebastianmarkow/deoplete-rust"; + rev = "5447ee448d3d63cda4681e6309b1c18c493e1cd1"; + sha256 = "1dr95vnp11zzia7vnwdhhrmkslnak77nps4zr447f34lxk185v5d"; }; dependencies = []; @@ -1352,44 +1361,44 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2017-04-30"; + name = "neocomplete-vim-2017-05-27"; src = fetchgit { url = "https://github.com/shougo/neocomplete.vim"; - rev = "0dbc6e4594db2e7fdd4c71b93e67b51e26c9c258"; - sha256 = "182hyi43sqy3y37vyjiapv2knz9n4f42x9dr4p10rmgpigp23axg"; + rev = "4fd73faa262f5e3063422d9fc244c65f1b758cf3"; + sha256 = "0hl5incxkxb491vnf3j2hndv4x31ic6dgj7wqka1bfqjcl53wjfl"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2017-03-29"; + name = "neosnippet-snippets-2017-06-11"; src = fetchgit { url = "https://github.com/shougo/neosnippet-snippets"; - rev = "2a9487bacb924d8e870612b6b0a2afb34deea0ae"; - sha256 = "0917zlh7fin2172jmlbzkszb1dqafx6l0sgxf1nm1b0k083c9bjz"; + rev = "0507e9c200a904a21fa5d15ee66a1ea9fe07bb01"; + sha256 = "1rc67yqfhzqxq15sl258kdwgk8r55w470s0vcd1ax2h8yd4s7sc7"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2017-04-23"; + name = "neosnippet-vim-2017-06-11"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "9996520d6bf1aaee21f66b5eb561c9f0b306216c"; - sha256 = "0j7z05br2cjdssdks3mac51xmr7js192gy30811nzjizwm2hhcwk"; + rev = "6f87e27d4e20ea8b71821df06f71818716a13cf3"; + sha256 = "0wfbicqblz91w5rzndy8zirzf819abmjv1az8yd26q1bbh3j0jpb"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2017-05-22"; + name = "unite-vim-2017-05-27"; src = fetchgit { url = "https://github.com/shougo/unite.vim"; - rev = "39dbd776f304d3a5f20483298be80991ed8fbd09"; - sha256 = "0snrg3nbr25qkk3nskygzy68qwgf9si1llryxpi6h28ixkn8n3n0"; + rev = "ada33d888934d8a9e60aa8ff828b651aaedb6457"; + sha256 = "0f4vnp3avpy7ns5ndr29ibff9d8hazji95y6m5idvziswywzpwsy"; }; dependencies = []; @@ -1502,22 +1511,22 @@ rec { }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2017-04-23"; + name = "vim-dispatch-2017-06-06"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "64ae8a26b9d8869aab9bef5b92602c8da541c7b7"; - sha256 = "090qq295iwd8aaggffjysmc37xx9nad25da51dgdhm5jxqv469gp"; + rev = "1beee74e5ae75c46fd3f1255cce2543769102dc0"; + sha256 = "0jvcxr22i3yqcfvshl97939kki9ng9mvmf79qph3y9x2h0fhzikm"; }; dependencies = []; }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2017-03-08"; + name = "vim-eunuch-2017-06-08"; src = fetchgit { url = "https://github.com/tpope/vim-eunuch"; - rev = "dcd29a00eb708be211d856afd3fddfbff7bc6208"; - sha256 = "1vq1qwhm27zmnp8xda1z27fhx835kni6ifcyix644shpd8mq8bi4"; + rev = "b536b887072ff3cc382842ce9f675ec222302f4f"; + sha256 = "0vp037kb12mawy186cm384m5hl0p051rihhm1jr2qck0vwaps58p"; }; dependencies = []; @@ -1535,11 +1544,11 @@ rec { }; vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-speeddating-2015-01-24"; + name = "vim-speeddating-2017-05-24"; src = fetchgit { url = "https://github.com/tpope/vim-speeddating"; - rev = "426c792e479f6e1650a6996c683943a09344c21e"; - sha256 = "1i8pndds1lk5afxl6nwsnl4vzszh0qxgqx7x11fp3vqw27c5bwn8"; + rev = "a418667791f03694065948342f2d6c5cca8d0f32"; + sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw"; }; dependencies = []; @@ -1568,11 +1577,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2017-05-19"; + name = "youcompleteme-2017-06-05"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "263bd88bd54278dba94c4d6c43ad5fcde2fcd3bb"; - sha256 = "1gggbigv7h21di7vxvpk252djhjfhppvjd26dqyhk885d5ddm4m6"; + rev = "b20809332c3298cb954cff20006cb52955b54b2d"; + sha256 = "19a9lyc2xx1qp39dgyyi74bnslh6vhdi4y55b61li07b5qa4sh20"; }; dependencies = []; buildPhase = '' @@ -1594,11 +1603,11 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2017-05-14"; + name = "vim-airline-themes-2017-05-24"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "3a39c85598aae19052aa0e2fe0512c8b228c0136"; - sha256 = "04bm0civzhvwx059q8hcd4zvg2qzy6qpzq41b86li4hzly32m5yn"; + rev = "43fe3927b884dcf722f9109e39801db110186dab"; + sha256 = "1rl4im3pllkfvc5z3shmwblzvp4s3lri3clzpirzqmywa027d0p8"; }; dependencies = []; @@ -1748,22 +1757,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2017-05-18"; + name = "vim-wakatime-2017-06-08"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "00443e2b580314b0cdb2bc2be746c44e75030074"; - sha256 = "0af34wc0fqhn1pb4dcm6ba5gnav7kg3wfchlciymv6pb8zvaqvfb"; + rev = "a96180dd0e694e9a5dadfb65e4c3465a9184840f"; + sha256 = "0wf108myrfjslf56xqiwsl2mkaqz7qn5k7ggvcfwmhp91lzl5aan"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2017-03-02"; + name = "command-t-2017-06-08"; src = fetchgit { url = "https://github.com/wincent/command-t"; - rev = "5a19460ea0eab0ca617a8dbf405f7a506eca4ff6"; - sha256 = "0vzw5cvlsw0cs2jp52qbc7nghw4jsbldrbkynbx8g7nrh36847my"; + rev = "3f0d21a06d9b936bcd79970c1b2301b05dd297bc"; + sha256 = "15wil973sqfgvix9li15qk49kv9l3rn8zqis2cl71k6xh1xvd9ff"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1798,11 +1807,11 @@ rec { }; deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2017-03-21"; + name = "deoplete-go-2017-05-26"; src = fetchgit { url = "https://github.com/zchee/deoplete-go"; - rev = "7990da5c8c89a47e0ccd3b7e60a836a6f115641a"; - sha256 = "0ybd9sg4x8pczvl0hz5azzs2sn4nyc7la9890xh373dv3lyb6gk7"; + rev = "aef73fdf275053a6fb00c3f66d1f18821bc74bd3"; + sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq"; }; dependencies = []; buildInputs = [ python3 ]; @@ -1815,22 +1824,22 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2017-04-26"; + name = "deoplete-jedi-2017-06-11"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "58354e749d81a55cc7e591beb4b4628b5e3cbd9e"; - sha256 = "1j5vp6yspnjqnrrfqvhz0xwhc4v1z73y0170nxpxw7xlb80bi05m"; + rev = "b7e789ef8b45b207650adb1af5e2e7f188053fe1"; + sha256 = "0xv7ggwyl332yr93rqmf1li0zz8rzhgb10cvd78jssdvlazi3mc8"; }; dependencies = []; }; goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-2017-04-02"; + name = "goyo-2017-06-01"; src = fetchgit { url = "git://github.com/junegunn/goyo.vim"; - rev = "64e750f726d8758c493931938a17c50f75e6f823"; - sha256 = "0g1kark21kljrk7i0ig8gfdh5kva8vj80cvi4jbph4rmrbxwjc7x"; + rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; + sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; }; dependencies = []; @@ -1870,11 +1879,11 @@ rec { }; pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2017-05-22"; + name = "pathogen-2017-05-27"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; - rev = "379b8f70822c4a89370575c3967f33cb116087ea"; - sha256 = "0j7cixmqllp3wwhsmwfcjj6rslx90lwrssi64mk3whm303x1qxvq"; + rev = "ddfb1f14d7597e6aedc749be06b559a673c437ab"; + sha256 = "0fdd88gj75bzq6ifaddz3sl71w8ljnnci9npm04jmyvf048gnjg8"; }; dependencies = []; @@ -1925,11 +1934,11 @@ rec { }; sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sleuth-2017-05-04"; + name = "sleuth-2017-05-28"; src = fetchgit { url = "git://github.com/tpope/vim-sleuth"; - rev = "0ffa819630678e442fc695c51a75ced640c8a95f"; - sha256 = "0izyaggk6qx8k1297ki6fan4534hvnnk95hhqy8jngshrq1a46w0"; + rev = "fc5cf44466d50fada784530de933af80c6448db5"; + sha256 = "10l6ins66g1wxwzgjcpwim0295yz9ni282f8n7vjafd5v486fxnw"; }; dependencies = []; @@ -2254,11 +2263,11 @@ rec { }; vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2017-02-08"; + name = "vim-easy-align-2017-06-03"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; - rev = "3b395bd5bafbdfb1f93190fa3f259b7ad2e40eb9"; - sha256 = "0nqvzxr2i9jsyx1qhspf636q0j4b0d8y98yqhxklcpq18ap442zp"; + rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; + sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; }; dependencies = []; @@ -2276,11 +2285,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2017-04-28"; + name = "vim-gitgutter-2017-06-08"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "b803a28f47b26d16f5fe9e747850992c9985c667"; - sha256 = "024sw99h3s9p3xsg9ih8p4v6m0hkahgl4jgq2jxyd62sc1nhpwbh"; + rev = "dcac1f74ee5c26125363dca164463bde6657c838"; + sha256 = "0knkdv0sbdwf4p82g438l7pylwzxfbxcj44np3v15wr97w95wmlv"; }; dependencies = []; @@ -2308,13 +2317,12 @@ rec { }; - vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2017-04-29"; + name = "vim-multiple-cursors-2017-06-02"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "92d0b8dc446e91984cc4a9722b767f5a28504d47"; - sha256 = "1a291sswkxv608rfsdpkv6l1b4vqc487jhzwcvgvjbf9x2w0simb"; + rev = "3afc475cc64479a406ce73d3333df1f67db3c73f"; + sha256 = "04dijb4hgidypppphcy83bacmfrd9ikyjc761hqq6bl4kc49f5kc"; }; dependencies = []; @@ -2332,33 +2340,33 @@ rec { }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2017-04-21"; + name = "vim-signify-2017-06-06"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "6e8c4b190078030f9cb979ce26274a79c0ac313c"; - sha256 = "1wch8pas15z5afw71i814z4cxl8l411kdizhwljx69ghvbwkmkpg"; + rev = "d9918a69bcff382569ddf5bda030aff412bfd790"; + sha256 = "1kc7q8xsvg0hl9b3z5a6phfndx7a5pcfy1d3q7i02aaa8dw4ga7j"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2017-05-22"; + name = "vim-snippets-2017-06-09"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "8a0f865950d70d6de1e39cec20ad4d52b611bd8f"; - sha256 = "1czs9zqjdb86fdb6lldzv4fjyc8yw2adhhbdzzj631hfcvi1a2r3"; + rev = "d21f43c210ac7b04ec1bcda39f10b03a934a9ae8"; + sha256 = "1vv7kpin3aqzz47937b5w5q2hcr9gldz0x39i6z3wa3q4x2sg366"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2017-05-07"; + name = "vim-webdevicons-2017-05-29"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "4a77915b43120e8fade8f40f961a96831a5732bd"; - sha256 = "02svpilb8vqvd5a8lfbb4ppwaicibb9hcjcq8415vi6dipmj1s7x"; + rev = "153266275acc4f4615407a18e90f58780ebaef92"; + sha256 = "1zjrra0q5c7lmgxzlz7ddd7vi6k2vhz69fdy2s7d873nnmmd7kgn"; }; dependencies = []; @@ -2375,37 +2383,36 @@ rec { }; - vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2017-04-15"; + vimproc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimproc-2016-08-06"; src = fetchgit { - url = "git://github.com/vimwiki/vimwiki"; - rev = "8cdc1c15388cc7f4edb827ff15dbc31d592a79af"; - sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h"; + url = "git://github.com/Shougo/vimproc"; + rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0"; + sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20"; }; dependencies = []; }; vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vinegar-2017-05-10"; + name = "vinegar-2017-05-23"; src = fetchgit { url = "git://github.com/tpope/vim-vinegar"; - rev = "1ed01e2135b0b8158ba289e03c54f63dad9865be"; - sha256 = "128sdiaxdvjxz67iy0sgaqi54r8sfd5881m1mrp58wc1zgafgfb5"; + rev = "9abe956acc14444c0fda75eb98c8e31cf81b4c26"; + sha256 = "16a85lk20v50krl899w0i9zl6gp7478f4pd6mqz8519d76vbmy99"; }; dependencies = []; }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2017-04-02"; + name = "vundle-2017-06-08"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "6497e37694cd2134ccc3e2526818447ee8f20f92"; - sha256 = "0mphybh0mwh5km2q0awmn8hdgvq3g45yyqpjird7kxybri6aw0kn"; + rev = "6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87"; + sha256 = "13k194g0rs5hz7ci0ys4gml71jily5hdd0yljzmmn8qjiq88v6p4"; }; dependencies = []; }; - } From 74fd4de95679bddaae7c1c6c58432c5bc207fc41 Mon Sep 17 00:00:00 2001 From: Nicolas Truessel Date: Sun, 11 Jun 2017 10:10:56 +0200 Subject: [PATCH 016/152] chromium: 58.0.3029.110 -> 59.0.3071.86 --- .../networking/browsers/chromium/common.nix | 10 +++------- .../chromium/patches/fix-bootstrap-gn.patch | 12 ------------ .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f36f28ac880..e747db6a8b7 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -3,7 +3,7 @@ # default dependencies , bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy -, libpng, libxml2, libxslt, libcap +, libpng, libcap , xdg_utils, yasm, minizip, libwebp , libusb1, pciutils, nss, re2, zlib, libvpx @@ -57,7 +57,7 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "libwebp" "libxml" "libxslt" "snappy" "yasm" + "flac" "libwebp" "snappy" "yasm" ]; opusWithCustomModes = libopus.override { @@ -67,7 +67,7 @@ let defaultDependencies = [ bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy - libpng libxml2 libxslt libcap + libpng libcap xdg_utils yasm minizip libwebp libusb1 re2 zlib ]; @@ -105,7 +105,6 @@ let patches = [ ./patches/nix_plugin_paths_52.patch - ./patches/fix-bootstrap-gn.patch ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch ++ optional enableWideVine ./patches/widevine.patch; @@ -134,9 +133,6 @@ let # use our own nodejs mkdir -p third_party/node/linux/node-linux-x64/bin ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node - '' + optionalString (versionAtLeast version "52.0.0.0") '' - sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ - third_party/pdfium/xfa/fxbarcode/utils.h ''; gnFlags = mkGnFlags ({ diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch deleted file mode 100644 index 34efb4f7a45..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 3148ccf..38cfb11 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/base_switches.cc', - 'base/build_time.cc', - 'base/callback_internal.cc', -+ 'base/callback_helpers.cc', - 'base/command_line.cc', - 'base/debug/activity_tracker.cc', - 'base/debug/alias.cc', diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 7ee28c7fc27..0cc53a0c31e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1dcad79kfayagqiv85ycla3iv3gc99k0rvnvnpar9hd6x1iv8cfl"; - sha256bin64 = "0ywf50rfzv1kkfpld62fi5g0kz33an0p03xqf7wkcqi7hild607v"; - version = "59.0.3071.47"; + sha256 = "151a7w2gqrv1svabhzmalrjr2pdbb9ys8zhrfz02779rjhzfz916"; + sha256bin64 = "1957q2wdkymibxqzpcq71fj3q6gca888r7gr621z0c03p0izlb7z"; + version = "60.0.3112.24"; }; dev = { - sha256 = "05kxl938mh41341lh5xsxcqxv9hhx8yn6nkawgg241sfwdx72db8"; - sha256bin64 = "1mr2615r30zjxa55mdcbfi0k2grgyykzawslmg41aw0jy5hfamal"; - version = "60.0.3095.5"; + sha256 = "15642f0nalx3zqdlr5ldcbrpxnadav3z6sl3imvzj2ssv3nbh25m"; + sha256bin64 = "0lbma509m3ppy3hg34r10ijhw3m92qxm147qhw0k4lpwdcmm6fnm"; + version = "60.0.3112.20"; }; stable = { - sha256 = "1zvqim75mlqckvf7awrbyggis71dlkz4gjpfrmfdvydcs8yyyk7j"; - sha256bin64 = "0vfx2m5zqfvfb6sgd3dg1sji72dzjcd1sf4r6qwhnz38wadys7id"; - version = "58.0.3029.110"; + sha256 = "1rxc555l3bxczg9vigr2p0y7j1gswy99gs5yhkbj3raakym32563"; + sha256bin64 = "1bvkibhvxdcszbh44x77cynnaqhrm5ngf79fp7rdljfhlflvsnw9"; + version = "59.0.3071.86"; }; } From c9cb6403d3c72b01aeccc537d1cbe7954aecf29b Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Wed, 7 Jun 2017 23:21:14 +0200 Subject: [PATCH 017/152] erlang: move erlang_basho_R16B02 to Erlang's general builder. --- pkgs/development/interpreters/erlang/R16.nix | 1 - .../interpreters/erlang/R16B02-8-basho.nix | 74 ++++--------------- pkgs/development/interpreters/erlang/R17.nix | 1 - .../interpreters/erlang/generic-builder.nix | 28 +++++-- pkgs/top-level/beam-packages.nix | 6 +- 5 files changed, 36 insertions(+), 74 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 3ac37b5bde1..123d813fc77 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -25,7 +25,6 @@ mkDerivation rec { sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; }; in '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call tar xf "${manpages}" -C "$out/lib/erlang" for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do prefix="''${i%/*}" diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix index fe24ad64bf8..89c97f5a0eb 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -1,76 +1,38 @@ -{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang -, gnused, gawk, makeWrapper -, odbcSupport ? false, unixODBC ? null -, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null -, enableDebugInfo ? false -, Carbon ? null, Cocoa ? null }: +{ pkgs, mkDerivation }: -assert wxSupport -> mesa != null && wxGTK != null && xorg != null; -assert odbcSupport -> unixODBC != null; - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}"; +mkDerivation rec { + baseName = "erlang"; version = "16B02"; - src = fetchFromGitHub { + src = pkgs.fetchFromGitHub { owner = "basho"; repo = "otp"; rev = "OTP_R16B02_basho8"; sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x"; }; - debugInfo = enableDebugInfo; - - buildInputs = - [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc - ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport [ unixODBC ] - ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; - - # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense - prePatch = '' - substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' - ''; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in ''; - - postPatch = '' - patchSheBangs make - ''; - preConfigure = '' export HOME=$PWD/../ export LANG=C export ERL_TOP=$(pwd) sed -e s@/bin/pwd@pwd@g -i otp_build - sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc - ''; + sed -e s@"/usr/bin/env escript"@$(pwd)/bootstrap/bin/escript@g -i lib/diameter/bin/diameterc - configureFlags= [ - "--with-ssl=${openssl.dev}" - "--enable-smp-support" - "--enable-threads" - "--enable-kernel-poll" - "--disable-hipe" - "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" - "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" - "${optionalString stdenv.isLinux "--enable-m64-build"}" - ]; - - buildPhase = '' ./otp_build autoconf - ./otp_build setup -a --prefix=$out $configureFlags ''; + enableHipe = false; + + # Do not install docs, instead use prebuilt versions. + installTargets = "install"; postInstall = let - manpages = fetchurl { + manpages = pkgs.fetchurl { url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; }; in '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + sed -e s@$(pwd)/bootstrap/bin/escript@$out/bin/escript@g -i $out/lib/erlang/lib/diameter-1.4.3/bin/diameterc + tar xf "${manpages}" -C "$out/lib/erlang" for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do prefix="''${i%/*}" @@ -79,14 +41,6 @@ stdenv.mkDerivation rec { done ''; - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" - ''; - - setupHook = ./setup-hook.sh; - meta = { homepage = "https://github.com/basho/otp/"; description = "Programming language used for massively scalable soft real-time systems, Basho fork"; @@ -103,7 +57,7 @@ stdenv.mkDerivation rec { ''; platforms = ["x86_64-linux" "x86_64-darwin"]; - license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ mdaiter ]; + license = pkgs.stdenv.lib.licenses.asl20; + maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ]; }; } diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 3d78c6ee242..02d7513331e 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -25,7 +25,6 @@ mkDerivation rec { sha256 = "1hspm285bl7i9a0d4r6j6lm5yk4sb5d9xzpia3simh0z06hv5cc5"; }; in '' - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call tar xf "${manpages}" -C "$out/lib/erlang" for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do prefix="''${i%/*}" diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 0127bb933c4..3434603f302 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,16 +1,20 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, autoconf, gawk, gnum4, gnused -, libxml2, libxslt, ncurses, openssl, perl +{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused +, libxml2, libxslt, ncurses, openssl, perl, gcc, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport , mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport }: -{ version +{ baseName ? "erlang" +, version , sha256 ? null , rev ? "OTP-${version}" , src ? fetchFromGitHub { inherit rev sha256; owner = "erlang"; repo = "otp"; } , enableHipe ? true , enableDebugInfo ? false +, enableThreads ? true +, enableSmpSupport ? true +, enableKernelPoll ? true , javacSupport ? false, javacPackages ? [ openjdk ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ] @@ -22,6 +26,7 @@ , installTargets ? "install install-docs" , checkPhase ? "", preCheck ? "", postCheck ? "" , fixupPhase ? "", preFixup ? "", postFixup ? "" +, meta ? null }: assert wxSupport -> (if stdenv.isDarwin @@ -36,13 +41,15 @@ let wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages; in stdenv.mkDerivation ({ - name = "erlang-${version}" + name = "${baseName}-${version}" + optionalString javacSupport "-javac" + optionalString odbcSupport "-odbc"; inherit src version; - buildInputs = [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper ] + buildInputs = + [ perl gnum4 ncurses openssl autoreconfHook libxslt libxml2 makeWrapper gcc + ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages @@ -58,9 +65,9 @@ in stdenv.mkDerivation ({ ''; postPatch = '' - patchShebangs make - ${postPatch} + + patchShebangs make ''; preConfigure = '' @@ -68,6 +75,9 @@ in stdenv.mkDerivation ({ ''; configureFlags = [ "--with-ssl=${openssl.dev}" ] + ++ optional enableThreads "--enable-threads" + ++ optional enableSmpSupport "--enable-smp-support" + ++ optional enableKernelPoll "--enable-kernel-poll" ++ optional enableHipe "--enable-hipe" ++ optional javacSupport "--with-javac" ++ optional odbcSupport "--with-odbc=${unixODBC}" @@ -78,6 +88,8 @@ in stdenv.mkDerivation ({ # (PDFs are generated only when fop is available). postInstall = '' + ${postInstall} + ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call ''; @@ -125,8 +137,8 @@ in stdenv.mkDerivation ({ // optionalAttrs (installPhase != "") { inherit installPhase; } // optionalAttrs (installTargets != "") { inherit installTargets; } // optionalAttrs (preInstall != "") { inherit preInstall; } -// optionalAttrs (postInstall != "") { inherit postInstall; } // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } +// optionalAttrs (meta != null) { inherit meta; } ) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 547e650a636..3451816c0c5 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -38,11 +38,9 @@ rec { }; # Bash fork, using custom builder. - erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix { }; - erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; }; From ca490a62906fa566e1f30504cd0f29d04ee48c4a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 11 Jun 2017 11:34:17 +0200 Subject: [PATCH 018/152] gdb: disable format warnings Fixes #26145 --- pkgs/development/tools/misc/gdb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e6dcc3057d1..1e9cf910857 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { # darwin build fails with format hardening since v7.12 hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ]; + NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; + configureFlags = with stdenv.lib; [ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline" "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}" From 29049d07f9fcf2755a2755dcda078891445da67b Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 11 Jun 2017 14:48:21 +0200 Subject: [PATCH 019/152] vim-plugins: fix evaluation --- pkgs/misc/vim-plugins/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a56f21f31e6..87d57e44182 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2383,17 +2383,6 @@ rec { }; - vimproc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-2016-08-06"; - src = fetchgit { - url = "git://github.com/Shougo/vimproc"; - rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0"; - sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20"; - }; - dependencies = []; - - }; - vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vinegar-2017-05-23"; src = fetchgit { From 3d601f6a8a4bcbd686011251f2a01e9c17595be8 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 11 Jun 2017 15:11:46 +0200 Subject: [PATCH 020/152] rustc: disable another gdb test --- pkgs/development/compilers/rust/rustc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index f4004c01df2..a8ba933b52f 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation { rm src/test/debuginfo/limited-debuginfo.rs rm src/test/debuginfo/simple-struct.rs rm src/test/debuginfo/simple-tuple.rs + rm src/test/debuginfo/union-smoke.rs rm src/test/debuginfo/vec-slices.rs rm src/test/debuginfo/vec.rs From c95f3a36cd2ab9c2565bfc9fd88eae57023146a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 7 Feb 2017 21:55:45 +0100 Subject: [PATCH 021/152] sdcc: 3.5.0 -> 3.6.0 * requires texinfo * --std=c99 unneeded, fixed upstream * can build with nixpkgs default boost (v1.62), so let's do that --- pkgs/development/compilers/sdcc/default.nix | 10 ++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index a246a413f50..7383f39f6cb 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchurl, bison, flex, boost, gputils ? null }: +{ stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.6.0"; name = "sdcc-${version}"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "1aazz0yynr694q0rich7r03qls0zvsjc00il14pb4i22c78phagq"; + sha256 = "0x53gh5yrrfjvlnkk29mjn8hq4v52alrsf7c8nsyzzq13sqwwpg8"; }; # TODO: remove this comment when gputils != null is tested - buildInputs = [ bison flex boost gputils ]; + buildInputs = [ bison flex boost texinfo gputils ]; configureFlags = '' ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""} ''; - NIX_CFLAGS_COMPILE = "--std=c99"; # http://sourceforge.net/p/sdcc/code/9106/ - meta = with stdenv.lib; { description = "Small Device C Compiler"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 959f7f6ea03..9e3998bb152 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5808,7 +5808,7 @@ with pkgs; scalafmt = callPackage ../development/tools/scalafmt { }; - sdcc = callPackage ../development/compilers/sdcc { boost = boost159; }; + sdcc = callPackage ../development/compilers/sdcc { }; serpent = callPackage ../development/compilers/serpent { }; From 46e2c1398f5ae44717dd00cd5846e54d02980ae0 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 7 Jun 2017 22:28:12 +0200 Subject: [PATCH 022/152] nextcloud: 11.0.2 -> 12.0.0 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 4bbff8b86ad..03c8463f9ea 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "11.0.2"; + version = "12.0.0"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0047kfl73720w7y2r7ivzj2gqg84rcfp98svq130nd0ziyfz27jx"; + sha256 = "0gr47bwwni7y33qz3l8g3sjrqridykxiid2jlmjdaz35bvq9r78v"; }; installPhase = '' From e19cdd3b34a81f7807a539974dd97bb091648cde Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 11 Jun 2017 17:42:48 +0300 Subject: [PATCH 023/152] icu: Fix ARM patch Broken by fad6fc3dae16b5161895165bf275e329e20860d6. Let's do it in a cleaner way. --- .../0001-Disable-LDFLAGSICUDT-for-Linux.patch | 28 ------------------- pkgs/development/libraries/icu/default.nix | 9 +++--- 2 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch diff --git a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch deleted file mode 100644 index 72d3f67d3bc..00000000000 --- a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 15 Feb 2014 21:06:42 +0000 -Subject: [PATCH] Disable LDFLAGSICUDT for Linux - -Upstream-Status: Inappropriate [ OE Configuration ] - -Signed-off-by: Khem Raj ---- - source/config/mh-linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/config/mh-linux b/source/config/mh-linux -index 366f0cc..2689aab 100644 ---- a/source/config/mh-linux -+++ b/source/config/mh-linux -@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN - LD_RPATH_PRE = -Wl,-rpath, - - ## These are the library specific LDFLAGS --LDFLAGSICUDT=-nodefaultlibs -nostdlib -+# LDFLAGSICUDT=-nodefaultlibs -nostdlib - - ## Compiler switch to embed a library name - # The initial tab in the next line is to prevent icu-config from reading it. --- -1.7.10.4 - diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index fdf1c6dffe9..173c9bb58ad 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -12,7 +12,7 @@ let sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; }; in -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = pname + "-" + version; src = fetchurl { @@ -39,6 +39,9 @@ stdenv.mkDerivation ({ preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure + '' + stdenv.lib.optionalString stdenv.isArm '' + # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch + sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; configureFlags = "--disable-debug" + @@ -59,6 +62,4 @@ stdenv.mkDerivation ({ maintainers = with maintainers; [ raskin ]; platforms = platforms.all; }; -} // (if stdenv.isArm then { - patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ]; -} else {})) +} From 86da6d441f7a248b02d545ac1b2c90ef27f42d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 11 Jun 2017 17:08:58 +0200 Subject: [PATCH 024/152] lyx: maintenance 2.2.2 -> 2.2.3 In particular, they claim some fixes related to Qt-5.8, so I switched back to using the default Qt (=5.8 ATM). Tested just briefly. --- pkgs/applications/misc/lyx/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 0da6e8eb34a..0d5ee979087 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.2.2"; + version = "2.2.3"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz"; - sha256 = "0s2mma8fkj5mi8qzc0j67589mbj854bypx2s3y59y1n429s3sp58"; + sha256 = "0mrbr24xbdg25gd7w8g76gpmy0a10nrnz0mz47mdjwi441yfpjjg"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e3998bb152..a3e1ec79583 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14870,7 +14870,7 @@ with pkgs; lynx = callPackage ../applications/networking/browsers/lynx { }; - lyx = libsForQt56.callPackage ../applications/misc/lyx { }; + lyx = libsForQt5.callPackage ../applications/misc/lyx { }; mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; From 370ace4cf03b31eedcf1e635ed5d52272b774526 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 11 Jun 2017 19:33:24 +0300 Subject: [PATCH 025/152] kernel: Don't build self-test modules --- .../linux/kernel/common-config.nix | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1dc161cca54..a0d4f8dbb5c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -36,7 +36,6 @@ with stdenv.lib; DEBUG_DEVRES n DEBUG_STACK_USAGE n DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n SCHEDSTATS n DETECT_HUNG_TASK y @@ -589,6 +588,46 @@ with stdenv.lib; # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK? n + # Disable various self-test modules that have no use in a production system + ARM_KPROBES_TEST? n + ASYNC_RAID6_TEST? n + ATOMIC64_SELFTEST? n + BACKTRACE_SELF_TEST? n + CRC32_SELFTEST? n + CRYPTO_TEST? n + DRM_DEBUG_MM_SELFTEST? n + EFI_TEST? n + GLOB_SELFTEST? n + INTERVAL_TREE_TEST? n + LNET_SELFTEST? n + LOCK_TORTURE_TEST? n + MTD_TESTS? n + NOTIFIER_ERROR_INJECTION? n + PERCPU_TEST? n + RBTREE_TEST? n + RCU_PERF_TEST? n + RCU_TORTURE_TEST? n + TEST_ASYNC_DRIVER_PROBE? n + TEST_BITMAP? n + TEST_BPF? n + TEST_FIRMWARE? n + TEST_HASH? n + TEST_HEXDUMP? n + TEST_KSTRTOX? n + TEST_LIST_SORT? n + TEST_LKM? n + TEST_PARMAN? n + TEST_PRINTF? n + TEST_RHASHTABLE? n + TEST_SORT? n + TEST_STATIC_KEYS? n + TEST_STRING_HELPERS? n + TEST_UDELAY? n + TEST_USER_COPY? n + TEST_UUID? n + WW_MUTEX_SELFTEST? n + XZ_DEC_TEST? n + # ChromiumOS support ${optionalString (features.chromiumos or false) '' CHROME_PLATFORMS y From d45aff53276d263ff1df73c001873f0ed64bffd3 Mon Sep 17 00:00:00 2001 From: Lukasz Czyzykowski Date: Sun, 11 Jun 2017 21:52:41 +0200 Subject: [PATCH 026/152] Adds ghc version to the patch file --- pkgs/development/compilers/ghc/8.0.2.nix | 2 +- .../{no-cpp-warnings.patch => ghc-8.0.2-no-cpp-warnings.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/compilers/ghc/{no-cpp-warnings.patch => ghc-8.0.2-no-cpp-warnings.patch} (100%) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 7463eb91e7a..cc0b1d4eadd 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch - ++ stdenv.lib.optional stdenv.isDarwin ./no-cpp-warnings.patch; + ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; buildInputs = [ ghc perl hscolour sphinx ]; diff --git a/pkgs/development/compilers/ghc/no-cpp-warnings.patch b/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch similarity index 100% rename from pkgs/development/compilers/ghc/no-cpp-warnings.patch rename to pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch From e35f3c0679cafb8de84274433159e1b393dca46d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Jun 2017 22:12:59 +0200 Subject: [PATCH 027/152] doc: Fix some typos --- doc/configuration.xml | 2 +- doc/functions.xml | 2 +- doc/overlays.xml | 2 +- doc/reviewing-contributions.xml | 2 +- doc/stdenv.xml | 12 ++++++------ .../manual/administration/imperative-containers.xml | 2 +- nixos/doc/manual/development/option-declarations.xml | 2 +- nixos/doc/manual/development/option-types.xml | 2 +- nixos/doc/manual/release-notes/rl-1509.xml | 2 +- nixos/doc/manual/release-notes/rl-1603.xml | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/configuration.xml b/doc/configuration.xml index 56950e07ab5..ea3acf4e575 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -227,7 +227,7 @@ packages via packageOverrides You can define a function called packageOverrides in your local -~/.config/nixpkgs/config.nix to overide nix packages. It +~/.config/nixpkgs/config.nix to override nix packages. It must be a function that takes pkgs as an argument and return modified set of packages. diff --git a/doc/functions.xml b/doc/functions.xml index 4e7159638ca..4a9015602af 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -70,7 +70,7 @@ In the above example, the separateDebugInfo attribute is - overriden to be true, thus building debug info for + overridden to be true, thus building debug info for helloWithDebug, while all other attributes will be retained from the original hello package. diff --git a/doc/overlays.xml b/doc/overlays.xml index 4b95f3e7288..f8f554bb556 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -78,7 +78,7 @@ self: super: The first argument, usually named self, corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of rr in the example above come -from self, as well as the overriden dependencies used in the +from self, as well as the overridden dependencies used in the boost override. The second argument, usually named super, diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index f86928bcd5d..0813e0968e8 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -18,7 +18,7 @@ The high change rate of nixpkgs make any pull request that is open for long enough subject to conflicts that will require extra work from the submitter or the merger. Reviewing pull requests in a timely manner and being - responsive to the comments is the key to avoid these. Github provides sort + responsive to the comments is the key to avoid these. GitHub provides sort filters that can be used to see the most recently and the s1 s2 - Replace every occurence of the string + Replace every occurrence of the string s1 by s2. @@ -1164,7 +1164,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello varName - Replace every occurence of + Replace every occurrence of @varName@ by the contents of the environment variable varName. This is useful for @@ -1177,7 +1177,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello varName s - Replace every occurence of + Replace every occurrence of @varName@ by the string s. @@ -1225,7 +1225,7 @@ substitute ./foo.in ./foo.out \ substituteAll infile outfile - Replaces every occurence of + Replaces every occurrence of @varName@, where varName is any environment variable, in infile, writing the result to @@ -1528,7 +1528,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup': depends on such a format string, it will need to be worked around. - Addtionally, some warnings are enabled which might trigger build + Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set to . @@ -1558,7 +1558,7 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro pic Adds the compiler options. This options adds - support for position independant code in shared libraries and thus making + support for position independent code in shared libraries and thus making ASLR possible. Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won't diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index 9851eb08afb..d5d8140e076 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -57,7 +57,7 @@ Thus, if something went wrong, you can get status info using -If the container has started succesfully, you can log in as +If the container has started successfully, you can log in as root using the root-login operation: diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index e322b6458a1..d20c2d1aa2e 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -96,7 +96,7 @@ options = { - Both approachs have problems. + Both approaches have problems. Making backends independent can quickly become hard to manage. For display managers, there can be only one enabled at a time, but the type diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index e928c557087..441393c9827 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -396,7 +396,7 @@ code before creating a new type. For composed types that can take a submodule as type parameter, this function can be used to substitute the parameter of a submodule type. It takes a module as parameter and return the type with - the submodule options substituted. It is usally defined as a type + the submodule options substituted. It is usually defined as a type function call with a recursive call to substSubModules, e.g for a type composedType that take an elemtype diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index e0271485c36..967fbcf869d 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -342,7 +342,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc - Python 2.6 has been marked as broken (as it no longer recieves + Python 2.6 has been marked as broken (as it no longer receives security updates from upstream). diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index f460e00e836..7279dd05827 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -362,7 +362,7 @@ services.syncthing = { networking.firewall.allowPing is now enabled by - default. Users are encourarged to configure an approiate rate limit for + default. Users are encouraged to configure an appropriate rate limit for their machines using the Kernel interface at /proc/sys/net/ipv4/icmp_ratelimit and /proc/sys/net/ipv6/icmp/ratelimit or using the From 5fbab5dfb3e4ef5ca35603bbe347e3fc6bda6111 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 11 Jun 2017 21:37:46 -0400 Subject: [PATCH 028/152] linux: 4.12-rc4 -> 4.12-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index c9dc44ba753..c56a25c3c26 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12-rc4"; - modDirVersion = "4.12.0-rc4"; + version = "4.12-rc5"; + modDirVersion = "4.12.0-rc5"; extraMeta.branch = "4.12"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "05sdyf9vs3cmcfpgn7bwmz59bpdpz65ly755lknxm5nms5vg7ph3"; + sha256 = "0d3lpf429fqrf6i529y0pjdwnpq2v82agn3xhw4jwkriib9i425x"; }; features.iwlwifi = true; From a12ae6171b372ffe66c65585c7d7864c4aaed612 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 12 Jun 2017 09:50:04 +0200 Subject: [PATCH 029/152] pythonPackages.boto: 2.45 -> 2.47 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87c469c937f..b33596dbf9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2969,11 +2969,11 @@ in { boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.45.0"; + version = "2.47.0"; src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "18z5nacnbdpw3pmzc56didhy4sfik8riap204px24350g9xlgz7i"; + sha256 = "051gq8z9m2cir03jhc00qs36bnpla7zkqm9xqiqcqvdknmi2ndbq"; }; checkPhase = '' From 798e256dcd195addcf6babf8bdcd0c2579337ceb Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 12 Jun 2017 11:19:40 +0200 Subject: [PATCH 030/152] cups-filters: fix path to pdftops This is hardcoded to /usr/bin/pdftops by default. --- pkgs/misc/cups/filters.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 6d6fab265b1..fec0634ba68 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-pdftops=pdftops" + "--with-pdftops-path=${poppler_utils}/bin/pdftops" "--enable-imagefilters" "--with-rcdir=no" "--with-shell=${stdenv.shell}" From 63e9d1c51ec0ad41c3ef729851442f199ce06a25 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Jun 2017 13:19:42 +0200 Subject: [PATCH 031/152] perf: Fix perf annotate This command requires objdump, so make sure it can find it. --- .../linux/kernel/perf-binutils-path.patch | 12 ++++++++++++ pkgs/os-specific/linux/kernel/perf.nix | 13 +++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/perf-binutils-path.patch diff --git a/pkgs/os-specific/linux/kernel/perf-binutils-path.patch b/pkgs/os-specific/linux/kernel/perf-binutils-path.patch new file mode 100644 index 00000000000..d20f2296ea3 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/perf-binutils-path.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' linux-4.9.31-orig/tools/perf/util/annotate.c linux-4.9.31/tools/perf/util/annotate.c +--- linux-4.9.31-orig/tools/perf/util/annotate.c 2017-06-07 12:08:04.000000000 +0200 ++++ linux-4.9.31/tools/perf/util/annotate.c 2017-06-12 13:10:08.811079574 +0200 +@@ -1350,7 +1350,7 @@ + "%s %s%s --start-address=0x%016" PRIx64 + " --stop-address=0x%016" PRIx64 + " -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand", +- objdump_path ? objdump_path : "objdump", ++ objdump_path ? objdump_path : OBJDUMP_PATH, + disassembler_style ? "-M " : "", + disassembler_style ? disassembler_style : "", + map__rip_2objdump(map, sym->start), diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index fa4ac3b513d..0a3b4070be1 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -11,7 +11,9 @@ assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src patches; + inherit (kernel) src; + + patches = kernel.patches ++ [ ./perf-binutils-path.patch ]; preConfigure = '' cd tools/perf @@ -30,9 +32,12 @@ stdenv.mkDerivation { # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. - NIX_CFLAGS_COMPILE = [ - "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" - ] + NIX_CFLAGS_COMPILE = + [ "-Wno-error=cpp" + "-Wno-error=bool-compare" + "-Wno-error=deprecated-declarations" + "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" + ] # gcc before 6 doesn't know these options ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [ "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" From 1951578395eacc6cdb697080f3328561ba95d2fa Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Wed, 7 Jun 2017 10:24:44 +0200 Subject: [PATCH 032/152] =?UTF-8?q?pijul:=C2=A00.4.4=20->=200.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../version-management/pijul/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index b9848f45aab..d72c2945239 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -4,21 +4,21 @@ with rustPlatform; buildRustPackage rec { name = "pijul-${version}"; - version = "0.4.4"; + version = "0.6.0"; src = fetchurl { url = "https://pijul.org/releases/${name}.tar.gz"; - sha256 = "8f133b7e14bfa84156c103126d53b12c6dfb996dcdebcf1091199ff9c77f3713"; + sha256 = "a6b066b49b25d1083320c5ab23941deee795e1fcbe1faa951e95189fd594cdb3"; }; - sourceRoot = "${name}/pijul"; + sourceRoot = "pijul"; - buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin + buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); doCheck = false; - - depsSha256 = "1zdvnarg182spgydmqwxxr929j44d771zkq7gyh152173i0xqb20"; + + depsSha256 = "0raim0ahqg6fkidb6picfzircdzwdbsdmmv8in70r5hw770bv67r"; meta = with stdenv.lib; { description = "A distributed version control system"; From 0e532a3ede6ee3c3abe8447b0447d501b8c9228d Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 7 Jun 2017 13:37:15 -0400 Subject: [PATCH 033/152] elpa-packages: 2017-06-12 --- .../editors/emacs-modes/elpa-generated.nix | 65 +++++++++++++++---- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 44e9a83e872..9bf51fc0904 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -561,6 +561,20 @@ license = lib.licenses.free; }; }) {}; + dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dired-du"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-du-0.5.tar"; + sha256 = "09yj37p2fa5f81fqrzwghjkyy2ydsf4rbkfwpn2yyvzd5nd97bpl"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-du.html"; + license = lib.licenses.free; + }; + }) {}; dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "dismal"; @@ -630,10 +644,10 @@ }) {}; ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ediprolog"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ediprolog-1.1.el"; - sha256 = "19qaciwhzr7k624z455fi8i0v5kl10587ha2mfx1bdsym7y376yd"; + url = "https://elpa.gnu.org/packages/ediprolog-1.2.el"; + sha256 = "039ffvp7c810mjyargmgw1i87g0z8qs8qicq826sd9aiz9hprfaz"; }; packageRequires = []; meta = { @@ -804,6 +818,20 @@ license = lib.licenses.free; }; }) {}; + gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gited"; + version = "0.2.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gited-0.2.2.tar"; + sha256 = "0ncxcrmiqhfzy18ssfkvbzmzwjbmr41ac1x7fpykrgihqiqglzfq"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gited.html"; + license = lib.licenses.free; + }; + }) {}; gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnome-c-style"; version = "0.1"; @@ -1031,6 +1059,19 @@ license = lib.licenses.free; }; }) {}; + kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "kmb"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/kmb-0.1.el"; + sha256 = "1wjfk28illfd5bkka3rlhhq59r0pad9zik1njlxym0ha8kbhzsj8"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kmb.html"; + license = lib.licenses.free; + }; + }) {}; landmark = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "landmark"; version = "1.0"; @@ -1312,10 +1353,10 @@ }) {}; nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "nlinum"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nlinum-1.6.el"; - sha256 = "1hr5waxbq0fcys8x2nfdl84mp2v8v9qi08f1kqdray2hzmnmipcw"; + url = "https://elpa.gnu.org/packages/nlinum-1.7.el"; + sha256 = "0ql1dbad29sdv3wmv65985g8ibl2176m2hqhjfrppgg34h3w51lz"; }; packageRequires = []; meta = { @@ -1404,10 +1445,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170515"; + version = "20170606"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170515.tar"; - sha256 = "0lfapcxil69x1a63cszgq72lqks1z3gpyxw7vcllqlgi7n7a4y6f"; + url = "https://elpa.gnu.org/packages/org-20170606.tar"; + sha256 = "0m2gln3wz9v3aflyxxy2317808yy05rrzrjx35spw2d90d10hmkz"; }; packageRequires = []; meta = { @@ -2061,10 +2102,10 @@ }) {}; websocket = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "websocket"; - version = "1.6"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.6.tar"; - sha256 = "09im218c1gkq1lg356rcqqpkydnpxs5qzdqkwk95pwndswb40a5a"; + url = "https://elpa.gnu.org/packages/websocket-1.8.tar"; + sha256 = "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9"; }; packageRequires = []; meta = { From beb18e135058a4fe2c87ff718690ea42f03425a8 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 7 Jun 2017 13:37:30 -0400 Subject: [PATCH 034/152] org-packages: 2017-06-12 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 024ae63f205..31d116fa2cb 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170515"; + version = "20170606"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170515.tar"; - sha256 = "04kpi7q1q4r9w4km941cy70q3k9azspw1wdr71if4f8am6frj3d4"; + url = "http://orgmode.org/elpa/org-20170606.tar"; + sha256 = "11x6s30j6k0y3jfzcp16qyqn48mki9j18iblnpl5dr1bk8kyvd0x"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170515"; + version = "20170606"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170515.tar"; - sha256 = "0jdcxir8wvmdxi0rxnljbhy31yh83n4p0l8jp85fxf5sx0kcc32p"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170606.tar"; + sha256 = "0r6a5spzdbx6qdz5aziycmhjxm392v7iifv7mnln4s5lgnsswb1h"; }; packageRequires = []; meta = { From 76082b63e82a61ce754072cc8a8e58d97dc907b3 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 7 Jun 2017 13:37:59 -0400 Subject: [PATCH 035/152] melpa-stable-packages: 2017-06-12 --- .../emacs-modes/melpa-stable-generated.nix | 386 ++++++++++++------ 1 file changed, 257 insertions(+), 129 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 9491122a7ad..f156494b83f 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -212,12 +212,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "c4aab21df64011916039e18094e189533018e115"; - sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms"; + rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686"; + sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -3688,22 +3688,22 @@ license = lib.licenses.free; }; }) {}; - ceylon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ceylon-mode"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "lucaswerkmeister"; repo = "ceylon-mode"; - rev = "5817a8ff2189a8dd0ee77b8ff23353ca81ee4f38"; - sha256 = "0n0kz0s2w82lbhzxmh8pq9xqnmc60ni0srvbwjbsinakwgkispf6"; + rev = "00f790b3ed5ec48e2461e20a4d466ba45c634e13"; + sha256 = "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4"; name = "ceylon-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ceylon-mode"; license = lib.licenses.free; @@ -3814,6 +3814,27 @@ license = lib.licenses.free; }; }) {}; + cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cheat-sh"; + version = "1.3"; + src = fetchFromGitHub { + owner = "davep"; + repo = "cheat-sh.el"; + rev = "760cff945839a8397d44ac95aeec94cc28a51691"; + sha256 = "10rr4bnhq2rjd6bx2r0d3cxa7ixk4la58agg5a83y3z52a673rqv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; + sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80"; + name = "cheat-sh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cheat-sh"; + license = lib.licenses.free; + }; + }) {}; checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "checkbox"; @@ -4171,15 +4192,15 @@ license = lib.licenses.free; }; }) {}; - clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: + clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "531a09fda51c9043efe18fd1f288be21ced3f3d1"; - sha256 = "0qjj40h8ryrs02rj73hkyhcjxdz926qxgvnjidav3sw2ggn8vdl3"; + rev = "9005de31ed05122d3db9f503fbc69722abf3634b"; + sha256 = "1pvxwvx36fl971j9dfhfk33sqg70nsw57brsi6kgphq7dgzmv7dk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -4188,7 +4209,7 @@ }; packageRequires = [ cider - dash + clojure-mode edn emacs hydra @@ -4196,6 +4217,7 @@ multiple-cursors paredit s + seq yasnippet ]; meta = { @@ -4437,12 +4459,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.8.1"; + version = "3.9.0pre2"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "8bd6af0d6386d1e0b26ff594b7d42621d67b5985"; - sha256 = "10rij858aq3hdkdpackhmpmqj3zlfahc3jbfjffk2yicnwmnkb6s"; + rev = "010b50fda71feaff3abec4d13910f4a4bd1f13b0"; + sha256 = "0b77hm5l18fbzphg3wcdzrblbhh65wx7c1b98driky1634kn9j10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5325,12 +5347,12 @@ concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "concurrent"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9668749635472a63e7a9282e2124325405199b79"; - sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; + rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; + sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; @@ -5430,12 +5452,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "161feb918b104e87f1a284f5c4e5e507e0c177f8"; - sha256 = "0y1j6f9xs877r4bv6dmcl2jsl27v0n6rsmpml719id2cfnh9sn4g"; + rev = "fba9fe57a310a71c5aac90a26434df4c08214833"; + sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -6056,7 +6078,6 @@ homepage = "https://melpa.org/#/darcula-theme"; license = lib.licenses.free; }; - }) {}; darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; @@ -6078,6 +6099,7 @@ license = lib.licenses.free; }; }) {}; + }) {}; dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; @@ -6312,12 +6334,12 @@ deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9668749635472a63e7a9282e2124325405199b79"; - sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; + rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; + sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred"; @@ -7181,13 +7203,13 @@ version = "1.2.5"; src = fetchFromGitHub { owner = "hlissner"; - repo = "emacs-doom-theme"; + repo = "emacs-doom-themes"; rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728"; sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; - sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; + sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs"; name = "doom-themes"; }; packageRequires = [ all-the-icons cl-lib emacs ]; @@ -7576,12 +7598,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "0.9.7"; + version = "0.9.9"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "708bea9516812c6641ef8fc6f42dc087036addd8"; - sha256 = "0yz0q3qvv9qxvwvjqd9zjqrrg6qxag092ni16vpni1mihw5803b8"; + rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62"; + sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -7933,12 +7955,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "b86a4b3a696328faaa37a808abeed54561d19385"; - sha256 = "0ak5rw3y9cqggyclf9qddqrg9kzl50r5ynk9f99xjmsn2mpw6dwj"; + rev = "1543835ce00412c3cd34a61497af5f68ead250a6"; + sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -8075,22 +8097,22 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ cl-generic, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: + ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.12.5"; + version = "0.12.7"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "9b4b9e28e307368568560a4290b278bc480e4173"; - sha256 = "0hgg6wckxlmwg45jsl35zxxd08apsk0csi1sp9jhy72alah2mflp"; + rev = "334bb4600051d96d5eb82655e6e2c2ef926e701e"; + sha256 = "07h3za6cwznmgwm5854yyc3paidbjlpwsj71ii7qlga7j00b7ak2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r"; name = "ein"; }; - packageRequires = [ cl-generic dash request websocket ]; + packageRequires = [ cl-generic dash deferred request websocket ]; meta = { homepage = "https://melpa.org/#/ein"; license = lib.licenses.free; @@ -9549,12 +9571,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.0pre1"; + version = "20.0pre2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "4f03eba5294f1c1bc922b07f1267e6b0099fd4b5"; - sha256 = "0ryi6r4ahh5dsl04nqgqhzymzm9krxr0kf4r3v3xg1yzw6d4g2a8"; + rev = "d106c5fffb3832fffbdf99cca905390fe15d489f"; + sha256 = "14hgl356fjkbx056fqhjif4kjs05ih08r9mi9qj58k0hxpva2l8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10621,14 +10643,14 @@ pname = "evil-surround"; version = "1.0.0"; src = fetchFromGitHub { - owner = "timcharper"; + owner = "emacs-evil"; repo = "evil-surround"; rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839"; sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; - sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; + sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1"; name = "evil-surround"; }; packageRequires = [ evil ]; @@ -11269,12 +11291,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.3.1"; + version = "5.3.2"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "d84263bdac55501e05662caffcb0642bb8bb4a53"; - sha256 = "0f133fpa53sqrx9a4hycvqzi3sbaswxdbma25isfrr0g9kf7j7db"; + rev = "99801cd730d579ed3b05d084ad254b6a73b259aa"; + sha256 = "0pqg6iib5ns6k5is0bv8riwficadi64dinzdjibk94h8i7cmp54h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -13061,12 +13083,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "1.9.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "c2acdaaf36176d36ccadfe73c2593362ef930ebd"; - sha256 = "00am42hl5icvbw5d7kpbdcl9sr8flsgl1pqmcxqpcz30yw6f4pr2"; + rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e"; + sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -13613,12 +13635,12 @@ gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "144280f5353bceb902d5278fa64078337e99fa4d"; - sha256 = "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8"; + rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2"; + sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -13862,22 +13884,22 @@ license = lib.licenses.free; }; }) {}; - git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "0.4.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "efd2a9a40b07e93cd5030d8b409d380c77fca88b"; - sha256 = "0yhk4r5fdlmiw7n0cpdbjqcsm2vkm37qwwvkb7xz9046mkdag6gy"; + rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf"; + sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7"; name = "git-link"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/git-link"; license = lib.licenses.free; @@ -14093,6 +14115,27 @@ license = lib.licenses.free; }; }) {}; + github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "github-notifier"; + version = "0.1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "github-notifier.el"; + rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987"; + sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier"; + sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw"; + name = "github-notifier"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/github-notifier"; + license = lib.licenses.free; + }; + }) {}; github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: melpaBuild { pname = "github-search"; @@ -16012,6 +16055,27 @@ license = lib.licenses.free; }; }) {}; + helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-company"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "Sodel-the-Vociferous"; + repo = "helm-company"; + rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; + sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; + sha256 = "1wl1mzm1h9ig351y77yascdv4z0cka1gayi8cnnlayk763is7q34"; + name = "helm-company"; + }; + packageRequires = [ company helm ]; + meta = { + homepage = "https://melpa.org/#/helm-company"; + license = lib.licenses.free; + }; + }) {}; helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; @@ -17296,12 +17360,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "ca919a4c71c187e1fbbad7e814aac1cf662ec51a"; - sha256 = "0rrrj44ml2ymvxmg8igpn2irdhihv3djy5dfm6p6499cm64mawai"; + rev = "a6a01cd4688fc9264fd36c279c0249f16704132b"; + sha256 = "0b6g9j76zd5wdqg4xkw34a6sijf8jsdvnnr7hbix7zf8cxrr2gqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -20611,12 +20675,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "d722d3662b191b61310dc9bba78f9a77f512b742"; - sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz"; + rev = "af14b1439097850ffa39935419ed83f5bcaa6d09"; + sha256 = "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -20933,12 +20997,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "f5603fb6bcfbae1e6950da7f91c3a15cf5250bb1"; - sha256 = "1zzk3rc86xrkys3rcqiz61mnp00jkvb05f8p21av52h19axm4nn8"; + rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674"; + sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -22018,12 +22082,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.7.10"; + version = "0.7.12"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76"; - sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp"; + rev = "31c68839bd1de8e79fe7bce6bdeade4bacdbc737"; + sha256 = "1hm8w04d0cyy21dnciblz4gg15k5axfvaxx788hfz2pmbp435yni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -22752,12 +22816,12 @@ mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mowedline"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "5c848d79c9eba921df77879bb7b3e6b97b9bccb2"; - sha256 = "1dmfks09yd4y7p1sidr39a9c6gxby47vdv8pwy1hwi11kxd6zbwf"; + rev = "832e81b7f90f6c2e753f89737c0b57a260544424"; + sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -22857,12 +22921,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "1.3.1"; + version = "1.3.5"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "ffc7974f1cafb5e03bae2765afc6a984ffcb0f7e"; - sha256 = "155bgayysdyr5a9wpx78azpipd11s3k8ijgw4mpvbmkk5j7fi6a8"; + rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577"; + sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -23424,12 +23488,12 @@ nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nginx-mode"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "ajc"; repo = "nginx-mode"; - rev = "9e25e1f696087c412a45fe004b98b9345f610767"; - sha256 = "0hjvbjwsk64aw63k4wcizpqiqq6d8s4qwzfvvsdbm3rx743zgzsz"; + rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005"; + sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode"; @@ -23652,11 +23716,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.24.1"; + version = "0.24.2"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "e64fdf889d0f78543557f5b72ebca1571caf497e"; - sha256 = "0vappcyidhzka2za6zqlcygn90a1xm9xrhpr9gvdp258m8qhz6d1"; + rev = "2e86a4da55c29e0751d950839cdcbe40234ca8ba"; + sha256 = "1g75k365cdl0670bs38bvf391hsiv7rwxbmwz53x03fyz4gl58by"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -24281,12 +24345,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "3.9"; + version = "4.0"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "59aa5ac1957b4875e13f52885255293608a960f4"; - sha256 = "1jjhksrp3ljl4pqkclyvdwbj0dzn1alnxdz42f4xmlx4kn93w8bs"; + rev = "7ca20bb808dd51adbd83e0c18885c4300548d032"; + sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -25084,15 +25148,15 @@ license = lib.licenses.free; }; }) {}; - org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: + org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "0.9.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "b6c6ae209d31caf71b158d6357780d74f6d08f19"; - sha256 = "18zzzh5aifbdbd2lw69fn7scvhalgxhzfz3f3cscjjkvzhkkya8j"; + rev = "785765d575ef4c28581f6790e9814d75eaeec4ab"; + sha256 = "18f5fppipandbirhhs5jlrk4gl7jxyrswfwr36859433x2wkfj70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -25108,6 +25172,7 @@ hydra ivy key-chord + pdf-tools s ]; meta = { @@ -27736,12 +27801,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "fb28fc8710b614e9ab535788ee58f9a9070561f1"; - sha256 = "0v7ddlk8mzqa8gvxrrcvd15klap5m31df8vn14z99s3ybj3zk0yb"; + rev = "19e3dc1236377de86147df8f3635fbbfe7558b2e"; + sha256 = "0n61npfg7hvybakn4nvsqyv2gmrwvf0jqwrh0nwzg9xg5hkbfmir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -27964,22 +28029,22 @@ license = lib.licenses.free; }; }) {}; - psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psysh"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "zonuexe"; repo = "psysh.el"; - rev = "6932f03447c3d821e4c03e99f1630928f0979452"; - sha256 = "00dssrdsdvwdg6a6fwl3wv0y94axcd4jb3b3ndd1p3bcr56fxq49"; + rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa"; + sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh"; sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5"; name = "psysh"; }; - packageRequires = []; + packageRequires = [ emacs f s ]; meta = { homepage = "https://melpa.org/#/psysh"; license = lib.licenses.free; @@ -29437,12 +29502,12 @@ robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "92704288036a3111835488933002c58c1da240b1"; - sha256 = "0sa1dfd3smhsxy7r1s4kl9a3rds8xjx7kszr9nw8f5h98z1999ws"; + rev = "22457d6855fb39b8aedf068556d0e2fbd2874d5b"; + sha256 = "0ll7ivxqnglfb0i70ly6qq2yfw9cyi3vq3lmj4s6h6c1c7rm3gcq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; @@ -30008,8 +30073,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "52091426ee319b4ec53799696bae75571f7ecbf6"; - sha256 = "15vr1yz23h0kb7h3d6gh3ljax762666lkz53chqgm54bszgfwjcm"; + rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; + sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -30319,14 +30384,14 @@ pname = "sexy-monochrome-theme"; version = "2.1"; src = fetchFromGitHub { - owner = "nuncostans"; + owner = "voloyev"; repo = "sexy-monochrome-theme"; rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96"; sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; - sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; + sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq"; name = "sexy-monochrome-theme"; }; packageRequires = []; @@ -30695,12 +30760,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "bcdbc7142a0542639f47abb48fe17aa6c92f8406"; - sha256 = "0wrxwjlkix5qgi3fvkaj9m43hyif9ba2bdyzc0hkig7ng0b99cjd"; + rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f"; + sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -30779,12 +30844,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "eba19a21da2e4d1e11abdc158f72d6513afaa669"; - sha256 = "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v"; + rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; + sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -31892,12 +31957,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "40f2bc0179539087971d48556dcce38e14907768"; - sha256 = "1ya5acz07l61hry96fq0yx81w7zwcswxinb3fi0g1s4gshxy4hgk"; + rev = "04970977b4abb4d44301651618bbf1cdb0b263dd"; + sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -33379,12 +33444,12 @@ thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thinks"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "davep"; repo = "thinks.el"; - rev = "f5a339b21cd5044f7b66beafab7c2d822c36f9e5"; - sha256 = "1qjwzr9q98da25rf8hjgancb0k2kgr8xllhb4lhnqc8jsc4qnn5v"; + rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d"; + sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; @@ -33627,6 +33692,48 @@ license = lib.licenses.free; }; }) {}; + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: + melpaBuild { + pname = "treemacs"; + version = "1.7"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; + sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; + sha256 = "1sg3m9l9l1xww6an2210bghlby5cljw2jxh7q0w8cwmcga7rr4jh"; + name = "treemacs"; + }; + packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; + meta = { + homepage = "https://melpa.org/#/treemacs"; + license = lib.licenses.free; + }; + }) {}; + treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: + melpaBuild { + pname = "treemacs-evil"; + version = "1.7"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; + sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; + sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3"; + name = "treemacs-evil"; + }; + packageRequires = [ evil treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-evil"; + license = lib.licenses.free; + }; + }) {}; trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "trr"; @@ -34707,12 +34814,12 @@ wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "wandbox"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "kosh04"; repo = "emacs-wandbox"; - rev = "c82a71e880cb701281dd96a9772bdad37a6eacf2"; - sha256 = "0hdpy4rf0406615mx5w235dkz71v24qmr2ci5rlqmfv53si0gynj"; + rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1"; + sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox"; @@ -34893,27 +35000,48 @@ license = lib.licenses.free; }; }) {}; - webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }: + webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "b5491ab52d9e73e8a3175f9713b6c1acde6dcfe5"; - sha256 = "1l45glgw6va6xaqbpjia69035p06a6csgwxs9xislfvmvq9lcxqz"; + rev = "77e6154ece15ffcc58db80dca48fe342376831aa"; + sha256 = "0zj1hhz7m0fxaj03aqjfd6jhcg2khi87l6742miwkdxxggwhdijj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm"; name = "webpaste"; }; - packageRequires = [ cl-lib emacs json request ]; + packageRequires = [ cl-lib emacs request ]; meta = { homepage = "https://melpa.org/#/webpaste"; license = lib.licenses.free; }; }) {}; + websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "websocket"; + version = "1.8"; + src = fetchFromGitHub { + owner = "ahyatt"; + repo = "emacs-websocket"; + rev = "a9b8e74fa190024cd450ef4f832482e8438674fa"; + sha256 = "0yi6g7wmjsgv0dmpyf8cpin0icw3ymb7vbr3f9s01xs2w6kp8p13"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; + sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg"; + name = "websocket"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/websocket"; + license = lib.licenses.free; + }; + }) {}; weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; @@ -36031,8 +36159,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "c940797c19ad"; - sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03"; + rev = "c996fbcc2e79"; + sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; From 97d750eac05bdbfab280772afb36e216980d0dff Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 7 Jun 2017 13:51:42 -0400 Subject: [PATCH 036/152] melpa-packages: 2017-06-12 --- .../editors/emacs-modes/melpa-generated.nix | 1708 ++++++++++------- 1 file changed, 1064 insertions(+), 644 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index bf943bf125e..daea504c24c 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -127,12 +127,12 @@ abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abl-mode"; - version = "20170309.117"; + version = "20170604.1309"; src = fetchFromGitHub { owner = "afroisalreadyinu"; repo = "abl-mode"; - rev = "0539862591a5af70e6fa04f0e88e7fc0f0fbb11e"; - sha256 = "0fxl67nmy6vi6viwxday4j81m9lg4l8vg6yw2phgagm4zlp65k58"; + rev = "9aff997fe7b4caded60150a832e3704ac55e69e5"; + sha256 = "0yfk7s7n10lkf11dy1l0xi0bbsjbam5lqq8kj9hxpz2zkddbaljl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode"; @@ -316,12 +316,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20170330.1108"; + version = "20170608.958"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "c4aab21df64011916039e18094e189533018e115"; - sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms"; + rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686"; + sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -801,8 +801,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "499db6f98cc725bca66d122bce571adcdfa32187"; - sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a"; + rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; + sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1258,12 +1258,12 @@ aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aes"; - version = "20160121.1237"; + version = "20170607.157"; src = fetchFromGitHub { owner = "Sauermann"; repo = "emacs-aes"; - rev = "1b9918036b16ee30ada71703a9283c67f2ad9999"; - sha256 = "1p90yv2xl1hhpjm0mmhdjyf1jagf79610hkzhw8nycy2p1y4gvl6"; + rev = "8d9ddaa7d13875745241f0f98758b1d72dd3be92"; + sha256 = "1d998xyfnzgci62h0wv1n9a7hlk23ngcbl83k04ahz61g7haqnh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes"; @@ -1487,12 +1487,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170529.1224"; + version = "20170611.1031"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "69f9f1aec6a52350a67ed1db87b6f6c99400622f"; - sha256 = "1fkpq787z1k914kyln280mk06x58niks5hp9if620qpqvmqaih3s"; + rev = "8bf40e0ed78c3d2b6536bee3a4b50a9f78a0c1a1"; + sha256 = "167lmzh4grz4k47pw0pcq5pqbwjncfgw2wgzhvvg5jp66p7pmwqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -2873,12 +2873,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20170502.2343"; + version = "20170610.2241"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "09a177c15bd3aafc57ba6a63ab093f640ffa2610"; - sha256 = "0jr5q7zrh2k5h884xk5m45g3ymj6kikx08wz521qhablfxma6xw8"; + rev = "d6222c2959caaca5c4980038756097da8a51e505"; + sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -3041,12 +3041,12 @@ audio-notes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "audio-notes-mode"; - version = "20140204.1154"; + version = "20170611.1459"; src = fetchFromGitHub { owner = "Malabarba"; repo = "audio-notes-mode"; - rev = "2158b2e8d20df3184bbe273a7fd5aa693e98baa9"; - sha256 = "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm"; + rev = "fa38350829c7e97257efc746a010471d33748a68"; + sha256 = "1srg6rg3j9ri2cyr4g78dfqq3fhpn6hf3mq4iz2jfqjayppfv38b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/audio-notes-mode"; @@ -3559,6 +3559,27 @@ license = lib.licenses.free; }; }) {}; + auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-minor-mode"; + version = "20170601.1421"; + src = fetchFromGitHub { + owner = "joewreschnig"; + repo = "auto-minor-mode"; + rev = "92871449782f8679f15573ad178b9c2247da8bfd"; + sha256 = "14kh6p34mrqfqyjzr0wvxx4acp72pz2b75w96y3jyhiswvaqfcr1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; + sha256 = "1dpdylrpw1pvlmhh229b3lqs07drx9kdhw4vcv5a48qah14dz6qa"; + name = "auto-minor-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/auto-minor-mode"; + license = lib.licenses.free; + }; + }) {}; auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "auto-org-md"; @@ -4382,12 +4403,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170525.1746"; + version = "20170606.1402"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "ac27813fdc7ce32eca1c16a439b46eb3a6835ac1"; - sha256 = "1alhmgj40hhkgdpc7j34iswl9d5afmxjw74p189gm782mzl9y4c6"; + rev = "be8f3ea35a2f58a218db062934ce3a1a054db3df"; + sha256 = "01pdwvv1pbphnsw3h38x087xbdp5ry1h18bqiiispzvhyc56xvak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4798,12 +4819,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20170526.743"; + version = "20170605.541"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "01920ffea5965d0ac5bc7196b73d4e0dcfe86c60"; - sha256 = "04fdcxb0rvrrrglwcd6f83fk445bziycrzdcvh3gcpq09x5ryinx"; + rev = "28806d09207e4a194a39eb385650824a0121e0cd"; + sha256 = "17qhbgq3ciyjjl4a1mm6qn5g5y39plmncad6i4kijcda9kx44w48"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -5153,12 +5174,12 @@ bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bing-dict"; - version = "20170209.1459"; + version = "20170604.1831"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "bing-dict.el"; - rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7"; - sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6"; + rev = "d4b261739e53e8ed8fa5db3d3946de82c0ab8e34"; + sha256 = "0dn6rifr0njpw3mwbyn21bw88lp0kzwwjp7ivgbbl1bxshj0ybhk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict"; @@ -6762,7 +6783,7 @@ version = "20151009.845"; src = fetchsvn { url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16556"; + rev = "16557"; sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; }; recipeFile = fetchurl { @@ -6972,8 +6993,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd"; - sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr"; + rev = "25057a27543788079e7040bf42b139e0aa0635b5"; + sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -7014,8 +7035,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd"; - sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr"; + rev = "25057a27543788079e7040bf42b139e0aa0635b5"; + sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -7198,12 +7219,12 @@ ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ceylon-mode"; - version = "20170527.334"; + version = "20170605.1450"; src = fetchFromGitHub { owner = "lucaswerkmeister"; repo = "ceylon-mode"; - rev = "2a53cef43915576f68deb9646e38d432334d7ee0"; - sha256 = "01qfivq3rr1rrsh45xjmw2wbljw14jbsm72a0c1fnbj9v75q2xlh"; + rev = "00f790b3ed5ec48e2461e20a4d466ba45c634e13"; + sha256 = "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; @@ -7223,8 +7244,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "1caec0c64d8fcf3b1e57192d1a6dff58e0a9ff87"; - sha256 = "0w3l9awi76m4d4jscy3s50xfk56z4ym1qrihf9yansdqjzlzsi8l"; + rev = "036c5898eb89e846fa1b86537a5c0569868dbaf0"; + sha256 = "0cz4cwisnlbkclc6cn7rlz7pkpwh5p0646dzrkw92bk5vmwh89pg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7263,7 +7284,7 @@ version = "20170201.347"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12213"; + rev = "12230"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7403,6 +7424,27 @@ license = lib.licenses.free; }; }) {}; + cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cheat-sh"; + version = "20170606.727"; + src = fetchFromGitHub { + owner = "davep"; + repo = "cheat-sh.el"; + rev = "512c74b0cb0798a75303c5384ee165c8a5f3356b"; + sha256 = "1m65k2gqd5irwk4cj97p33q14shn4cpz0zxcpg4m3bgiwl8qmxhs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; + sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80"; + name = "cheat-sh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cheat-sh"; + license = lib.licenses.free; + }; + }) {}; cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; @@ -8142,8 +8184,8 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "304204"; - sha256 = "1yvk57q2q4hg04lkvrnx79vgkw6j7hzlx3kvrq0xw93nr351adqv"; + rev = "305184"; + sha256 = "1hs00lf2f2fmxv2abhskrlqr96395j3ywbgs8aacadbzigdx4iq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -8348,12 +8390,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20170520.323"; + version = "20170608.320"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "8904b7a9e21ea6319f8c37cf83a7200896bfae9c"; - sha256 = "1bklsndfhg76a6y3vwbdcakmbrr2hnywjjfk2qaa3mbyxvmlqii3"; + rev = "769eb06ac82dff8aa0239b9ca47cf3240ff0857f"; + sha256 = "17g6rq30dvvhr3lljzn5gg6v9bdxw31fw6b20sgcp7gx4xspc42w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8528,12 +8570,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170527.1442"; + version = "20170608.2315"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "6e966d57578bd1d30f2986b7aa8e222baa59a11c"; - sha256 = "0l97zfa6vzb90w6592mydxvbppg126nyvd13m6w5b37bdm1ykj7v"; + rev = "eacd330f28513276da18e4d6f2607f9041314c49"; + sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8553,8 +8595,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "6e966d57578bd1d30f2986b7aa8e222baa59a11c"; - sha256 = "0l97zfa6vzb90w6592mydxvbppg126nyvd13m6w5b37bdm1ykj7v"; + rev = "eacd330f28513276da18e4d6f2607f9041314c49"; + sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8759,12 +8801,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170522.1105"; + version = "20170605.12"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "afad08063f8b3d4e412b92663b237a2a7db467e9"; - sha256 = "12n4fznz38p4iy8ak5ix7yvclhxrdkkmg324m4b2i3hd2s4ql80r"; + rev = "b7bb7bf36d442c377988a090fc648b03b50c8eff"; + sha256 = "1iw0blpi38yykqqzl6s0w7z74ym0b56k1rxg5anyw0q9zkp0hb72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8784,8 +8826,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "3ed14cb3ac03e7df53b9f9f987d5180e74dc2b64"; - sha256 = "1c8ilgx713lkg2hlla5bgp6lm3g12l6viy0ddflcghh3ql744x4f"; + rev = "abd1216c1f8a1211d348568bb7695c30505de84e"; + sha256 = "1z3c0wjvk5ry69sjmslvw2mnnri63dk1vk6lbx881fxf67r4wf7f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9048,6 +9090,27 @@ license = lib.licenses.free; }; }) {}; + coin-ticker = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "coin-ticker"; + version = "20170611.27"; + src = fetchFromGitHub { + owner = "eklitzke"; + repo = "coin-ticker-mode"; + rev = "9efab90fe4e6f29464af14e0d8fd1e20c0147b80"; + sha256 = "0xnrh6v4s2s3fgvw0v9fl48dlk4r2p6axp7xf41gzb1ai81yczhv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fd783998658b69159e39d9440da7a0dd04135e49/recipes/coin-ticker"; + sha256 = "0v4zyswhghknlsal9xfsgwf8ckjwrjkjrg8w7p6yjqrxmfsbw93b"; + name = "coin-ticker"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/coin-ticker"; + license = lib.licenses.free; + }; + }) {}; col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }: melpaBuild { pname = "col-highlight"; @@ -9259,12 +9322,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170528.1653"; + version = "20170604.1611"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "2e229477acab33f4df54e3106ab3dc379df10f35"; - sha256 = "00zhdmqfk50gilcan067ymc9n4wjw1ab3xyvv6v6q3s365wyh120"; + rev = "21b9b9ae14f2f0084497de00e5a0a00919b87c88"; + sha256 = "0v69lzqknk8qr7digda9vwri7pkhr5600lb39xzlml15m693acin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9530,12 +9593,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20170517.1436"; + version = "20170611.1356"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "a5289c533c7a5445b2add25b7bf784cfa0f1f23c"; - sha256 = "1wz1dp3fincxjcajmy35cbkjbwz5gi9iqdan9bhxii91g842zgpq"; + rev = "950c54721f85e68fd21f1e92991d597fd38685e4"; + sha256 = "1gkjin7ikghh4zbnpbg7gzhdj1hg125h8kq694aa4ag9379vivw7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9664,12 +9727,12 @@ company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-c-headers"; - version = "20150801.901"; + version = "20170531.1330"; src = fetchFromGitHub { owner = "randomphrase"; repo = "company-c-headers"; - rev = "9bfdd438be5ecb75e5717eb48e09ce69904676e3"; - sha256 = "152fwy23x5k3dp45z1k4h4n6pcvl3wrhwhwd4l4rp06yhgwf0i1a"; + rev = "e959d43bebf0a524f7378669983a39ee1379cc21"; + sha256 = "18fi1jp3scz5rrf877qd1ciwx29bzndb85ifnx4ki0jvznvfas8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d97b5c53967e0ff767b3654c52622f4b5ddf1985/recipes/company-c-headers"; @@ -10007,12 +10070,12 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "20170515.1608"; + version = "20170611.1403"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "cebd82506c59d21a9c436bd8e8a33dfa8be84955"; - sha256 = "09mzxyvp07qwdhxagyiggpccxsklkbhjg730q6wbqd13g1mlkryj"; + rev = "f68c1b46d64b9f95cfc2a6d611089d0442ed58ba"; + sha256 = "0kfv89vma93qv97vh1ajg74wq62sq7f6gr39pm8hmfvmk0d6y51y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -10311,8 +10374,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "499db6f98cc725bca66d122bce571adcdfa32187"; - sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a"; + rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; + sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10475,12 +10538,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20170521.1109"; + version = "20170606.49"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "b7ad7c440dc3640a46291a9acf98e523272e302b"; - sha256 = "0cpq2kqhxg61rs6q53mfidgd96gna3czw90rhb6njhch01cv9i5m"; + rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6"; + sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10542,8 +10605,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba"; - sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2"; + rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; + sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; @@ -10559,12 +10622,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20170425.1845"; + version = "20170608.756"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7"; - sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2"; + rev = "0257cd83796c3bdc357b69c1ecaf6d7eb6e2bf53"; + sha256 = "035srwyx94fp80f6rgkvx1vxlvaznsgp7zy5gcddvyazx1a1yj0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10726,12 +10789,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "20170310.1621"; + version = "20170603.945"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "161feb918b104e87f1a284f5c4e5e507e0c177f8"; - sha256 = "0y1j6f9xs877r4bv6dmcl2jsl27v0n6rsmpml719id2cfnh9sn4g"; + rev = "fba9fe57a310a71c5aac90a26434df4c08214833"; + sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -10789,12 +10852,12 @@ coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "coq-commenter"; - version = "20160808.2307"; + version = "20170607.1355"; src = fetchFromGitHub { owner = "ailrun"; repo = "coq-commenter"; - rev = "b57c7c92219201c0f931014127b50fd9b1e0039a"; - sha256 = "03wwdd9n7fijrczrrdhn9xisrj7mqhc2q7z4da6fm3q45sy2npqk"; + rev = "6100933cadea289cdaabf2f56f2a0dd72385c1fe"; + sha256 = "1b28gyyfjknjz23m18yhaj1ir72y8nl75cnam3ggygm9ax65h8i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coq-commenter"; @@ -10831,12 +10894,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170526.203"; + version = "20170610.2335"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c93194941c1ac36ee762b70dc9061ee830769f6a"; - sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca"; + rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; + sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11630,8 +11693,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "290fb3c5101cf2957596cd21dfc8c04f6c441ca2"; - sha256 = "0wxk1ylqn5zamjs6ksin4a2j3afgv3bygngb3sfvf6x061wyvzzr"; + rev = "1fd1023bd5f2ec2f457f13d0d0a165a98c05fde2"; + sha256 = "0gxn0kdzzsc801h5vhbpnn5p6msj6gv5lpy5qq6gyvvd0djp06mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11728,10 +11791,10 @@ }) {}; cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cus-edit-plus"; - version = "20170206.1603"; + version = "20170604.1000"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cus-edit+.el"; - sha256 = "02mcvr8fnaflqwxzafr6i745wcw8akhjjq8ami312aibf5yjadik"; + sha256 = "0awn3m16cyamb4h9i4iq9fzbwzl6qrkpbcr4v3dr7iwlcz7lw7jl"; name = "cus-edit+.el"; }; recipeFile = fetchurl { @@ -11897,8 +11960,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "1b7a91a2c2aea7d3a25e8f0bf3689b106d673201"; - sha256 = "0msv987niax3sid3krj791p780lm9kb2v83gd4f8g5y29if930dm"; + rev = "0898a2f2bdc4dd01cc5ffacdf5dad45c9e38e32b"; + sha256 = "0chfmiy1nk12yalq2bd812580fr38x3di5vjf6z2kyi96p11jw6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12523,12 +12586,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20170322.401"; + version = "20170610.1729"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd"; - sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr"; + rev = "25057a27543788079e7040bf42b139e0aa0635b5"; + sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12731,12 +12794,12 @@ deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "20170331.1759"; + version = "20170531.2135"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba"; - sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2"; + rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c"; + sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred"; @@ -13277,8 +13340,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6"; - sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x"; + rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; + sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13442,8 +13505,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6"; - sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x"; + rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; + sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13463,8 +13526,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6"; - sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x"; + rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; + sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13589,8 +13652,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6"; - sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x"; + rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; + sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13610,8 +13673,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6"; - sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x"; + rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; + sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13626,10 +13689,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170522.918"; + version = "20170530.1023"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "061m501k8mg641acpvfjh6vbfhlml98xz0zxdqd34mm7aqsbrnz2"; + sha256 = "121i39l4zaw3vhsxbh6r0b088982y3gvm0skf5b8wqldp4nsy55m"; name = "dired+.el"; }; recipeFile = fetchurl { @@ -13667,12 +13730,12 @@ dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-rainbow"; - version = "20170417.1341"; + version = "20170531.816"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6"; - sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x"; + rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; + sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13692,8 +13755,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6"; - sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x"; + rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; + sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13792,8 +13855,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6"; - sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x"; + rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; + sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14562,12 +14625,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20170114.440"; + version = "20170601.1345"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "b565a66d7fb8b41363fb90172b9882d4768ddd47"; - sha256 = "185mw8yaxpq7327nyyqjbc4bipx6shhmbl1dzdl3bfhc11vp1xfn"; + rev = "d3bdb09af10c7aa466b25e0c65a3d21fdf44514e"; + sha256 = "097nrhnc668yclvisq5hc3j8jgpk7w7k7clrlp5a1r1gd5472sj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14738,16 +14801,16 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170528.1204"; + version = "20170611.1109"; src = fetchFromGitHub { owner = "hlissner"; - repo = "emacs-doom-theme"; - rev = "71ca3f2910f2d857cea50f84a8cd27894aef848f"; - sha256 = "1f4c3nf0psn6si13a7044z06mhj416hzqjgiyypxcwqx9mgbryhn"; + repo = "emacs-doom-themes"; + rev = "4b6482765e3be2c51a9d8d23bbbfb9a0c80bf4ac"; + sha256 = "0g1883qz5a0fra1hsn6kx9r1hply61ba0bxhb8xx08j2zxbwj65s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; - sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; + sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs"; name = "doom-themes"; }; packageRequires = [ all-the-icons cl-lib emacs ]; @@ -15173,7 +15236,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1796835"; + rev = "1798436"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15274,12 +15337,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170520.112"; + version = "20170611.1336"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "4fd2911b97db3d2d2450b4129337fa47da7e9011"; - sha256 = "0zfc2lpb4lhrkhr5lyaqyk20zw11xh05hgb6b26sbvaz730s2rwb"; + rev = "9743f3f2736c0e84c5dff860a142c78a0c4ed861"; + sha256 = "19pdgwziriamf31vjca3y4fxcz4pcfdhr8ac2djz1gsfslq9n236"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15651,12 +15714,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20170529.2039"; + version = "20170531.216"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "1aee9432aa99286410611c59c6317c3f97a66481"; - sha256 = "0l05hg1fwjxknvv2rcz145disyxy9yr98lfd0nd1rhjgwhwyv2wh"; + rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62"; + sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15798,12 +15861,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170523.1324"; + version = "20170605.1440"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "594f69068c0022e3d9655ec794b55318458f3d6a"; - sha256 = "00aw1mc7vaywk808jsnc0myl9l6vhkz2ag202mh5rp8zdsm9vy9s"; + rev = "4624e67ca26cb348063a97a8f59a3fbcbf8a5736"; + sha256 = "0ds11hphxp8jxsc50lvnr9n4macvzd82y7siqh8wvswk62l8vb4x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16279,12 +16342,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170518.817"; + version = "20170607.713"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "4355de0802a88c04fa3016e91a66a640e2af066b"; - sha256 = "0ikp37wq0992vn7qjzymp8xqri257mprqwxijxcp7q7w8xhcdq0n"; + rev = "1543835ce00412c3cd34a61497af5f68ead250a6"; + sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16476,12 +16539,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20170112.2043"; + version = "20170601.817"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "d81561d39524a5f78d5f94216b0ca5fef4b5700b"; - sha256 = "0scnhpj4naaicxp62hd0b5g3kf05gpldbi1z1sfnq4mqi84fnfgx"; + rev = "93ccd450d2d9e5db27aebb024a1b2ed56d5131dc"; + sha256 = "0izxsckmkdw70cz3ljar2r4iv784c43mnzjkayly08hlabq1g6b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego"; @@ -16534,22 +16597,22 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ cl-generic, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: + ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20170524.758"; + version = "20170606.1325"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "8a231bfb2dd8e3b8e88cc449e73bcd73beba62e9"; - sha256 = "02hqxfvb5yzqlslas7cd268s2apminw8nh2nj8x1l6hlnmcqvqd7"; + rev = "d9c81f3d900f2ffd78fd314685023d66d6d16438"; + sha256 = "1vf2bxxk3dj0npgab0yzqfx6dvfh5aj1bhmbpw1xfhssciyg8q47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r"; name = "ein"; }; - packageRequires = [ cl-generic dash request websocket ]; + packageRequires = [ cl-generic dash deferred request websocket ]; meta = { homepage = "https://melpa.org/#/ein"; license = lib.licenses.free; @@ -16654,8 +16717,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "464ed451b506956ac7ec36c2a62be73243510291"; - sha256 = "1jzk1798arigjdz99ss6ll8cbd8fxagn2mz7afcissvaq7rw35rm"; + rev = "5b623bc5fa394389be7b0c00fd0b32e8e6b024c3"; + sha256 = "0wisl97gpp9a2mbs34v4mas2q3hkry3zqxmlbll7l3h7r950wyqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -17108,12 +17171,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170518.1835"; + version = "20170531.206"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "c79fd5824a3881a8d82cd2fb4b18a559e1f26b8b"; - sha256 = "1vgbk8blh43h2ih4jqn19wrhdigbf649d28iplv8r9d8vp54njp4"; + rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55"; + sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17182,8 +17245,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "c79fd5824a3881a8d82cd2fb4b18a559e1f26b8b"; - sha256 = "1vgbk8blh43h2ih4jqn19wrhdigbf649d28iplv8r9d8vp54njp4"; + rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55"; + sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17409,12 +17472,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20170527.1917"; + version = "20170603.2006"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "2edb123372624222e3510b5ce9b59c5e20a55a3e"; - sha256 = "1yc3xbfx3ly6r5hicn4qm4rp27x6j4nm41cc0m7cshl7fdf83wzi"; + rev = "85319b9e75dea9f79e6d16011ee2a15be11eb9c0"; + sha256 = "1gnjx7ay0c167vnl7k9gxmvm93ipqfs93jmcmvy56rlvc7yyk39x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -18234,11 +18297,11 @@ }) {}; emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20170501.1102"; + version = "20170601.1651"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "179e8e73f501115a9b0c73056846d80809d5a144"; - sha256 = "0v81x21bsxmvaxrg8yx4j5ycyd4fkjnk9bf3dw7p2cdywsjfb1hi"; + rev = "0481ca3b8f8d558e545582440dde6dac514818fe"; + sha256 = "1z2kzaw2jr4m189gd8978g6wy6z9wicf1klyh48l623lh7cv48ic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18728,12 +18791,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170530.354"; + version = "20170611.1428"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "cccdd2f7caa9b5357f8021098e63384b4cae381c"; - sha256 = "0fhzlawd2nq14a0b8yx6lnmmklh2s9y5i23nwz8zmwmxxivffn3z"; + rev = "86a52709a0c45e2f84737319f8f95abd0ea55ff2"; + sha256 = "10ix3yx916c929i8fj2bqkjjm409mwpjzydji6x8n8v5s8lnw6m2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19369,8 +19432,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "b182febe36aa63eb8290f24ba4b7932673a9a9bc"; - sha256 = "0p45lcfm4qxzfrcw2pw53m19swgx1m1805v7vdgdkcm63qbdjalj"; + rev = "dd9e39dc2b97e30c03b24a00eb757be7d2c2bdc2"; + sha256 = "1q5pd9a5d5513brw5s2x6652fmmql7y7lcnzv18kw3wc4qvccl24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19532,12 +19595,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170502.2206"; + version = "20170608.1234"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "ac13cb477d0775fc8fe1ffbd88f9909eb0688174"; - sha256 = "0416sqx32aby2qaybc3qif8dhsmc3xq0968y772y5hq2lk7sh8dm"; + rev = "3752438d17c45553956cf775022b2358ff3d8731"; + sha256 = "0a2afjg0ygd88qp5pc39ghwck837f6sk57c8zbcsyxwrabxnchhd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -19952,12 +20015,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170516.257"; + version = "20170603.817"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "39fa48ac89fcc0a3b8dfd9708207e4acf64bb2fa"; - sha256 = "1i40v2dah5d1rx5pj40ivl534qs840bvk1h44hqs8n9fz945ck2j"; + rev = "f2643cd3ae6727535ce76ed00a91bf96c09e280f"; + sha256 = "1fyr963y2mnp8wk9jf0fpfp1k74ayhbcdyg1xknvd5jd5lyjgbkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20326,12 +20389,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170528.1105"; + version = "20170612.100"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "00ab2876f2849c3be9f5d7475e4538a0ffecf872"; - sha256 = "06idkqrbh96vp6nb2835g4cgxdcxhp3nm7am46r5ylvgmflw9jf6"; + rev = "d45772929db630be8226e2786132d46e2c6bdb2c"; + sha256 = "07mc036lz2lj0csg10a8gdqxqsf8mxsjfy3ha9wsrmbqhsvwixn9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; @@ -20851,12 +20914,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20161130.847"; + version = "20170611.1237"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "9251065b73c5023fc21d56f5b94c505cb7bee52d"; - sha256 = "17jnqd73i680fpmghghadc4d4xlg39xfjx3ra8sll0h1xf4xkspi"; + rev = "f851e5896fa90ae94dfde3d2a7554b4d5f9e665c"; + sha256 = "127ccll30526b38g64pagagnia8mw0bs9db95xri0n48x4vginkd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -21061,12 +21124,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20170528.1654"; + version = "20170611.1149"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "7cd1903419b9681993210723fc854bd43ca080e5"; - sha256 = "14jfvk7y102ba7ky8qanhpg46i6if3narshixlbnsb2jd26dyvh6"; + rev = "4da3d179d71113b906173a974fec933e9f55afa8"; + sha256 = "16d9x89plmy6qrjvc8czrqpc1y53xbcaclc20yd8yyi722sdd4x1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21233,8 +21296,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "c3e5e26c14f4a47daedb4fc48e1b0fb993aa0999"; - sha256 = "009491hskqkvycng70n3mm7zqxlf6jjninddlcbnknyfr44y4xka"; + rev = "d6d60b077e31755b6d543337dd165ab7e1c67d36"; + sha256 = "05fxr48r7qilh52ycm6bi108y9kd1zw62mckf8ddhsjrvszx97nb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21273,14 +21336,14 @@ pname = "evil-surround"; version = "20170124.1110"; src = fetchFromGitHub { - owner = "timcharper"; + owner = "emacs-evil"; repo = "evil-surround"; - rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839"; - sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"; + rev = "a4fc4483dff0bb0e544d832a845fdc6fb85c6214"; + sha256 = "0xqvpr8irkv4qw82gcgnnfb9mjavb4jj9a11cw32wqjdg0106dlr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; - sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; + sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1"; name = "evil-surround"; }; packageRequires = [ evil ]; @@ -21711,12 +21774,12 @@ exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "exsqlaim-mode"; - version = "20170418.124"; + version = "20170607.303"; src = fetchFromGitHub { owner = "ahmadnazir"; repo = "exsqlaim-mode"; - rev = "3cac2ba06862a6407ce487423898af04de4996c6"; - sha256 = "149g76rms1h183f78kzns6cy3jyllxyyhvb1x61c2823k2372wvh"; + rev = "a2e0a62ec8b87193d8eaa695774bfd689324b06c"; + sha256 = "1gj1q2h1ja30jizkjql12cxlppj07ykr4wxqca9msy043zdhqnkk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode"; @@ -21774,12 +21837,12 @@ exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170528.2210"; + version = "20170606.2038"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "9f71ca70942724e7a0c0ec2723963961ed0980c8"; - sha256 = "13dpqm1b58ivlb17nbsb0rxg5bm52r64y4x0k0pajqfyig2krsrd"; + rev = "ff656107e55458cb2b453eb4637ad203007068f1"; + sha256 = "1ssbqcrhcprfd1n4bvcbczp3dqhq4hcl75qaz6alc9y11r2jb4ar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -22251,12 +22314,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20170208.1012"; + version = "20170602.1912"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "ec1d202c11a1c81f7ab0b9cf235d64c68d8e3134"; - sha256 = "1p32lqmnp7k0gck6my1cy4hd5sck28zkfvlg8q23lpkcg1vcsqlx"; + rev = "2e3abe356b464b30350c08e243988a3116818b19"; + sha256 = "0cplg10mhr2r3cp4wcaykyvbzilmjma90hkv4h1m8d8xrfdmmi7g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -22537,12 +22600,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20170522.729"; + version = "20170531.2054"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "d84263bdac55501e05662caffcb0642bb8bb4a53"; - sha256 = "0f133fpa53sqrx9a4hycvqzi3sbaswxdbma25isfrr0g9kf7j7db"; + rev = "eb9fec502a2622b46301ca49183147b6b1fcaff6"; + sha256 = "1hrdqdps76c1sfq9m9l6nid32lklsli2hgwzd4sl5ypb0zqhn25k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23293,12 +23356,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170524.1742"; + version = "20170601.608"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "b6baa8abc95d83a2f612e4f62f99681b8c4a91b6"; - sha256 = "1i0bpfpascza9mw9w34a20d4l8q9pm444hw9dk39jkkvzksh98qc"; + rev = "db3a745edb6b2678286e4d2bccebbb8d388c1a9e"; + sha256 = "057yy3nmvlsczzq4h72a67qi4qbjl5ysv3vz4iw2nr1772a1y9ja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23839,12 +23902,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20170512.836"; + version = "20170604.811"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "01c1150737b6d824153ec41adfbafcd3e1442d61"; - sha256 = "1wxmx40hs391pkjiqmxdz1i4ajksagxbrm3wmp654pix8ynxcvxl"; + rev = "a249e60803b1e423c67e40462229646cc77fcb68"; + sha256 = "04xghj1l4fnfhl139k3s6q7fhln946gx8ak7l6ys7rz23iizbx4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -23902,12 +23965,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20170519.1321"; + version = "20170604.447"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "2e4167d4cc055d5f825ed22d25b1662e10ebf8d2"; - sha256 = "1idh7ji2hn4wxhxw4cz66qwkgh6fhzy6lqbxw55d0wlwwq1zva3d"; + rev = "84a8853d2ed4bd74038bb45d531dfbff0a3b1de0"; + sha256 = "1lzf5wahmbxfqa7944z5gjbs7vfbm5qsv02jc7x3cvj8z22kf4fd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -24179,8 +24242,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38"; - sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa"; + rev = "cb526f54f4017454e2503b340757ba15578a5aed"; + sha256 = "1x1pmz7gd909s11fsyqrh8a7bg2j4hw572wwqy1kjz2qf42mfw53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; @@ -24368,8 +24431,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "499db6f98cc725bca66d122bce571adcdfa32187"; - sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a"; + rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; + sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24578,8 +24641,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "b7ad7c440dc3640a46291a9acf98e523272e302b"; - sha256 = "0cpq2kqhxg61rs6q53mfidgd96gna3czw90rhb6njhch01cv9i5m"; + rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6"; + sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -26142,12 +26205,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20170416.335"; + version = "20170606.925"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "c2acdaaf36176d36ccadfe73c2593362ef930ebd"; - sha256 = "00am42hl5icvbw5d7kpbdcl9sr8flsgl1pqmcxqpcz30yw6f4pr2"; + rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e"; + sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -26171,12 +26234,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20170529.2340"; + version = "20170531.1958"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "75444875c86fdf33b1604b26100cf5399d6aec86"; - sha256 = "0a8nb947xab72pcahjz11jilnzasldi0ywcaxwviv6z6k92j8k62"; + rev = "c9a9d722848dfc3f37ac9e0e91603340e5f5df1e"; + sha256 = "0faf8796vvfi2g4kmh7xsnc08m3iyldgcivslq0xy86ndh682f06"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -26200,11 +26263,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170107.626"; + version = "20170601.1205"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "5b1198e20cc5b7e748835040bd5331b4618c419f"; - sha256 = "0gyy77zm8mfx4krrdzdpivmzrfx3kp89sw7wipqpx6g4a4ji6pgz"; + rev = "dc0b8994f00bd46de99398f92bf949a784c7a9ee"; + sha256 = "1wka0ldx68psxjp3bl6xwx48mlnawqccvyig1lr4c5vi1avkf6dk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -26329,8 +26392,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "6a06fd8ce22d945edf6eb777d6b82f8859c5189f"; - sha256 = "1jglv0f1lw5wf7xc9hmbgdbfn465qymp53wmy93k43k0zhg9nzpi"; + rev = "19015c8d84abc84cfd5f39295b02af8af5ef2e94"; + sha256 = "1vp24kgi3hv2j7df6nmczhfy847725c6jpjizmgfl9r2d7d1v9bs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27009,6 +27072,27 @@ license = lib.licenses.free; }; }) {}; + gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gift-mode"; + version = "20170603.906"; + src = fetchFromGitHub { + owner = "csrhodes"; + repo = "gift-mode"; + rev = "0d6adae976ee0831877d4bf237090ff67fb76e1d"; + sha256 = "1ld367qvyn7700mry24j4ywmanaknpwgfmq18h72sn408z9vsalc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode"; + sha256 = "0sybrjmcg90cjaax7lzzqvacirn5l23hqy9d843c660fsv98scg1"; + name = "gift-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gift-mode"; + license = lib.licenses.free; + }; + }) {}; gildas-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: melpaBuild { pname = "gildas-mode"; @@ -27033,12 +27117,12 @@ gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; - version = "20161127.855"; + version = "20170604.1834"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "62888de7f776c867a51cee4d5d55edc561e519cc"; - sha256 = "0xvmrpx3gbdancxhggw7k7r2bzlwmni9vynsjf5ddpv5alw2bscx"; + rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2"; + sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -27159,12 +27243,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170510.910"; + version = "20170609.2310"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "7c833ba867dc27346e4e16975e107cc49e8494ca"; - sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f"; + rev = "622c994183294b02893ff286210bffd5255296df"; + sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27327,12 +27411,12 @@ git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "20170504.1834"; + version = "20170603.1026"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "88bb1cddbcbaa52c674288173fc0806fc6d4a904"; - sha256 = "0yj0rldpvyfz939ld9pfgpamlzrc70wchvq094js6il78514lr49"; + rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf"; + sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -27579,12 +27663,12 @@ github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-notifier"; - version = "20161102.755"; + version = "20170604.2119"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "github-notifier.el"; - rev = "12621caa8d78bf2b559d2113ef476a8f2c2a4e0e"; - sha256 = "1cwabnm6nirmrwdq14l3pqdjh40h49icbfjx3z86rppp7cj3dmlm"; + rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987"; + sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier"; @@ -28610,8 +28694,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "a5f4a247366d8fc436941822e14fc3eac7727015"; - sha256 = "0fixw5j4ypzaj5jni7d1pak8g0wv3c9h267x3nkyjdwwwqrxkwi0"; + rev = "c5fb716d6688a859aae56d26d3e6070808df29f7"; + sha256 = "0bp9aarkinjr6m358qw9x4qxi3v9h06jvipyx1pg3pwsqh61vb12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -28771,6 +28855,27 @@ license = lib.licenses.free; }; }) {}; + goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "goose-theme"; + version = "20160828.545"; + src = fetchFromGitHub { + owner = "tokenrove"; + repo = "goose-theme"; + rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c"; + sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e23a52e068ec0e6d457402254727673ea02bd407/recipes/goose-theme"; + sha256 = "1nw948js678xc5vgrpdkykpcbn1b1id4k1clf87vfv7y5zssvd0x"; + name = "goose-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/goose-theme"; + license = lib.licenses.free; + }; + }) {}; gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "gore-mode"; @@ -28923,8 +29028,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "67b13b52bd135469ede5b0caa4b1f79e19d228d0"; - sha256 = "15mpcp8pyg22d9a81nxv7zbwiqipvz7xfllkrrwn9ggb0vp3bj2q"; + rev = "98f52561d70fd95cfb7a5155ec9e62282bc55dc2"; + sha256 = "0vqnsyn80h06qi2ypql4j66a9w1dsnd5f95gcnj5dgwk0scgpfxp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29049,8 +29154,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2"; - sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7"; + rev = "816182124457bed620678f9a92b349787cbf87bd"; + sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29430,12 +29535,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170529.46"; + version = "20170609.1120"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2"; - sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7"; + rev = "816182124457bed620678f9a92b349787cbf87bd"; + sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29640,12 +29745,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170508.1218"; + version = "20170608.303"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "41a9d7ba0acfd19e4c669aed12684e852bf886ca"; - sha256 = "1vkhzb9mzcrm7yc6vccd0937j19hg1m3jbswlb7qjl3gi3dc57hr"; + rev = "af57f5e969004dc5141cdb1d4c77c55ece0c6868"; + sha256 = "0nv85nlcac7k5pld2sg9wsbggq394jlmpcayzkrm81yy8a5grm5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30144,12 +30249,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170526.2107"; + version = "20170601.2103"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "b0a5743f349e5e5b812291b5b06095aee1456656"; - sha256 = "0ms4jf9zj2svyyh0rqbdbkx4rjll4rla7x5lzyiki7z27pf3c7df"; + rev = "c46bdf129fb7ac241b84e0cfffcd3c7588dfb1af"; + sha256 = "095y6zg8frdl9z7r4xp4dysf93d947srwiylngss8fclav7fjq2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30413,12 +30518,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170527.2302"; + version = "20170611.701"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3396747e847a355b9cfbf7df1e851c507bd96381"; - sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644"; + rev = "9f532785d43389339ed73d90357d4aea9d966020"; + sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30788,6 +30893,27 @@ license = lib.licenses.free; }; }) {}; + helm-charinfo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-charinfo"; + version = "20170611.1746"; + src = fetchFromGitHub { + owner = "mandoku"; + repo = "helm-charinfo"; + rev = "a4902a90bd9f012468ad8186e2548c7814847613"; + sha256 = "024pqnw87whwa7zpld8bcz1izaymqk0vajhbf9m173hlfw6x7wmp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/helm-charinfo"; + sha256 = "04k6crcwhv2k69f5w75g0dg0f5qsbhyxl93qzxxdb5bnr56ad7f6"; + name = "helm-charinfo"; + }; + packageRequires = [ cl-lib emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-charinfo"; + license = lib.licenses.free; + }; + }) {}; helm-chrome = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-chrome"; @@ -30980,12 +31106,12 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "20170519.2126"; + version = "20170608.1029"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "helm-company"; - rev = "467617b68f43600e09ea6e3e7ad82cab08148fd1"; - sha256 = "1akrc04xfsv3xjvj783mvmq20rch1igpzldd3ym4l343xrgbi69w"; + rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; + sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; @@ -31001,12 +31127,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170526.36"; + version = "20170611.135"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3396747e847a355b9cfbf7df1e851c507bd96381"; - sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644"; + rev = "9f532785d43389339ed73d90357d4aea9d966020"; + sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31085,12 +31211,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20170221.638"; + version = "20170531.135"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "f07a77bd6ae6d8c933753f25526cbf3b71903e77"; - sha256 = "0az1j68g0svynvag7p3x7l1rv4n6y1knkmfcjhcli4jwrkn720xr"; + rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe"; + sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; @@ -31568,12 +31694,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20170423.759"; + version = "20170530.830"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "605e214632644224b5b7adf2a68f265489c2a080"; - sha256 = "03hix4vqp1krh8v3x6iqs3xqpcjzibwlafxrmn2gz3n4f9xb9j37"; + rev = "e3ae5f60585ac0213876dca5093aca467db1ac5b"; + sha256 = "0bld5kjzgjhkjcjc7b66kg55yb7pzrbnxfqx79f5glxckbp2pxjr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -32030,12 +32156,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20170523.1149"; + version = "20170601.2200"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "61ee52a6b095a8cd1b23387e0eec58c93a7368be"; - sha256 = "10g60rdbk46xr8kxcvvqnpha20vv38fj1qpc1872ycg3r911sa11"; + rev = "1253c7615da055a95548b4f92a8a503fe249884e"; + sha256 = "1zyix2whj9j19ica9pff1hh7vgyg1h009vx5xhcqw5sligrh2dwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -32621,8 +32747,8 @@ src = fetchFromGitHub { owner = "bomgar"; repo = "helm-rage"; - rev = "dc51371265acea60ac0691016f6ce84597bcace1"; - sha256 = "1asz4rq5c4w82w167li0vvmqv3zjl4rz67c2dj8i717ihcm45sip"; + rev = "3cae7f309b45cc6e40507be68c0cc2e5595c1392"; + sha256 = "0j8yvxvd78lcfpss327xc6rahkqva66rrqjjx5cmdl82xncb53vz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; @@ -32789,8 +32915,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "499db6f98cc725bca66d122bce571adcdfa32187"; - sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a"; + rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; + sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33104,8 +33230,8 @@ src = fetchFromGitHub { owner = "bomgar"; repo = "helm-unicode"; - rev = "e331c38e651287981e5d34c27e5d7dc4ff24b0d4"; - sha256 = "05pvswisi44bl35anjbimd0q8i3c7kkjfksvaj69gcr788lhb8iv"; + rev = "1ad1fcca7a83c163ae74eb72a443cfc102128e33"; + sha256 = "16s0k6l2k32nxmgqc159kr5vzgn8gydj3bkrkvhhydm3lnh8ki0n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode"; @@ -33251,8 +33377,8 @@ src = fetchFromGitHub { owner = "maximus12793"; repo = "helm-youtube"; - rev = "7a944bc25f0f9e915011e9325caf46b46fcaa1b8"; - sha256 = "0948rq6i4ibwhmi6m2k23f83yvf56vwgri1sg2060d901zd86cxy"; + rev = "202c27fc3b54927611e9d9c764465e1b42ef7e41"; + sha256 = "1wqxcz03fq2z31a1n90dg9ap3451vx1376ijbpfy9sg66pgj8yxv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7537f732091b96b6c1b96c0174895278eba6776a/recipes/helm-youtube"; @@ -33343,6 +33469,27 @@ license = lib.licenses.free; }; }) {}; + helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "helpful"; + version = "20170612.205"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "helpful"; + rev = "fdabfe7d88853e052cd5a20614585ed3cc1faeac"; + sha256 = "0x8d28s6fi8lmdyp8nyqi0dryf06703kddws079qr0l4p5jiibxr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; + sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; + name = "helpful"; + }; + packageRequires = [ dash elisp-refs emacs s ]; + meta = { + homepage = "https://melpa.org/#/helpful"; + license = lib.licenses.free; + }; + }) {}; hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hemisu-theme"; @@ -33632,12 +33779,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "20170502.746"; + version = "20170605.842"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "18722f28baf24e2040c5ba00e548bd2e73b52bb4"; - sha256 = "1f07hpg8v1xyxn2nrwz5hq1m9iq162k7b0sgi5jnq55zyii25dvr"; + rev = "d26f566d386a56e752d8ca1c813932d68b088bde"; + sha256 = "1dk5hdcjakxi91q29lbnwvbfhr834sxmsr2mrxr5mqhp3wfg3qga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -34105,12 +34252,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "20160905.243"; + version = "20170609.126"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "ea919ff276028b525688bcc09105943c584c0892"; - sha256 = "08gd4dl7p0gxmlds1yw1a36902zgbrdcjzb6sp45yk1i4xqqg1az"; + rev = "b858104fab63257de4b172b085b28e24ecacfed0"; + sha256 = "1yzmlflzx9gvm0dysgjwi0a5nm7w7diczwqp4zggd4bl8bb45fip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34354,10 +34501,10 @@ }) {}; hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-line-plus"; - version = "20170223.745"; + version = "20170604.1526"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-line+.el"; - sha256 = "1dhrfbmh98y18xgsp42rx1qqcs296mpqqzzp3nr9rcqv4gvpllgp"; + sha256 = "09dwllzhw0441fbhkw7nb4isfnll6nbpp0il4yc7wgjvg4s94hw6"; name = "hl-line+.el"; }; recipeFile = fetchurl { @@ -34456,12 +34603,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170525.748"; + version = "20170606.644"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "6dacb781f48bc818286d8a63bcb23a93991ed292"; - sha256 = "0vgmms7z5rfhjjh2gszyaqdnfhx585mlmn8mp54rrz9zbnqy5qnd"; + rev = "bee9cee09d6909cf35f80582aee5a1de6c90db39"; + sha256 = "0jzl2qjyl7kbb16barh365kl5qziamgv87nx934s608498dyl4j6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -34853,12 +35000,12 @@ http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "http"; - version = "20161127.1449"; + version = "20170603.1107"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "http.el"; - rev = "18057d0967015979ee7e59598b1d3410d5966fcb"; - sha256 = "1bw9369c3r172p14rb74vqs0243696rqf46z627p1w73afq48zy5"; + rev = "19317fcc928bb75e0464e39032af1627b7961a0c"; + sha256 = "14zq54g4ckcrrbpwjcb84krg9bijw88nwnkj8kg9kij5p25knqwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http"; @@ -35270,7 +35417,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170522.1503"; + version = "20170609.903"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087"; sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp"; @@ -35477,12 +35624,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170313.1603"; + version = "20170601.559"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; - sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; + rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40"; + sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -35792,12 +35939,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170313.1603"; + version = "20170530.1839"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; - sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; + rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40"; + sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -35876,12 +36023,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20161102.707"; + version = "20170611.2243"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "b5e057bf6b805f4da7c17cb6ca5e69833935e900"; - sha256 = "1bwrf529m9xjb9bdypx35ss5v6k5v96hcqah3sij98x9357g7b6n"; + rev = "8a2711efb7e2e4cc2a9a48cee422dba848c6155c"; + sha256 = "0akp4mbsm4jmf5c652sbbb7gqf5w31ijfqdcckm28zxk2jwc1gz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -36373,12 +36520,12 @@ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "importmagic"; - version = "20170519.2206"; + version = "20170601.1828"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "a5505985086ce3c5bb3255ca10b140f3a5563e65"; - sha256 = "1ikik8b99qkmfdcp6lqy0ivpb1wbav6vd0idvbd5qazkp9jj3qya"; + rev = "41f90782b7d5c58f53ad0187b816faeea408e4cf"; + sha256 = "1w73734n8qwhvina1y9m60b5jj5yy1csizbldyph4vcgi3x0ff6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -36415,12 +36562,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20170322.1001"; + version = "20170608.647"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "d50c762d9f6f66cd1b4b72f1b5d024284b378aa9"; - sha256 = "1jk8k13mx5z3v38q9d8m5lz52p14imj89zvy7484mbjqmvxh6wga"; + rev = "8d2072eef1fdc87e35f7495adfbfa0beb9faf6b7"; + sha256 = "1hrsmv25q9rpmj8paf3gggw7sp28z1m4gwlx50s64k5mxqa99iy8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -36454,29 +36601,22 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ company, emacs, exec-path-from-shell, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: + indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20170524.651"; + version = "20170609.923"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "07c3d444def957a05757a035dc178b8459822ee1"; - sha256 = "1hbhkl7i1b09dhc9vc555xic8hsmlh8rjhvkcb09g372slikzxfa"; + rev = "e9b0104bb36b1ce349bf048979746e0ad738d43d"; + sha256 = "14a0gpp71045j4hs5s2kmisv3466imzyag7f43r1gsg4b0gp4c8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; name = "indium"; }; - packageRequires = [ - company - emacs - exec-path-from-shell - js2-mode - seq - websocket - ]; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/indium"; license = lib.licenses.free; @@ -36569,12 +36709,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20170515.1648"; + version = "20170530.1824"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "81adadf0f98122b655d0c2bee9c8074d2b6a3ee2"; - sha256 = "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z"; + rev = "62c1c72d8e2a8e1ca8430010c19be930f54e6daa"; + sha256 = "1w9jgrvly07056f72xf4ink0i8q1xv3rnpv5kbifsjfxzz05crbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -36819,12 +36959,12 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20170413.120"; + version = "20170602.1000"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "372ad654293cd0b8cf7db6129674c5a84d54ca53"; - sha256 = "0642rcjj1z5c86ry97b6kmf7kivhajvz5f9fz9kqfw0f98srzhrs"; + rev = "d9e97a2b95a7740c8eb72fa795fface8b1500fd0"; + sha256 = "1c8zl512c5mw126p43l6prdimfn2mi58msb0sw4csf9r1krkv8if"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -37028,12 +37168,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170518.307"; + version = "20170611.437"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "4151177d17af8af58488398a4092e406bb93311d"; - sha256 = "0q8qbg2j84vb4n2yyg279yprf9ssh0s6mi0gpmawjwvqp7f3rjdw"; + rev = "70c9c524b3de8dce739df7fe0fdb5128fc8adf11"; + sha256 = "1jb28d9mcnn2098lmlq4jfk64jjdfn24pmwl8gax80v4p81b54vm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37505,12 +37645,12 @@ itasca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "itasca"; - version = "20160406.542"; + version = "20170601.922"; src = fetchFromGitHub { owner = "jkfurtney"; repo = "itasca-emacs"; - rev = "bf0b6a66b57c8a0e7d692d306a50b587a2da8284"; - sha256 = "1174f75p3rkq812gl2rs1x51nqbz4fqxwsbrd7djh1vkd2zii3aw"; + rev = "3d15dd1b70d6db69b0f4758a3e28b8b506cc84ca"; + sha256 = "0mfcl7ka7r5mx52xvf13i3799ddkdi9sq2q4p2rkgb96r37ia221"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/itasca"; @@ -37589,12 +37729,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170524.950"; + version = "20170609.943"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c93194941c1ac36ee762b70dc9061ee830769f6a"; - sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca"; + rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; + sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37631,12 +37771,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170524.2010"; + version = "20170605.2046"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "2d93b1b0ec1705e449f2e0f43073aacc8f1e3242"; - sha256 = "0lrnd5r9ycy2qqggqd0sr6b2w7s28yfm15pgyh0r0rjdxky4a5vm"; + rev = "117369f882f81fb9cc88459a4072a2789138c136"; + sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -37694,12 +37834,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20170412.30"; + version = "20170609.938"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c93194941c1ac36ee762b70dc9061ee830769f6a"; - sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca"; + rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; + sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37782,8 +37922,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "499db6f98cc725bca66d122bce571adcdfa32187"; - sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a"; + rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; + sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38445,6 +38585,27 @@ license = lib.licenses.free; }; }) {}; + jemdoc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jemdoc-mode"; + version = "20170611.1536"; + src = fetchFromGitHub { + owner = "drdv"; + repo = "jemdoc-mode"; + rev = "0b09b0368acf3b90c9b58274ff8c2a1e77d1d5e1"; + sha256 = "094smy6n30lwgldg958z387dc0nzjvghlai5xpxc5q2i1gjjqh78"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/49a8c0f885df0b91d758b4d7c92bd67368da8a56/recipes/jemdoc-mode"; + sha256 = "1bl8a9fcilrqjzh92q7nvd16pxjiwmbnj157q2bx36y7bxm60acv"; + name = "jemdoc-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/jemdoc-mode"; + license = lib.licenses.free; + }; + }) {}; jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "jenkins"; @@ -38968,6 +39129,27 @@ license = lib.licenses.free; }; }) {}; + json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }: + melpaBuild { + pname = "json-navigator"; + version = "20170606.34"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "json-navigator"; + rev = "bc5634fc78d2e43ebd3c255350829877f3e4549c"; + sha256 = "1j2lic9sn00j6pzq5qslv9m2z0rvsxkvz73z8swp7vcrsgz7qvqd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator"; + sha256 = "0yfl31cg0mkgsbpgx00m9h2cxnhsavcf7zlspb0qr4g2zq6ya1wx"; + name = "json-navigator"; + }; + packageRequires = [ emacs hierarchy ]; + meta = { + homepage = "https://melpa.org/#/json-navigator"; + license = lib.licenses.free; + }; + }) {}; json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "json-reformat"; @@ -39116,12 +39298,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20170426.1806"; + version = "20170607.537"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "46d2469c408888cfeeec27904116cfc22ceb1461"; - sha256 = "13w3wpq5qi5fvzs56ckfr118qx7kfllhjsxxfj2l4ijg8x5d56vq"; + rev = "f591c6d42e493d51f1522fd0449d6a62881adfad"; + sha256 = "1wjbvwfdish673y5qjr3r8w935dv1cz8j0sv8dmd2i6w5wf5d1qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -39408,12 +39590,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170529.1516"; + version = "20170611.1344"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "4b3dab02562eeadfb67ea07bc9f2c9d7b6be2d44"; - sha256 = "1gqfpg2agf2ln8ca3qp14rwmh1blxrfwm1aai2n7bv2maz3b1lz9"; + rev = "e0c14489867eaafa3ab39bb271e3e466cebb632e"; + sha256 = "0zk2crzqzrbn1051fdkpxzyr6d2rknh7nznnbqyw3k75agiq3lm9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -39916,8 +40098,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "b7906e7456383c39555cd988f410043dbcca47a1"; - sha256 = "1ifzx2z48l1g1livnmhngnaf875fgnnmv1p79j2w10xjwkasvff4"; + rev = "27e3b90eae2a0155b22a435f1b6f65c913519db6"; + sha256 = "0c6qxnhmhwsb7gqib40fgg2p7krvmxdx75xka8gh3j47zww0pylp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40105,8 +40287,8 @@ src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "e5ee4c4bd25a61e0f5067ca8939d1a3185909471"; - sha256 = "1sfl4cz2ll5vvzzmg3cr8gpcbg0rmnd8dvmbvphb80gc8qacnd7s"; + rev = "1ed0c5589ef2d53242f767f6071dbea90c64e813"; + sha256 = "0nywyf0znaffkchca5hal1w6h7fis9pybiivz7vzrr85ppl0gzas"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -40372,12 +40554,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "20160116.1654"; + version = "20170606.432"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "d014434d5698d927dfdbd0882d974edc3fc6ac66"; - sha256 = "1rj0j4vxfwss0w6bwh591w5mbyzjg5rkbwyjaphyi6p7wq5w6np1"; + rev = "d976e4f0cadb2309b798540429558936f8f45889"; + sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -40686,12 +40868,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170529.647"; + version = "20170612.123"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "7a987a57317272e9ffc1f7e8bb82045a2f4566f8"; - sha256 = "0jazqm4cb4sai9qbb0pwnpql0x6s2w6mfwk32kzm7fn9iplih8rl"; + rev = "1afc0c9a3b1a25fdf510c13bf7764f6c4867a897"; + sha256 = "1niww7czhqxn2dpnjbdghplva7l7ymrx77ka3djjln70x0gnvv2v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -40942,8 +41124,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "c6422663ab03a3d8e9bee6413890d0fe93bc9556"; - sha256 = "0lx5lxlql9pxgjqidb2k850i36qgx97jx15b24vv2s2l9f1skrw2"; + rev = "e231e8325765cde4ec3faa73d57bb5064a35620b"; + sha256 = "1k2s7s3wq7pgncrj1hs8vbd393kp8zmxygbci5jq4gvymmsb6qza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -41596,8 +41778,8 @@ src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "5a04d426b33566027fdf5fd3090dfd315fda7314"; - sha256 = "073cqwy2iw9ynrdbb8r9n4rnkk9j8zba91872sx2gyp47xkq6pjk"; + rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674"; + sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -41679,8 +41861,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "3ba25d2222701517a0e00ba189a1d47b58fb7359"; - sha256 = "1y7v50w3i07jzizj5vrbqiafz2355bxw6hai3v7vam15ii3ir6fw"; + rev = "f6d6d2b0f7ca39f7b64137c4c90241af7099ebe8"; + sha256 = "1kjyf2gj3kj9blyabri3z808krs1a7wq0ffxsz8378pl8dl8vcwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -42115,12 +42297,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170510.726"; + version = "20170601.1101"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "228980c3fe73c111ce6035a3d5e210da450cc052"; - sha256 = "0gwxvglfgp5fblwg14wwrj74wblsapv8plqvsdfca7myzkvrp7yk"; + rev = "6fe3246e00995ca7ebe3b3c36ea58a69de521193"; + sha256 = "1ib4ld45wfwq5c48w56k8ca5qggjmxgpn2q0vvi556awk47anhqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42449,12 +42631,12 @@ magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magic-latex-buffer"; - version = "20161231.2300"; + version = "20170530.1705"; src = fetchFromGitHub { owner = "zk-phi"; repo = "magic-latex-buffer"; - rev = "49a9ac6aff0a45aa6630dc0044533b7b3d3be7ad"; - sha256 = "1r9zq16n546xd9i27kiifdl7mwld8jk88rll2h0lbd77ir6wdlfm"; + rev = "c03277d5619d9adcd871f3e6480a1a27985810cb"; + sha256 = "065xfj6asw7px4xmh5isbfs0y6m6818lrds1ca45rhkyfw98d2sb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer"; @@ -42470,12 +42652,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170528.740"; + version = "20170609.2322"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "7c833ba867dc27346e4e16975e107cc49e8494ca"; - sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f"; + rev = "622c994183294b02893ff286210bffd5255296df"; + sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42666,12 +42848,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170508.936"; + version = "20170609.2310"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "7c833ba867dc27346e4e16975e107cc49e8494ca"; - sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f"; + rev = "622c994183294b02893ff286210bffd5255296df"; + sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43146,6 +43328,35 @@ license = lib.licenses.free; }; }) {}; + mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }: + melpaBuild { + pname = "mandoku-tls"; + version = "20170611.6"; + src = fetchFromGitHub { + owner = "mandoku"; + repo = "mandoku-tls"; + rev = "e21205ca9c1c053801190f291d6583ce057e8a65"; + sha256 = "0yd33hflm1da61mc54y7yaaxb6y8gzv00n4ghcqn6rp4vlmi6534"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/mandoku-tls"; + sha256 = "0zny1l548rvjsbbzj47wysz6gk1sqxvpj215r3w84vw5dyrn78bz"; + name = "mandoku-tls"; + }; + packageRequires = [ + emacs + github-clone + helm + helm-charinfo + hydra + mandoku + org + ]; + meta = { + homepage = "https://melpa.org/#/mandoku-tls"; + license = lib.licenses.free; + }; + }) {}; map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "map-progress"; @@ -43254,12 +43465,12 @@ markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "markdown-edit-indirect"; - version = "20170210.1504"; + version = "20170607.1244"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "markdown-edit-indirect.el"; - rev = "980d8bf3a123a72aef18f608e99be3472be100c3"; - sha256 = "1idsh6gsm7kaz7i8kv3s326qxnd2j3nmwn8ykbnfwracm6him3qf"; + rev = "a789320354eab2b2275a308c38b1390e6d2cc41b"; + sha256 = "067rp6h2wax242zmykz5iv2v30cj327dh9vz6c69im02lsn65ib3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect"; @@ -43275,12 +43486,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170526.1213"; + version = "20170611.1532"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9"; - sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs"; + rev = "0fa1d523fe95a15a8cebaaba7d4af3002ddbeef5"; + sha256 = "0y6j5gdlxw9kp961sgdpnkprxdmnndcjd6s3v9jbz8py2k3pqpxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -43846,12 +44057,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170525.2333"; + version = "20170610.1806"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76"; - sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp"; + rev = "f8ebc163a289532ce99134716008440a515e65ea"; + sha256 = "00z9w8nzf1adh6kic485w332dj6m53qdmb99w4aqz70ygq6i2s89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -44576,12 +44787,12 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20151214.558"; + version = "20170605.2342"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; - rev = "98064f098e6871382614fcf3c99520f7a526af0a"; - sha256 = "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c"; + rev = "c33a8e23817468c2a64dcfede6dea41485fb43df"; + sha256 = "1892s4cxzxdrwj2mjav1lqbisx20zsjgnw41m6a61ds7hg035c3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; @@ -45489,8 +45700,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "5c848d79c9eba921df77879bb7b3e6b97b9bccb2"; - sha256 = "1dmfks09yd4y7p1sidr39a9c6gxby47vdv8pwy1hwi11kxd6zbwf"; + rev = "832e81b7f90f6c2e753f89737c0b57a260544424"; + sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -45695,12 +45906,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "20170528.2256"; + version = "20170610.1044"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "ffc7974f1cafb5e03bae2765afc6a984ffcb0f7e"; - sha256 = "155bgayysdyr5a9wpx78azpipd11s3k8ijgw4mpvbmkk5j7fi6a8"; + rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577"; + sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -45882,11 +46093,11 @@ multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20170322.332"; + version = "20170604.1514"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "c03cafbbfba9"; - sha256 = "0v0q4v3pnqmm89hix90pfx4hpfpc9iv1r5ldn3zwzwhbs0jvgj3d"; + rev = "04eeab45d19b"; + sha256 = "11mn36m40i93wig79kj1jp2i3ggck1qsfw2z9q24a1zxj2gns12i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -47071,12 +47282,12 @@ nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nginx-mode"; - version = "20170524.1812"; + version = "20170611.2137"; src = fetchFromGitHub { owner = "ajc"; repo = "nginx-mode"; - rev = "9e25e1f696087c412a45fe004b98b9345f610767"; - sha256 = "0hjvbjwsk64aw63k4wcizpqiqq6d8s4qwzfvvsdbm3rx743zgzsz"; + rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005"; + sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode"; @@ -47152,6 +47363,26 @@ license = lib.licenses.free; }; }) {}; + nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nikola"; + version = "20170301.1148"; + src = fetchgit { + url = "https://git.daemons.cf/drymer/nikola.el/"; + rev = "6752cc70b08889ff5184ac111616863f1881d357"; + sha256 = "0cwn05q0fj6xddfc5qimryvqi5l68sqyxvw638vzmrpnzl6dfc9h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola"; + sha256 = "1i6z4gkh52fr9s506dqr3ccczank7c8zr0q1bg8ik5gbna0jv705"; + name = "nikola"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://melpa.org/#/nikola"; + license = lib.licenses.free; + }; + }) {}; nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; @@ -47243,8 +47474,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "6e01ecd112dce8d8bbe46c839f982892a3ffb589"; - sha256 = "1gxsp2xf8lcqwk0f842g9cimc6k12cpf0m4rs0qv3v3mqqic985n"; + rev = "186571965dccf57d15b9f37c1cca92a57187b7b3"; + sha256 = "1iz48szkby5b3f4935c8pnry84f6mh4f2xklv7zdykrczdqy5b0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -47299,6 +47530,27 @@ license = lib.licenses.free; }; }) {}; + nlinum-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }: + melpaBuild { + pname = "nlinum-hl"; + version = "20170609.440"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-nlinum-hl"; + rev = "294037f5231375ac63836637651585f8b82b962d"; + sha256 = "048zm3x62wjp2ym0q8jn4ll0f11nak5i41q6mdcabq3zwg42zbqi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl"; + sha256 = "17lcp1ira7yhch9npg9sf3npwg06yh9zyhg0lnb22xg09lbndj0x"; + name = "nlinum-hl"; + }; + packageRequires = [ cl-lib emacs nlinum ]; + meta = { + homepage = "https://melpa.org/#/nlinum-hl"; + license = lib.licenses.free; + }; + }) {}; nlinum-relative = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }: melpaBuild { pname = "nlinum-relative"; @@ -47470,12 +47722,12 @@ nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nodejs-repl"; - version = "20170110.940"; + version = "20170607.1303"; src = fetchFromGitHub { owner = "abicky"; repo = "nodejs-repl.el"; - rev = "53b7f09a9be6700934321297758e29180e7850d7"; - sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy"; + rev = "f72a537700b08e14db28e6bcc1d6244bbeaefca4"; + sha256 = "1wha680gklq974wl2si3q024qhcdkqgicr6x3qrb9fhfkfr1nbjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; @@ -47554,8 +47806,8 @@ version = "20170530.454"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "51cf6dbab220ca0f7c9f7472280adf02189ba437"; - sha256 = "1ixdrg3ak0x8rnkckz392s91dhssrsh9hcg30606fhjd9nk811a5"; + rev = "1ec634461ea25d87cc16dbeb1318f8e30a07c9f1"; + sha256 = "00sqb0vl0990c5fxg0znwdfgq20q0zbx1pnhpr3dmnydqzmh7wwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47737,12 +47989,12 @@ nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nubox"; - version = "20170528.109"; + version = "20170611.725"; src = fetchFromGitHub { owner = "martijnat"; repo = "nubox"; - rev = "2ef0281511aa29347d79575449c3f44f91fd0f97"; - sha256 = "0idd2sg68x02ishcziigkr5izvdrda5ra3imqgb1ilgfh6kgfqjw"; + rev = "2c6c1cae665dfc9cd000aacd84b9843eac0c74cb"; + sha256 = "13zjrql7arj0fklvajmr7xr7486i9917b9x54mxzmkwnbas4rg04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox"; @@ -49080,12 +49332,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20170509.104"; + version = "20170601.1329"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "59aa5ac1957b4875e13f52885255293608a960f4"; - sha256 = "1jjhksrp3ljl4pqkclyvdwbj0dzn1alnxdz42f4xmlx4kn93w8bs"; + rev = "7ca20bb808dd51adbd83e0c18885c4300548d032"; + sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49632,12 +49884,12 @@ org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-caldav"; - version = "20170529.1205"; + version = "20170610.945"; src = fetchFromGitHub { owner = "dengste"; repo = "org-caldav"; - rev = "4a618a03ef4a0c95d4f8ffe1c92e986c12a53416"; - sha256 = "0sgwq7zwgr2khhyvf0a1b5fl616h8x05bd2bmm6437ih3fcx8mjy"; + rev = "57dce0b4f0f234d9f4a72e5f0b811ee399e6d989"; + sha256 = "180amsndil1y24675xbdr9l6qad7lxq1pr7nlqgspmw0nccp0al4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav"; @@ -49905,12 +50157,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20170213.1151"; + version = "20170605.23"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "137c3d2aa083283a3fc853f9ecbbc03039bf397b"; - sha256 = "0c4vvpccmc60bavywsd0lijzyzchs6cdmp8y36d70lmp4s66863v"; + rev = "131d2409b3639798ebac6d77c98eae446ea915dc"; + sha256 = "1l04vs47pl63daz9n0d2xby43kr2ynbykvdr7hjbyizcg9l9fzp7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -50077,8 +50329,8 @@ src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "6c98be7488fb0dc7cea8f88af6e432edb43e0e32"; - sha256 = "0jlaspk11l0g8mqbwqiarn7ada1zgnxg9i68xgrjzhxmv1nw9mq5"; + rev = "aff7bf3885e318287abf7d542916d21372496bdd"; + sha256 = "1z6rj7nrjdmkc7skx2si7s462228bpka96p0zzmkg7wa82j7ywv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; @@ -50265,8 +50517,8 @@ src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "4876bbc7cd3129f6285f41b9076c178d30720163"; - sha256 = "18fxficbm430alxn82866qphiaxdzjcb73ckm7czw2yvgxd706qs"; + rev = "c020fa3f58cdeff51701322334daa6253a144db6"; + sha256 = "0pcymhjaybaxpghixa2gnshzqy03hafmzjdas8q087dn7b19cr8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -50327,8 +50579,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "496b2a9855fe514b186890a1f883411ee566d294"; - sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0"; + rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86"; + sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -50347,8 +50599,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "496b2a9855fe514b186890a1f883411ee566d294"; - sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0"; + rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86"; + sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -50511,12 +50763,12 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20170522.524"; + version = "20170607.442"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; - rev = "35404eac9aba04081e575b7c84e628bc68e01dd1"; - sha256 = "1apx105gm36xf813lhwsq69lk88gyb9gmmvscrps9gmml6lzknnf"; + rev = "fa4e86621a63033148f8fe295a11b4721ba17462"; + sha256 = "123b0cf47c5gnj3yakhjr2q7kc8nmhim9c2ngdls6g944ig07l0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; @@ -50755,12 +51007,12 @@ org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-recent-headings"; - version = "20170518.129"; + version = "20170604.1353"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "7bc05874de270c5314e4c927b66f27d6aed344ee"; - sha256 = "13kqkv2wn3c7s5pnp1hyr2558827cipqg3lg31bpbjr6j9pn9l6m"; + rev = "9b373ddafe33283ed9a41bddc65f05d6e9bfcda6"; + sha256 = "0k92z02dyzax35wx7q5s9zasmkba9vzb2y7jf55jn8d7qjdw4lnn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; @@ -50797,12 +51049,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20170526.1519"; + version = "20170611.1357"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "d61770adfbc39dd8544db3a96724089d5bd6ded3"; - sha256 = "16anl4ls66xm7vbcziwisg41jwzcd4cphxvrxv83vw52w24gqf1r"; + rev = "b84634891be4323ccba938dc68b971150ae9a609"; + sha256 = "1m8g9laf2fij5vm3sqb087323gqncnww35jx8bbn888zjzxnsiy9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51270,12 +51522,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20170521.903"; + version = "20170611.1836"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "b3de93c348f5da8b9cb892664c1eab461e443525"; - sha256 = "1c4zr4bz3w8y8gaq21flgrj1bid0rh6dsajgl0gydb8sbrfc4f3q"; + rev = "256c0af68004fde8cf35d4824acb938803b10e7c"; + sha256 = "17ib0rsfdw3krvvz9gmfsqsn9gagqlvwh0ydfyaqpdiq9q2nllbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -51456,6 +51708,27 @@ license = lib.licenses.free; }; }) {}; + orgnav = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: + melpaBuild { + pname = "orgnav"; + version = "20170608.1013"; + src = fetchFromGitHub { + owner = "facetframer"; + repo = "orgnav"; + rev = "9e2cac9c1a67af5f0080e60022e821bf7b70312d"; + sha256 = "0764dg3dcsdy4i6syv9aqqmr47civn9dl3638g4lsqdikghw7lvv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a41436df126d7ef2c0a8b56d90afb942fe47dc59/recipes/orgnav"; + sha256 = "0z04n5rzv5c0lvn658nrfj6rg3a31n369h5rjgi5bap06qm427ix"; + name = "orgnav"; + }; + packageRequires = [ dash emacs helm s ]; + meta = { + homepage = "https://melpa.org/#/orgnav"; + license = lib.licenses.free; + }; + }) {}; orgtbl-aggregate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "orgtbl-aggregate"; @@ -51967,8 +52240,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "feaa96ff995237270f0ed0af861f59b544e484c9"; - sha256 = "05idkkvnjrsfbrg0dhcvagsgbybvlqyiqnng5z6abqwbsp344hv2"; + rev = "2080e5fcbce8147ef6931457c678309f7a679c49"; + sha256 = "0kmga1zm8zyby9yrczybrqm0gj56lk29v2nan4rhzhfnb87v9r28"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -52089,12 +52362,12 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20170326.47"; + version = "20170607.1513"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "638a9a44c96f5b21e2e36121465645e586910713"; - sha256 = "12is86csnix270rnyf9q0l7ds70g128fn9nzgjgjgfylsp5nk9rf"; + rev = "a5e7c7166f5d4baf4b6487f44865f2636cda4698"; + sha256 = "14qybj34wvpn91m9hvfmcrsj5d9zzq5pyzjc61gd0zn482bklxz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; @@ -52509,12 +52782,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170417.54"; + version = "20170608.1006"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "1cee5135bd9a12e1b28e515a28093a751b4f7dd1"; - sha256 = "1qvvdr5wx37x5jrw4hkx5vl4jmi3l1bjn97nnvwlsmzi6sgkcwsr"; + rev = "bef9e37fd8a9cb726e9b8a0e28baddc773a65912"; + sha256 = "10h6zlyhaw8waxd6g1x2xqprq0y9prl3jgndhgnmlq7zcmh7fjrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -52889,8 +53162,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "4554d7651c26de10d350db28e150c685cd171e19"; - sha256 = "0k2gbgrh1vb810qpdx632gbd8gx0gy4img022a16n620l3g1s0rn"; + rev = "c508a52aee7f10f5e9b750b4724e264a3e694757"; + sha256 = "1xbys48368a6vcyjqxn71lg6yf7zvb2k9dlf07dl6hvh0a7qlpqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -54056,12 +54329,12 @@ pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pfuture"; - version = "20170529.813"; + version = "20170531.805"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "f6728c808ba96b19718ff4e15ac5173bf848b21d"; - sha256 = "10v5rc1kcv3rd6mqksqc8bcc6w0w20fcz77fvgq0hxl88ng6vi4q"; + rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5"; + sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -54203,12 +54476,12 @@ phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-grep"; - version = "20170220.103"; + version = "20170606.107"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-grep"; - rev = "e0cdb6d6b8502f9cb4db2d5536d8b32a3be9ebc5"; - sha256 = "12y7jhhqg16sqm063zbz8hjlh1hggjl627qqigqnslxbgsghk97n"; + rev = "ab9bd8d25e751a9cbfa108b49839293230b6e8b5"; + sha256 = "0p1i07dgaic0jnwdsnvsnib2913r9w8j98d1p5rx8db2nabjmzc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/992655fa4bd209abdf1149572e95f853e595125e/recipes/phi-grep"; @@ -54476,12 +54749,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170428.1853"; + version = "20170609.1728"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "6e57817aa3a3cabe41e069ff8af1521db118ff13"; - sha256 = "15lf3hvq466bhsnw5hzmpnwsnynqk0wsg5d5vn2n4j9kax4lzhb9"; + rev = "dc30cb8110f395fffbc42c6271141887a0c0ec60"; + sha256 = "1zgyy3mnn6sciy0ml2l0crfqy9mlcy1iqck5kracbbz41ygigsqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55068,8 +55341,8 @@ src = fetchFromGitHub { owner = "brocode"; repo = "play-routes-mode"; - rev = "ef8230932f7bb96643febbd6872c522932f9571a"; - sha256 = "1wv4wnkcdlq5qvxr55wgs6dc64m69r0niz0r5h2ch9d5nclmvbkh"; + rev = "ec861ab171fc5513df082d26b96a2e9d545ad64c"; + sha256 = "1yn3270d0djsi7jwxw0arrylsyxkwbwawyw2ifpn6iwzcz55cnxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode"; @@ -55788,6 +56061,27 @@ license = lib.licenses.free; }; }) {}; + postcss-sorting = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "postcss-sorting"; + version = "20170531.1858"; + src = fetchFromGitHub { + owner = "P233"; + repo = "postcss-sorting.el"; + rev = "1320d74abd8ee7f0a09b5f7920d554650a7047a6"; + sha256 = "0071al1nwqazv8rhr7qm799rmizbqwgcrb5in3lm0sz88fbs9vnk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9fae97430f211786f615f7450936f823e2a04ec4/recipes/postcss-sorting"; + sha256 = "0730b2wddal15yi4k6wzhv9xv1k40iwrn3mivg9bkxabh3mgrl10"; + name = "postcss-sorting"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/postcss-sorting"; + license = lib.licenses.free; + }; + }) {}; pov-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pov-mode"; @@ -56015,6 +56309,27 @@ license = lib.licenses.free; }; }) {}; + prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "prettier-js"; + version = "20170606.612"; + src = fetchFromGitHub { + owner = "prettier"; + repo = "prettier-emacs"; + rev = "f8ab2e5fb74beaf9e3023baafc118828526c5bb7"; + sha256 = "00gjzw855xa6ahghdlq6yygz6b279xbp47s6vj0rjsyghf65xkf6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; + sha256 = "0mf66sdsdbhf76pwkjkfjsnh26g4j3zb4y1qrbxc9jcvymccb3yq"; + name = "prettier-js"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/prettier-js"; + license = lib.licenses.free; + }; + }) {}; prettify-greek = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettify-greek"; @@ -56539,12 +56854,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20170524.1333"; + version = "20170602.336"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "399a214f629168501c33589b6175c447f38ea0b3"; - sha256 = "1d6y8pqn6yll2vpv457z5bf30qb92wmnpyfarfvcs07spqq3zkz0"; + rev = "4e864c75bfbee4a5a1a9c76d3d2a77b2da01fa5f"; + sha256 = "1a0a3hay6ixplk0q6jd2s0hbwxm36zxd5vng3k769cjc8nrsnbix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -56564,8 +56879,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; - sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; + rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e"; + sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; @@ -56837,8 +57152,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "1e86ef4e9f0b9c9e8bd8d62a61e141f139366920"; - sha256 = "1cf87jxq8r56nxp4h9ig3q489lj7bb35wkasrw2yi48q9j445bw8"; + rev = "96095f3a8577cd61ded2191d267cca70f221a9c9"; + sha256 = "1ia0krk66l0cl5bklprdk4bbrzv9j8lszvkakcd0fd9ikcdv68a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -56875,12 +57190,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20170512.1513"; + version = "20170607.1512"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "cba01805f1c767fba386ca61305bfb781cf7286e"; - sha256 = "0384l3n1870xw3bcskp2hrbdkbvzr2dp8w0zd8nja1zpx38gr0ly"; + rev = "04de7bd8a14ea71eaed568127428b8a44f325b24"; + sha256 = "14dbg9cvph8b0shs49g6sfh5xrzpr9nn7c5rzxsnaaijys3z47rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -56966,22 +57281,22 @@ license = lib.licenses.free; }; }) {}; - psysh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psysh"; - version = "20170205.1142"; + version = "20170610.2104"; src = fetchFromGitHub { owner = "zonuexe"; repo = "psysh.el"; - rev = "429b59ba8fd5ac7b6d3c6c4e3ad72867062c96db"; - sha256 = "0ldv1lyra05g91hdsif131x7yqdmwld8hdpg4h3qi040kls9bix1"; + rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa"; + sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh"; sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5"; name = "psysh"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs f s ]; meta = { homepage = "https://melpa.org/#/psysh"; license = lib.licenses.free; @@ -57325,12 +57640,12 @@ py-smart-operator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "py-smart-operator"; - version = "20150824.1910"; + version = "20170531.509"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "py-smart-operator"; - rev = "5e3222e4fc285c48a77c8e4c0e1cbc985a9713c8"; - sha256 = "14gppb354wzbbqv0zp1675p84n07rll9n4i6lncd9bvv1flqsxy8"; + rev = "0c8a66faca4b35158d0b5885472cb75286039167"; + sha256 = "09pmkp24s7nwh6p4pzsjp1z65ksi9n3n2xv7d3igpa86l8qgcm2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7491a1825b7aaa5f76aafadb8f04721ab1b1cfe/recipes/py-smart-operator"; @@ -57601,8 +57916,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "6f2b4ccf5542be7243db1b679c6f52e2e4acf504"; - sha256 = "0966c47nja1mav4qixj9xr0529pxqqrh7j4vb9jk8l3hdky99vw9"; + rev = "2e820672609c489458dc2cf39d811e8c10255fe4"; + sha256 = "1nvylps33w5lbxh33qc704rvl998cniwhvwzj1x8fqlsnh1qaxfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -57744,12 +58059,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170521.1217"; + version = "20170605.123"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "5d2d85a370ae20c29203ad64f1eb508a63420ed9"; - sha256 = "1r36xxm5xhhrps3wywjnr5rb4dcb8zpkwvj4bgadvmszi8pbzbpj"; + rev = "17747eaca4e75e17e29fbdceab9380cd4772c4ad"; + sha256 = "0j4xq66gdwnz94wm68xzc88gbaigfxhc035whijl43yxkf9mc14y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -57909,6 +58224,27 @@ license = lib.licenses.free; }; }) {}; + qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "qt-pro-mode"; + version = "20170604.1141"; + src = fetchFromGitHub { + owner = "EricCrosson"; + repo = "qt-pro-mode"; + rev = "66601441cc728a609765b149ee0d7dcfb74dc8bf"; + sha256 = "0azx8a7kwgn5byijgwar2rib9xv2p9w7w3yyb5bk19g3id2f8gdw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9af710be77ccde8ffa5f22168d2c8a06b73dd6a/recipes/qt-pro-mode"; + sha256 = "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf"; + name = "qt-pro-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/qt-pro-mode"; + license = lib.licenses.free; + }; + }) {}; quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quack"; @@ -58164,12 +58500,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170524.935"; + version = "20170607.737"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "4cfb2eba0bf3a78f5e622731496cc3783c42054d"; - sha256 = "0cly2c1k2gmf7v4ka0l1kkq24r2r33cj44ajaaacr3i59bahcvnf"; + rev = "02fe949875a7db935693af7d20109d29521b4276"; + sha256 = "0aqv9j36abmhd82fd443khaj3i4mww5xs4f9p3d65glg07wm2j7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -58836,12 +59172,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170522.325"; + version = "20170603.1430"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "a1130df3ada34e76675324a8c25823b420b20239"; - sha256 = "12nz159if1hlz12fmkil3mmzn1f66f6vjnlz65na8jr39hrkgx8n"; + rev = "3d0fcb80eb017ee2277440d688bf366af3bcdf6f"; + sha256 = "1i71z36hk46w50c9p4b078rqlh4bvwb3dcylhfcwnp4b8j02f31p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -59178,8 +59514,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "a9afa481d6194ea46ec00c1dc3098e88b419f6d1"; - sha256 = "1hjkqjvnjmalmrcb1dikzsg0glnlzjb5s4insn2g83irwid7v8y1"; + rev = "e0d467cfc50546d88f286383ea8ab54aa36cd5a9"; + sha256 = "1lyj4h2qpl88hwxfrk2f1vr729bdyr5vvm8ra8p73rcz40zwdamr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -59800,12 +60136,12 @@ restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restart-emacs"; - version = "20170413.2305"; + version = "20170609.905"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "dc25f00c3cab1c97db2ca4733e7e7e7805ae68f2"; - sha256 = "1rx5mj7lpxpmkbpbwb78garhl118d0kpbwvdwfh3f3j1rmzyiblx"; + rev = "e6ac81464cce37b7ae3aea38dcf2720cc2750d31"; + sha256 = "19fh4hsnxb7jc0zhgrg01hn8vbcirjxny5w29gcq7xiighwrbap7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; @@ -59924,12 +60260,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20170209.556"; + version = "20170611.2334"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "47033e0597675a45d2b6852682e392e848a51af8"; - sha256 = "0kd55p8hl7mhcbsqxhqqyfkzq31cnk4aaqzrka681dk6d1xzk8z5"; + rev = "341e1d7955d9b25778a0e28921abc4d31704ec3b"; + sha256 = "1mcggccv75v9xrd1i1x2csjnk432ws2h93bh5y4wm3sp3ky8lg6d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -60048,12 +60384,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170527.806"; + version = "20170603.1202"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "6069dafb4a71b8d8b6c8787d2b68f4745e0c9cae"; - sha256 = "09xdpzp2yviqnxc7m2l1zy4rkyp1m8sdwyvsbbdqiiwa8pjg9gvf"; + rev = "fa63228680add9b30735fec571a3eea572345914"; + sha256 = "0bh23avfdcadfx2awkbd0mld54g6ir0bg1szbwi8m0w9pwa4w4mk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -60174,12 +60510,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20170211.857"; + version = "20170602.152"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "73595f1364f2117db49e1e4a49290bd6d430e345"; - sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj"; + rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e"; + sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -60237,12 +60573,12 @@ robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; - version = "20170522.1815"; + version = "20170611.1755"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "845d10041b3eb76fb35b895279c9dde45c599929"; - sha256 = "0cvspl9wqg73bl9xpdlzcm564i9kvlr29by3lc8n1sc4yaghw8sq"; + rev = "9305fa042c40a32a2fcf60f935c0796dc67b5c55"; + sha256 = "0jx3pnz9m9bxlga867qdb6midz82mfl4wzn9dsfihkl399hbj46j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; @@ -60451,8 +60787,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "499db6f98cc725bca66d122bce571adcdfa32187"; - sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a"; + rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; + sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -60513,8 +60849,8 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "58969"; - sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb"; + rev = "59070"; + sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional"; @@ -60594,8 +60930,8 @@ version = "20150424.752"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "58969"; - sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb"; + rev = "59070"; + sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric"; @@ -60842,12 +61178,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170514.2022"; + version = "20170606.457"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "3220937aca17fd3200c9616d97a3484f55b604d5"; - sha256 = "060kk4yds0iz070p8x3mjjsyify7pyxfs7zhhvs4hf1v0mzil21c"; + rev = "ac6a45e6091c0d542b696b6e13551be7e333264a"; + sha256 = "0hba3djxzgpk13xcfz51s0qlv9415q8701pkw9qq974fxqpcrawl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -61031,12 +61367,12 @@ salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: melpaBuild { pname = "salt-mode"; - version = "20170526.1702"; + version = "20170611.420"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "6f5776ab411aa62668e774c5cf2aaff22cae5401"; - sha256 = "05fla50f9dmp3wb4wr8wx5j2mhfarsq50sbr0yi29kabyn3va9ig"; + rev = "bfcfa72093974f36635413a845e7a5df7c5ea974"; + sha256 = "1x974csw8xyd90xf8ns5h6c0s9fszy02hdmcdax6ywi8vxksmjsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; @@ -61245,8 +61581,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "d1e295137589b5285e26c962d648f53c081bb972"; - sha256 = "17y7db32836gj97k85hk8acvd0xvrdck3hb9j1qxmdzf16lmagfi"; + rev = "0b7aaa108710b2f197cbcb32fdb3ae12ff121747"; + sha256 = "1yp382s4jxbyn646mv245gm5c2h1n734r8qzrspimipr79mrbklk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -61283,12 +61619,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20170530.356"; + version = "20170611.806"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "52091426ee319b4ec53799696bae75571f7ecbf6"; - sha256 = "15vr1yz23h0kb7h3d6gh3ljax762666lkz53chqgm54bszgfwjcm"; + rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; + sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -62263,16 +62599,16 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "20170324.510"; + version = "20170611.859"; src = fetchFromGitHub { - owner = "nuncostans"; + owner = "voloyev"; repo = "sexy-monochrome-theme"; - rev = "c221231bb8a0d60413d710efe6226683326d57b0"; - sha256 = "0zjy6d4fqg08dwbn1y360514pzzj3nrg3wzm656n7sg90mffh22i"; + rev = "8def559784c9f3ebaad179caaff58a9c6afc83a5"; + sha256 = "043pplyjdvqz45q1vlnkh8j8a4fhiw4km3b2xb06bycgs3ysb42h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; - sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme"; + sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq"; name = "sexy-monochrome-theme"; }; packageRequires = []; @@ -62889,12 +63225,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170529.2012"; + version = "20170610.1147"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "bcdbc7142a0542639f47abb48fe17aa6c92f8406"; - sha256 = "0wrxwjlkix5qgi3fvkaj9m43hyif9ba2bdyzc0hkig7ng0b99cjd"; + rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f"; + sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -63203,12 +63539,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "20150804.1010"; + version = "20170603.1542"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "7079086ec09a148fcc9146ba9bd10e12fb011861"; - sha256 = "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s"; + rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; + sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -63413,12 +63749,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170524.2122"; + version = "20170610.841"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "3cd88700176541b3c1ae39fa9f1219d3367be684"; - sha256 = "020vvzqv39lm9h037jk42zisx59xz9c5pkmblg7p35yjz9nxydwf"; + rev = "b020352573a14e452a5c8a18bbd0ab23539a52cc"; + sha256 = "1nqax756ya008glr1qffqa222hcz45grjwfnncsq48k1nj5b0dpf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -63665,12 +64001,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "20170522.631"; + version = "20170602.304"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "a2f640f724fee7ecbd1cf28fc78297180cd959bc"; - sha256 = "0gzpwcrmlbd7fphgyv6g04wjavd9i3vgn3y1fnh178iswmpsxj62"; + rev = "07f515f835c92b6be538d2f39dda31ed281f1054"; + sha256 = "12fzcfw4fxf6g0zadzcr8mx46a8x8969shpcmkn0f8ixn014w7ax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -63690,8 +64026,8 @@ src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "35ccf713384477b9e314ffef69f762ce2a6a94e9"; - sha256 = "0j1z536ydcdmg16xx0nzd2cj9cpi8l8lhwb8ig0b9nl3lv12cb4d"; + rev = "95519c4ef41988205bb642e534bf2bd2463b6170"; + sha256 = "1bvmmpk4xd954i6dmxjcqayd6apzabg732yhcmjyg633d8hmmiwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -64187,12 +64523,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170524.1533"; + version = "20170606.725"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "a758dd1d231ce0b6a5648bbedc20927abb6a2bce"; - sha256 = "1kfsnbdj9mgx666pq94ajjwnf3hj59rlmr545ka3k0g981lqkap2"; + rev = "3bc7f1d38a0b5800e62a612e16fe42d9b0c0e11e"; + sha256 = "1xghvmwx66mns3kzk1jw2g08553qqa50h1sq1jg5n2apjl4gprdh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -64708,6 +65044,27 @@ license = lib.licenses.free; }; }) {}; + solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "solaire-mode"; + version = "20170610.442"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-solaire-mode"; + rev = "70e3b9cc171d4d9171c652c6d255bf03dcd0ad9a"; + sha256 = "15plb1gh7wz558008653v1xskz0bby477vvs7d7a752vrd8s6jcr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; + sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5"; + name = "solaire-mode"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/solaire-mode"; + license = lib.licenses.free; + }; + }) {}; solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; @@ -65096,12 +65453,12 @@ spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: melpaBuild { pname = "spaceline-all-the-icons"; - version = "20170530.114"; + version = "20170605.838"; src = fetchFromGitHub { owner = "domtronn"; repo = "spaceline-all-the-icons.el"; - rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350"; - sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2"; + rev = "bc611779a7a3c10b7367bc8c985923d26ee91443"; + sha256 = "1slnzb26fkmj01hakzbaarlmf2ng4d1zkimgb93axx0svxh03qc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; @@ -65117,12 +65474,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170305.506"; + version = "20170611.1307"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "9358c37ee9c90a3d13a43afcd6917fea8eef144b"; - sha256 = "1k711ppzkd9c5ial8cs0aazsi0zig6r9acmbhr0h9zizbrsw5sl1"; + rev = "a7e76aeb0a62f986e0469183728407c7bcbf4993"; + sha256 = "17gbrijf62qdk5s02lish5nf6l8mfqrkly98hpkwzz3js4xkykkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -65345,12 +65702,12 @@ sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sphinx-mode"; - version = "20160911.558"; + version = "20170607.1436"; src = fetchFromGitHub { owner = "Fuco1"; repo = "sphinx-mode"; - rev = "7db516b8b985cf209b6430b032cd0457af83b72b"; - sha256 = "0a3vgkp65hpc1a5h79yl0pc02lr6w299wd2fs9cgn8nvbdrip5ij"; + rev = "0a9fcd60639f1f4235b4747e8449b9f48651705f"; + sha256 = "05kn45gh4l1wrj06qb3qzphx8mfqn3zqb8v73awhn5p7a1asb8kr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode"; @@ -65721,12 +66078,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "20170521.1628"; + version = "20170610.837"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "40f2bc0179539087971d48556dcce38e14907768"; - sha256 = "1ya5acz07l61hry96fq0yx81w7zwcswxinb3fi0g1s4gshxy4hgk"; + rev = "04970977b4abb4d44301651618bbf1cdb0b263dd"; + sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -65847,12 +66204,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20170506.2330"; + version = "20170603.251"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "2d47d28a527d2e5a6aa350ef5f50e0c05378ad35"; - sha256 = "0x8153ps266b359ll15w792qzqzpqs0jllc006jd59n71frdi8zv"; + rev = "ba47dd11c5be684595ffa62dbdfdc616ce3eb9d6"; + sha256 = "011n7vyhrawmymkhmr28isk5zvdljj9bhynmfr6v0mi2h7kn79p3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; @@ -65973,12 +66330,12 @@ standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "standoff-mode"; - version = "20170516.1042"; + version = "20170609.134"; src = fetchFromGitHub { owner = "lueck"; repo = "standoff-mode"; - rev = "83ec2460cd9f6979aab2ed64a9ae32221a0ec930"; - sha256 = "0hzdq8wf28zx7llisg2907fibb4pfn2x5vxl44ka0c45kbza3q8b"; + rev = "b194fde6bf31ddc77409275e134aacba27e88043"; + sha256 = "0l48dij62d5cvw7kry0739i8zixkbmj80ghhixb30l6g0wg8k48g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode"; @@ -66511,12 +66868,12 @@ sublime-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sublime-themes"; - version = "20160111.122"; + version = "20170606.1144"; src = fetchFromGitHub { owner = "owainlewis"; repo = "emacs-color-themes"; - rev = "4648b68e96bfde26d6e4af9f919971eef2768e5f"; - sha256 = "0q9p974xvswr2sijz1rs858x9sdx0rb00lkhj5cd90abn33lb260"; + rev = "60ee40af82eb55b79d5ed4026f1911326311603f"; + sha256 = "17fcqvavgyl9cmv1hwcid2bw513vhawlsmac1w2adiz567594i6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/648d250c7d341b31581c839f77c1084ac29d3163/recipes/sublime-themes"; @@ -66614,12 +66971,12 @@ sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20170520.845"; + version = "20170605.1710"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "0e079e12cba524dc9745f30cbd6e8c553679b624"; - sha256 = "1gq48whi09hib1723r7182iy8ywpa9xxvbr8ybb0z5jn0z2dvs51"; + rev = "57d49eafd53868d3c86b20fa51e1889e621872c0"; + sha256 = "1gxyy1z8qq610g2x0zzlccqq33gd54wwl1akhnw5xg4mvwhjvidf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; @@ -67051,12 +67408,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170515.1409"; + version = "20170609.938"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c93194941c1ac36ee762b70dc9061ee830769f6a"; - sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca"; + rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; + sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67198,12 +67555,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20170528.119"; + version = "20170604.2240"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "fcd6ffe97aeb3e9190610f29f1d69895771edcb6"; - sha256 = "10iidqq7gz3cmkp8sxg0jwyn0hn6hrlnbvll62hdrb91cxa0hgnf"; + rev = "3eb0864b65f9fe0e7c98fae7e9bcfd6330c471a0"; + sha256 = "178ny3cbxm2hvmh0f49hvi2m15r72f2by3k076d4rzawab0gnp1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -67992,12 +68349,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20170528.1027"; + version = "20170611.1115"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "80b09f3357161705fce9ccee9ca23056e91ee2cf"; - sha256 = "08wc37qw22rsmyzxqiz6d8mwq13j6r4i38lb4gk7kxjpqxwzblxc"; + rev = "743614f372598597282efd29a18e624d5ef80bc1"; + sha256 = "0jl4kdmid2jy5gys9q1r58x41q4srh7hinhzr3q1f6f47lpcpvkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -68720,12 +69077,12 @@ thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thinks"; - version = "20170418.854"; + version = "20170607.144"; src = fetchFromGitHub { owner = "davep"; repo = "thinks.el"; - rev = "f5a339b21cd5044f7b66beafab7c2d822c36f9e5"; - sha256 = "1qjwzr9q98da25rf8hjgancb0k2kgr8xllhb4lhnqc8jsc4qnn5v"; + rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d"; + sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; @@ -68787,8 +69144,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "72ca60debae1d9fb35d9f0085118873669006d7f"; - sha256 = "1hgqs1z2m2g3avid98bhgipsqp2478bpf1vby3c3f2xmymag0l74"; + rev = "b8ee72de5bf9318d50846852082325d0f932682b"; + sha256 = "0gaiy81zvhx6d7yfnxy0hlpb8q5crg312xhqxbx8lgw0m702k6a3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -68845,12 +69202,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170516.543"; + version = "20170609.753"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "669ce39bcd93ca6353d24a72a358272d7b0e2268"; - sha256 = "1sbvkgrdf6s8bkg38rfyj677dq3x4pry84hv30dgqhll7h8ja72w"; + rev = "dda031ba33e1c61674c1c17861abef6b5c37fe28"; + sha256 = "17r7vjpcj4wxq8zxvm5bzm8xg0y29ybgff608s8hq6vkbj5sflm2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -69835,6 +70192,48 @@ license = lib.licenses.free; }; }) {}; + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: + melpaBuild { + pname = "treemacs"; + version = "20170607.1239"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; + sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; + sha256 = "1sg3m9l9l1xww6an2210bghlby5cljw2jxh7q0w8cwmcga7rr4jh"; + name = "treemacs"; + }; + packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; + meta = { + homepage = "https://melpa.org/#/treemacs"; + license = lib.licenses.free; + }; + }) {}; + treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: + melpaBuild { + pname = "treemacs-evil"; + version = "20170604.315"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; + sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; + sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3"; + name = "treemacs-evil"; + }; + packageRequires = [ evil treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-evil"; + license = lib.licenses.free; + }; + }) {}; trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }: melpaBuild { pname = "trident-mode"; @@ -70025,12 +70424,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170508.930"; + version = "20170531.557"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "d1a7ce84c51a3dc5639ebb643bd7557a55c91f76"; - sha256 = "056hdzh1kgy33s7pnqn59jwhrs5fqh8rzsxq4h3spadyyga33k36"; + rev = "79bca7dc9254da190d821b504da4946df8c3d548"; + sha256 = "02zjjq3nmmawmialhj95bz032a3ycyvzl5sgp7g37l7q3l0s63bc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -70298,12 +70697,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20170530.530"; + version = "20170530.953"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "4235b47a389bf04a95fa54e59695f60599dc918b"; - sha256 = "1mkl8y1khzsggg08jmjj73f1gvvjy3z34i1vfrhik05qx1n9z3jz"; + rev = "9ad892fb2274decb637d12d81a8640d2c6cf11d3"; + sha256 = "0ynnh3ac6zblcg2d0nf8fwdfmp5ymzjqncl64xa43m4lw24p6xng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -70504,12 +70903,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170530.246"; + version = "20170607.206"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "30efb05b1135992eaa88c5755814b35291e1f343"; - sha256 = "1j0hzbm5zhz3qrz264xmj60f4227yrly2namr5ys115pbvhhh4hc"; + rev = "e3a343991c0175092f27665fce9474e240f3f1f7"; + sha256 = "0wmyym7aj0wr80ya1wif1ywmsy4pln4khyzcnfhd0xrp62pya2cv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -71144,8 +71543,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "ab45d0499f541884d009654d99c5014508c7c5bd"; - sha256 = "0zp67asbn0kic4clc0r6hmmplq38rdvqfs561sw7zilh5wrnj5dy"; + rev = "06460235d6f6ffd82dd2d973c2ad1004a4a2619b"; + sha256 = "19ffqy52r52c7kjpb54flfilgnfkmxa7pkq5w0mw6xiaw3qvha2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -71539,12 +71938,12 @@ vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }: melpaBuild { pname = "vdirel"; - version = "20161009.224"; + version = "20170605.43"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "vdirel"; - rev = "1f071902d4e2aea49e7e96a327e09712565cb39c"; - sha256 = "0qkb7wx1qaa85g0dwmkyh4r65fg1j441f0b4hgg7qjq1yxrlkkhb"; + rev = "a1e6ea3ed5faaf70667c62bc5591dc810331cb1a"; + sha256 = "1z8q3akm0hq7z7nqclra1wv7a6m0cbskhnd3ca4v9wf9dajiwnsb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel"; @@ -71812,12 +72211,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "20170519.729"; + version = "20170606.539"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "3e0bdb14ecce4f601ef37350a20e31167f7708bf"; - sha256 = "1v80m7aficvjj0h1vg2d5pxznzh8y7fq5cwmi957cin30ac0k7cw"; + rev = "527a1d9b9e031713c29f12d1a82f1fdac50c5610"; + sha256 = "1k8m7b0h3qb5w0wvvjz8047xz71ljfj7kj4z5sv26rhsh5bsdb2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -72352,12 +72751,12 @@ wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "wandbox"; - version = "20170425.1502"; + version = "20170603.531"; src = fetchFromGitHub { owner = "kosh04"; repo = "emacs-wandbox"; - rev = "c82a71e880cb701281dd96a9772bdad37a6eacf2"; - sha256 = "0hdpy4rf0406615mx5w235dkz71v24qmr2ci5rlqmfv53si0gynj"; + rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1"; + sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox"; @@ -72604,12 +73003,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170529.1030"; + version = "20170603.632"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "aef2a32f6e5e2fdb7f38a650b009a737c67959e2"; - sha256 = "14x91pngh9i7r66inssc4jaqvzv2kb3bnbks5x2bhsidvls7s28r"; + rev = "290f0ecb43dc6a636e45f55cf95c0d8fbda3fdc2"; + sha256 = "00i697brchwdz3hviq2khhxcih7zi90dym1s5m9vk5azi2qly8ys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -72706,22 +73105,22 @@ license = lib.licenses.free; }; }) {}; - webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }: + webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20170514.240"; + version = "20170611.345"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "865ff10f5315ead9c9ed29edd9cbed85babf8c4c"; - sha256 = "1mg9bfya0j3kax7h74jhx9mbf6a2l56qpchm8rxbvr31gkk1ffcg"; + rev = "90a96d21fc3c7edc7c339b343462696bfc6d21ff"; + sha256 = "0q2fdxdlyfggrlgyfbq63n5k7qfjyr08cjy0k4i74sjphdss1bcl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm"; name = "webpaste"; }; - packageRequires = [ cl-lib emacs json request ]; + packageRequires = [ cl-lib emacs request ]; meta = { homepage = "https://melpa.org/#/webpaste"; license = lib.licenses.free; @@ -72730,12 +73129,12 @@ websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "websocket"; - version = "20161113.1736"; + version = "20170610.2117"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "fbd9e2263d2d7168aae31d4f8bde38f511e9d2ec"; - sha256 = "04kg6njw5frp9xafjyqff57m0a2r15r7c57mnb6dw6lgazxlscgb"; + rev = "ccbe93ac8b5858a85686b83642fbd6e828a47deb"; + sha256 = "18aw5pmvz91gv9wlmna1i5sli6z3f6dqk0bc4wkc15zbsi1dmdlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; @@ -74172,12 +74571,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170527.1910"; + version = "20170531.554"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "85748f769689d923ff7f88227c78ccd3315b8336"; - sha256 = "07miaf7fgfl54pdjj7y6lymmk9yz1qyyvvdv4i1h1fshv07c57qd"; + rev = "4d871873024520168572babd174adc203776c71c"; + sha256 = "0xiyh9qam40c2by0qp26x8ki090z2yv0319qrn5d4lsz69ivnpy0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -74550,12 +74949,12 @@ xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xquery-tool"; - version = "20160823.902"; + version = "20170605.126"; src = fetchFromGitHub { owner = "paddymcall"; repo = "xquery-tool.el"; - rev = "b81b5862e8541aca5231840eb176afad7ab55cf3"; - sha256 = "0dv3gl9djs9sbsg5mhdfnnv61ir9xccqijh7i2b82gq2j3lqhibm"; + rev = "0d1e2960c48701b83be5255d56324f65a6ee182e"; + sha256 = "0x6927x18nimh9rgnkl8dyc6r437a03byzscgg053lbg0cf2mqp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; @@ -74820,6 +75219,27 @@ license = lib.licenses.free; }; }) {}; + yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yahtzee"; + version = "20170608.836"; + src = fetchFromGitHub { + owner = "drdv"; + repo = "yahtzee"; + rev = "0a4c06ce68868133498e0ce1ab5efdf296fa4862"; + sha256 = "12vmgn118bwrrjpp1a1s47zk1q80gx7pakjhll03vpsyw08yvg13"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; + sha256 = "1fnywiami9mszagmms27dmak6chcichdi7q70x5c6aimc4jb98jk"; + name = "yahtzee"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/yahtzee"; + license = lib.licenses.free; + }; + }) {}; yalinum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yalinum"; @@ -74928,12 +75348,12 @@ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20170523.235"; + version = "20170607.819"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "1742630496f1994fe0746f8079582da5a168232d"; - sha256 = "09qjpkk9q4xw395afnzf3rmwaahsrzhx0793p77rrpxckg64hrgz"; + rev = "70e755fcf58e37092de2c335355eab93d5f1fb44"; + sha256 = "1ijd3vpym573p96dh81pw9rzlmman7dvamhvnf0jqp8mmy4g4bml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -75073,12 +75493,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170518.1753"; + version = "20170605.1940"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "1043b6c557f39a38b14b7618c174d8c47e946c4a"; - sha256 = "1yn1aij0s4zibc51i7ya9wxmd6xfcr8769skm2d0psi1ng8wjfsc"; + rev = "e8ed276e2cba90126f694a90df28b5f5eca66376"; + sha256 = "0ripg5bvj4hj0y7qb35fdfg38fkqsvcxa977d24wbswmgcj08bjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -75114,11 +75534,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20170528.1711"; + version = "20170603.725"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "c940797c19ad"; - sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03"; + rev = "c996fbcc2e79"; + sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -75180,8 +75600,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "b7ad7c440dc3640a46291a9acf98e523272e302b"; - sha256 = "0cpq2kqhxg61rs6q53mfidgd96gna3czw90rhb6njhch01cv9i5m"; + rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6"; + sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -75436,12 +75856,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20170505.439"; + version = "20170607.1301"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "60615d101769694038b17a2c75bb31c26f36a042"; - sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj"; + rev = "ab406749083a41e5ca7fe518949a09853f23e5d5"; + sha256 = "0kanprhczqx14gn87wjwi9x4fg6dn7i64awbwsls4r5nkqf4ykn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -75645,10 +76065,10 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20170309.1440"; + version = "20170605.1046"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zones.el?revision=28"; - sha256 = "1mgfv9q4mwng0cqni13kmsridbfqsw66z5cgynlrvagga6v94bq0"; + url = "https://www.emacswiki.org/emacs/download/zones.el?revision=30"; + sha256 = "05my99nn7pj5alswfhd11kkyibivqh65bhjfalbfv7flfmvg6pcz"; name = "zones.el"; }; recipeFile = fetchurl { @@ -75832,11 +76252,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170420.2233"; + version = "20170608.2201"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "f3a17c2b58c0"; - sha256 = "1ra92piwxv5knlc79pj4n4dv895bdz5nv4pf8zd0k1rirn6qj6sa"; + rev = "66d2f665daa1"; + sha256 = "1fgggwivp405qm0nvbqk8vrnprimg336mcv3am37yavi9da48fi8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; From c5467a16c44e1d2d7a3d6953c368918bf7e308d9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 May 2017 18:56:16 +0200 Subject: [PATCH 037/152] errbot module: needs network-online to connect properly --- nixos/modules/services/misc/errbot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index 427cb7c546d..cb2fa677624 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -84,7 +84,7 @@ in { dataDir = if !isNull instanceCfg.dataDir then instanceCfg.dataDir else "/var/lib/errbot/${name}"; in { - after = [ "network.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' mkdir -p ${dataDir} From d138f9ef65c2ad27ddf1368c1b9c7f9600fc6c05 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Sep 2016 21:44:15 +0200 Subject: [PATCH 038/152] gstreamer-plugins-bad: add deps for HLS & H.265 --- pkgs/development/libraries/gstreamer/bad/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 7ca2ddd0ce2..4efef258211 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -6,6 +6,7 @@ , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls, mjpegtools , mesa, libintlOrEmpty, libgme +, openssl, x265, libxml2 }: assert faacSupport -> faac != null; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { openjpeg libopus librsvg fluidsynth libvdpau libwebp xvidcore gnutls mesa - mjpegtools libgme + mjpegtools libgme openssl x265 libxml2 ] ++ libintlOrEmpty ++ optional faacSupport faac From 934b72301e5147e66de0c791619e63469ea39c1e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 20 Mar 2017 21:23:15 +0100 Subject: [PATCH 039/152] libfann: init at 2.2.0 --- .../development/libraries/libfann/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libfann/default.nix diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix new file mode 100644 index 00000000000..4c637485086 --- /dev/null +++ b/pkgs/development/libraries/libfann/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "libfann-${version}"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "libfann"; + repo = "fann"; + rev = version; + sha256 = "0awbs0vjsrdglqiaybb0ln13ciizmyrw9ahllahvgbq4nr0nvf6y"; + }; + + nativeBuildInputs = [ cmake ]; + + outputs = [ "out" "dev" ]; + + meta = { + homepage = "http://leenissen.dk/fann/wp/"; + description = "Fast Artificial Neural Network Library"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf3e3c70f81..b0104a07e1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2870,6 +2870,8 @@ with pkgs; libevhtp = callPackage ../development/libraries/libevhtp { }; + libfann = callPackage ../development/libraries/libfann { }; + libircclient = callPackage ../development/libraries/libircclient { }; libite = callPackage ../development/libraries/libite { }; From c34299f5926756837b68c020bcce566b9b0cd36e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 7 Jun 2017 07:14:16 +0200 Subject: [PATCH 040/152] dmidecode: 3.0 -> 3.1 --- pkgs/os-specific/linux/dmidecode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index 7ba8dffcc31..65908fd18e2 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dmidecode-3.0"; + name = "dmidecode-3.1"; src = fetchurl { url = "mirror://savannah/dmidecode/${name}.tar.xz"; - sha256 = "0iby0xfk5x3cdr0x0gxj5888jjyjhafvaq0l79civ73jjfqmphvy"; + sha256 = "1h0sg0lxa15nzf8s7884p6q7p6md9idm0c79wyqmk32l4ndwwrnp"; }; makeFlags = "prefix=$(out)"; From 4268eb51450be7aa5fc9964ec5dbf543c463a331 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 12 Jun 2017 17:32:53 +0200 Subject: [PATCH 041/152] gnutls: remove unused parameter --- pkgs/development/libraries/gnutls/3.5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index bca23f2e748..e47537c64a9 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, libunistring, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "3.5.13"; From b733a34e8e5e0692e542ac631926dd425510406f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 16 Apr 2017 14:32:36 +0200 Subject: [PATCH 042/152] firmwareLinuxNonfree: 2017-03-11 -> 2017-04-16 --- .../linux/firmware/firmware-linux-nonfree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 69f0a16785d..b81c8f257b8 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2017-03-11"; + version = "2017-04-16"; # This repo is built by merging the latest versions of # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "fpletz"; repo = "linux-firmware"; rev = version; - sha256 = "05hz78z919jnacvk4i1mghjn2h15ph91vkffgi4w94zhzbf77cna"; + sha256 = "0ar29vjjpsw7r7pqqa8b0jxx03k230cn7x8fkqi23bj68bd9x5pc"; }; preInstall = '' From 8ef32b334ee9c741fc40e09dcae2357b62455407 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 12 Jun 2017 09:55:27 +0200 Subject: [PATCH 043/152] pythonPackages.bz2file: init at 0.98 --- .../python-modules/bz2file/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/bz2file/default.nix diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix new file mode 100644 index 00000000000..9f7ef8d5521 --- /dev/null +++ b/pkgs/development/python-modules/bz2file/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +}: + +buildPythonPackage rec { + pname = "bz2file"; + version = "0.98"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "126s53fkpx04f33a829yqqk8fj4png3qwg4m66cvlmhmwc8zihb4"; + }; + + doCheck = false; + # The test module (test_bz2file) is not available + + meta = { + description = "Bz2file is a Python library for reading and writing bzip2-compressed files"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jpbernardy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b33596dbf9a..e38036ca6c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30483,6 +30483,8 @@ EOF distro = callPackage ../development/python-modules/distro { }; + bz2file = callPackage ../development/python-modules/bz2file { }; + }); in fix' (extends overrides packages) From 4b3e5c9beac6c874dce36d6dcd6cc01ae4f127d2 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 12 Jun 2017 10:13:42 +0200 Subject: [PATCH 044/152] pythonPackages.smart_open: init at 1.5.3 --- .../python-modules/smart_open/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/smart_open/default.nix diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix new file mode 100644 index 00000000000..dbc3889406f --- /dev/null +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, boto +, bz2file +, moto +, requests +, responses +}: + +buildPythonPackage rec { + pname = "smart_open"; + name = "${pname}-${version}"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0m5j71f7f36s17v4mwv0bxg4azknvcy82rbjp28b4vifrjd6dm7s"; + }; + + propagatedBuildInputs = [ boto bz2file requests responses moto ]; + meta = { + license = lib.licenses.mit; + description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file"; + maintainers = with lib.maintainers; [ jpbernardy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e38036ca6c7..bf5184ca606 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30485,6 +30485,8 @@ EOF bz2file = callPackage ../development/python-modules/bz2file { }; + smart_open = callPackage ../development/python-modules/smart_open { }; + }); in fix' (extends overrides packages) From 3b29d702da6ced54e7d5ae24ad9cc8715c23662d Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Mon, 12 Jun 2017 10:21:40 -0700 Subject: [PATCH 045/152] hugo: 0.21 -> 0.22 --- pkgs/applications/misc/hugo/default.nix | 4 +- pkgs/applications/misc/hugo/deps.nix | 106 ++++++++++++++---------- 2 files changed, 64 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index ab844e8b5b8..f25426d8b06 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.21"; + version = "0.22"; goPackagePath = "github.com/spf13/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "spf13"; repo = "hugo"; rev = "v${version}"; - sha256 = "1lv815dwj02gwp5jhs03yrcfilhg5afx476bv7hb9ipx4q3a8lqm"; + sha256 = "1gjkzvpd8hpr77v6lxrry8diigr8ch8cvwb8gkbd0z33wsvr2vqi"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 4b33a1ec0de..1daab7854d8 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -49,8 +49,8 @@ fetch = { type = "git"; url = "https://github.com/chaseadamsio/goorgeous"; - rev = "42b0ec184e93fc9fd2c0402f099a4939aba68407"; - sha256 = "00mlv64q34d0vdq7p88hlsck4lsnk2pnxghx1jzy99r7wvs34am3"; + rev = "677defd0e024333503d8c946dd4ba3f32ad3e5d2"; + sha256 = "1mcncs3qdb62m9xwhkxy743ddvgsjfbmbl2djnhqmz1va05njna1"; }; } { @@ -58,8 +58,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"; - sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; + rev = "bcc0a711c5e6bbe72c7cb13d81c7109b45267fd2"; + sha256 = "097l5ln1b08x5hc41qhiybzlyjfcm6kjllgv6pgsgxlx8irz459j"; }; } { @@ -76,8 +76,8 @@ fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "d15eb996544134263b00cce829b5bc4988fdb2df"; - sha256 = "1izrfw8vp5m2x8bmjaz1psmyn9pqcmcdsr3adiv1kkkqr01r37bb"; + rev = "f0d8fdb67f9f4a2c0d02fb6ce4830b8b6754de10"; + sha256 = "148q8ng5kzv1n8wz5dx9fjhz7kz1l34n8vmksnfwhnqg82b77vsy"; }; } { @@ -85,8 +85,8 @@ fetch = { type = "git"; url = "https://github.com/fortytw2/leaktest"; - rev = "0db74e8cd5adacfcc982838c6e185789e4b44e14"; - sha256 = "11s04f1pliqw185ai1dbpqn5rahc3yzv2fp5zdanjvql4168499m"; + rev = "7dad53304f9614c1c365755c1176a8e876fee3e8"; + sha256 = "1f2pmzs0dgayg0q672cpzxqa1ls48aha262qxlglihdvami53b2m"; }; } { @@ -107,13 +107,31 @@ sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; }; } + { + goPackagePath = "github.com/hashicorp/go-immutable-radix"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-immutable-radix"; + rev = "30664b879c9a771d8d50b137ab80ee0748cb2fcc"; + sha256 = "0v9k0l7w2zmczcqmhrmpb9hvc63xm9ppbb8fj87yvl0hvrb92mgb"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } { goPackagePath = "github.com/hashicorp/hcl"; fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "630949a3c5fa3c613328e1b8256052cbc2327c9b"; - sha256 = "00lalg0gz7218gnw6zgn28gfizpcl8zw8jpkghn681vj7lfah5dh"; + rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; + sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; }; } { @@ -130,8 +148,8 @@ fetch = { type = "git"; url = "https://github.com/kardianos/osext"; - rev = "9d302b58e975387d0b4d9be876622c86cefe64be"; - sha256 = "0r6f727s16g4f66k8c2z1xh8ga1p53hg9g2v95pmhd1i60fhy47a"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; }; } { @@ -148,8 +166,8 @@ fetch = { type = "git"; url = "https://github.com/kyokomi/emoji"; - rev = "7ad0be7be9d4ee6ec2cf5df483dbec752626ac64"; - sha256 = "1ck33c8xhdqdpmi5zjdk0f2qv2fda3wz88i22bxr10f9rmwkj004"; + rev = "ddd4753eac3f6480ca86b16cc6c98d26a0935d17"; + sha256 = "16vnpj8zxg3gg9ljwmvrlmdf4dqbxjagi8mldpq1cr481r35dsqh"; }; } { @@ -166,8 +184,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/mmark"; - rev = "8b498b013a3e10b12864c2023a59d490c9d4bf5b"; - sha256 = "1v1q365d94hmpdip13a5435y6pfw3mq5isjj33q19by21zvb433v"; + rev = "f809cc9d384e2f7f3985a28a899237b892f35719"; + sha256 = "0fyw2dkv9bk1fx10a23n8qvcgsr0pjk7p379k8nafx8sjmz3pdbd"; }; } { @@ -175,8 +193,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "53818660ed4955e899c0bcafa97299a388bd7c8e"; - sha256 = "10gdkk8gcjv0lg15ajy68dwgvfkjhawk08ccs9x9ym1adp6l2ycs"; + rev = "d0303fe809921458f417bcf828397a65db30a7e4"; + sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; }; } { @@ -184,8 +202,8 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "f373441d6d54a32891b2d8b1dbf99bc518f3d60d"; - sha256 = "094kcybx0vmdvi3n2y4krrirg79527cq8713kppd6b19jwrqwqf4"; + rev = "3e70a1a463008cea6726380c908b1a6a8bdf7b24"; + sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i"; }; } { @@ -202,8 +220,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "fe206efb84b2bc8e8cfafe6b4c1826622be969e3"; - sha256 = "1dlabfpnlzvwf4i86idy8ilqpjsl8yqfgdv0nv5cccm8gkcans5w"; + rev = "26ae43fdeeea7db6778850f76cc828b232da1e13"; + sha256 = "06gz20ywqbsy4sfsjjay60y7km9m07l9qvmarr7fldqfi8xgl1f4"; }; } { @@ -211,8 +229,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "ff09b135c25aae272398c51a07235b90a75aa4f0"; - sha256 = "0pwl6v3hmc22zp32gkyqykl4kg69xk1mlp0vmhgd1f44difd5fvz"; + rev = "c605e284fe17294bda444b34710735b29d1a9d90"; + sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; }; } { @@ -220,8 +238,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/sftp"; - rev = "4d0e916071f68db74f8a73926335f809396d6b42"; - sha256 = "0l4n4ld0lx53s0hgz5rhk8gn7kr51adsr0cs6wlqm296xlcfp52h"; + rev = "a5f8514e29e90a859e93871b1582e5c81f466f82"; + sha256 = "0fis12k0h4jyyrpm13mhr5vvyqrgmnc06p4dwgzbfk6h6aq3qzcd"; }; } { @@ -229,8 +247,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "b253417e1cb644d645a0a3bb1fa5034c8030127c"; - sha256 = "1knj8vabymhmkg12cj3hnpqf3b74wwrvqib12yczcvpi52xaqi20"; + rev = "0ba0f2b6ed7c475a92e4df8641825cb7a11d1fa3"; + sha256 = "0jj9zkk64sxs8vpfhz95y9li30q6qnxm7sncsfjn2ykcdgs252f7"; }; } { @@ -238,8 +256,8 @@ fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2"; - sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg"; + rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; + sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; }; } { @@ -265,8 +283,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "3d7bff8a321b0a0f88b115558bb7e21bec9124ab"; - sha256 = "07lxw8lnbpdqjvjlx732v9i04z8kgyvlp68d0fqdv6a16smf3nyz"; + rev = "ca57f0f5dba473a8a58765d16d7e811fb8027add"; + sha256 = "1lycnfkby5c7aamvwgxwq6ivzyvd8r761zkdignww1rmnqmiwd2h"; }; } { @@ -283,8 +301,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66"; - sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8"; + rev = "0efa5202c04663c757d84f90f5219c1250baf94f"; + sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs"; }; } { @@ -301,8 +319,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "f1d95a35e132e8a1868023a08932b14f0b8b8fcb"; - sha256 = "0fwvkyq36jvy2gid81031ll7qaj8jxr5g36fff7hhkp3hh4kz6zh"; + rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; + sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; }; } { @@ -310,8 +328,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "5d46e70da8c0b6f812e0b170b7a985753b5c63cb"; - sha256 = "1wvcb1n3y3b7ixlw9vcj4fss5r6vi35a89c42nfb1hqaaji3lypi"; + rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2"; + sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f"; }; } { @@ -337,8 +355,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "cbc3d0884eac986df6e78a039b8792e869bff863"; - sha256 = "1b82asfxajwjb9rindx85c39lll8ygsj9rxxjca9171yh6wi5xbb"; + rev = "7e9105388ebff089b3f99f0ef676ea55a6da3a7e"; + sha256 = "0q3nx9px0bddpfnh2d5h56hsvbfx483jz93j6vanxqnysizgfc1n"; }; } { @@ -346,8 +364,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "5602c733f70afc6dcec6766be0d5034d4c4f14de"; - sha256 = "0n7jv3sl2s5fzdvj9jv4dqsgsdgkw6m3azqhiwq8igi97rymchyd"; + rev = "5961165da77ad3a2abf3a77ea904c13a76b0b073"; + sha256 = "0r4zb2pafrjyjb0alfnxbxkfc27iikkfdqhpklrm790j2x9xrp89"; }; } { @@ -364,8 +382,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "f4b4367115ec2de254587813edaa901bc1c723a8"; - sha256 = "1a5m97y7sdxks02p4swg8ffp8bgr95aaf5fhfw511p7h3xg1dm0d"; + rev = "19e51611da83d6be54ddafce4a4af510cb3e9ea4"; + sha256 = "09pcfzx7nrma0gjv93jx57c28farf8m1qm4x07vk5505wlcgvvfl"; }; } { From 0bffe0382863e317b392996685bb1eedccd9fc90 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Jun 2017 20:09:12 +0200 Subject: [PATCH 046/152] nix: 1.11.9 -> 1.11.10 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++--- pkgs/tools/package-management/nix/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 83378247719..6ccc645a125 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/71im965h634iy99zsmlncw6qhx5jcclx-nix-1.11.9"; - i686-linux = "/nix/store/cgvavixkayc36l6kl92i8mxr6k0p2yhy-nix-1.11.9"; - x86_64-darwin = "/nix/store/w1c96v5yxvdmq4nvqlxjvg6kp7xa2lag-nix-1.11.9"; + x86_64-linux = "/nix/store/qiiwjyc338xigks5wqyxn0nnqiwy7xav-nix-1.11.10"; + i686-linux = "/nix/store/30fi96qqggjs51c5085y3fiws0a3wdcl-nix-1.11.10"; + x86_64-darwin = "/nix/store/zs6msqwjgjr9v9kbs5s0sap7vhdw692z-nix-1.11.10"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 40ef90fa2b2..bef203e588e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -39,7 +39,7 @@ let buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals fromGit [ brotli readline ] # Since 1.12 - ++ lib.optional (stdenv.isLinux && is112) libseccomp + ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112) (aws-sdk-cpp.override { apis = ["s3"]; @@ -148,10 +148,10 @@ in rec { nix = nixStable; nixStable = (common rec { - name = "nix-1.11.9"; + name = "nix-1.11.10"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1"; + sha256 = "b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467"; }; }) // { perl-bindings = nixStable; }; From ab9d2443488a271abc4e1c298625aadd75178613 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 12 Jun 2017 14:56:28 -0500 Subject: [PATCH 047/152] elfkickers: init at 3.1 --- .../tools/misc/elfkickers/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/misc/elfkickers/default.nix diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix new file mode 100644 index 00000000000..98976b5ab0e --- /dev/null +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "elfkickers-${version}"; + version = "3.1"; + + src = fetchurl { + url = "http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"; + sha256 = "0n0sypjrdm3ramv0sby4sdh3i3j9d0ihadr951wa08ypdnq3yrkd"; + }; + + makeFlags = [ "CC=cc prefix=$(out)" ]; + + enableParallelBuildingg = true; + + meta = with stdenv.lib; { + homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"; + description = "A collection of programs that access and manipulate ELF files"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0104a07e1b..b29525a1f77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6690,6 +6690,8 @@ with pkgs; elfutils = callPackage ../development/tools/misc/elfutils { }; + elfkickers = callPackage ../development/tools/misc/elfkickers { }; + emma = callPackage ../development/tools/analysis/emma { }; epm = callPackage ../development/tools/misc/epm { }; From f78362d64c8d81375cc15f76030f19653e3ad72d Mon Sep 17 00:00:00 2001 From: gratuxri Date: Mon, 12 Jun 2017 22:25:00 +0200 Subject: [PATCH 048/152] fvwm: 2.6.6 -> 2.6.7 Release notes: https://github.com/fvwmorg/fvwm/releases/tag/2.6.7 --- pkgs/applications/window-managers/fvwm/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index f8c8a59f6f6..75df68427aa 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -8,11 +8,13 @@ assert gestures -> libstroke != null; stdenv.mkDerivation rec { - name = "fvwm-2.6.6"; + pname = "fvwm"; + version = "2.6.7"; + name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/fvwmorg/fvwm/releases/download/version-2_6_6/${name}.tar.gz"; - sha256 = "c5de085ff25b2128a401a80225481e63335f815f84eea139f80a5f66e606dc2c"; + url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz"; + sha256 = "01654d5abdcde6dac131cae9befe5cf6f01f9f7524d097c3b0f316e39f84ef73"; }; buildInputs = [ From b349d4b899a42edcd83cf7057e9d3f1c0833a741 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 12 Jun 2017 19:29:46 -0400 Subject: [PATCH 049/152] haskellPackages.developPackage: Add overrides argument --- .../haskell-modules/make-package-set.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index f933d6ebfeb..cc161e3ca2d 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -129,16 +129,20 @@ in package-set { inherit pkgs stdenv callPackage; } self // { else self.callHackage; in generateExprs name src {}) overrides; - # : { root : Path, source-overrides : Defaulted (Either Path VersionNumber } -> NixShellAwareDerivation + # : { root : Path + # , source-overrides : Defaulted (Either Path VersionNumber + # , overrides : Defaulted (HaskellPackageOverrideSet) + # } -> NixShellAwareDerivation # Given a path to a haskell package directory whose cabal file is - # named the same as the directory name, and an optional set of + # named the same as the directory name, an optional set of # source overrides as appropriate for the 'packageSourceOverrides' - # function, return a derivation appropriate for nix-build or nix-shell + # function, and an optional set of arbitrary overrides, + # return a derivation appropriate for nix-build or nix-shell # to build that package. - developPackage = { root, source-overrides ? {} }: + developPackage = { root, source-overrides ? {}, overrides ? self: super: {} }: let name = builtins.baseNameOf root; drv = - (extensible-self.extend (self.packageSourceOverrides source-overrides)).callCabal2nix name root {}; + (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {}; in if pkgs.lib.inNixShell then drv.env else drv; ghcWithPackages = selectFrom: withPackages (selectFrom self); From 94ec54598c3a8d67cb6b6667ad86b0874962bb2b Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 13 Jun 2017 15:29:14 +1000 Subject: [PATCH 050/152] snpeff: 4.3i -> 4.3p --- pkgs/applications/science/biology/snpeff/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index 6c7a6b969ee..844374fceb9 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { name = "snpeff-${version}"; - version = "4.3i"; + version = "4.3p"; src = fetchurl { - url = "mirror://sourceforge/project/snpeff/snpEff_latest_core.zip"; - sha256 = "0i1slg201c8yjfr4wrg4xcgzwi0c8b9l3fb1i73fphq6q6zdblzb"; + url = "mirror://sourceforge/project/snpeff/snpEff_v4_3p_core.zip"; + sha256 = "1xb3k0yxd634znw2q083ligm2ww4p6v64041r9sdy3930lhjvxb1"; }; buildInputs = [ unzip jre makeWrapper ]; + sourceRoot = "snpEff"; + installPhase = '' mkdir -p $out/libexec/snpeff cp *.jar *.config $out/libexec/snpeff From d74f8351a525c604d85289119de4e65199365b58 Mon Sep 17 00:00:00 2001 From: timor Date: Fri, 26 May 2017 15:18:11 +0200 Subject: [PATCH 051/152] kernel: enable audio jack reconfiguration Change kernel config to allow for changing the functions of the audio jacks at run-time as well as at boot time. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index a0d4f8dbb5c..b23d52b39e3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -212,6 +212,8 @@ with stdenv.lib; SND_DYNAMIC_MINORS y SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_HDA_RECONFIG y # Support reconfiguration of jack functions + SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot SND_USB_CAIAQ_INPUT y ${optionalString (versionOlder version "4.12") '' PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) From f866cae200b9989faa0375e5dc8994fd0868479f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 Jun 2017 08:05:37 +0100 Subject: [PATCH 052/152] android-udev-rules: 20170305 -> 20170612 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 08c729baaaf..55f62e6073f 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20170305"; + version = "20170612"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "0di64pqs0snbfmncbarvyb9dr3bpv203pqxn5h5i39400jvqwyb6"; + sha256 = "14x22d00zby6wsjaccyh7n8jq1mqzwpx49s85mhmaahbrfd5jwnw"; }; installPhase = '' From cbbdc7d3eb6cd359f94e3d763341c864aeb15b88 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 12 Jun 2017 10:15:19 +0200 Subject: [PATCH 053/152] pythonPackages.gensim: init at 2.1.0 --- .../python-modules/gensim/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/gensim/default.nix diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix new file mode 100644 index 00000000000..51794059b8e --- /dev/null +++ b/pkgs/development/python-modules/gensim/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, six +, scipy +, smart_open +, scikitlearn +, testfixtures +, unittest2 +}: + +buildPythonPackage rec { + pname = "gensim"; + name = "${pname}-${version}"; + version = "2.1.0"; + src = fetchPypi { + inherit pname version; + sha256 = "1wn7bji9b80wn1yggmh7a0dlwzdjr6cp24x4p33j2rf29lxnm2kc"; + }; + + propagatedBuildInputs = [ smart_open numpy six scipy + # scikitlearn testfixtures unittest2 # for tests + ]; + doCheck = false; + + # Two tests fail. + + # ERROR: testAddMorphemesToEmbeddings (gensim.test.test_varembed_wrapper.TestVarembed) + # ImportError: Could not import morfessor. + # This package is not in nix + + # ERROR: testWmdistance (gensim.test.test_fasttext_wrapper.TestFastText) + # ImportError: Please install pyemd Python package to compute WMD. + # This package is not in nix + + meta = { + description = "Topic-modelling library"; + homepage = "https://radimrehurek.com/gensim/"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ jpbernardy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf5184ca606..0d294661136 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30487,6 +30487,8 @@ EOF smart_open = callPackage ../development/python-modules/smart_open { }; + gensim = callPackage ../development/python-modules/gensim { }; + }); in fix' (extends overrides packages) From 156a9afb2b86444d5d3bc239db89c57d02cedb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Jun 2017 10:57:33 +0200 Subject: [PATCH 054/152] knot-resolver: 1.2.6 -> 1.3.0 --- pkgs/servers/dns/knot-resolver/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index c60e7232b79..1fec8ef11b7 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,19 +10,13 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "31e1b8899c5592433e5265a8e9685126fc5aeff3bd6b10884154b2e34b786f3c"; + sha256 = "667002dc3ee0b0f755628997ef4f71be769a06fb8b9ccd935db329c8709c2af4"; }; - patches = [(fetchpatch { - name = "luajit-2.1.0-beta3.diff"; - url = https://gitlab.labs.nic.cz/knot/resolver/merge_requests/289.diff; - sha256 = "1cgfi715qhmvb31ri2wr6cacsjvb1dqavdmnnl1074y25zalxfax"; - })]; - outputs = [ "out" "dev" ]; configurePhase = ":"; From db2849c8a2201199c1d5945a4f8d046655df54f4 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 12 Jun 2017 09:42:05 +0100 Subject: [PATCH 055/152] rigsofrods: 20160412 -> 0.4.7.0 --- pkgs/games/rigsofrods/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index ac658ee1367..a118a75aefe 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "git-20160412"; + version = "0.4.7.0"; name = "rigsofrods-${version}"; src = fetchFromGitHub { owner = "RigsOfRods"; repo = "rigs-of-rods"; - rev = "1ebd359dbd467b4c3171dd6d054e7d8ec39f78ba"; - sha256 = "0h71nrgq5r5cnh20c7wl8jzyaf50dj1b5jdrwihnklpsfyfvjlw4"; + rev = version; + sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4"; }; enableParallelBuilding = true; From d6452233065eba63cc74380fe5691d204b644dd3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 13 Jun 2017 06:58:57 -0500 Subject: [PATCH 056/152] elfkickers: fix typo in enableParallelBuilding. Thanks @bjornfor for spotting this! --- pkgs/development/tools/misc/elfkickers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index 98976b5ab0e..603f8c0bef6 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=cc prefix=$(out)" ]; - enableParallelBuildingg = true; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"; From 5ad7d3106e04f961d0c6fdf05b7a9e79c27c9d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Jun 2017 14:26:15 +0200 Subject: [PATCH 057/152] kde4.kdepimlibs: fixup build by using older cmake I have no idea why, but apparently the last cmake update caused: kdepimlibs-4.14.3/akonadi/tests/../pastehelper.cpp:343:27: fatal error: pastehelper.moc: No such file or directory --- pkgs/desktops/kde-4.14/kdepimlibs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index 5e7643469b6..1f412d3c766 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -1,7 +1,7 @@ { kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison , kdelibs, akonadi, libxslt , shared_mime_info, shared_desktop_ontologies, qjson -, automoc4, cmake, perl +, automoc4, cmake_2_8, perl }: kde { @@ -11,7 +11,7 @@ kde { setOutputFlags = false; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + nativeBuildInputs = [ automoc4 cmake_2_8 perl pkgconfig ]; cmakeFlags = [ "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3" From 9d4bf6b1557e7d606fc55cb0bcd8debe88f1aba8 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 13 Jun 2017 15:55:56 +0200 Subject: [PATCH 058/152] wireguard: 0.0.20170531 -> 0.0.20170613 Simple version bump. Release notes: Signed-off-by: Jason A. Donenfeld --- pkgs/os-specific/linux/wireguard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 696166f3947..3ccf703370c 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,18 +6,18 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170531"; + version = "0.0.20170613"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1k6asxx7qzmxasvdwkvlalvav643fqfbndv80vjkbjqxy6mdkdrf"; + sha256 = "88ac77569eeb79c517318d58a0954caa0a4d2a6a1694e74c2a3b1c14438ac941"; }; meta = with stdenv.lib; { homepage = https://www.wireguard.io/; downloadPage = https://git.zx2c4.com/WireGuard/refs/; description = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security"; - maintainers = with maintainers; [ ericsagnes mic92 ]; + maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ]; license = licenses.gpl2; platforms = platforms.linux; }; From b7f71bd2ada3000b01058b32daa7c47496b2539f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Jun 2017 16:55:50 +0200 Subject: [PATCH 059/152] mr: update to version 1.20170129 --- pkgs/applications/version-management/mr/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 551a5795d11..4d7ccaf3027 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - version = "1.20160123"; + version = "1.20170129"; name = "mr-${version}"; - src = fetchurl { - url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz"; - sha256 = "1723cg5haplz2w9dwdzp6ds1ip33cx3awmj4wnb0h4yq171v5lqk"; + src = fetchgit { + url = "git://myrepos.branchable.com/"; + rev = "refs/tags/" + version; + sha256 = "15i9bs2i25l7ibv530ghy8280kklcgm5kr6j86s7iwcqqckd0czp"; }; buildInputs = [ perl ]; From 90cf4cfabecad2b4e04d1c018f862868bb59b0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Jun 2017 17:17:03 +0200 Subject: [PATCH 060/152] rhash: extend meta.platforms Now cmake evaluates on Darwin again. Let's be optimistic about building. Discussion: https://github.com/NixOS/nixpkgs/commit/d74d871f52 --- pkgs/tools/security/rhash/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 1f72ca294eb..35fab64ffc8 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://rhash.anz.ru; description = "Console utility and library for computing and verifying hash sums of files"; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.andrewrk ]; }; } From 6b1087d9b135c94b929fec3d4cf3724b9539c6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 Jun 2017 18:08:27 +0100 Subject: [PATCH 061/152] add zx2c4 to lib/maintainers.nix --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f83b887ba97..d4f9d1c31a8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -604,4 +604,5 @@ zohl = "Al Zohali "; zoomulator = "Kim Simmons "; zraexy = "David Mell "; + zx2c4 = "Jason A. Donenfeld "; } From e973c75d659f15897191d3e46e06a04744cc7358 Mon Sep 17 00:00:00 2001 From: Tim Shaffer Date: Tue, 13 Jun 2017 13:24:51 -0400 Subject: [PATCH 062/152] vim: update URL for vimrc Previous URL was returning a 404. Adjusting the query parameters fixes things. --- pkgs/applications/editors/vim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 8c9a725ddd6..98e9a47a760 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -2,7 +2,7 @@ # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; - url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?h=packages/vim?id=68f6d131750aa778807119e03eed70286a17b1cb; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?id=68f6d131750aa778807119e03eed70286a17b1cb; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; } # apple frameworks From 8d71c758a105e3aade5d087933476cc3e1a63087 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Jun 2017 17:17:30 +0200 Subject: [PATCH 063/152] perl-Shell-Command: initial version 0.06 --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 97ec906f30f..b9eb8a82eef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12212,6 +12212,14 @@ let self = _self // overrides; _self = with self; { }; }; + ShellCommand = buildPerlPackage { + name = "Shell-Command-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FL/FLORA/Shell-Command-0.06.tar.gz; + sha256 = "1lgc2rb3b5a4lxvbq0cbg08qk0n2i88srxbsz93bwi3razpxxr7k"; + }; + }; + StringToIdentifierEN = buildPerlPackage rec { name = "String-ToIdentifier-EN-0.11"; src = fetchurl { From 14283b6a95b40881a79cf37d1b46cd5cfc0ff971 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Jun 2017 17:19:14 +0200 Subject: [PATCH 064/152] vcsh: update to latest Git head, enable test suite, install man page --- .../version-management/vcsh/default.nix | 19 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 4f87f4b569c..038e72e83a0 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,20 +1,19 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }: stdenv.mkDerivation rec { - version = "1.20151229-1"; + version = "1.20170226"; # date of commit we're pulling name = "vcsh-${version}"; - src = fetchurl { - url = "https://github.com/RichiH/vcsh/archive/v${version}.tar.gz"; - sha256 = "0wgg5zz11ql2v37vby5gbqvnbs80g1q83b9qbvm8d2pqx8bsb0kn"; + src = fetchFromGitHub { + owner = "RichiH"; + repo = "vcsh"; + rev = "36a7cedf196793a6d99f9d3ba2e69805cfff23ab"; + sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + buildInputs = [ which git ronn perl ShellCommand TestMost ]; - installPhase = '' - mkdir -p $out/bin - cp vcsh $out/bin - ''; + installPhase = "make install PREFIX=$out"; meta = with stdenv.lib; { description = "Version Control System for $HOME"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b29525a1f77..ab9c2abcf14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4515,7 +4515,9 @@ with pkgs; vboot_reference = callPackage ../tools/system/vboot_reference { }; - vcsh = callPackage ../applications/version-management/vcsh { }; + vcsh = callPackage ../applications/version-management/vcsh { + inherit (perlPackages) ShellCommand TestMost; + }; verilator = callPackage ../applications/science/electronics/verilator {}; From ec27fcdd6cf78c6b923ce4658be63af8f50f2ab6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Jun 2017 21:14:01 +0200 Subject: [PATCH 065/152] caddy: 0.9.5 -> 0.10.3 --- pkgs/servers/caddy/default.nix | 8 ++-- pkgs/servers/caddy/deps.nix | 73 +++++++++++++++++++--------------- 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index add92f68876..5e5ac3bcafd 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.9.5"; + version = "0.10.3"; goPackagePath = "github.com/mholt/caddy"; @@ -12,12 +12,12 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0z1qjmlxrsiccrl5cb0j4c48ksng4xgp5bgy11gswrijvymsbq2r"; + sha256 = "0srz1cji1z6ag591vfwjd0aypi32hr7hh9ypps8p5szf075rkr8p"; }; buildFlagsArray = '' -ldflags= - -X github.com/mholt/caddy/caddy/caddymain.gitTag=${version} + -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version} ''; goDeps = ./deps.nix; @@ -26,6 +26,6 @@ buildGoPackage rec { homepage = https://caddyserver.com; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = [ maintainers.rushmorem ]; + maintainers = with maintainers; [ rushmorem fpletz ]; }; } diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix index 49ae8fa09e8..e2b318ca60e 100644 --- a/pkgs/servers/caddy/deps.nix +++ b/pkgs/servers/caddy/deps.nix @@ -1,12 +1,21 @@ -# This file was generated by go2nix. +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 [ + { + goPackagePath = "github.com/codahale/aesnicheck"; + fetch = { + type = "git"; + url = "https://github.com/codahale/aesnicheck"; + rev = "349fcc471aaccc29cd074e1275f1a494323826cd"; + sha256 = "1zab6jjs5hiqpq484pbpx490zlj42v7hf4wwkqmicyaq7wclfnka"; + }; + } { goPackagePath = "github.com/dustin/go-humanize"; fetch = { type = "git"; url = "https://github.com/dustin/go-humanize"; - rev = "7a41df006ff9af79a29f0ffa9c5f21fbe6314a2d"; - sha256 = "0055ir369kz63x9ay0fxqpx2xby8digja6ffbc35vsqjnzfwws18"; + rev = "259d2a102b871d17f30e3cd9881a642961a1e486"; + sha256 = "1jiada1pfhw2wwkx7cjsa6ixa8c37w51b3x09vlr4m0l945pval9"; }; } { @@ -23,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "0674c7c7968d9fac5f0f678325161ec31df406af"; - sha256 = "0ql8bsxcc0rjli5cxb0jf22jaq18bd6s4pja7razir3a9zcyn3km"; + rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; + sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; }; } { @@ -77,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/lucas-clemente/quic-go"; - rev = "86e02c4d2c459b70073cd5c39468e8a5a22db45a"; - sha256 = "16qrkcwllx88f6623ps5p5h62168xs6mcwybbw8862pvb0zkndz0"; + rev = "bb280f29be75d6d78c64a32692b668e2a99c57bb"; + sha256 = "1a6xqh7z8amb1372kb63kmn764w6c0ypcl7c4c7kyy2sqx8lyjyc"; }; } { @@ -95,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "ca336a1f95a6b89be9c250df26c7a41742eb4a6f"; - sha256 = "03yh1zszhspmmq0v22ckw96q8ds2a5s3nd0c6r3p3n165w28z434"; + rev = "e78414ef75607394ad7d917824f07f381df2eafa"; + sha256 = "1g5rgbjy7nr0l6074plh2aqiwiy9nck9bhhks9c5ki3r00fjj3ay"; }; } { @@ -113,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/naoina/toml"; - rev = "751171607256bb66e64c9f0220c00662420c38e9"; - sha256 = "07ivrcdd62y7jj5isrz7jhkqqc29s0wsn005mn0yxain51f8h7ly"; + rev = "e6f5723bf2a66af014955e0888881314cf294129"; + sha256 = "0kh7xnckw689kksh23ginyl3g8h2yqyvjh54nmnfvjaj886lvbsf"; }; } { @@ -122,17 +131,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70"; - sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2"; - sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg"; + rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae"; + sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137"; }; } { @@ -140,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/xenolf/lego"; - rev = "f5d538caab6dc0c167d4e32990c79bbf9eff578c"; - sha256 = "026sjqinb0j4ddfh3rwhhh7a1yjkfdmdr4yflba5syp1hrjf1f37"; + rev = "aaa8e70aec58a858b6bef0706b367dd5e8d58128"; + sha256 = "0899mdgb01bpz83zyxzln8ygyll78gmcslw5i36q9m60pqj59z60"; }; } { @@ -149,8 +149,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "41d678d1df78cd0410143162dff954e6dc09300f"; - sha256 = "1gcw2850nghsfi3m98ibsxs8bwqzhdjsgiznrr9ymarzn58v3357"; + rev = "e7ba82683099cae71475961448ab8f903ea77c26"; + sha256 = "0w6zvzchgzk197siq3qbsh6pdpnx7g9xc08k5axv5yc6w8qhgx11"; }; } { @@ -158,8 +158,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d"; - sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s"; + rev = "1a68b1313cf4ad7778376e82641197b60c02f65c"; + sha256 = "1nfva16dasc9h5y1njcfnr2g09damk754g3yliij3ar06k06p1xf"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "210eee5cf7323015d097341bcf7166130d001cd8"; + sha256 = "0sm9548ky5vi2sr5zjzwwna5f4pfs0nmlaw0pjnamxwfjzy4jnfb"; }; } { @@ -167,8 +176,8 @@ fetch = { type = "git"; url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "dd45e6a67c53f673bb49ca8a001fd3a63ceb640e"; - sha256 = "1fla2mzbwl1lxa9na3xhjmcszn8kiw051xq7i9xzbazzpgf0csg0"; + rev = "a96e63847dc3c67d17befa69c303767e2f84e54f"; + sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d"; }; } { @@ -185,8 +194,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "14227de293ca979cf205cd88769fe71ed96a97e2"; - sha256 = "038hnrjcnjygyi3qidfrkpkakis82qg381sr495d2s40g2dwlzah"; + rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; + sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; }; } ] From 071815cb244e2f884552936d245944e4369e81a0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Jun 2017 22:02:06 +0200 Subject: [PATCH 066/152] caddy service: sync with upstream systemd unit Increases security and fixes minor issues. --- nixos/modules/services/web-servers/caddy.nix | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index eec285f6bc4..9ac1a08bb58 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -50,17 +50,30 @@ in config = mkIf cfg.enable { systemd.services.caddy = { description = "Caddy web server"; - after = [ "network.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = ''${cfg.package.bin}/bin/caddy -conf=${configFile} \ - -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} + ExecStart = '' + ${cfg.package.bin}/bin/caddy -root=/var/tmp -conf=${configFile} \ + -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Type = "simple"; User = "caddy"; Group = "caddy"; + Restart = "on-failure"; + StartLimitInterval = 86400; + StartLimitBurst = 5; AmbientCapabilities = "cap_net_bind_service"; - LimitNOFILE = 8192; + CapabilityBoundingSet = "cap_net_bind_service"; + NoNewPrivileges = true; + LimitNPROC = 64; + LimitNOFILE = 1048576; + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + ProtectSystem = "full"; + ReadWriteDirectories = cfg.dataDir; }; }; From ac5258edb25814f2b2c70380f24a15625b10fae1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Jun 2017 22:04:03 +0200 Subject: [PATCH 067/152] caddy service: don't use extra dotdir in dataDir --- nixos/doc/manual/release-notes/rl-1709.xml | 9 +++++++++ nixos/modules/services/web-servers/caddy.nix | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 6948c22cc88..c16499a0c1d 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -89,6 +89,15 @@ rmdir /var/lib/ipfs/.ipfs The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example. + + + The caddy service was previously using an extra + .caddy in the data directory specified with the + dataDir option. The contents of the + .caddy directory are now expected to be in the + dataDir. + + diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 9ac1a08bb58..ee32a1c86d4 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -36,7 +36,11 @@ in dataDir = mkOption { default = "/var/lib/caddy"; type = types.path; - description = "The data directory, for storing certificates."; + description = '' + The data directory, for storing certificates. Before 17.09, this + would create a .caddy directory. With 17.09 the contents of the + .caddy directory are in the specified data directory instead. + ''; }; package = mkOption { @@ -52,6 +56,8 @@ in description = "Caddy web server"; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + environment = mkIf (versionAtLeast config.system.stateVersion "17.09") + { CADDYPATH = cfg.dataDir; }; serviceConfig = { ExecStart = '' ${cfg.package.bin}/bin/caddy -root=/var/tmp -conf=${configFile} \ From 44cb792077c7f111e2ef721f85acfe76e0a9e713 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Jun 2017 22:20:47 +0200 Subject: [PATCH 068/152] powerdns: 4.0.2 -> 4.0.3 --- pkgs/servers/dns/powerdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index b1e4ec6e368..8b838a58b27 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "17b2gv7r53skj54ms4hx8rdjiggpc8bais0cy0jck1pmccxyalfh"; + sha256 = "10p2m2zbydbd5xjdgf8z4zgvl8diyb4k3bq1hzsl32r71daj3yk0"; }; buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ]; From 3640c65be64506d00ed9d3096cb1840738e154c6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Jun 2017 21:20:10 +0200 Subject: [PATCH 069/152] jenkins: 2.64 -> 2.65 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 2c80e9c8002..2737329121a 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.64"; + version = "2.65"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0w0yz36kj4bw5lswyxqg6rfcvrqmkvidfrbbvdn8rq6sfrcpvjrg"; + sha256 = "0ydg8crv8a4lg2y8dihflxcb3b2fxn6ds70c9l1vwmb8j29wsli6"; }; buildCommand = '' From 50b3f8e051c6a1e6c571d9ee43c0ad29fde045d6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 13 Jun 2017 21:26:07 +0200 Subject: [PATCH 070/152] fsql: 0.1.1 -> 0.2.1 --- pkgs/tools/misc/fsql/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index ffd3b3f5153..e3a9297c4ab 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -1,15 +1,16 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "fsql-${version}"; - version = "0.1.1"; + version = "0.2.1"; goPackagePath = "github.com/kshvmdn/fsql"; - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "https://github.com/kshvmdn/fsql"; - sha256 = "1zvblhfd15l86dcx0p12yrc2rrmfdpzyd107508pb72r2ar638vh"; + src = fetchFromGitHub { + owner = "kshvmdn"; + repo = "fsql"; + rev = "v${version}"; + sha256 = "1izcfxm77hjj8z7a2nk9bbwbz4wc2yqzs2ir8v3k822m1hvgwb9a"; }; meta = with stdenv.lib; { From 053377e49f289cee713ee1b380430cba6a2e1887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Urban=20=C5=A0kudnik?= Date: Sun, 11 Jun 2017 18:40:50 +0200 Subject: [PATCH 071/152] google-play-music-desktop-player: 4.2.0 -> 4.3.0 --- .../audio/google-play-music-desktop-player/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 12e9b88880d..47b85af724a 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -4,7 +4,7 @@ }: let - version = "4.2.0"; + version = "4.3.0"; deps = [ alsaLib @@ -46,7 +46,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "0n59b73jc6b86p5063xz7n0z48wy9mzqcx0l34av2hqkx6wcb2h8"; + sha256 = "0mbrfnsnajmpwyqyrjmcv84ywzimjmm2b8faxqiwfcikdgpm9amb"; }; dontBuild = true; From 972fa2a2191e422a04b1175cc90eb9485b70915a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 13 Jun 2017 21:31:42 +0200 Subject: [PATCH 072/152] instead: 3.0.0 -> 3.0.1 --- pkgs/games/instead/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index a0bb45746f7..2c360241fb9 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }: let - version = "3.0.0"; + version = "3.0.1"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "14scbb5x36dywak930ry7hwv502jnzc4m5cjkymqn1vz1xkq2m5w"; + sha256 = "0ynqzmr35zd1vbbv8n3vk93zj0njhs45w9z33wwkphg2zlniwnzb"; }; NIX_LDFLAGS = "-llua -lgcc_s"; From c9fcce368d20de7755fdc1e5d2e93af88c674597 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 13 Jun 2017 21:34:58 +0200 Subject: [PATCH 073/152] ragel: 6.9 -> 6.10 --- pkgs/development/tools/parsing/ragel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 5140719c62b..bfd43401a34 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -37,8 +37,8 @@ in { ragelStable = generic { - version = "6.9"; - sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf"; + version = "6.10"; + sha256 = "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az"; }; ragelDev = generic { From a9b2de487b2e81394decb687638d0c14d32bdef1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 13 Jun 2017 21:36:49 +0200 Subject: [PATCH 074/152] rage: fix license for unstable Beginning with the next development release (> 7.0.0.9) Ragel is licensed under an MIT style license. Ragel 6 remains under GPL v2. Please see the file COPYING in the source. --- pkgs/development/tools/parsing/ragel/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index bfd43401a34..02a13bfa28d 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -3,7 +3,7 @@ }: let - generic = { version, sha256 }: + generic = { version, sha256, license }: stdenv.mkDerivation rec { name = "ragel-${version}"; @@ -27,7 +27,7 @@ let meta = with stdenv.lib; { homepage = http://www.complang.org/ragel; description = "State machine compiler"; - license = licenses.gpl2; + inherit license; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; @@ -39,10 +39,12 @@ in ragelStable = generic { version = "6.10"; sha256 = "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az"; + license = stdenv.lib.licenses.gpl2; }; ragelDev = generic { version = "7.0.0.10"; sha256 = "1v4ddzxal4gf8l8nkn32qabba6nbpd2mg8sphgmdn8kaqv52nmj0"; + license = stdenv.lib.licenses.mit; }; } From 5c8192c7d66cbea01e3b6cbab86463ca59defcf2 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Tue, 13 Jun 2017 12:40:45 -0700 Subject: [PATCH 075/152] hugo: 0.22 -> 0.22.1 (#26558) thanks --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f25426d8b06..8d14db09c3f 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.22"; + version = "0.22.1"; goPackagePath = "github.com/spf13/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "spf13"; repo = "hugo"; rev = "v${version}"; - sha256 = "1gjkzvpd8hpr77v6lxrry8diigr8ch8cvwb8gkbd0z33wsvr2vqi"; + sha256 = "0m459np11izsflwdja6k0znaxvd8zpgivvswnq9501m49h8m4x7q"; }; goDeps = ./deps.nix; From 727ec216dced62f90b4dc3d1cc052a915290904d Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Wed, 14 Jun 2017 03:43:33 +0800 Subject: [PATCH 076/152] go-ethereum-classic: init at 3.5.0 (#26551) thanks --- pkgs/applications/altcoins/default.nix | 1 + .../altcoins/go-ethereum-classic/default.nix | 24 ++++++++++++ .../altcoins/go-ethereum-classic/deps.nix | 39 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 pkgs/applications/altcoins/go-ethereum-classic/default.nix create mode 100644 pkgs/applications/altcoins/go-ethereum-classic/deps.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 471d2a16ef7..1fcfd5f2b60 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -21,6 +21,7 @@ rec { freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; }; go-ethereum = callPackage ./go-ethereum.nix { }; + go-ethereum-classic = callPackage ./go-ethereum-classic { }; hivemind = callPackage ./hivemind.nix { withGui = true; }; hivemindd = callPackage ./hivemind.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix new file mode 100644 index 00000000000..b7585b2f109 --- /dev/null +++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "go-ethereum-classic-${version}"; + version = "3.5.0"; + rev = "402c1700fbefb9512e444b32fe12c2d674638ddb"; + + goPackagePath = "github.com/ethereumproject/go-ethereum"; + subPackages = [ "cmd/evm" "cmd/geth" ]; + + src = fetchgit { + inherit rev; + url = "https://github.com/ethereumproject/go-ethereum"; + sha256 = "15wji12wqcrgsb1glwwz4jv7rsas71bbxh7750iv2phn7jivm0fi"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "Golang implementation of Ethereum Classic"; + homepage = "https://github.com/ethereumproject/go-ethereum"; + license = with lib.licenses; [ lgpl3 gpl3 ]; + }; +} diff --git a/pkgs/applications/altcoins/go-ethereum-classic/deps.nix b/pkgs/applications/altcoins/go-ethereum-classic/deps.nix new file mode 100644 index 00000000000..0aa6755ee96 --- /dev/null +++ b/pkgs/applications/altcoins/go-ethereum-classic/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/maruel/panicparse"; + fetch = { + type = "git"; + url = "https://github.com/maruel/panicparse"; + rev = "ae43f192cef2add653fe1481a3070ed00a4a6981"; + sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; + sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "4163cd39dda1c0dda883a713640bc01e08951c24"; + sha256 = "1vzrhxf8823lrnwf1bfyxwlm52pph5iq2hgr1d0n07v8kjgqkrmx"; + }; + } +] From f03ee2475406a24c3162f8d137aae8f6f5440cda Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 13 Jun 2017 21:46:37 +0200 Subject: [PATCH 077/152] gfortran7: added by wrapping gcc7 (#26535) thanks --- pkgs/top-level/all-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab9c2abcf14..ea00365659d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5312,6 +5312,14 @@ with pkgs; profiledCompiler = false; }); + gfortran7 = wrapCC (gcc7.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj49; gcj49 = wrapCC (gcc49.cc.override { name = "gcj"; From 8a06af11637760fb8038f2b0b71830bd464211e7 Mon Sep 17 00:00:00 2001 From: Guillaume Koenig Date: Tue, 13 Jun 2017 21:50:46 +0200 Subject: [PATCH 078/152] reno: 1.8.0 -> 2.3.2 (#26516) thanks --- pkgs/development/tools/reno/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index dbc2401970b..35aab138292 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonApplication rec { +with pythonPackages; buildPythonApplication rec { name = "reno-${version}"; - version = "1.8.0"; + version = "2.3.2"; src = fetchurl { url = "mirror://pypi/r/reno/${name}.tar.gz"; - sha256 = "1pqg0xzcilmyrrnpa87m11xwlvfc94a98s28z9cgddkhw27lg3ps"; + sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4"; }; # Don't know how to make tests pass @@ -15,8 +15,8 @@ pythonPackages.buildPythonApplication rec { # Nothing to strip (python files) dontStrip = true; - propagatedBuildInputs = with pythonPackages; [ pbr six pyyaml ]; - buildInputs = with pythonPackages; [ Babel ]; + propagatedBuildInputs = [ pbr six pyyaml dulwich ]; + buildInputs = [ Babel ]; meta = with stdenv.lib; { description = "Release Notes Manager"; From 4fc077bfeee8e09980a75f19823400e46cbd5063 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 13 Jun 2017 20:51:33 +0100 Subject: [PATCH 079/152] vdrift: fix build (#26522) Had been broken since 7bf7f1976545666ba958034f7e61062595338f84 --- pkgs/games/vdrift/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index ea3231dbe63..98fe9d7c6f6 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { cp -r --reflink=auto $data data chmod -R +w data sed -i -e s,/usr/local,$out, SConstruct + export CXXFLAGS="$(pkg-config --cflags SDL2_image)" scons ''; installPhase = "scons install"; From 9fb87f9c9d0eaeb97773e53e3740231d52b1104f Mon Sep 17 00:00:00 2001 From: "Taylor \"Nekroze\" Lawson" Date: Wed, 14 Jun 2017 05:54:36 +1000 Subject: [PATCH 080/152] Kubernetes ABAC policy file fix (#26499) Fix the incorrect nix map that generates the Kubernetes policy file --- nixos/modules/services/cluster/kubernetes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index f58306ab63e..68917af5094 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -40,7 +40,7 @@ let }); policyFile = pkgs.writeText "kube-policy" - concatStringsSep "\n" (map (builtins.toJSON cfg.apiserver.authorizationPolicy)); + (concatStringsSep "\n" (map builtins.toJSON cfg.apiserver.authorizationPolicy)); cniConfig = pkgs.buildEnv { name = "kubernetes-cni-config"; From b83609add3e90bf67aba7e4dc628542487271340 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 13 Jun 2017 07:04:29 -0500 Subject: [PATCH 081/152] psmisc: 22.21 -> 23.0 No longer need fuser patch, fixes musl compat. --- ...ypo-in-fuser-makes-M-on-all-the-time.patch | 44 ------------------- pkgs/os-specific/linux/psmisc/default.nix | 9 ++-- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch diff --git a/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch deleted file mode 100644 index 2bb93955aea..00000000000 --- a/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 -From: Brad Jorsch -Date: Fri, 28 Feb 2014 21:55:02 +1100 -Subject: [PATCH] Typo in fuser makes -M on all the time - -Brad found that fuser had the -M option on all the time. -A simple but significant typo caused this, thanks the the patch. - -Bug-Debian: http://bugs.debian.org/740275 - -Signed-off-by: Craig Small ---- - ChangeLog | 4 ++++ - src/fuser.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index fd1cccf..e5f784c 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+Changes in 22.22 -+================ -+ * Fixed typo in fuser which has -M on Debian #740275 -+ - Changes in 22.21 - ================ - * Missing comma in fuser(1) added Debian #702391 -diff --git a/src/fuser.c b/src/fuser.c -index b485f65..389b302 100644 ---- a/src/fuser.c -+++ b/src/fuser.c -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) - usage(_("No process specification given")); - - /* Check if -M flag was used and if so check mounts */ -- if (opts * OPT_ISMOUNTPOINT) { -+ if (opts & OPT_ISMOUNTPOINT) { - check_mountpoints(&mounts, &names_head, &names_tail); - } - --- -1.9.2 - diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 5cf5e9a542d..7209c44ff3c 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -3,18 +3,15 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "psmisc-22.21"; + name = "psmisc-23.0"; src = fetchurl { - url = "mirror://sourceforge/psmisc/${name}.tar.gz"; - sha256 = "0nhlm1vrrwn4a845p6y4nnnb4liq70n74zbdd5dq844jc6nkqclp"; + url = "mirror://sourceforge/psmisc/${name}.tar.xz"; + sha256 = "0k7hafh9388s3hh9j943jy1qk9g1c43j02nyk0xis0ngbs632lvm"; }; buildInputs = [ncurses]; - # From upstream, will be in next release. - patches = [ ./0001-Typo-in-fuser-makes-M-on-all-the-time.patch ]; - meta = { homepage = http://psmisc.sourceforge.net/; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; From 9079f94df7530b2794a0aa0c032db3e3340cf2b9 Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Tue, 13 Jun 2017 15:27:51 +0200 Subject: [PATCH 082/152] exa: 2017-04-02 -> 0.6.0 --- pkgs/tools/misc/exa/default.nix | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index c49f11a72a9..4dd49e02e0e 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }: with rustPlatform; @@ -12,31 +12,28 @@ let }; cargoPatch = '' # use non-git dependencies - patch -p1 < path = "${zoneinfo_compiled}" + EOF ''; in buildRustPackage rec { - name = "exa-unstable-2017-04-02"; + name = "exa-${version}"; + version = "0.6.0"; - depsSha256 = "0szjba03q4iwzjzb2dp39hhz554ys4z11qdhcdq1mgxqk94scjf4"; + depsSha256 = "0c1vyl1c67xq18ss0xs5cjdfn892jpwj6ml51dfppzfyns3namm4"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; - rev = "1a6066327d2643881996946942aba530e8a1c67c"; - sha256 = "1xrsg3zw5d3sw2bwx8g0lrs6zpk8rdrvvnknf7c9drp7rplmd8zq"; + rev = "v${version}"; + sha256 = "0065gj4pbbppbnwp23s6bb7zlz428nrir00d0kz7axydxk6swhyv"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ openssl zlib ]; + buildInputs = [ zlib ]; # Some tests fail, but Travis ensures a proper build doCheck = false; @@ -60,7 +57,7 @@ in buildRustPackage rec { for a directory, or recursing into directories with a tree view. exa is written in Rust, so it’s small, fast, and portable. ''; - homepage = http://bsago.me/exa; + homepage = http://the.exa.website; license = licenses.mit; maintainer = [ maintainers.ehegnes ]; }; From 30412f99304e51e8c27aa5be6d413d17c1da0ece Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 13 Jun 2017 21:37:24 +0200 Subject: [PATCH 083/152] rhash: fix darwin build Fixes cmake update to 3.8.2, d74d871f52512a1f827d2dc165db685f499ce5f0 --- pkgs/tools/security/rhash/darwin.patch | 38 ++++++++++++++++++++++++++ pkgs/tools/security/rhash/default.nix | 4 ++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/security/rhash/darwin.patch diff --git a/pkgs/tools/security/rhash/darwin.patch b/pkgs/tools/security/rhash/darwin.patch new file mode 100644 index 00000000000..76ad8fe9abd --- /dev/null +++ b/pkgs/tools/security/rhash/darwin.patch @@ -0,0 +1,38 @@ +diff --git a/Makefile b/Makefile +index e40dbc3..e198b93 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ ALLCFLAGS = -pipe $(CFLAGS) $(ADDCFLAGS) \ + -Wbad-function-cast -Wmissing-prototypes -Wmissing-declarations + LDLIBRHASH = -Llibrhash -lrhash + ALLLDFLAGS = $(LDLIBRHASH) $(LDFLAGS) $(ADDLDFLAGS) +-SHAREDLIB = librhash/librhash.so.0 ++SHAREDLIB = librhash/librhash.0.dylib + SHRDLFLAGS = $(LDFLAGS) $(ADDLDFLAGS) + HEADERS = calc_sums.h hash_print.h common_func.h hash_update.h file_mask.h file_set.h find_file.h hash_check.h output.h parse_cmdline.h rhash_main.h win_utils.h version.h + SOURCES = calc_sums.c hash_print.c common_func.c hash_update.c file_mask.c file_set.c find_file.c hash_check.c output.c parse_cmdline.c rhash_main.c win_utils.c +diff --git a/librhash/Makefile b/librhash/Makefile +index 2f9bcc9..0c5aaad 100644 +--- a/librhash/Makefile ++++ b/librhash/Makefile +@@ -28,8 +28,8 @@ PREFIX = /usr/local + INCDIR = $(PREFIX)/include + LIBDIR = $(PREFIX)/lib + LIBRARY = librhash.a +-SONAME = librhash.so.0 +-SOLINK = librhash.so ++SONAME = librhash.0.dylib ++SOLINK = librhash.dylib + TEST_TARGET = test_hashes + TEST_SHARED = test_shared + # Set variables according to GNU coding standard +@@ -182,8 +182,7 @@ test-dll: $(DLLNAME) test_hashes.o + + # shared and static libraries + $(SONAME): $(SOURCES) +- sed -n '1s/.*/{ global:/p; s/^RHASH_API.* \([a-z0-9_]\+\)(.*/ \1;/p; $$s/.*/local: *; };/p' $(SO_HEADERS) > exports.sym +- $(CC) -fpic $(ALLCFLAGS) -shared $(SOURCES) -Wl,--version-script,exports.sym,-soname,$(SONAME) $(LIBLDFLAGS) -o $@ ++ $(CC) -fpic $(ALLCFLAGS) -dynamiclib $(SOURCES) $(LIBLDFLAGS) -Wl,-install_name,$(PREFIX)/lib/$@ -o $@ + ln -s $(SONAME) $(SOLINK) + # use 'nm -Cg --defined-only $@' to view exported symbols + diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 35fab64ffc8..e33c680b457 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -10,13 +10,15 @@ stdenv.mkDerivation rec { sha256 = "0nii6p4m2x8rkaf8r6smgfwb1q4hpf117kkg64yr6gyqgdchnljv"; }; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; # we build the static library because of two makefile bugs # * .h files installed for static library target only # * .so.0 -> .so link only created in the static library install target buildPhase = '' - make lib-shared lib-static build-shared + make lib-shared lib-static build-shared CC=cc PREFIX=$out ''; # we don't actually want the static library, so we remove it after it From 0edd78f7bc15df371fe53c3bd214915d8efd41e8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 13 Jun 2017 22:09:48 +0200 Subject: [PATCH 084/152] calibre: fix missing gsettings schemas --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 5d228d264d0..49c005cf739 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite , makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp -, xdg_utils, makeDesktopItem +, xdg_utils, makeDesktopItem, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = [ poppler_utils libpng imagemagick libjpeg - fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ apsw cssselect cssutils dateutil lxml mechanize netifaces pillow python pyqt5 sip From 424dc0138d45c63ae7c71a0a09778dcb67aea7e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Jun 2017 22:28:05 +0200 Subject: [PATCH 085/152] parallel: fix broken shebangs to /usr/bin/perl Adding perl to buildInputs accomplishes this for us automatically. --- pkgs/tools/misc/parallel/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 08c672b5612..8097902b0d9 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -8,11 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0afk1q8mqzz02h6imyykgi9gwk5gj08hzs6lwgd65ilj4slkh93s"; }; - nativeBuildInputs = [ makeWrapper ]; - - preFixup = '' - sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* + nativeBuildInputs = [ makeWrapper perl ]; + postInstall = '' wrapProgram $out/bin/parallel \ ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \ --prefix PATH : "${perl}/bin" \ From 2444eab485ed6631fea02577b0d21c808405fd5e Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 13 Jun 2017 22:36:08 +0200 Subject: [PATCH 086/152] ELK: update kibana and the elastic beats to 5.4 (#26252) * Add kibana5 and logstash5 * Upgrade the elastic beats to 5.4 * Make sure all elastic products use the same version (see elk5Version) * Add a test for the ELK stack --- nixos/modules/services/logging/logstash.nix | 106 +++++++++++++++----- nixos/modules/services/search/kibana.nix | 48 ++++++++- nixos/tests/elk.nix | 95 ++++++++++++++++++ nixos/tests/logstash.nix | 41 -------- pkgs/development/tools/misc/kibana/5.x.nix | 45 +++++++++ pkgs/misc/logging/beats/default.nix | 42 ++++++++ pkgs/misc/logging/filebeat/default.nix | 25 ----- pkgs/misc/logging/heartbeat/default.nix | 25 ----- pkgs/misc/logging/metricbeat/default.nix | 25 ----- pkgs/misc/logging/packetbeat/default.nix | 36 ------- pkgs/servers/search/elasticsearch/5.x.nix | 4 +- pkgs/tools/misc/logstash/5.x.nix | 39 +++++++ pkgs/top-level/all-packages.nix | 23 +++-- 13 files changed, 362 insertions(+), 192 deletions(-) create mode 100644 nixos/tests/elk.nix delete mode 100644 nixos/tests/logstash.nix create mode 100644 pkgs/development/tools/misc/kibana/5.x.nix create mode 100644 pkgs/misc/logging/beats/default.nix delete mode 100644 pkgs/misc/logging/filebeat/default.nix delete mode 100644 pkgs/misc/logging/heartbeat/default.nix delete mode 100644 pkgs/misc/logging/metricbeat/default.nix delete mode 100644 pkgs/misc/logging/packetbeat/default.nix create mode 100644 pkgs/tools/misc/logstash/5.x.nix diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index c9477b9e3ab..b4abd2cd7e5 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -4,17 +4,46 @@ with lib; let cfg = config.services.logstash; + atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4"; pluginPath = lib.concatStringsSep ":" cfg.plugins; havePluginPath = lib.length cfg.plugins > 0; ops = lib.optionalString; - verbosityFlag = { - debug = "--debug"; - info = "--verbose"; - warn = ""; # intentionally empty - error = "--quiet"; - fatal = "--silent"; - }."${cfg.logLevel}"; + verbosityFlag = + if atLeast54 + then "--log.level " + cfg.logLevel + else { + debug = "--debug"; + info = "--verbose"; + warn = ""; # intentionally empty + error = "--quiet"; + fatal = "--silent"; + }."${cfg.logLevel}"; + pluginsPath = + if atLeast54 + then "--path.plugins ${pluginPath}" + else "--pluginpath ${pluginPath}"; + + logstashConf = pkgs.writeText "logstash.conf" '' + input { + ${cfg.inputConfig} + } + + filter { + ${cfg.filterConfig} + } + + output { + ${cfg.outputConfig} + } + ''; + + logstashSettingsYml = pkgs.writeText "logstash.yml" cfg.extraSettings; + + logstashSettingsDir = pkgs.runCommand "logstash-settings" {inherit logstashSettingsYml;} '' + mkdir -p $out + ln -s $logstashSettingsYml $out/logstash.yml + ''; in { @@ -45,6 +74,15 @@ in description = "The paths to find other logstash plugins in."; }; + dataDir = mkOption { + type = types.str; + default = "/var/lib/logstash"; + description = '' + A path to directory writable by logstash that it uses to store data. + Plugins will also have access to this path. + ''; + }; + logLevel = mkOption { type = types.enum [ "debug" "info" "warn" "error" "fatal" ]; default = "warn"; @@ -116,6 +154,19 @@ in ''; }; + extraSettings = mkOption { + type = types.lines; + default = ""; + description = "Extra Logstash settings in YAML format."; + example = '' + pipeline: + batch: + size: 125 + delay: 5 + ''; + }; + + }; }; @@ -123,31 +174,34 @@ in ###### implementation config = mkIf cfg.enable { + assertions = [ + { assertion = atLeast54 -> !cfg.enableWeb; + message = '' + The logstash web interface is only available for versions older than 5.4. + So either set services.logstash.enableWeb = false, + or set services.logstash.package to an older logstash. + ''; + } + ]; + systemd.services.logstash = with pkgs; { description = "Logstash Daemon"; wantedBy = [ "multi-user.target" ]; environment = { JAVA_HOME = jre; }; path = [ pkgs.bash ]; serviceConfig = { - ExecStart = - "${cfg.package}/bin/logstash agent " + - "-w ${toString cfg.filterWorkers} " + - ops havePluginPath "--pluginpath ${pluginPath} " + - "${verbosityFlag} " + - "-f ${writeText "logstash.conf" '' - input { - ${cfg.inputConfig} - } - - filter { - ${cfg.filterConfig} - } - - output { - ${cfg.outputConfig} - } - ''} " + - ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}"; + ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"''; + ExecStart = concatStringsSep " " (filter (s: stringLength s != 0) [ + "${cfg.package}/bin/logstash" + (ops (!atLeast54) "agent") + "-w ${toString cfg.filterWorkers}" + (ops havePluginPath pluginsPath) + "${verbosityFlag}" + "-f ${logstashConf}" + (ops atLeast54 "--path.settings ${logstashSettingsDir}") + (ops atLeast54 "--path.data ${cfg.dataDir}") + (ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}") + ]); }; }; }; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index d377a6feeb8..9d7d2d79918 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -5,7 +5,11 @@ with lib; let cfg = config.services.kibana; - cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON ( + atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4"; + + cfgFile = if atLeast54 then cfgFile5 else cfgFile4; + + cfgFile4 = pkgs.writeText "kibana.json" (builtins.toJSON ( (filterAttrsRecursive (n: v: v != null) ({ host = cfg.listenAddress; port = cfg.port; @@ -36,6 +40,27 @@ let ]; } // cfg.extraConf) ))); + + cfgFile5 = pkgs.writeText "kibana.json" (builtins.toJSON ( + (filterAttrsRecursive (n: v: v != null) ({ + server.host = cfg.listenAddress; + server.port = cfg.port; + server.ssl.certificate = cfg.cert; + server.ssl.key = cfg.key; + + kibana.index = cfg.index; + kibana.defaultAppId = cfg.defaultAppId; + + elasticsearch.url = cfg.elasticsearch.url; + elasticsearch.username = cfg.elasticsearch.username; + elasticsearch.password = cfg.elasticsearch.password; + + elasticsearch.ssl.certificate = cfg.elasticsearch.cert; + elasticsearch.ssl.key = cfg.elasticsearch.key; + elasticsearch.ssl.certificateAuthorities = cfg.elasticsearch.certificateAuthorities; + } // cfg.extraConf) + ))); + in { options.services.kibana = { enable = mkEnableOption "enable kibana service"; @@ -96,11 +121,29 @@ in { }; ca = mkOption { - description = "CA file to auth against elasticsearch."; + description = '' + CA file to auth against elasticsearch. + + It's recommended to use the option + when using kibana-5.4 or newer. + ''; default = null; type = types.nullOr types.path; }; + certificateAuthorities = mkOption { + description = '' + CA files to auth against elasticsearch. + + Please use the option when using kibana < 5.4 + because those old versions don't support setting multiple CA's. + + This defaults to the singleton list [ca] when the option is defined. + ''; + default = if isNull cfg.elasticsearch.ca then [] else [ca]; + type = types.listOf types.path; + }; + cert = mkOption { description = "Certificate file to auth against elasticsearch."; default = null; @@ -118,6 +161,7 @@ in { description = "Kibana package to use"; default = pkgs.kibana; defaultText = "pkgs.kibana"; + example = "pkgs.kibana5"; type = types.package; }; diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix new file mode 100644 index 00000000000..65ff1cac070 --- /dev/null +++ b/nixos/tests/elk.nix @@ -0,0 +1,95 @@ +# Test the ELK stack: Elasticsearch, Logstash and Kibana. + +import ./make-test.nix ({ pkgs, ...} : +let + esUrl = "http://localhost:9200"; +in { + name = "ELK"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco chaoflow offline basvandijk ]; + }; + + nodes = { + one = + { config, pkgs, ... }: { + # Not giving the machine at least 2060MB results in elasticsearch failing with the following error: + # + # OpenJDK 64-Bit Server VM warning: + # INFO: os::commit_memory(0x0000000085330000, 2060255232, 0) + # failed; error='Cannot allocate memory' (errno=12) + # + # There is insufficient memory for the Java Runtime Environment to continue. + # Native memory allocation (mmap) failed to map 2060255232 bytes for committing reserved memory. + # + # When setting this to 2500 I got "Kernel panic - not syncing: Out of + # memory: compulsory panic_on_oom is enabled" so lets give it even a + # bit more room: + virtualisation.memorySize = 3000; + + # For querying JSON objects returned from elasticsearch and kibana. + environment.systemPackages = [ pkgs.jq ]; + + services = { + logstash = { + enable = true; + package = pkgs.logstash5; + inputConfig = '' + exec { command => "echo -n flowers" interval => 1 type => "test" } + exec { command => "echo -n dragons" interval => 1 type => "test" } + ''; + filterConfig = '' + if [message] =~ /dragons/ { + drop {} + } + ''; + outputConfig = '' + file { + path => "/tmp/logstash.out" + codec => line { format => "%{message}" } + } + elasticsearch { + hosts => [ "${esUrl}" ] + } + ''; + }; + + elasticsearch = { + enable = true; + package = pkgs.elasticsearch5; + }; + + kibana = { + enable = true; + package = pkgs.kibana5; + elasticsearch.url = esUrl; + }; + }; + }; + }; + + testScript = '' + startAll; + + $one->waitForUnit("elasticsearch.service"); + + # Continue as long as the status is not "red". The status is probably + # "yellow" instead of "green" because we are using a single elasticsearch + # node which elasticsearch considers risky. + # + # TODO: extend this test with multiple elasticsearch nodes and see if the status turns "green". + $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red"); + + # Perform some simple logstash tests. + $one->waitForUnit("logstash.service"); + $one->waitUntilSucceeds("cat /tmp/logstash.out | grep flowers"); + $one->waitUntilSucceeds("cat /tmp/logstash.out | grep -v dragons"); + + # See if kibana is healthy. + $one->waitForUnit("kibana.service"); + $one->waitUntilSucceeds("curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green"); + + # See if logstash messages arive in elasticsearch. + $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); + $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); + ''; +}) diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix deleted file mode 100644 index 01f6a0358b2..00000000000 --- a/nixos/tests/logstash.nix +++ /dev/null @@ -1,41 +0,0 @@ -# This test runs logstash and checks if messages flows and -# elasticsearch is started. - -import ./make-test.nix ({ pkgs, ...} : { - name = "logstash"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow offline ]; - }; - - nodes = { - one = - { config, pkgs, ... }: - { - services = { - logstash = { - enable = true; - inputConfig = '' - exec { command => "echo flowers" interval => 1 type => "test" } - exec { command => "echo dragons" interval => 1 type => "test" } - ''; - filterConfig = '' - if [message] =~ /dragons/ { - drop {} - } - ''; - outputConfig = '' - stdout { codec => rubydebug } - ''; - }; - }; - }; - }; - - testScript = '' - startAll; - - $one->waitForUnit("logstash.service"); - $one->waitUntilSucceeds("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep flowers"); - $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons"); - ''; -}) diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix new file mode 100644 index 00000000000..4a4fc3e214f --- /dev/null +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -0,0 +1,45 @@ +{ stdenv, makeWrapper, fetchurl, elk5Version, nodejs, coreutils, which }: + +with stdenv.lib; +let + inherit (builtins) elemAt; + archOverrides = { + "i686" = "x86"; + }; + info = splitString "-" stdenv.system; + arch = (elemAt info 0); + elasticArch = archOverrides."${arch}" or arch; + plat = elemAt info 1; + shas = { + "x86_64-linux" = "1g5i81wq77fk6pyaq3rpfqs2m23xsbz2cndh3rg4b59ibg5qv0sq"; + "i686-linux" = "0pxnpg3g8l6hy8qz404kbkk5rd9y65jrzd0y9j8wr5fd4pqs7vgv"; + "x86_64-darwin" = "0pffl2hbck3s271jlzdibp5698djm5fdvj15w2knm815rs2kfbl5"; + }; +in stdenv.mkDerivation rec { + name = "kibana-${version}"; + version = elk5Version; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz"; + sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/libexec/kibana $out/bin + mv * $out/libexec/kibana/ + rm -r $out/libexec/kibana/node + makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ + --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" + sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + ''; + + meta = { + description = "Visualize logs and time-stamped data"; + homepage = http://www.elasticsearch.org/overview/kibana; + license = licenses.asl20; + maintainers = with maintainers; [ offline rickynils ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix new file mode 100644 index 00000000000..d4c78389e66 --- /dev/null +++ b/pkgs/misc/logging/beats/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, elk5Version, buildGoPackage, libpcap }: + +let beat = package : extraArgs : buildGoPackage (rec { + name = "${package}-${version}"; + version = elk5Version; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "1if16sqbhgxc7ahn9pak8av9rq9l8ldk44hr4w4g7lhxnqhmhsji"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ package ]; + + meta = with stdenv.lib; { + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = with maintainers; [ fadenb basvandijk ]; + platforms = platforms.linux; + }; + } // extraArgs); +in { + filebeat = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat = beat "packetbeat" { + buildInputs = [ libpcap ]; + meta.description = "Network packet analyzer that ships data to Elasticsearch"; + meta.longDescription = '' + Packetbeat is an open source network packet analyzer that ships the + data to Elasticsearch. + + Think of it like a distributed real-time Wireshark with a lot more + analytics features. The Packetbeat shippers sniff the traffic between + your application processes, parse on the fly protocols like HTTP, MySQL, + PostgreSQL, Redis or Thrift and correlate the messages into transactions. + ''; + }; +} diff --git a/pkgs/misc/logging/filebeat/default.nix b/pkgs/misc/logging/filebeat/default.nix deleted file mode 100644 index c33f34c6dc4..00000000000 --- a/pkgs/misc/logging/filebeat/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: - -buildGoPackage rec { - name = "filebeat-${version}"; - version = "5.2.2"; - - src = fetchFromGitHub { - owner = "elastic"; - repo = "beats"; - rev = "v${version}"; - sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; - }; - - goPackagePath = "github.com/elastic/beats"; - - subPackages = [ "filebeat" ]; - - meta = with stdenv.lib; { - description = "Lightweight shipper for logfiles"; - homepage = https://www.elastic.co/products/beats; - license = licenses.asl20; - maintainers = [ maintainers.fadenb ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/logging/heartbeat/default.nix b/pkgs/misc/logging/heartbeat/default.nix deleted file mode 100644 index faa558589f2..00000000000 --- a/pkgs/misc/logging/heartbeat/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: - -buildGoPackage rec { - name = "heartbeat-${version}"; - version = "5.2.2"; - - src = fetchFromGitHub { - owner = "elastic"; - repo = "beats"; - rev = "v${version}"; - sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; - }; - - goPackagePath = "github.com/elastic/beats"; - - subPackages = [ "heartbeat" ]; - - meta = with stdenv.lib; { - description = "Lightweight shipper for uptime monitoring"; - homepage = https://www.elastic.co/products/beats; - license = licenses.asl20; - maintainers = [ maintainers.fadenb ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/logging/metricbeat/default.nix b/pkgs/misc/logging/metricbeat/default.nix deleted file mode 100644 index fcb2376a93d..00000000000 --- a/pkgs/misc/logging/metricbeat/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: - -buildGoPackage rec { - name = "metricbeat-${version}"; - version = "5.2.2"; - - src = fetchFromGitHub { - owner = "elastic"; - repo = "beats"; - rev = "v${version}"; - sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; - }; - - goPackagePath = "github.com/elastic/beats"; - - subPackages = [ "metricbeat" ]; - - meta = with stdenv.lib; { - description = "Lightweight shipper for metrics"; - homepage = https://www.elastic.co/products/beats; - license = licenses.asl20; - maintainers = [ maintainers.fadenb ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/logging/packetbeat/default.nix b/pkgs/misc/logging/packetbeat/default.nix deleted file mode 100644 index d4445bec998..00000000000 --- a/pkgs/misc/logging/packetbeat/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, libpcap }: - -buildGoPackage rec { - name = "packetbeat-${version}"; - version = "5.2.2"; - - src = fetchFromGitHub { - owner = "elastic"; - repo = "beats"; - rev = "v${version}"; - sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; - }; - - goPackagePath = "github.com/elastic/beats"; - - subPackages = [ "packetbeat" ]; - - buildInputs = [ libpcap ]; - - meta = with stdenv.lib; { - description = "Network packet analyzer that ships data to Elasticsearch"; - longDescription = '' - Packetbeat is an open source network packet analyzer that ships the - data to Elasticsearch. - - Think of it like a distributed real-time Wireshark with a lot more - analytics features. The Packetbeat shippers sniff the traffic between - your application processes, parse on the fly protocols like HTTP, MySQL, - PostgreSQL, Redis or Thrift and correlate the messages into transactions. - ''; - homepage = https://www.elastic.co/products/beats; - license = licenses.asl20; - maintainers = [ maintainers.fadenb ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 030c4730f38..512337cf382 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: +{ stdenv, fetchurl, elk5Version, makeWrapper, jre, utillinux, getopt }: with stdenv.lib; stdenv.mkDerivation rec { - version = "5.4.0"; + version = elk5Version; name = "elasticsearch-${version}"; src = fetchurl { diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix new file mode 100644 index 00000000000..13387b5c1a9 --- /dev/null +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, elk5Version, makeWrapper, jre }: + +stdenv.mkDerivation rec { + version = elk5Version; + name = "logstash-${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + sha256 = "019bhsnbbbg1a4g9jf02j3jb1xhhmrr3i7882s5l4pmkyn1d3gd1"; + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + buildInputs = [ + makeWrapper jre + ]; + + installPhase = '' + mkdir -p $out + cp -r {Gemfile*,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" + ''; + + meta = with stdenv.lib; { + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; + homepage = https://www.elastic.co/products/logstash; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.wjlroe maintainers.offline ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea00365659d..5f838d3156c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -667,6 +667,12 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; + inherit (callPackages ../misc/logging/beats { }) + filebeat + heartbeat + metricbeat + packetbeat; + bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; @@ -968,8 +974,6 @@ with pkgs; fastJson = callPackage ../development/libraries/fastjson { }; - filebeat = callPackage ../misc/logging/filebeat { }; - filebench = callPackage ../tools/misc/filebench { }; fsmon = callPackage ../tools/misc/fsmon { }; @@ -1018,8 +1022,6 @@ with pkgs; gti = callPackage ../tools/misc/gti { }; - heartbeat = callPackage ../misc/logging/heartbeat { }; - heatseeker = callPackage ../tools/misc/heatseeker { }; hexio = callPackage ../development/tools/hexio { }; @@ -1050,8 +1052,6 @@ with pkgs; meson = callPackage ../development/tools/build-managers/meson { }; - metricbeat = callPackage ../misc/logging/metricbeat { }; - mp3fs = callPackage ../tools/filesystems/mp3fs { }; mpdcron = callPackage ../tools/audio/mpdcron { }; @@ -1732,6 +1732,9 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; + # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. + elk5Version = "5.4.0"; + elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; @@ -2625,7 +2628,8 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - kibana = callPackage ../development/tools/misc/kibana { }; + kibana = callPackage ../development/tools/misc/kibana { }; + kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -2685,7 +2689,8 @@ with pkgs; lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash = callPackage ../tools/misc/logstash { }; + logstash = callPackage ../tools/misc/logstash { }; + logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; @@ -3500,8 +3505,6 @@ with pkgs; nix = nixUnstable; }; - packetbeat = callPackage ../misc/logging/packetbeat { }; - packetdrill = callPackage ../tools/networking/packetdrill { }; pakcs = callPackage ../development/compilers/pakcs {}; From 3b1c4fce4fc18cd8ce51fc895527ecfa273d2761 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Tue, 23 May 2017 17:56:00 -0400 Subject: [PATCH 087/152] psensor: init at 1.2.0 psensor is a graphical hardware monitoring application for Linux --- .../os-specific/linux/nvidia-x11/settings.nix | 41 ++++++++++++++++--- pkgs/tools/system/psensor/default.nix | 33 +++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/system/psensor/default.nix diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 9c8f3f9cd74..ddc190a08e6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,18 +1,43 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau +{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau, libXext , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: +let + src = fetchurl { + url = "https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${nvidia_x11.version}.tar.bz2"; + inherit sha256; + }; + + libXNVCtrl = stdenv.mkDerivation { + name = "libXNVCtrl-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + inherit src; + + buildInputs = [ libXrandr libXext ]; + + preBuild = '' + cd src/libXNVCtrl + ''; + + installPhase = '' + mkdir -p $out/lib + mkdir -p $out/include/NVCtrl + + cp libXNVCtrl.a $out/lib + cp NVCtrl.h $out/include/NVCtrl + cp NVCtrlLib.h $out/include/NVCtrl + ''; + }; + +in + stdenv.mkDerivation rec { name = "nvidia-settings-${nvidia_x11.version}"; inherit (nvidia_x11) version; - - src = fetchurl { - url = "https://download.nvidia.com/XFree86/nvidia-settings/${name}.tar.bz2"; - inherit sha256; - }; + inherit src; nativeBuildInputs = [ pkgconfig m4 ]; @@ -52,6 +77,10 @@ stdenv.mkDerivation rec { $out/bin/$binaryName ''; + passthru = { + inherit libXNVCtrl; + }; + meta = with stdenv.lib; { homepage = "http://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix new file mode 100644 index 00000000000..b62bb92564c --- /dev/null +++ b/pkgs/tools/system/psensor/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchurl, pkgconfig, lm_sensors, libgtop, libatasmart, gtk3 +, libnotify, udisks2, libXNVCtrl, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "psensor-${version}"; + + version = "1.2.0"; + + src = fetchurl { + url = "http://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; + sha256 = "1smbidbby4rh14jnh9kn7y64qf486aqnmyxcgacjvkz27cqqnw4r"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ + lm_sensors libgtop libatasmart gtk3 libnotify udisks2 + ]; + + preConfigure = '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include" + NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib" + ''; + + meta = with lib; { + description = "Graphical hardware monitoring application for Linux"; + homepage = "https://wpitchoune.net/psensor/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f838d3156c..56769470689 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3768,6 +3768,10 @@ with pkgs; psutils = callPackage ../tools/typesetting/psutils { }; + psensor = callPackage ../tools/system/psensor { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; + pv = callPackage ../tools/misc/pv { }; pwgen = callPackage ../tools/security/pwgen { }; From fd2976bb20afed977fee27562b7454abbc402121 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 14 Jun 2017 10:22:31 +0800 Subject: [PATCH 088/152] syncthing: 0.14.29 -> 0.14.30 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 87018c1e08e..e0ba43986e3 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.29"; + version = "0.14.30"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "01q0xlixjvmzs0acrg54b07fp68sa5axh1wb4lz25mmxfjl04v1d"; + sha256 = "14f2v8i8ga9vii015vbx70k1vd85ac0ygykz2z614ii932g5lfdr"; }; buildInputs = [ go removeReferencesTo ]; From 89b1d4cbe2fe1f57cbf3397dbe885982adf6553c Mon Sep 17 00:00:00 2001 From: romildo Date: Tue, 13 Jun 2017 21:17:13 -0300 Subject: [PATCH 089/152] greybird: 3.22.3 -> 3.22.4 --- pkgs/misc/themes/greybird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 515b8fc712a..b1e104b7c3e 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "greybird"; - version = "3.22.3"; + version = "3.22.4"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0hz8q2sf2kcxixzw088rny6zmhfls5z49zlhm8m9013wph799a8c"; + sha256 = "1xh6vi4rmxmkrgy9qskcl8q6014qnsn19xjjwbmwf8n6yr07scl3"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; From 773cc7c03d8f3579453b155abb5045062dbb9ea5 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Tue, 13 Jun 2017 20:55:38 +0200 Subject: [PATCH 090/152] pythonPackages.hug: Disable on python2 Hug is only supported on python3. --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87c469c937f..55128c4aaa4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11191,6 +11191,7 @@ in { url = "mirror://pypi/h/hug/${name}.tar.gz"; sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c"; }; + disabled = !isPy3k; propagatedBuildInputs = with self; [ falcon requests ]; From cc0ce6b7a61976c9ea517d12daf62505365c0b8a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 14 Jun 2017 08:32:42 +0200 Subject: [PATCH 091/152] rofi-pass: 1.4.3 -> 1.5.0 --- pkgs/tools/security/pass/rofi-pass.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 165091d934a..2f3fab6de81 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; rev = version; - sha256 = "09wpkxg5b7xicdisgbhlfr8vs1iv7z9sc58pjl0p198yap57khq5"; + sha256 = "08chbn966140p3gmgalkhhm01ym64fvb6d2w5mbwpyl0986m89ba"; }; buildInputs = [ makeWrapper ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = https://github.com/carnager/rofi-pass; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny garbas ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; }; From 537944ea77d100a56345df449d9a05622f5b949d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 14 Jun 2017 09:19:51 +0100 Subject: [PATCH 092/152] gajim: 0.16.7 -> 0.16.8 --- .../networking/instant-messengers/gajim/default.nix | 9 +++++---- .../instant-messengers/gajim/fix-tests.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1228804f5b9..a21a82848e0 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -25,13 +25,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16.7"; + version = "0.16.8"; src = fetchurl { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "18srrsswq09i54gcqqy0ylmrix1rrq43f0b8sz1lijr39h3ayw3j"; + sha256 = "009cpzqh4zy7hc9pq3r5m4lgagwawhjab13rjzavb0n9ggijcscb"; }; patches = let @@ -42,11 +42,12 @@ stdenv.mkDerivation rec { # sha256 = ""; #}; }; - in mapAttrsToList (name: { rev, sha256 }: fetchurl { + in (mapAttrsToList (name: { rev, sha256 }: fetchurl { name = "gajim-${name}.patch"; url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff"; inherit sha256; - }) cherries; + }) cherries) + ++ [./fix-tests.patch]; # https://dev.gajim.org/gajim/gajim/issues/8660 postPatch = '' sed -i -e '0,/^[^#]/ { diff --git a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch new file mode 100644 index 00000000000..cb866bb2d73 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch @@ -0,0 +1,13 @@ +diff --git a/src/common/gajim.py b/src/common/gajim.py +index 4a5d884b6..95d401b67 100644 +--- a/src/common/gajim.py ++++ b/src/common/gajim.py +@@ -415,7 +415,7 @@ def get_jid_from_account(account_name, full=False): + jid = name + '@' + hostname + if full: + resource = connections[account_name].server_resource +- jid += '/' + resource ++ jid += '/' + str(resource) + return jid + + def get_our_jids(): From 9cad7076d1bc5475a857fd2c6e9a56d9ed254252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 14 Jun 2017 10:33:37 +0200 Subject: [PATCH 093/152] Fix #26441: avoid infinite recursion --- pkgs/development/haskell-modules/generic-stack-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 53772b90dfb..fbc586bd74c 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -5,7 +5,7 @@ with stdenv.lib; { buildInputs ? [] , extraArgs ? [] , LD_LIBRARY_PATH ? [] -, ghc ? ghc +, ghc' ? ghc , ... }@args: @@ -14,7 +14,7 @@ stdenv.mkDerivation (args // { buildInputs = buildInputs ++ optional stdenv.isLinux glibcLocales ++ - [ ghc pkgconfig ]; + [ ghc' pkgconfig ]; STACK_PLATFORM_VARIANT="nix"; STACK_IN_NIX_SHELL=1; From 3803864ca61b7737e3b6be843fc8e09598ce4bda Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 14 Jun 2017 10:57:38 +0200 Subject: [PATCH 094/152] thefuck: init at 3.18 (#26529) --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/thefuck.nix | 31 +++++++++++++++++++++++++++++ pkgs/tools/misc/thefuck/default.nix | 27 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 61 insertions(+) create mode 100644 nixos/modules/programs/thefuck.nix create mode 100644 pkgs/tools/misc/thefuck/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 13924f7e507..bdede1726a1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -99,6 +99,7 @@ ./programs/spacefm.nix ./programs/ssh.nix ./programs/ssmtp.nix + ./programs/thefuck.nix ./programs/tmux.nix ./programs/venus.nix ./programs/vim.nix diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix new file mode 100644 index 00000000000..433a0ca95fe --- /dev/null +++ b/nixos/modules/programs/thefuck.nix @@ -0,0 +1,31 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.thefuck; +in + { + options = { + programs.thefuck = { + enable = mkEnableOption "thefuck"; + + alias = mkOption { + default = "fuck"; + type = types.string; + + description = '' + `thefuck` needs an alias to be configured. + The default value is `fuck`, but you can use anything else as well. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ thefuck ]; + environment.shellInit = '' + eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias}) + ''; + }; + } diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix new file mode 100644 index 00000000000..00fde7acafb --- /dev/null +++ b/pkgs/tools/misc/thefuck/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgs, ... }: + +pkgs.pythonPackages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "thefuck"; + version = "3.18"; + + src = fetchurl { + url = "https://github.com/nvbn/${pname}/archive/${version}.tar.gz"; + sha256 = "1xsvkqh89rgxq5w03mnlcfkn9y39nfwhb2pjabjspcc2mi2mq5y6"; + }; + + propagatedBuildInputs = with pkgs.pythonPackages; [ + psutil + colorama + six + decorator + pathlib2 + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/nvbn/thefuck"; + description = "Magnificent app which corrects your previous console command."; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56769470689..ccfdcb9385b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4342,6 +4342,8 @@ with pkgs; thc-hydra = callPackage ../tools/security/thc-hydra { }; + thefuck = callPackage ../tools/misc/thefuck { }; + thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; tiled = libsForQt5.callPackage ../applications/editors/tiled { }; From f6fbbabcb70a19428a7adde2e4f1ec477c439654 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 14 Jun 2017 11:26:39 +0200 Subject: [PATCH 095/152] pythonPackages.django: 1.11.1 -> 1.11.2 (#26557) Bugfix release. See https://docs.djangoproject.com/en/1.11/releases/1.11.2/ --- pkgs/development/python-modules/django/1_11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 0845352fba1..f0035095b04 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.1"; + version = "1.11.2"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "131swdygapgrnkicvksqf904gkrfvljcrsqq8z82rvzf4bwgvkmv"; + sha256 = "05q6bgm3vkdqg72i1m1z8bp2jdrm9n1c37aka1brwkyzh820fnrw"; }; patches = [ From 79dd4deda5a5ee44359a88cdcbbc22a15ba26224 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 14 Jun 2017 11:29:31 +0200 Subject: [PATCH 096/152] Ultrastar (#26524) * ultrastardx-beta: init at 1.3.5 * libbass, libbass_fx: init at 24 * ultrastar-creator: init at 2017-04-12 * buildSupport/plugins.nix: add diffPlugins Helper function to compare expected plugin lists to the found plugins. * ultrastar-manager: init at 2017-05-24 The plugins are built in their own derivations, speeding up (re-)compilation. The `diffPlugins` function from `beets` is reused to test for changes in the plugin list on updates. * beets: switch to diffPlugins The function is basically just extracted for better reusability. --- pkgs/build-support/plugins.nix | 29 +++++ .../libraries/audio/libbass/default.nix | 59 +++++++++ .../ultrastardx/{default.nix => 1.1.nix} | 0 pkgs/games/ultrastardx/1.3-beta.nix | 49 +++++++ pkgs/tools/audio/beets/default.nix | 11 +- pkgs/tools/misc/ultrastar-creator/default.nix | 41 ++++++ pkgs/tools/misc/ultrastar-manager/default.nix | 121 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 15 ++- 8 files changed, 315 insertions(+), 10 deletions(-) create mode 100644 pkgs/build-support/plugins.nix create mode 100644 pkgs/development/libraries/audio/libbass/default.nix rename pkgs/games/ultrastardx/{default.nix => 1.1.nix} (100%) create mode 100644 pkgs/games/ultrastardx/1.3-beta.nix create mode 100644 pkgs/tools/misc/ultrastar-creator/default.nix create mode 100644 pkgs/tools/misc/ultrastar-manager/default.nix diff --git a/pkgs/build-support/plugins.nix b/pkgs/build-support/plugins.nix new file mode 100644 index 00000000000..bf8a982a88f --- /dev/null +++ b/pkgs/build-support/plugins.nix @@ -0,0 +1,29 @@ +{ stdenv }: +# helper functions for packaging programs with plugin systems +{ + + /* Takes a list of expected plugin names + * and compares it to the found plugins given in the file, + * one plugin per line. + * If the lists differ, the build fails with a nice message. + * + * This is helpful to ensure maintainers don’t miss + * the addition or removal of a plugin. + */ + diffPlugins = expectedPlugins: foundPluginsFilePath: '' + # sort both lists first + plugins_expected=$(mktemp) + (${stdenv.lib.concatMapStrings (s: "echo \"${s}\";") expectedPlugins}) \ + | sort -u > "$plugins_expected" + plugins_found=$(mktemp) + sort -u "${foundPluginsFilePath}" > "$plugins_found" + + if ! mismatches="$(diff -y "$plugins_expected" "$plugins_found")"; then + echo "The the list of expected plugins (left side) doesn't match" \ + "the list of plugins we found (right side):" >&2 + echo "$mismatches" >&2 + exit 1 + fi + ''; + +} diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix new file mode 100644 index 00000000000..dedfa5ceb35 --- /dev/null +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -0,0 +1,59 @@ +{ stdenv, unzip, fetchurl, writeText }: + +let + version = "24"; + + allBass = { + bass = { + h = "bass.h"; + so = { + i686_linux = "libbass.so"; + x86_64-linux = "x64/libbass.so"; + }; + urlpath = "bass${version}-linux.zip"; + sha256 = "1a2z9isabkymz7qmkgklbjpj2wxkvv1cngfp9aj0c9178v97pjd7"; + }; + + bass_fx = { + h = "C/bass_fx.h"; + so = { + i686_linux = "libbass_fx.so"; + x86_64-linux = "x64/libbass_fx.so"; + }; + urlpath = "z/0/bass_fx${version}-linux.zip"; + sha256 = "0j1cbq88j3vnqf2bibcqnfhciz904w48ldgycyh9d8954hwyg22m"; + }; + }; + + dropBass = name: bass: stdenv.mkDerivation { + name = "lib${name}-${version}"; + + src = fetchurl { + url = "https://www.un4seen.com/files/${bass.urlpath}"; + inherit (bass) sha256; + }; + unpackCmd = '' + mkdir out + ${unzip}/bin/unzip $curSrc -d out + ''; + + lpropagatedBuildInputs = [ unzip ]; + dontBuild = true; + installPhase = + let so = + if bass.so ? ${stdenv.system} then bass.so.${stdenv.system} + else abort "${name} not packaged for ${stdenv.system} (yet)."; + in '' + mkdir -p $out/{lib,include} + install -m644 -t $out/lib/ ${so} + install -m644 -t $out/include/ ${bass.h} + ''; + + meta = with stdenv.lib; { + description = "Shareware audio library"; + homepage = https://www.un4seen.com/; + license = licenses.unfreeRedistributable; + }; + }; + +in stdenv.lib.mapAttrs dropBass allBass diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/1.1.nix similarity index 100% rename from pkgs/games/ultrastardx/default.nix rename to pkgs/games/ultrastardx/1.1.nix diff --git a/pkgs/games/ultrastardx/1.3-beta.nix b/pkgs/games/ultrastardx/1.3-beta.nix new file mode 100644 index 00000000000..ca7d6b35a21 --- /dev/null +++ b/pkgs/games/ultrastardx/1.3-beta.nix @@ -0,0 +1,49 @@ +{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +, lua, fpc, pcre, portaudio, freetype, libpng +, SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf +, ffmpeg, sqlite, zlib, libX11, mesa }: + +let + sharedLibs = [ + pcre portaudio freetype + SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf + sqlite lua zlib libX11 mesa ffmpeg + ]; + +in stdenv.mkDerivation rec { + name = "ultrastardx-${version}"; + version = "1.3.5-beta"; + src = fetchFromGitHub { + owner = "UltraStar-Deluxe"; + repo = "USDX"; + rev = "v${version}"; + sha256 = "0qp64qsj29a08cbv3i52jm1w2pcklw6ya5sniycs24zxggza5pkn"; + }; + + buildInputs = [ + pkgconfig autoreconfHook + fpc libpng + ] ++ sharedLibs; + + postPatch = '' + # autoconf substitutes strange things otherwise + substituteInPlace src/config.inc.in \ + --subst-var-by libpcre_LIBNAME libpcre.so.1 + ''; + + preBuild = with stdenv.lib; + let items = concatMapStringsSep " " (x: "-rpath ${getLib x}/lib") sharedLibs; + in '' + export NIX_LDFLAGS="$NIX_LDFLAGS ${items}" + ''; + + # dlopened libgcc requires the rpath not to be shrinked + dontPatchELF = true; + + meta = with stdenv.lib; { + homepage = http://ultrastardx.sourceforge.net/; + description = "Free and open source karaoke game"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ profpatsch ]; + }; +} diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c1418d152dd..35b4557a33c 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, glibcLocales +{ stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins , pythonPackages, imagemagick, gobjectIntrospection, gst_all_1 , enableAcousticbrainz ? true @@ -158,20 +158,13 @@ in pythonPackages.buildPythonApplication rec { doCheck = true; preCheck = '' - (${concatMapStrings (s: "echo \"${s}\";") allPlugins}) \ - | sort -u > plugins_defined find beetsplug -mindepth 1 \ \! -path 'beetsplug/__init__.py' -a \ \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \ | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \ | sort -u > plugins_available - if ! mismatches="$(diff -y plugins_defined plugins_available)"; then - echo "The the list of defined plugins (left side) doesn't match" \ - "the list of available plugins (right side):" >&2 - echo "$mismatches" >&2 - exit 1 - fi + ${diffPlugins allPlugins "plugins_available"} ''; checkPhase = '' diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix new file mode 100644 index 00000000000..0700c43b26e --- /dev/null +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub +, qmakeHook, qtbase, makeQtWrapper +, pkgconfig, taglib, libbass, libbass_fx }: + +stdenv.mkDerivation rec { + name = "ultrastar-creator-${version}"; + version = "2017-04-12"; + + src = fetchFromGitHub { + owner = "UltraStar-Deluxe"; + repo = "UltraStar-Creator"; + rev = "ac519a003f8283bfbe5e2d8e9cdff3a3faf97001"; + sha256 = "00idr8a178gvmylq722n13bli59kpxlsy5d8hlplqn7fih48mnzi"; + }; + + postPatch = with stdenv.lib; '' + # we don’t want prebuild binaries checked into version control! + rm -rf lib include + sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \ + -e 's|-L".*unix"||' \ + -e "/QMAKE_POST_LINK/d" \ + -e "s|../include/bass|${getLib libbass}/include|g" \ + -e "s|../include/bass_fx|${getLib libbass_fx}/include|g" \ + -e "s|../include/taglib|${getLib taglib}/include|g" \ + -i src/UltraStar-Creator.pro + ''; + + preConfigure = '' + cd src + ''; + + nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ]; + buildInputs = [ qtbase taglib libbass libbass_fx ]; + + meta = with stdenv.lib; { + description = "Ultrastar karaoke song creation tool"; + homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator; + license = licenses.gpl2; + maintainers = with maintainers; [ profpatsch ]; + }; +} diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix new file mode 100644 index 00000000000..61b2c6aaa22 --- /dev/null +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -0,0 +1,121 @@ +{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmakeHook, diffPlugins +, qtbase, qtmultimedia, makeQtWrapper +, taglib, libmediainfo, libzen, libbass }: + +let + version = "2017-05-24"; + rev = "eed5dc41c849ab29b2dee37d97852fffdb45e390"; + sha256 = "1ymdgaffazndg9vhh47qqjr5873ld7j066hycp670r08bm519ysg"; + buildInputs = [ qtbase qtmultimedia taglib libmediainfo libzen libbass ]; + + plugins = [ + "albumartex" + "amazon" + "audiotag" + "cleanup" + "freecovers" + "lyric" + "preparatory" + "rename" + ]; + + patchedSrc = + let src = fetchFromGitHub { + owner = "UltraStar-Deluxe"; + repo = "UltraStar-Manager"; + inherit rev sha256; + }; + in stdenv.mkDerivation { + name = "${src.name}-patched"; + inherit src; + phases = [ "unpackPhase" "patchPhase" ]; + + patchPhase = with stdenv.lib; '' + # we don’t want prebuild binaries checked into version control! + rm -rf lib include + + # fix up main project file + sed -e 's|-L.*unix.*lbass.*$|-lbass|' \ + -e "/QMAKE_POST_LINK/d" \ + -e "s|../include/bass|${getLib libbass}/include|g" \ + -e "s|../include/taglib|${getLib taglib}/include|g" \ + -e "s|../include/mediainfo|${getLib libmediainfo}/include|g" \ + -i src/UltraStar-Manager.pro + + # if more plugins start depending on ../../../include, + # it should be abstracted out for all .pro files + sed -e "s|../../../include/taglib|${getLib taglib}/include/taglib|g" \ + -i src/plugins/audiotag/audiotag.pro + + mkdir $out + mv * $out + ''; + }; + + patchApplicationPath = file: path: '' + sed -e "s|QCore.*applicationDirPath()|QString(\"${path}\")|" -i "${file}" + ''; + + buildPlugin = name: stdenv.mkDerivation { + name = "ultrastar-manager-${name}-plugin-${version}"; + src = patchedSrc; + + buildInputs = [ qmakeHook ] ++ buildInputs; + + postPatch = '' + sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \ + -i src/plugins/${name}/${name}.pro + + # plugins use the application’s binary folder (wtf) + for f in $(grep -lr "QCoreApplication::applicationDirPath" src/plugins); do + ${patchApplicationPath "$f" "\$out"} + done + + ''; + preConfigure = '' + cd src/plugins/${name} + ''; + }; + + builtPlugins = + symlinkJoin { + name = "ultrastar-manager-plugins-${version}"; + paths = map buildPlugin plugins; + }; + +in stdenv.mkDerivation { + name = "ultrastar-manager-${version}"; + src = patchedSrc; + + postPatch = '' + sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \ + -i src/UltraStar-Manager.pro + # patch plugin manager to point to the collected plugin folder + ${patchApplicationPath "src/plugins/QUPluginManager.cpp" builtPlugins} + ''; + + buildPhase = '' + find -path './src/plugins/*' -prune -type d -print0 \ + | xargs -0 -i'{}' basename '{}' \ + | sed -e '/shared/d' \ + > found_plugins + ${diffPlugins plugins "found_plugins"} + + cd src && qmake && make + ''; + + # is not installPhase so that qt post hooks can run + preInstall = '' + make install + ''; + + nativeBuildInputs = [ makeQtWrapper pkgconfig ]; + inherit buildInputs; + + meta = with stdenv.lib; { + description = "Ultrastar karaoke song manager"; + homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager; + license = licenses.gpl2; + maintainers = with maintainers; [ profpatsch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccfdcb9385b..cbe2a9bfc5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -98,6 +98,8 @@ with pkgs; inherit (haskellPackages) dhall-nix; }; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; + dockerTools = callPackage ../build-support/docker { }; docker_compose = pythonPackages.docker_compose; @@ -8325,6 +8327,9 @@ with pkgs; inherit (ocamlPackages_4_02) bap ocaml findlib ctypes; }; + libbass = (callPackage ../development/libraries/audio/libbass { }).bass; + libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; + libbluedevil = callPackage ../development/libraries/libbluedevil { }; libbdplus = callPackage ../development/libraries/libbdplus { }; @@ -17327,7 +17332,15 @@ with pkgs; ultimatestunts = callPackage ../games/ultimatestunts { }; - ultrastardx = callPackage ../games/ultrastardx { + ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { }; + + ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; + + ultrastardx = callPackage ../games/ultrastardx/1.1.nix { + ffmpeg = ffmpeg_0; + lua = lua5; + }; + ultrastardx-beta = callPackage ../games/ultrastardx/1.3-beta.nix { ffmpeg = ffmpeg_0; lua = lua5; }; From 264ec9242fa36b5990851af589d05f7ad32c6387 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 13 Jun 2017 21:14:12 +0900 Subject: [PATCH 097/152] flashplayer: 25.0.0.171 -> 26.0.0.126 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------ .../mozilla-plugins/flashplayer/standalone.nix | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 3de495ae327..01f4b03e4ca 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "25.0.0.171"; + version = "26.0.0.126"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0g2955wybwqlcgslm0mfi0jdnpih1w10lkzm5g5am4smgpch8prs"; + sha256 = "17ivhkdkbnzxr10ln1ix30k1hmaak5p9zzcchdyrjxdpzfk5qq7s"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 69fdb285d6f..5936c86c1cc 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,25 +73,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "25.0.0.171"; + version = "26.0.0.126"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_npapi_linux_debug.${arch}.tar.gz" else "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; sha256 = if debug then if arch == "x86_64" then - "0rm7kdb8h1pf9z2sl3lv8siyizz3dw4fyfmizn48622nsfh13dzd" + "0i5rr8bymbdzwqpns854i2r9390av89v1ikh8msincczq5vpj012" else - "1akvvya0jn708ifmrf4pbpp3dpi10i3mgyld46275lcwpz8xhyw5" + "1mzq3wvq6rxqfdlapd0b1ymw7389414jxwhkd6wk3677qdhr1y42" else if arch == "x86_64" then - "1r6cr00ax590jgjfp20wya67gkpw6cw0dgb9ixvlxnld4wi4mzk0" + "0684kizzfwfzaj0i54cdlkx3fqb3kyhb9jw88n031bjrzv7ddiz7" else - "1x326qihprq59s70szf0yh96p78mbnkw41lhar71128nv91mnfc3"; + "1pn15wnldabacmahlqdsl8nd60982j77bghjlf2cdc7drysby3ns"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 94f6d8bf26c..e29af0eaf4e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,19 +55,19 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "25.0.0.171"; + version = "26.0.0.126"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1llvglydsqp5r9f903bzn8i09zg6rcka7lzxlhb8xi0gbw4imsv2" + "17s55b1ncjj0hnldjmxm133z0i4jf49wbh4sn1cfwrw6xrhgbkiw" else - "1sx20mgja17hi6zp5ygqg4sklp5h0h55j3jw5b759j9c2x1frq5g"; + "02j98ji2jw2sxrs9hhlkkdrhpf2c4hc336cfvqzdf1iajza5was8"; }; nativeBuildInputs = [ unzip ]; From 6cf604828568f0594db75daae39498f055c1a01f Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 14 Jun 2017 21:10:49 +0900 Subject: [PATCH 098/152] firefox-bin: 53.0.3 -> 54.0 --- .../browsers/firefox-bin/release_sources.nix | 756 +++++++++--------- 1 file changed, 383 insertions(+), 373 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 44066161448..7bc97b093a4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,935 +1,945 @@ { - version = "53.0.3"; + version = "54.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ach/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ach/firefox-54.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3ed2b420a4e9e1d05c4fc8750f0f426283a8c10ef914a163ed203ce65368bdaf11191151a17b0a5efcf80f7fc5ca5d910fd58e7afabe650328792aae36e1ab52"; + sha512 = "d6ba946848d9e771def1a4cf28a7a43c3dca0d6f1bed0a51c6ebeaef59fc8df808c8cc9bd8d016c2ce9e21e8dee35989ed6575f6047735a7ebe62e75f68fbefe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/af/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/af/firefox-54.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e3fd2b922d6371ac4908dad8a18ab5fc2a331f6f07b369bcd25465f958c6425a61a737b20b490a59cd27484fde718ebe5139c8fa5149ea48d4a47d7149d7ee28"; + sha512 = "23564ab7f741ed5eccc2178a5fa3f72941bc843dbd0ad4f265467cf6fe6fb3afe65238d9026a5dc036e91aa0fcc32c8aa8a56d9d514df9c02642fa61c00360ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/an/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/an/firefox-54.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ead664ef262bccfed1326f55df271afdcbcbd1e172dd413c0488b2590a22ee8ba828d4e78df77ce7df3310b0e6e64cc446775093efa858baacee88f5a986901c"; + sha512 = "22c2ff25acc8b573fa975ad0a002cc1babda188c60635c75a618d8ec008a14c79d62bec4a432a3b18b11cf38836a70c62156aa7f6991fac50f744ab5141ad52b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ar/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ar/firefox-54.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a4a50be0ddf294f11f083956583c0ad2e2475a77d9f7d93669ef0fa9b81c11a3bbb3ac3531b213ebbc0be1ab68dd8c9ccdb1d6308eca91b48de9bd5712ac90ed"; + sha512 = "8ebb9385e8a988c5c1215030833b694300df4f6415b592059fc286fd2b8ddc5e2b7b3e0ed09514c4b97cbeb96d6b463a1105b70f9a7a18833ff4142b4de01661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/as/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/as/firefox-54.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "93260ffc4f050ac7731771e07b84b749e7dfa1b5ae44daf9e2149e794220911805837f56a47777debb5dd321a50295723e9c6289f02045db949a1e5bc773a3da"; + sha512 = "2c51fed49a6be6f8162a8b67a851d8ce5ddc438a7c10dbb77cd3ab3d839d7737839ee0104d8a11dad8ed98923346d7658305ab291b8843e87a653f33fe342a60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ast/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ast/firefox-54.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f55ef36a1985d30852b84b6fe0255534c1d425e54dbfdb8a50c538869cad59f8a9089f0129dfe61f9c2f834c560050233c9ba87638846eb833d112516273c54b"; + sha512 = "a2d9c266dadc87aa7c3a0d57b31b4dc28ae674fb19a6ceafbf936f6fcb7ee86eda5f2ff2ad52b1567376aaf637c77bbcfcae62b8c526c62c2d7ebc87c8a2501b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/az/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/az/firefox-54.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "0e07ad2848c0c2f45fa7cbaaa80ccc505458766dcaff7cb9bbd060c1a05bcf6b1ca85e602a78cb6cb6b57b95c7b49df374021a2ac429a4e8f99d2b08864ab215"; + sha512 = "af5617504e53c360a9b1a2d40dc9231d3518115f3d8149e9e7aff8eabed4d1c86467d3634c8c2278e7e10039952feca0513a62934e52645410aa85069123efaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bg/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bg/firefox-54.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a1d253a65f790faf026dc4431fc090677a001697d575c172270228abddf29a3574d2a30f519938b1a950b2f3a3bfba8efc5218fea90e5a9d11c158a8d1dd6491"; + sha512 = "2f13be1e976b02769e1c47ea1dfee7e8bc940c524c4881daeffe10500d7fcc662f00273156699ba37d82fe4f52dded2e2b34cba1caa22fa6fb9184d4ed7d2ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bn-BD/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bn-BD/firefox-54.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "1a5dbe0fc52a8daf5c13b055b1cb12bf7eff5b5ca6715abe78b6ef1093efcdb3744fc268955d62258a7580b2bd363435bdb289f9db5c91eff294736b272b20f2"; + sha512 = "c4f9f249788df7e10fc226cd10ba8d4638743b65b46cc87b97460e7e551cff8d814a93ba41da294f409b032fdc05b19ab9774a09d6b62458a1ab695805757dd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bn-IN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bn-IN/firefox-54.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "487fc98d5a1b15344287e8088053c43a81633ac4a6b567c41fd4b15886a02830e12dfa98c673f1076ab5b90e1e7ceae924e28415913a6cfefe6599915177c17f"; + sha512 = "bb6d4dfe207bd7fb018a6a473ac1c3c63d13e4c4aeb152174579c85a29b503d382c02df420028f1b98335fbef5ccb1a712e72cf0eca889f841e3b45a30d98db3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/br/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/br/firefox-54.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "37bca2e9f120ab1a491ca318e0440a3704b4b1c7d01c7704af5ac3a32295b0896e9944a8c41e01b6b4a7bf08093fa947376f69103abefd568d3bc4a78991958c"; + sha512 = "1c8c98dded57330c5008cff959da2fb23808aec2397b0b5d2b9dd2b190c73e113d9b599ab243e500dcf94aa81f3497f91b205067de2d0f766a1d801bc2f9fb76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bs/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bs/firefox-54.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "0f2b0572d5f77d046a095e89e0a449015ecf0bb6a4ca38573fe20aa2ab2971c7f5f38a7efc5ddddb84cff5758c4b62928f369f037841485d16dc79e1c660b233"; + sha512 = "89e51b99c1386567a09a78927945f1a7157064d34b3b0f8972893be491fe04033da92a68690a9d81ee9578f1b35af34eb57cea29a403b1d399f8dd50934bb24b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ca/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ca/firefox-54.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "2380f8a53e96bd7ac2b366eea27483d181c347bfdec3ffdda9e31b487bf93a1ae80d950cb5321c6c76bc8808e03feb0d3eeaa466f6168c7f4db5cd358076ec28"; + sha512 = "650f81422fa74dee6d12db5e3e66056ffdad669c110633b796e59c7fddbac96e042f4e4eb11c2146f3f4f9625ce9e283aa4309aa8e6f814567be8c5a3bece3e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/cak/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cak/firefox-54.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "df86bac5a6fd67c3bedb9a04ba1f1de27090f58dda3a0e1b5a5d23569e610d1d16a1bbc5c9d1d068d73d6ab0f87f24d819293189dcf1e562e58772f63ee7a11a"; + sha512 = "9b76e8827814e487b4d240a77b2c5bf9900bc0476073bbe9e7d0f7f90120906021b33e74ee92677deb33c84a5eb11c4fd4cc81a330140b8f5f0002795ca6ef81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/cs/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cs/firefox-54.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "6d17878babeeea65e7eb2b32c44b13700b2a294eb75116e98e9b4603c921614cb5278142cbafdbbdac5948f33e5381ee266933beb53bba1cf76152a60c402808"; + sha512 = "9c450275e7b8abad2e2cd96a4cc4b97deab479d30540687227802084890e33b69dad96a0389f43fc49dccf86269b3830f35ec810cc87d92b3e0642c71bf3b6f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/cy/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cy/firefox-54.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "9088b69d9bcad59215fd64905ada085f9b5f27c850e73174bccc9b6beb99d7423d1b688a36e82dc4fb4923e1fe3624ac2039175a08389f1a3459b856ab762f9f"; + sha512 = "aa6f96cc78054703f474a2a386fa4d76604e9f38c682647d27f987013225244e0e62e23523132fbad2ec021c5795f23c3fdccd76c43f560882581a2847205705"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/da/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/da/firefox-54.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4333533bc2496b5059dbd0d727de207419008d5e1a45855504e602d7351d27419abf0a82b56004a35fe6c104370c44eaf52d240943641a07bc281d23f3294fa0"; + sha512 = "c4270c94ea2a9d864ec7b19b94279c9f260afb99c3c70d6b5a2cd24d3cf05a709dcf5b14f977a197f0460a33ba5f0f70311a4d581f1e21dce863182e8213d961"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/de/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/de/firefox-54.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "8962dd969b0f6e4c03d52dd222cd1307d838ef5e03d938852e11ed3ba0df4578f1fdcce0ab560772d1b3810982b011fae9846bb93f723be1103686012447141a"; + sha512 = "e254eaa1fce2385fc7fb564b8342529b23b9004156104e35da963fe166cbdf89f1079a966e818bd57386def6436c4894fca4de7876e31452763e66ea7aa74968"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/dsb/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/dsb/firefox-54.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "b33a1fe8f235d6522345bbbbcca791036236c6ceee16d42883830048f866b1bd816d4f065350cda7fc7be2f0bb8bad1a37c455ac3353b8db7aa80e8bb3921c30"; + sha512 = "f1c13a53ee4a86d3e88020babd3cbabc4be84595f51d7060be531d3f02a4eadd0db398b17539b877dd1de3c9b29bbec21a810c42bd430421c66d1e9d4e17b346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/el/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/el/firefox-54.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ff32cf67e9d5e424fe318fbefae5c10fca855f8105b3a0ced52a4a894b76731fd8e581ee9835d5424e3a08aefdbb4024fc94f02dbaa1ba6beeea0e07dd67e22f"; + sha512 = "3449ea6101a16f78e0f36a4fe85b993f70b5e77e6e7bf2a30dd2a2f1dec85af5627681825d0ee2cc47feae1b22d979257b77b59d61371c5cac7a27b90f9cd1ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/en-GB/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-GB/firefox-54.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "863336e62c3ef2e99babb2bd08a57b29097a9b7fd8a9b5a790bb7002a6a6f7cdc29d921783845271b7602af6a40c8905c3b075551f0a5e73887177417887770b"; + sha512 = "01f521f407cceefe3f8ea432fb66f8f554791c9f5ba5bedc9eff08039c02c637af5e725e3cf9e9b74b7c071d8479472a4abf7e9ecae8cc85188dfa5fced9a1d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/en-US/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-US/firefox-54.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "57d31466390e60d45a77ba2b41a78bafc17d22c4258d184252993a9a1ce9334988cdcda45fcec43afd23f13db5438d04d795e6da383434e434c1b426c2f53362"; + sha512 = "96e4f085134296203e4c42db570e9b38e61e08766966d71ef6863bb695ff80f37c1839f44a1bb1257ba35fe9fcec9f403c1e259e93147d54cf2b8a4561c0cfae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/en-ZA/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-ZA/firefox-54.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "3283d2a67baca3e552a1c7507e4ec3d36679c61501773d1ca2c8d7e972a864c59f24ba29895e0ccd11eca0ad335f4a47ffb5e6bc2f1282c451d1b34aa306ea0e"; + sha512 = "5789e07d2b90f63aafcce9ba8ef8469a420ac03fb4b98f3bab19d7bf51a37b7796215f0cb5614e3dc490d3724dd01f3dbfa26030659b66ea9390fb452d3dac49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/eo/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/eo/firefox-54.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a708cd2f3bbdabd87a07d957db31dc2fa7bb873f50f0139b5feca2d95b9ad1424ea0c809d194dd38cc0c33170be34dd4ddcb1fc1da52d91bfb1006d066b4688a"; + sha512 = "c76ecdce017ffe7688383295155687a30034461affaa405ad37e477ef634f7c6dd0f9e07594aeae3f9a61fa5698346f9970fa8effdfec55d9fdc95e5ed67d66b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-AR/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-AR/firefox-54.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ef930196f23ef40dffef2bfe9772ee65306497019200b8932865bd03f2053069c02a08bf4857bc291e7d3d6597dba7e90c82a15cb33eb99d2818a1ce5390879b"; + sha512 = "f993cbbdeb2a8a065f827a4eb4152b3537af84fb95d0876dd363b1c04cd57634c2b24466e2a03432ee29e1615e7b5d1bd13ba20f844b347f0f9efe504d48efa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-CL/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-CL/firefox-54.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "6f16598409eee0b14c98185d764d691c31f1da63a66e0be70261227d5c7739010964b54ca42dd3aabce0ae82448a6839b8abdf5794a5bed621dab269a3ff5866"; + sha512 = "75557b6731be41d435a0e962117a01c078f36a1d385816a05e15dc3c0148d89c7901af7471da64ded327972d9e73a50e49668b7b3b30c89e2b6aea2068b35ed7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-ES/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-ES/firefox-54.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "6e6a5f74d26cb0b53a53e1a600ecf34efeeb79f56d36747116e11ab25a63c4b48bab7c7d57b2cc8748297a1b106671367b4ed463f56978a4142f830cf1a2ed9f"; + sha512 = "1aadd468b2328379b7958a5ede8f9658f4521ab877ca86e7e2bb7ff04a13294b5e0f6be510068fecb94603d4f81c5f51584db308711043f0bde36ce72723417c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-MX/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-MX/firefox-54.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3b5eb1e55060caa77c86e56ff11d89435b816e2ae0b42c3059be5c0f50f3e4d3ed6e818386cd0ae75d00fb0e6541df0c3d3cdb313237d504df48667818f3a204"; + sha512 = "de5e95e50b7f04572f7812bd4cff5a724dd32b9ccc389eb61eb258fde4dff651df7ad0fcee78f78692413e73381b1711cfd80200be66d4b1c5e87a5cbe19da42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/et/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/et/firefox-54.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7d1bd7e1fafdb2f58c09ea30bfc52ab233ef744465163fb39c59b2481090c1e3d3ed6d2beab304aa6d2784ee4240c7c9f13cbea787ceb505ae7be369669d785c"; + sha512 = "0889d3884a01e6e69f67197f1b86bae4fc506064fdb40c082e9b9892e4b42d9f13f61d41cc55063b9d4fa51f45b96f5ed7c8a50070b9af4b8e9be94e7aea73ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/eu/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/eu/firefox-54.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f8829234556a6fbacddc2e5702c9ece833414eb480421e6a6820ac854377b5d9a7f704fe8e9f793b09598695e8cfd256bd0dab357c81d6530a2d7fdc1934afbe"; + sha512 = "353e2230c1bedea7b805a2ada15ab863591b92c9a8bfa0e47464fb0d0f2f2601d086a71679dc5c1f560bfa6ae9bc428026eeb88a0d8a2b04318d38c8183ccb9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fa/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fa/firefox-54.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "40016acde4a5cea189fbe1abad75851e054b69d1446216fddb553151732466f48a93443d377b989e0092cb01276a45cee56436fab5275fac84f4dceff3f93225"; + sha512 = "e09d1adfba848d46e55102c0e5c366237d9e273646a82a03609fe70c13e38ae28f5029515e8656d1a0634574dddd557f9427bc26b8d5b2fce1d873a3cb2a69c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ff/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ff/firefox-54.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "5eec968da6bac4064562309c3253d2e57999399f241d9e59c83284fb6fb35e0619180e1c41d1e39c9741037d3419d6ff7fb2560d2c5c1b1eea33d56494d52d1f"; + sha512 = "cc998af1b778a4c9688001ac139f1018d723bea35cb6149ef16516998f46f0f9addec295d2b377ff1f47d26bef27722b9300b28d5dd5f1eb860816b279c7cba9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fi/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fi/firefox-54.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f90b091a238398259972884fc759c48d5aba51b4879dd70595139202119eb8982a51d3c6c38ef5efcd1c7774a27dbdfe95243e7f22ae62c510c41131c77d4c07"; + sha512 = "e976095a009d5a51439d6fbdf81e84679c1a1d7ad2db4fc027cf52b4a8c9fa188fe337d0d08cb42d415a2132b8a38dd03698e3fa53605db221c781025c1a0437"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fr/firefox-54.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "18772c36b65bfbb383b1b953e2505275bfce8096278ef9d0ea31d421368bf5d71d48b61b15c0c1de603439a584656870292abe46a37a3a1e6a6630b759fa7c4f"; + sha512 = "7d3346a00e4ea36d438f4ac42bb840ae070cae87a68a773d63319b06308a25650c3a69d97631f30552ff53ba992389ef1d5e62781bf5eb257a9286eb66f15afb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fy-NL/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fy-NL/firefox-54.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3cde666bb2f708450e094a20d452ce4b5f1e69f345bde017c2d61bdd5dbf90172caf2f4f27f2dfae3a68fb27edf11beb0152fbaab981d36d34e0fc96b9b09801"; + sha512 = "39e670e2f5e6956bce1ca4c8b4fcef4893e47c102988880ba546b91e5055fe9438c6c8cedf69aae922d64af0ce427f6fa66456bcbd907a75be7e4360cd86d2f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ga-IE/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ga-IE/firefox-54.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "02324de8476db9c5d64aa04e7e034856495833f01b115e1ea8a9063b778e74e19350f9352f1c0d544837ca7970b871525d28785af54057064fdee9018eae1d38"; + sha512 = "a6815ecf3c1660aa7fe9c32ef3335ed4227649545bf5316aefaf1767559604b282412d2541a0be266121a75fea770790ea419d91359a97e25d9fd31334fe8532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gd/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gd/firefox-54.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d08c084011c92b161245587d1c01870332bc82c3f032dd2198849f1a87eb31eeab6daba435193cbc2ccf9086e0a3008a9ab50c5a938260ae7c14730f60608d8d"; + sha512 = "9d7a273e3717d21eb2316fc073f4270ec904a9182fc4a2b8b5fb01b90bda20f63a9886b427ae7fe5b3ac0107c7a1316578f42b2ff85fc3b9baa3721d1616e11c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gl/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gl/firefox-54.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "fb9cc6fc39708c04d7581879977de4f4070f7766e8050889302d9cd0c4faaf0b25dfc41f46f7ee380f416bda55deba0b7f9e6baf69a8d9abb643d60ab009d57a"; + sha512 = "bbcf4690ed439d3214ccd2387b4fde5b5252b2039dad168b67f5103ec0407fe040bf263185e54b360e0c9875b972827937a6a634cd928d817e09b10c7cc50103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gn/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gn/firefox-54.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b836aed3b5fa3cc5fd4675753b090305d195bdce97de29865eba72e7f5faacb5ba21b0646d9766f5545151650157e4bd5a6e0a6f43c6fb452ee590fef886ffc0"; + sha512 = "cf82a08458e6182ec8c320e5dab4e1629b86efc6f68c26b967fc646d91bc8f3a394849de50c4f960df75bdc88b884c8b59181238302262e864eeca60181c285f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gu-IN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gu-IN/firefox-54.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2c2325aa1f52d3e5ca639d95f76fd7671805c5402ae9b943f416260184bc03fe087f2186f21b935e12c0669720bbad3aeada2286a6c77f06ff76c0663b86954f"; + sha512 = "3b1c8246364405574c4ce064969b69704141cb8fda339d1064c3e1499563f5ea2fd5b3749077aaa6fae1cc98c610ac0fafc1e0129e49f064f3603e2e6097f81e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/he/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/he/firefox-54.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c00eea318d9e96e3da14b815f0dfd75aaf196aa2623dc7732ff6dedd911329445b4eb2d2ee2fb0004a68f461c15210c2b1f867d41ecc808bba21cd5db7cbd790"; + sha512 = "3171dd501918aad9a612a679d9f0ca2c682b5e4f49b5249ac74890df6e8e98520afb724791f9c610c90135623c414e8da667e1e4777c1fb6a6e4b52495a9d905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hi-IN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hi-IN/firefox-54.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f301e9983fc30107dad8ba206ba0ade4a24d845395333bf7faeffb1eaf688a5854798ade11692326e14a7107d407542199cf3db4903c2fbcb3a20bca29e31e0a"; + sha512 = "cb72f0f30d029968a80ea775661dddd255d7c3520895c3241e5f309c6fe52399fef4f7b904009237ee047ad16fe6e893fd008fdfde852b39dff2878de454df45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hr/firefox-54.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "931681f57455ef67512d5f68a8c0b2284314dbff1e7f5aefc7d08048ff4efc083158daf6c4b41310943063d91afcf15f952b1b3a743ba18158b9a88290751b2d"; + sha512 = "7a4a9989416fb270a861b2ca5738ddecae4fd28d050cae482f096b9b8d497e4109687eb3f1f7f5bec52fc5255a11c9248564677896e803dafc260d2460573618"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hsb/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hsb/firefox-54.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "840e9c919251be5f31d692ceb111272611c7f4b468304b643580b0b4b12baa54b1a2e2f208369013854f145bf747aa326e4f2767534e49c27e62ccbe626bf8d8"; + sha512 = "33e1ac831c8aa44675b76259ee90836db8c6dc22c012a1235aa3b4f8715b59a47a5afe73f7f2cd0d160f4026799d2ed8635a289c17fd8424edbc8e3f7e4aae2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hu/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hu/firefox-54.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "05b04d6ee4ce2c0999397471eda64305afe5f5c4d714a404f5ed98f6298d77599cb7c10225e876559a790cb37984db5a3a1fa31f3db83adb04f505f46eca9704"; + sha512 = "357c9ef51cf8c55b0b651f6208afe47caa3972e59183d4cbd9173c4825f6b1a1a831bd148455078bc2899732e094eeb6997954465311a04ffdd52a1add5d90c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hy-AM/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hy-AM/firefox-54.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3696cba2a380c8d0b1a2c116dfac8dc3c3afb9f28e0ba5f03b07b52f23c52d5b6fce293b3c83d8ed041df3a2f4f9c387113753387e1ff94a2854d09284a322e5"; + sha512 = "0baf66276422e646dc0085ace17b0ce6c9da5ce690d78388c2d8658cf79837658bbba045d2fc98a50c8d0f3b8f6895889687605c458fae1f1f7894e880dae2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/id/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/id/firefox-54.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "fda5ebc2e4e0aff27a3ed719fa9caaca3d622221b9288d4075e3964fccbb3efca312f0cb7c36090474d3296aca6944967ba9fce7446c9bc33d82c5518ad182f4"; + sha512 = "658bef583f93bbc91c2a1f4106987e0099089f88d6537c23f6cf53757cba8886b2b59175a6b99b4abeeb6462b59951cd4fe15feaa69d73e9948e91246f3c1119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/is/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/is/firefox-54.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "4c106cce385024290a02953f793caa5f28b65b9a2369ee9644d64d3f547d0c4fb6a9e4fd4f2a03337b8c29e5559c1df7bec9f6138b74fb199a0b259fe599b493"; + sha512 = "63eba83cc9c8d601c8916d1fe5ad2fc08f9177334df66f299deaa1a25bd15c61656e7f22c68db4717928c75d6e2efb9127e818da631c24432a106e255afcd695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/it/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/it/firefox-54.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "bdf7c1f37b60ba514ff5098917f82dcdcd96a871bc546f9aa951153e8c633fd218411a2c10481c6d0f1a02b22db10b51751ea9c5a954155ee7fcc43e2e160b63"; + sha512 = "0adbc77efaaf4f666f650bfaaa0371aaed517c172086e9c6977b4e44a7eb359f460cbdf52293151cb7aa44461cd1f0867e35b30845d544279b95c93911f3082c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ja/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ja/firefox-54.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "09b741a0edd5608f96a5309167a5fb082c004fc2c7ca6ab2a9ddf8133d106563a942cd3763966623f2e98407375987071f8fe05e8132fbb28fe68589e6c1ffe3"; + sha512 = "3b4b6a3428c2eb5a733807e659c5de44f4731a39c5e18845851b9d5f5b812ca86ef9bb0100218fa6a158f0da5094b1035ceba9c54011b7bf2af0f168e3242069"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ka/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ka/firefox-54.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8dc9a1fedc8f0a4fbb7b85cbb1f2571f13d6e1e3a421b84b6efc80a7ba69fce43eb11e9ce2b5969bde8443062340515e875ac14246905421b4832c771277125e"; + sha512 = "bf978f673c00f0f56d99291e2ab47581bfc5373b95831ea097b96866705517eb126853e14b74f677b887016cdbe7120a0b2cc57f4dd2f1ccb892022d1acd5f14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/kab/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kab/firefox-54.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "63db0e66a5696388887077b8666fbe4e9706c9ad05ee3c2ba5e7fddf8a861ba03da3ab2fd80ac005595f59ee3d5f0a85a7e38e7f9d8032052ad1d56335790c2f"; + sha512 = "3bd525ac91d472f6b9001a9074963cb3fe3ca6ed6b9a8fa48c90425b1305302f0ac8ff3155282025fbcb0df65ae63864bb86c23ad6506d0f34ad49b9feeb1664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/kk/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kk/firefox-54.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a9191d0d3ad3f42de52cd63631acfc1829b5cdba4b92d59d6966bc9a0ceec93aa0d1fbc258310706c9993df51f5a917fb781f936cbac3a1d1848de281a00eaad"; + sha512 = "590e66e973f822f4823f2b0a333c955555080a0dde0e3931d93c398fe2121156d93e0b779fdc71fa952261d3fcec75899c127854f62ac68ed88867fc6591b8c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/km/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/km/firefox-54.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3ceda47889de3f7041dc0acda2440ce25285aa21a9d4323da8c50d7e1c3abc03c92806195afe25e8f4998a97d481aa8be3f0761b679795f57eb2edaaf1b92092"; + sha512 = "1e88844f2164de5725d9ed694b25c702feea980cb3cb3a1750ec0876296da4687b56f167fb9dc89bb2cc84a1439b22db5fa40ff42a506426e71cb4016fb04b38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/kn/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kn/firefox-54.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "fecfd001bebf9ed11dfdbfaa96933eec721a12d213fc5b3e7f115cfb8de27d01792662799856ba26d2f3529d10a8ecdbf08df33124c7f60c18c8ffe45e35994d"; + sha512 = "29d306c15e87feb3740a146614a01d113cde8621930ca4b97c64c42fe761409f50d8d05e7953dbf3e8b3f971479b2bb6826cc9d7ae83d87ab9d3cf8959ad4fee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ko/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ko/firefox-54.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "c863345b98c37662b8848ddbdd3f567e1b14ad1c303fca517918126722c7819f57ee4b4ab7e222c1e7d84f7b04aaa6bd7ab1bc1e68df27086ef48b785c3d4047"; + sha512 = "79aed8d95b7680a8ba634cb2016c7aafc9cdac723bfa291bde7d3a9929ed6716376b02db523e544842862782ab0c6157edd2e747d461bcfe10495eb09d2cf85d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/lij/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lij/firefox-54.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "5b0d6dcf400e32d51be63feb5fdb0d8161ce4fac9ebb2f6f2f70dac6d3df052bef7aebd25d53f79db73589e48145945ba2671bc0a34a429822e56d9913405136"; + sha512 = "d0c57332f12b617e8a0f819b6aac170f0a253a13f1bf9ca2e43435c8edfd6c6d16a3bb4746349cd92097dd4b94aa131b4fc3d01a4b088444881284c7bb355f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/lt/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lt/firefox-54.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3d9bad39dcd2cfc80fc16c7a443d8553540b0f22d712f6ec9a6b98de988442e1fcc3a57b1424ae784ebf5dd9e6fffe64b9ba6afbc09ed8942a6bb7f8b4ccf805"; + sha512 = "7e4f74337824f52bafaae0b72c4d250bd5d6b023dfb13724af63f27e43db082a9a46d30654944124379553545d2bdd7c345685fe91a249ec6fc837a54e1681f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/lv/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lv/firefox-54.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "d2ae12c346575f634801bbdde46791cadf0002508c210fd76970201786aa849e18abdf433ab3917056c1b7d61f02aefbf7f43bfa940dcde76ee16b1cf307beb5"; + sha512 = "e1a794ffdefb6f05d4c8c775f1352396ae66bf4f09ef10cfec166cddc98808b35a286997f5dc7df9515cd31c9012801c749c79b07c50091218159fce38caf5c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/mai/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mai/firefox-54.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "5b60c10506d243bc557e791edc8eb92830346f309a514b98d42b75340e330367eae6566b4eeb20d4c7e63d0cab0f74686ccdc6eea48b816b13fe27e7f311de4e"; + sha512 = "af68ec14dbe6136d40e43f408fffb2e1fd481231ee2fc0925ccc63abc59c2c737446b34342b90b71e740ff3de4431e0c39c3f6e626e0b5bb196c92a865bd0414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/mk/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mk/firefox-54.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "44636a0e2b9424ee2fb0db99d2bf080f2c1d5b5c27642486bea11d70c3db41e9013e6095f502c426c3ae22bc13cdd414f0561579abe08e9f81324125cf2f2b70"; + sha512 = "7a898ea167773d30af253bffd3806ebf65ac65622f9da5bbca7b4f39eb6b98e728a06bb19894fd8f6306a830755b0947956be34dda96af4e1a14b96f5948c758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ml/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ml/firefox-54.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "2a1d4a1890ba1dc90e79a92589b713fb1b0d3485af70cd37a04e5e75cfe5d5474fb98e1ecb18c819570e7b1b2f9796a8440b08b0b72c38757f5399ac6644d54a"; + sha512 = "cbb924b17d93794d2c1b457fae63f75a77f70d42b95d55288f34f232d50323ae49b19689b71254e8c94f02c6347745ba99b847ebdffda99cf645e2ab38db058b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/mr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mr/firefox-54.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "e637a7aeb70e77299eef5dcb351822158a876d9c09eb32baba0e3d48627114ad3f2776d0fe58b9b1979a2ac49b1930656ce46877773fc0981c39c114c0bc7464"; + sha512 = "0d92711677ade6316b06cf6ba2a5f0eac11d3e31c852204e12c4b9b77de0d1e3cb29be798bdcc2eeafe9201a6b59dbd7b9c12cd30331fcd031230acde54e4fe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ms/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ms/firefox-54.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "f112dff09f6589982d3ef7f9861302cb161274f9a54b1884955472b0e4032c5686e6e459a925bb34f060e8fe820ce012d7ab2cdf11181bac795f58a379499ccb"; + sha512 = "a5eaa800c71d623aaab224cf61e97565f49382d382c05a097c19eba4ae4f0f655f268237a8bb2e42ffe01ba82045fe50a13c94ee45912c80351c883502280be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/nb-NO/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/my/firefox-54.0.tar.bz2"; + locale = "my"; + arch = "linux-x86_64"; + sha512 = "9e2e6b85fe3d6ecdea000fe87c1060d7ab954cceea3b6b93386c77012e108b8bdb7aeed18506964e58297a0c513b734462982047b1d3afc1ef4945beae76f574"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nb-NO/firefox-54.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "121ccfff0492ee00ce4934fe741247a663f36bdbb65944d2f21fbde45d7f5dcbbc42d1770b31d5a23d3369d3e6959edfd5231900ed8d905ed55c43e0f528f1c8"; + sha512 = "1885b3d94e505d68cf84cafb86b72a5fbe8b787ed2b274ab607fda3320daabf096793e16b330262110c606d3aa9802cee01e8529a3f7387b8923f44f9afa85fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/nl/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nl/firefox-54.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c74a422603fbfc1afce6b5bf3da5197a9a5b10c643ada427a7833e7331c1a307212960b6a8252ccae876a33743a0d14393260bff7914f7527bd1c79868618d00"; + sha512 = "769939416b77471e735533c562767ad2234bd3700c766cbaf3c365d49c55f4f84c426050d8c19a59d0cef9ea6d4456830d73ed201611e960c21e3d4ac8511b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/nn-NO/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nn-NO/firefox-54.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "da0e91486235f65ed42a3bae7e230313a75020e3d0f0da5c10822cb91eb2aa4db2566ce33149bce25fdacea768f516e45ae6b5cd071d332f94d6ee2d3ad7aa3f"; + sha512 = "fecf58250fc95780305e2424e15b1b792fd319418ab378974ed2f1fe2d12d66ec2237db278aacd32201f04164ba77364effa5b83832859f599f494a1bf19dfef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/or/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/or/firefox-54.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "e47f99475bd827edbc4bd79499a481333823a138a4d5ffc105105e3ef707ace1c695db0d4d9cf4ed41f8e498f6e1152d8905e84ea45b7407c4a14b7bc7668833"; + sha512 = "4f5c95899185a2836f51bb1e46581a6c3a983935d2a51a2877caa6e275b94d576e2d09c1ad5ef1c586d5b862b7318d013160e21a466ad122b147a06e118791d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pa-IN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pa-IN/firefox-54.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "e90471400caf622d690c0b3bd7abbb55094871742a263aefe89a83add637459bb4f004d9bfabac7f32258f77123e5a85bd414fe56cc286a2eaa7f0342ef8e46d"; + sha512 = "f67051953287c794eee5223739d637557b287dc0edc91b24a4cebac84e106d9a1c1b670c763da7a4b15a3204fb7292e8c436b51d8b45af22f4c4c726f45aea05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pl/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pl/firefox-54.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ae97799d80447aa54c9989780fcabe3f2840bbc1bcc9ccf2378de85eacf5957b99522b345c528d751cf055ce04a90bf206da3f53c55ff704ad8202e6f0d298e1"; + sha512 = "ac3e10595201713e06a80554732a7ec53334f288b223fe04ab388b83d3190bd4046c82ce60d934b15245964de68ac2a1d1923362025209e5c0ac683dcaa0b6e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pt-BR/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pt-BR/firefox-54.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7fe17634ccb071ff55eb49c63cfe6e0fe7ad5b65aa158bf64d8cdaf4725fa54feeb7c5546c057f5f73690cc805637d6149e3ca938bc31f1798337f69a79eb0f6"; + sha512 = "cff8e41d257181bdc2dceaa301b3d38b51157690d4b4ab78506353f3f0f883547aa688a74de643d82851619388ee37407ef48d3578a397d9ef352ceb08d112d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pt-PT/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pt-PT/firefox-54.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "50d0597479e726eb8342eb0ff41be5130a991cdeefcf0a020e46fff70940bcd4422ed9cdb12260d9ccb91ee04cc2cd2d3d103aed6cc49f4ebd40270fd7180954"; + sha512 = "156516df4abe22265eb9f7b8515a7ace20a0d35c6e460f10ba5ce9a96b428deac0c72ac22b61c2bd95b0da9dae52c1cb055730720c5fe0c42314f83b838950c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/rm/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/rm/firefox-54.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "5a7c05944c5cd97cdd45e467244cfd0118cf960f8353d34746463eae627a2aadf298097d97f5545a570e7a3eddfaf2dfb02541efe9cb24fb36b8bcb3d1b8e1f2"; + sha512 = "738716a0580928ef597b64f3cfccd73a38ff42b7d4f5ea18bf3425dbdb262fb7beb99ec11b31acf1d2ee321af4b4ab25ecc554c819223a84aea7722d14ee3246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ro/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ro/firefox-54.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "daba193469d8114eb8b6fb85b0f79ce7b7a9a6f61b34bc6debcd9ef5254e0f716024cee6760a3ccb2fe3c0f0e5948fd56753e0a3036177ea4bfa3c3f11c5561e"; + sha512 = "6c5f8e0eeda88f40765ede24c75b3f0fb70f9e90af30767d8fe4d08cb49be64a389a0e7b4e141031d15e2def42074bac0c64d2cf5b650587f898e6be981c9756"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ru/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ru/firefox-54.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "2421185e831ba4720c01f471fc919ffefeeb5684050834fcc039da0508fe71a2a3bfbdb1a8968d1dbd1d282ba6b7075a8568290f32adca9d987fe7c1cfe83a4b"; + sha512 = "7ddb1a185465980310695ac06794a8d659da3eef8c451f0e0c75588fcce9a1af65e75a0ebfc0dd583f0a6e6e511b03108e6d9923a2f6488da2276018d7ad2c04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/si/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/si/firefox-54.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d8ece0794a893d1b0469203084720bdf06c8e68c31ed9c84c4f998061c310460849d979c7cf4d30a6e339ac05191a5196c280ce8c734378082b629090e2c46cf"; + sha512 = "16d516cad8e6ae86eea95d0c4bbd8eaa56afbb74f5d6db82452176394c723c4e2b821616ca76186c990a78d30e208554e7eaf7deb82e7a3d78c97cb2c1338b45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sk/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sk/firefox-54.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "9ebd01ceaee3927a4a45e0add1de69b2a3b142c00a3495488f649a56884b503235ccb67fb0f693c305a5c5c13f1f314c3e9ecf4a7d6887ac6f22f14186ff9508"; + sha512 = "e6175dd3316c7b05f95e075ea5966b50e243b83d281bbc87f6a4dace16c708560bbaec8fb0700823ddf1b55d27f7f64450254a40570616a9bba0d2497bea1a08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sl/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sl/firefox-54.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "9517e4379531feb4741e6f679e8e7e366a75c61fb9f47885ee7cab83446807ec91519a2829e2cb947d0816b5801788d21ff7d4c17181403703aa26c849d14e89"; + sha512 = "4e78e2d9808b88c191f51f8cf0d83f1762d743b4bc736d469bc145056af2207bdd8c3dbef7283a730486b041826bb25fb4816017786b0bc7515238b67a285062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/son/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/son/firefox-54.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1f3ea9241c91249f7dd35da0ca27487a844e9902fc6ca567bde28306f2556448dd32291bfffe3567ccd12162dfc92b06c26b25cbd1af8565cace2934993ea358"; + sha512 = "6ee8a87158c2f7cc8bc38aa59959644514888bf683b7fbc3c703ae596fc6260190cea141b5f4d6aa72b21484b4a4218850d7d0c72cbe83b8329352de64b19e3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sq/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sq/firefox-54.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1359d549c9bf298b869968d5d5fee722ce2ebc11095f3b7472111df07d2148153358e0ed31a722192deba68b67fc9d5a1f237f975412fc5d762fc3f396652b5e"; + sha512 = "1dd34fd13cb790a91f0592af0e21ecc815820ff4fe6d0c07c27b5efd82b37aa6c9526f5af9a444a1911b249651c17d9b367c02bdc5ccb420c80718f01bcae925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sr/firefox-54.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "4200ca53e3b4b61baa929385dbaab5bbf4b5f8fb922695c8ee378f5be6ed7b4c505c616782fc992df0f88ba5cc95a06ca1f8cbba79319f2e9734be42ab336093"; + sha512 = "869e31f47498ef748557c7bc0b9d49b893826b785112b5e152bac46a9260877f9d73740ad36fa139452074cc9b0bd23880d7a046eedc0bd652ca44eb5188e035"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sv-SE/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sv-SE/firefox-54.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5208eca959275c6c491b609f9afa750c7c509eb8fea1a7996ef74314c6001797879887111048071bfa06583e9caf710be75edc8015f16b4e0975f949a21a9229"; + sha512 = "94601f07bfe9e13872cad9a0273c669d4a8a44b3c8f654aa866b703e325a0f1b6313cbce70fada7bd2bbc074d6d51ad28e829c6afba59d0e7d95645c276c2594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ta/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ta/firefox-54.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a3c9dcdf28703bbe2ec1243e93074462729c4ff81c0cd0c8d8b83dfbfe1f0d1e6d0480f292a6df5b6f961f928fb503563ad5ac19c02802ae69fd415d9b4782df"; + sha512 = "0ca3d09ceb89ece40b8f6825ee7f46d4ba2a546204ab185b82e32d9206e428e8818ca0478d8b54fabe6ceef4641e8411a1490d862bf53964e0ab269bb2bdfe1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/te/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/te/firefox-54.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d39abe44752af8ad2eaed332306c5708c619cb8223f47bc639d0872e3199561a2546c003c39a6e14ce7ffc1ece686314cb0ee93e747dc89ba699c5ab2f9de2d0"; + sha512 = "58e6e95a7972f2c5b4ad8f3428b95c82434d9041dc8879ff1fe961adc6baff87584011296621f07ac9f1277f6392d1f230310a65d64f245c7bc3494872dc0248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/th/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/th/firefox-54.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "1f2900ca72f19786ff7832d4b279c26ae56fbef6e85f12f41c0fb180fc84da7dc795c6b09e413a616325744d6a970a8aeba037bca2bd2ab136f68f658bc255d7"; + sha512 = "da0c6bd3cde25ab20eec1e31538dd93d4aabd5659af3a00da1279a7ed37a30f5321f8260dc684610f37e7f744ca70bdf882c9db3d66b2988a7231ed4f07f6232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/tr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/tr/firefox-54.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "7854700e0274974799e1f7496896a06122351c8915d30eecd9b0109a94dc22f095d964187614cf38d4be4d453231b07ee9517227acc6cbe4003856e18455539b"; + sha512 = "fa98f5488afce2b1b7f27810bc9fb8bf6d45e09137bd7a5dae89adcfa77f3f1eeef9ae593d037614197524128c317549edfd8b692b25ac6a79005f49f8deab4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/uk/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/uk/firefox-54.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "536075f5842b5ecd79032cb9a62f7d5efe8235ca34b3f089bf9e7b44af5e9e39dcdc8ca04b45392ffb943f2d53c64fe39e34b28df1345beb63307ef359d66ede"; + sha512 = "2ba13913b317f059093abd6407f9c4f798dc82491375fe8cd5ba21cd6f92f7144496f9f879b3f34eae7d41bd6a5e5a66efd57c19a76f1f89a266c2d50069f01d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ur/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ur/firefox-54.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "219c7b7437e70a7970bac631bdcd1d70c98bb19bb51a7f95ab45106b97f2207a3d19f45b55fc8b26d136029f2ead5767acf6bb241b1e62b0d4e45cec6fdb6d19"; + sha512 = "b3c9ee474325b2afad9380896f2f785949170bf32582187afb414b4052bf6ec55e1ec7ee974a980f6256b178621abecf6e87a24c23d7df8c9faeb486cdf9aedf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/uz/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/uz/firefox-54.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "c90d39920c732bf022a417c7ee4ac6ff616274cd37c3a0263afd97efd9edf992aeae7dd9a3a7303a2d4e65b1bac49e70554e9e0310088c5367aa7a15963ab233"; + sha512 = "1b419fd85815927410a43aca976074965953eb217596b6273fbdbdffaa71b0a87786a266a27fb9db11acf25df539c45807d780ec9af0c2e05fdb8b43e12833dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/vi/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/vi/firefox-54.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "66f08964c0eee2befc58c8edd0faa9140ea3a9a2ea90a31cb28dc20faf3aa471f06ac12568ca0d8ded0bd6dc5e34b90a141602c37742bd6918f00a0d02a20972"; + sha512 = "74be717bec52c300b7accc9a31012c2a6483d4f5060315326aed2cbdf500d627fbb101d9cbe0e19f7a3ad76029a88e42e815118683fb5b32d6ea855c5044bfc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/xh/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/xh/firefox-54.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "06510ed45ff6eac5af3a5ce6e58487abc849b91148587dc8905cabd2762ab04890561dc0f49959c51fd52fdcc9664fee4452de189f13c4acabc99308f6db16d1"; + sha512 = "9b5e7428042d619f61f45ca58092247462bd683060772fa7c32d862aff7882a402a10bd0ebed940d31871bfc0212b3555fc5c99b1470d590e7b9d3d614351a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/zh-CN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/zh-CN/firefox-54.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e9c6459671027431433a8734e9126575713a1bdc6c4059f0010c9357f6cc6474ab294c6b1db093513d51e6ba48afa1b467ea90502ee92c09b540e93b5eb80764"; + sha512 = "e86dc80340a30a89cff1063dd9559156c7a8713228d1f5bdd660a203373bf1ae99f682fbc29f8ce2de65d48eb5380e748b5484f20e1d73cb52f719327274d90a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/zh-TW/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/zh-TW/firefox-54.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "a1e9b1490cd6d309131cf3432aac9fb82d4f473d832c935252fa9c3cd5dbeeecceacf31f11bb51c06c58ef998339201331663f12d9e586f4d3a2abc1bcbf7f4b"; + sha512 = "bd412bb36f6c41293ef68f38609ef0554d492aa92b6ae74e318cde23e9fe13b8e8d4d5e3d46a95020951c0dbe64ff83df0987b166d8de6afce14b6f4ca09d3ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ach/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ach/firefox-54.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9644dc1f73f520aa89998e7ef37fe658a63cd625d90ea0ba478f321506aafce4a1c18470f94adac25ce1be2aed8dfbf2e255984febc4008bb031b369dbf494ea"; + sha512 = "bcf4707a88b8e40ce98ff2f6dfd9bd219d567e9595b1686485f6229c3644528320e2f4639752e4144493fd6066996235a850ca5539b67f2dfe07902ce4759b13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/af/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/af/firefox-54.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "98b2d5862db2853d0c9253ba63604ff55766d7e601620a1dfbca8a4bc8c356652e24e91892c530195651fbe93ab38b69eea7e4a7aa8da8c1c19b2489790f88b5"; + sha512 = "f527c2f0cf5b7585f00f1c897a178e2f526db0ed126ff8616da7ea86f1dede94b3e5e011622886323fc1245c935d362f96c8bcb792043b05febb4a8dc01c2a50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/an/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/an/firefox-54.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d69ac47458c5ba751f21db719336114e49a6601db52b1c4d2fb6636cf4d869ee5eca1f32e9d106ae384719d511bfca595445dfa30a8ec2347b544661e7203177"; + sha512 = "b99880f2b69a44b24750642a67db2d617c237483b5da6da10b18250b419aa54b0809052ea7d09bba8e66bb8047a65f4ad3a371bdc8a016d800b24b5ef1a453f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ar/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ar/firefox-54.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "6f09ceb03ce77ecf8eaea8cc4087f8531290ba0c1c3bb727811fa03c25228f0d38cea020281cff53d7acd682560590de2e2355d3ca5c46e8e777696e6424717c"; + sha512 = "b9792beb0db0e1555e9bebf33fe5912abdecaf54302a6573d8d1a7dd3b362b4bf364e13f38c1aa326cbcb80c16ad2ce2f6ca7557f1eb8afcd3aa37c0c5272823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/as/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/as/firefox-54.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "428974d2c110cc2bc88c792c0fe835232a51cc5b2c8bff1ecc08490a20e9641b3a465b3412e0a05dfa8859bd2839846a7ed75e26b31456db77bf35a9079162c9"; + sha512 = "f215bc4be896f04a867d516dd2dfcbe2965428306bf5faeda66981d80171d66bdf7363175fc0ab15d41ee54ce064d5f4d662518d41731b569b89fafad959b19c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ast/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ast/firefox-54.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5368dfb536053eff3ea846366e8d5b4c025c3c5b828f41bb015276ca40c9c6b529cdac715a181d53e70df3ff99b1ea310b1a9c5a5da74e36ab97504b03c99e3e"; + sha512 = "aef5200ea3333c899e206667de6333405d8605a502ac2c1d08f9ce6609939c347d5e19c4475da3476623657e6dcf9eb92b72698901ac38eed3704fe15684d31d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/az/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/az/firefox-54.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d9c69659d8f77949b3c12419202ba95a53c2a0bd9a8b1e580afafe93e245609071239cd69722e391af7373ad431f1acd09dd9484038d6eade48d0642c667f137"; + sha512 = "f5dc2d4218f1433c4ec5c0e363f78ee445ad9afe70be3f019ca206fa873d6905d553b3ce6b8227f02d00353b3d4db349a2a8ef2354c5a740a799774be1ec4fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bg/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bg/firefox-54.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "20dceee7ca9dedd1fc063fec6485acbfca5db804d6f7dec8a8fa0513615f1a8b73c51f8dc4cd427e5e06d1fa49e74f2b94293880a47fec95e7c670f0a6c9fc2e"; + sha512 = "57b7e5c479e092bceae1633f6e117db0a3652d3a037667a97d9f5283cf390df731e6b67105b4c59296c4843e1f98624030a7bd72ba8812488094ebd1336ebfb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bn-BD/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bn-BD/firefox-54.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "00050cc713a7901848eb73bcfe15c3757a028391e71d59d6e20843b67aa1f19283e45fc5fd22e9301a15a4178f2f461a5984ff196473125682ec5eb5dcab41b0"; + sha512 = "dcb2f5c033648cf5a887cabd1ac70d4a569bf1af965e3c0eebe2c1a2b746be007b3e76cff666288b29279246b005e2309c7b5e48df20955ee9b685a0d9548636"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bn-IN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bn-IN/firefox-54.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "6439b4ba4808ac648543818388f08752dd7ee07d30390afa6735777b70e84cd1110e6846d3baa1424262fd3e1fe78acec9815781a2b0a1942798b2292d26fe3a"; + sha512 = "5cb248381eb1c67f0d18d2a9fef63ecea7bc8b3cf6f3db2aede0e9c25dfd6d0eb8aabc4d9177f2f174f2718e4361166bc5045e815ebbebbb613bf79de3345060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/br/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/br/firefox-54.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7d9380030df59be07f1b5d8952313d1de06b7f2d4a04edec74eab06a35997609624d8b90400158ce43638d0134db7a71fc3194db8bf60e480f0bbc4ae358a884"; + sha512 = "5e0693d9cf46a78cf5f1581e5a18d3ad56f072f975e9169c6505715dc054819fe6773196b9d71e46c40b1757ea2060d8d5365b98550fa068d4f27f63e89ebc1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bs/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bs/firefox-54.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "0326ce367d48f4696868defb1c5ef6295d71abfb4e152df57fa37644c0e9c9ddc4d1a859bde9710baa7e1dd164d2509a690b49782e691755117f8955ce019981"; + sha512 = "71e79a378d6ff2a29a2c3e20f0595688dcb344829e6b241fe97ba6ac0dbf27b982966168a691e0293d8625459f89dbb4c7cb6072547934aba2410dc20b525f3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ca/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ca/firefox-54.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "7225dbb158fafc1fd3b0aaed1b2b012b30a3595c0763b9d695a757dac6f279909a3a5ced7afe260b2b22afa1b80286f15edd04889b91d0a5d0f02d4e3af464cf"; + sha512 = "5a40bf62d0d6691df4588e4db7e9e48d64922d1d81f94d383873588abbd4541a7589ee662c9624b5a9d1c70fffe3e3a468af420e54fef119d1b66c5eac9bea52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/cak/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cak/firefox-54.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ecad96912d70051d7ea41e32f100c028a45c5ad819e22e8e9cd60c72b87d57300f797d661f9af20bfb18bade2921b59260c0eb08b5430316a1d706ff8f0cbd1d"; + sha512 = "65e760fe89659181582f86424d44406e0a2e4d033b5ae030f199564fe1666a5a85e77839ea9458c474e4c7f26b1ae6656c071c7c27553c53d276cf5a5aa976fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/cs/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cs/firefox-54.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d1d78d58b141cd919153b2c2d4667628786c330df01f9183b63f4592faab8863af3103204786f14bbdbb3e8a1e769ad2578e337ab528191dabdd82f51a45809e"; + sha512 = "5b9e2c3d30d316ed7c013d49ff0524497ce76c02f2bc5d33254c561d94fcac5be8bc4cf269b6239399b22aa9d9c466698499149dd895644d17a65e2960d1b6bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/cy/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cy/firefox-54.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "fa97198f6850be7fad4a6740813eee763f2a9c69d0c23cc5f1bab5067874cf843bd529f63e2078731d68f916a0b628008fede65fafc1e899441472fd32d6efbc"; + sha512 = "85ca010fce9e7a15891ff51e1c69a2ddcc686857e0958495b7f7eb8ed59e2faad7de5c81453d2ad901de3db2695f8dde0c3bf4a182cd4b8ad6ce94895669ccb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/da/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/da/firefox-54.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a19211b6d5aa3e4b4f3b15ea4c44355227c30aa01e0cb501187eaa92633d549a67df89e7b6edafc4671b69f7110f28d197f27c02dd7f603f9fbc7a1e70bfe629"; + sha512 = "22913845f9bc2ad7eb58c0d556b2dcc139b98b37ffc3606bf4595d748890e094968adbd4f888117a2ac163ed0dcba2c5a4ab97105ffc48cfef38accc15c06ad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/de/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/de/firefox-54.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "195878e23fcee7b344b0b318a6e8c7b2af30de97ef9228e5a0c80cce7e7c7405e6a58ee8489c100a5b2d8801c388598e80a22048686cbd9b736b30298757cc86"; + sha512 = "8a650095e1c80dbf8f931b8dd7f883312f52f76f2743a6428d0a5d7526946247e3ae87512454ac77a2601fdec05abc8ae16957d09ce440e02ecdefda243d4a86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/dsb/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/dsb/firefox-54.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b1bfbd251b59a122932edc3d4edeaa311f72fa093d103bae8f18ec900063cf9b88bf26f695decbcc2cbe7a8b0cf6c978db3ece86b8aa11c7d097db47bf8fcb93"; + sha512 = "7d673a98260823cdec8cd44dd564c4dbd0e6f4cbafe1b1234eb4c631dd07edbe34ec6aadc5863d62030271c1d4fb39a7f8be1036ed5048ce98d2af85d4999e09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/el/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/el/firefox-54.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a8cdda39a3f221adf0361871c5eba486808209809eca5a1b9d3b9d2c0c91e68569451dac2907e33018ad97efb4c3d646ddd6db87a9cd98461fe8a5a6de2a492a"; + sha512 = "fddc48117e63558a7a8cbe83ecdd937cf5d3d444c1d58f016026b51ae46cb7a0c4a44f04474d285b8681a985c59c1962c39a8171802821702d6ed4744ab39390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/en-GB/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-GB/firefox-54.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b99dfa1b518e7fd0b5ac3780b69cdefc6fff26d5a30a0a0c95aae9bca88def65a0cbcc1ac22aaa369fa854686dff0de75e138edee1d8d13cd5c1d25110c0befa"; + sha512 = "0f27b44e13c620a22ddb24adb03aa504ea48ba1674d25272ad5dff86cd59554b66c517cb378a6d2668d6c9014fbbb4fc9e56565ee943c608479a6c6ab577dd50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/en-US/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-US/firefox-54.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "df0f895b336faeefdb24a65f110d73709a9d9c37aeb66348d8f347db237b5f4989a4b37e3e15fd638b7cb907e567e40e88f4372fdd1f10c924f44c5bb61086a2"; + sha512 = "727ad142bc3861407552a0c4438911493381ca5def555b3ceeb2b15d6a66cb4ef97c05dbace932b06048b3a5636f6568e3940cc8ef45af28a9797b738f2510cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/en-ZA/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-ZA/firefox-54.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "928e0efcdb9284ed8eebfc9a05fb9b33ff05a72f5db28813928064970e0c6b5c67de429fbc49b85cb780fc18ed3964e14b445460dbcee8d9c271ea112c43a402"; + sha512 = "47f1385a47014a0517a15dcdd1ec93752207992de077a89742ca1b6998ea49e9d07b1ca12cee02c3b8381be674e9687cb403d620231003bf8b683e279d281b69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/eo/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/eo/firefox-54.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a624a4d42a096929ac6eb467251de6bf3eadd5b6492b5b9e5ab7923601015ccee69f976186c66bbb2ea268b791cc2708fe9e128a4d978176a5d9ca3801631774"; + sha512 = "b3d941ca034a50f2f998ca6827682cfb18a9a3e280696951dae1964980e153bb2a0461fa33c21109b5aec1f12514bfcb9eb89376df6d8e4d87f81fcf5f9b7d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-AR/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-AR/firefox-54.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "7a2d2ff9251935b8cc3f592b2c7708ad86e85a389d8599620801f514b797a64cc28bc0458c0d7903261f5251be65e29ae8eb1628d45d9a7ae70f57ea56f20e12"; + sha512 = "39f930dab3f08441b6dbeb08d85803ace7e81e43208a03fc820c6245ae66de183f3759081c4f2ea4dae9ea8724f8fe5081123cd4b82bfe695e1bf0afe34407fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-CL/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-CL/firefox-54.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "0b9ccf6f2024409348623ade927d0b21df79211ef7a01f9efe414ce389a6a4d98ab5f34f8c3b4c0dd01209c8304d102068e8a9517be097b64768a163aff96ae6"; + sha512 = "469a2e7af658fb21f41cdaad5bcd77610e031c965cc5e8e1e6abb32c2553f68a6c7b60eceec56a3eed99f65dce34b09046748e0551bf95f0bf98cfe97a3f726e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-ES/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-ES/firefox-54.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "02b8f2b83d869db41cc910f647d6c6c8136609d499b6e77f2526915654e6bc22fa202b09f9c93a3f2fca7a432deea9a08a2e983f0783b5712341d9ec02d4754c"; + sha512 = "1e33b0a7dce58908bf98b63e3248628a8d62e5c980555b4385ffa990d8401cdeb14240f4a79eeaf6e3f5f0830455aa00009c142dd499714bf50209d10a083f51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-MX/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-MX/firefox-54.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "b18d0971d8b595c8a6bad2fe51fb46d995565947890979b2a157664ea9c5d20852043340c944754d90b820ad5b65f35bc5d0f847a7bcfd322b2a952b3a5fd4ed"; + sha512 = "8d847605bd336079728087716b781fea40d256304c8f5bd839d83c0e5b4062ee13f30fd257da84bbe4203656aa31c8acd570c400ae04f39107f6c56f7d2ebb09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/et/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/et/firefox-54.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "f8836395758112d16b6ff74bd5144279184b125e9d415d239b1dbc87899da2000880af3bb9e0b4d49dfaa641f3c8cef4585c31699014fb2dc95969407fae4a69"; + sha512 = "9502f47b30053aa89d0a79f6fc88a698e4206bd7cc37a2befed76d7811c5d758d61716f949de21e73c5690fb348ee26df7bd6eaa05473e4b257e4e9d6721ea77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/eu/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/eu/firefox-54.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "05584c588f76685791c54f24bfdbeea37c9ec36f0080ea5efda8fb5db5b59789b68384be1e36aafbc79338cacb200f1246d786afe1b3331ce1b1bfcb6c86c403"; + sha512 = "7bbf574f723999e238ca8daff96a81dc124545046e6a0143c95ac6ea05ee3aefec86dc33b588fe206c862d2fdbc882112fe0cc1d30ac5e4b215f16f41957413f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fa/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fa/firefox-54.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "c89ecae7468b0c0689995df31c8d0b04b25ee8b3f6633db9a84197bd7e7348b4289af95b8d656794bef22250e9aa7598be3a871661e0d03e02267766c2caabb4"; + sha512 = "05ff15f72e785af68f91a890a72982c218e0dd8075e7ab5a43f11d9a0ea03b67535b5a7b088a6ebe1ef97bb6f08a1ead394fde51dc708e8aec8843c611765e3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ff/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ff/firefox-54.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "63302710dd067dac349a322fe7df8ffb33796790bf17758bb9554d1601e4d414c0f919cb92ea56f3030b4d3604caaa39149ea438bdf03fc6164f384e9cc081c6"; + sha512 = "b70de55bcb1e582fbafe6ff7a61da548300e0c21c78ba80178e07540dda9088024e3286c3c9dd8d5473e02a1692916adf0417baae8c949ee19a8f00f6882cb65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fi/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fi/firefox-54.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "df62123c529bf3f9ac017a553268ce58cece1c916bf2d671b03a5207434c762cd9b2f1c81f960e5eb26038f4dd39d99ac8c65d426eca996c230694ea1b4ab2a8"; + sha512 = "fd895e153156ebe879115c24e6e35d3983dc0e8968a061de017584f6c255d4b9aefda19ac244eca5e8b833e9a7836df2bff4e61a39ea71dadec1242431202971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fr/firefox-54.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "4e6b3b271c1ac945e05e72926a4ade75bfd2e24bb97bed78e350c5f637007810035720c25a24a6cf0c0cd24d49915259a7a38e0f792b78dbd26ac01a30092922"; + sha512 = "ec36040ceb536d4b99da9b9b5b300b066f4e54b29faacd248c7d29834e1e902da446fdcbb3972b4a07c1bab71bc144f53650e0ace150ecb3e659cc8fc15be71b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fy-NL/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fy-NL/firefox-54.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "11118697039174892aaf813d434dd2f3ac93839681d9544100560e5d906ea7f71063e89b9a4e2f53e7aff3a4b83726a0645dcc4ad212255b054a51ef3d3cdd1c"; + sha512 = "085a76fdf7def5a9bde73b7d92369fe577b448b8fb829445ddccf15fa3918f9fd1a6cdcea68376ec0c0b716592c8148b1ab638f5cdbe22e0a6ba7135e9702c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ga-IE/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ga-IE/firefox-54.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "3d22dfe4827d218bb42a65dea5309d058f4e047a33ddbaedf95d0eb98960e567b7735fb7e25e508e06f5b92cc21494e73fd37e02a5228c87a903bb77f37bdf78"; + sha512 = "c344ca0fcdc266361ce5dde1e8adda69c9bf0ca093538ae339e520035c5cbd16906e4b40db03098647511071f6e11df819bbbf07661fb61edf8cd14662429374"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gd/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gd/firefox-54.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "71ea69837a36b698b483e44c87db1737a618f4099d4b6450434a5518a9f77a0d1373f85ab91f76397e7594c1a5be921c6302f1cf9b66701b5a8aadf846f64321"; + sha512 = "4d44ef6abde187c2546b01bb59a1453bff07491152a9e08abc8674f72fdb201d0ca84bde913f0de7f46a69d6687affb419060994f49f5f934628456964eae075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gl/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gl/firefox-54.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "86db97e300e8ede881524618b110993999e08c4d21c309ea0228f742ec47a7e7d4d71c6f77eb1b57f16fbbf08fd5b5d7d1e314feeec4bcc10821047bbf1946ac"; + sha512 = "c3f3d6de8511b7f782a57d99a368ad82f8caecf86caf88508f01e4c86cda35504bc99eba89b007ed1b79e089863a3ba8a93efd348e13ed64cf2ac6b9501da65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gn/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gn/firefox-54.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "151c2c8f78f00414d358b296625dcd2c8166de12a8deb5dc31d330e5083e3020c7b12b9334dac7cb09e1508fb28b3b2601ded61914ba9df9df7e239871812f1b"; + sha512 = "126c042e28e2aaa6ea6d36a52ee5d80a0700f4660d5ead0a7d756e59a1aa42044e67e2dd297d95282b71b94fe9ede9ec8ccd1a553c1e03ac2217769ea407d09a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gu-IN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gu-IN/firefox-54.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "8201dc515ebf1457dbffe1e518f4d1d4073f51b1491fe794edd86f30e8e9d7e0feace1ba2fe74b136157597ed7087a857f204e5a6bafc297fec4fc0e04acee9f"; + sha512 = "ec796a9f4b1d8e8c5b2c16d96efeaf1841aec9e66429f0ec2aa87b81281c29e7f99b94228a3963dd81e30685d1125d673d8b0f287593cecdbd64563353a0420d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/he/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/he/firefox-54.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "4a665fbcd7e54acb84e7948a326219557e14dd7326a4a0513de7271f128661a928305814dea69ef6a48d349deb148a08bb386b381fc0ea8c18c5632c7b9a3c54"; + sha512 = "1fde862295fe781992694670e015e1b3baf717032d2c8f3ce7cdf3d4a97e708c2fc7e3d0aebe2bd46b960c108f2a7843e69cdea2c0bbfc29f36f10b1a7895f89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hi-IN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hi-IN/firefox-54.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "9e071cc2d107b04d874f3bd11b2ebc184fa4ff6534bc4b2a87f85cc3996f8b3d7ca453edbc58ae598bfe5ad90f9b23a1fbc5eb77d6e3095f09fa4b3619282ccb"; + sha512 = "f06fb8d9e06e02b9292000556a3c3e7b7076fcb832fee023411a53acb7e8a6292d5bd25afb19d840424623213149432bab52edff0976a7a05ae70a340927480f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hr/firefox-54.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "263c65dcfd77a79dabb9416f23fa48400ec577ef03204daeead577c7159d5ef0b12cb2a17d2d7523078edbdfc61bd0bf41435c300b690b0121a5dbe76df76bde"; + sha512 = "7c7ddabc990da13351a2796bcd8797d67200076d3bc4df772f1db1d6b894832d54b3cb6d491d928a4266b32716a27a5dd4bb5a70e8e5b008ae72613e65894cab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hsb/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hsb/firefox-54.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "78b3777c2017c60428a15a3531b7864d7a58347686fff2486ac9194852fabb658c170ff11c7b59bc96a9c73e6b35ff8074ebd9e5ee401e74c760ff598b5fc28d"; + sha512 = "304907257fa32adfa16afa23743f7c4f8dda5b79f92c99bbebbd971965376a2fa81995873ca13ad85698117404ae3ddc60f29b1aa19d1a54e0441eced35e56e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hu/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hu/firefox-54.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "688a543527d26ebdc9fd2b2022d34e500aa0d65e6a85d504c957c988d0ea285ef2208a2a17c80be472eacd2cb726e99ddfa9048c1035c70999c0a8cbf98500e9"; + sha512 = "4f9cadd48ddc7a4e25d79388a833d74418b013346a597edff0b9a7f418fe899f2ada685406fd02d0d4912126fd35c31ee51772cdab0951aaa2a38da3cef4dfc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hy-AM/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hy-AM/firefox-54.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "561cd5c209113abe4c36e9697323a966a09734e9039f9e2ad40bab5e7ee701e2aa5aa1f6f0ded758be914e7a9f33f59e84d895c40d3b15bbe7043b04e9e23918"; + sha512 = "d8b57889da068cb0aa8c5bd8b3900d81b2944795dca03e09abc2803b985d0bf5b8ec183493ff51423bebee7ce3294ae8e9c5c3feec3e2af4c20627c4ee2f20e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/id/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/id/firefox-54.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "c624da71c7f3fd040b5ddc6da0795aff8796c684e44a05b53bb375d69abaea436350588bd6e3c60cd7fe75c5e0d17be11c956d2e3196212fd3e4208af3c4d131"; + sha512 = "9f37f651b8fea3bab155550923a8bb6baf1d0a887f2a21c01da3c15c7935d176d7b63abfeef0fcd883807017aef39d66bf2cf5e80dbf3a42e8fe1691c12f965f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/is/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/is/firefox-54.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f43157cc8c0bfc7108d9638c1b6997444d11c4c82fa2d937085fba02e8cf7bcf6e2c3c498d58039baea60461d8895b3a959d39af1612bf1b1f30574ab5c6a6ea"; + sha512 = "2d98104a4b4c000416cbf3fd9fbf03e2923b502ff32cfc8e94aa10a6f86170b0ee1a6a3caa2ad6974203a3ec81b7ba17a55c7d7935170eaf67e8f59c29973d78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/it/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/it/firefox-54.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a8278d7a14f0570f5d418c87e55b710a40dc9e76fcf9c3318f361a72f51e55777d726e99bd2afa495b09f997fef9e86f31ab7a1110a43617719d49456b7f2136"; + sha512 = "0ae1021ec2e8ad2a4c028c44fa568f3561dce73feca12245b033650a9df023a7eb957fa748159fccc0735e16b227caaf019f738094ecf06d2c09dd537a8a7adb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ja/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ja/firefox-54.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d9d305dda59cd09db5444f27599f9846e25869d3a43cfda90af0f8a760504e92df1df95da6559da8294baa75ce6c587721dc45a4d80163f7d8464a1039c9c180"; + sha512 = "9f555cdf704922c3151ae41bda1222371c149aa7ba1f8f6ac61962a7f296effc337ed3579a7aad4eb187bd2a7fb40a5374342ea87112589dd4a9d9335a4b8f35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ka/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ka/firefox-54.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "d5d8a55002e8828f3e32c90f7a24aaede2eb820f203b3a2d5151010aaa5c3996f47dcdd36a4702ec96a93157cb7cd591ef81affa9c1750e078f3b569a537725e"; + sha512 = "9b4a943cca2841617fd4e62cbd6e5b696282903e540f7d177e790da5ff388b1af2e2397f27b82af136fee37149bfbcd6b18906996f383f14a0bc79351efe8ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/kab/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kab/firefox-54.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "31b158d5e83cd8f241740a350465ab3d4e1a12fb374d85b97b4f32f848357bcdc4f179b97ac63701ddd619f9934a2edcf41f65ad1c13b8b2141522f79f3b24fc"; + sha512 = "39688e228149ccf9f0435fe1bc2c04bfaa3ea4da66eb0310b9eb2d757ecabbcf157ff8af7821565b2d78743f9075e398a76024854815427bc04ac99148634d01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/kk/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kk/firefox-54.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a32d200a7715a7598fca3f3214ab4c5ad6d25ceb92224f1602d3446af75d7da15b36d8ec1f71e65ae8f74cda8650bd46b81e16b16aae7130795764a8ed2779eb"; + sha512 = "46c7f12f73a4fa5d7835e957ea7179b81438132fdc3683b4fd61bf68aeb78fe3cfbdcf5c92b77dfb2eea1e5e3c249e03dc5c0d9adeca75417938ddf8f8be9dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/km/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/km/firefox-54.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "9fc0a533296974bd1ab7c16d7e6d2f6c5482e292bce11ab322ae94a96003cda788750a1a26f4064e9c65144003e0acac67d214f89a388c9c433be6d2ecc5444a"; + sha512 = "de65d654b3381b111694134697866e6c9924e42e2957449cafbd50fa67d1330c53ee1dcad21e59dcb9993d706ca08fa0e82bbce4cb2e48d318bba46134a12a59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/kn/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kn/firefox-54.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "a613e37c8635508f728d890232e54cf69f2f66b76ee9cb1994d4c0050f579fbacba749efb2307cc40cdea32aadc024497d80f921afc632bcc6d0d4db88828b83"; + sha512 = "10c8be44d567ef6dbd5030611a3bf72604485504033d27df336e7db6e44b9e319771026dfef3db666c7107e6c9e53e57e7923b9059091ea288f44a594dba1953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ko/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ko/firefox-54.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "014e823ba7c4e4b2d36283157a5931d7fd4a8bb499216e5ff9228cd598602eb426d38a5d8e50452b0187dc8475dace5844c08c18a960db78b26d2139c6d843de"; + sha512 = "d0a3a812c96990eacc2b332696b6f17a602b65691fff54d8e1511b5261cd8d482e590abaa93e56ef801388b02cb8dcb20575658d7429ceb1dba24bc2e30cd8e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/lij/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lij/firefox-54.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "cf8b398d2b1d47c3f5803311cee0a7f3b3ee2a28d74ff7b2b8537a14b7b05fcff37ab5097da6ad0370982cfdecc9b6bdc8b40880c745f491c42e10eeca67eab8"; + sha512 = "700991c2ff12ecca4f11540a563b3cfa72c928fcb864471d638777ed53eaee105c62f62e6de768df895d54c2718cb4dc0ae1648e4869d5af102eb567d6fccaf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/lt/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lt/firefox-54.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4dce327b10e2a7f79fff55d02e6cdbca3edefd3b5f6618af6bfb9ef4db7049499a274dd6deb3964a3bf473952377ce21b3887deaf2822073b0dff1109ef45b56"; + sha512 = "488b215810ee0672b0a0f44a3891881df312095537f6f7936ae4fcb17b211a6675080ef720b977c1a35ea2fdae38b1e0393aab57dc2a008705d6a8d27560b0c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/lv/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lv/firefox-54.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c088c08ab0f6f6d4222675808928dbf623be20e64f10e08ddc01e99054724060272d1ea71df8db8e93fe107a91559005954c0fd267634b14b0b9cac874d80761"; + sha512 = "b5ab118ebb407c17dabbcd32ae297fd22b663bed8f9feff40d442a9a24f2dc0c5a2762cb5136ef8910820014f404fd9ef4160a413c70bc2840ffcf11578ed56a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/mai/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mai/firefox-54.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ebd15fe44dd5c8e8880f45c854ce8785c6a3fd74f4c7991c99ca47d3bcc57371d0378fec3d40d1565aca1ee4a85ba787776690892700fc6714d7212405d94a9a"; + sha512 = "b77d5a3b1d57ddeb45bb765610901ba6c142a125450d5a247088ec2b113ffcdce33341ddcbad277a9789972297f98bb9c120501bcd47578d9d633697bded8af3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/mk/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mk/firefox-54.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "342b993d781d170f23543bfc4e37ae624326ca0b0fea570e58ea30ca49eb0cf8e2d868dc11efec00e84aa7461c6d84594ec816ea1fd5ade1eeac3d54804363c1"; + sha512 = "180a9730ffed7c69db3fe5deb0496d077a655106c06492e0da3611c5775acadc62c5ebf47e525aeb3cb51a0beb7f8599aafdb725884ffb2a9a9a5a8b61d7c032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ml/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ml/firefox-54.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "9f73181a36e7f357fafb9fd7fe740e67bdce13788674396ca34a13560aeb0aa5326efcbce88f55040e4b7516a1cf0baa933b19559eaf6c5ce0a61502c41151a5"; + sha512 = "07a29dda4ab7aee1a67b8d832e5237ba5bcec6be8fc848985428f7385687269b798530582788e11cc7858a1e0be0cfba5a134d0ac164bfa61c0e2cffc5640c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/mr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mr/firefox-54.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "042c362723d46b32888fae19cf9b81b2ddc13fbc35123c507cba00171339e2bbb0d107b51f9c18c6d422196bba0c6c1eac2fec2828b1f2f2347eb1d78f10d9e0"; + sha512 = "18b6d2f31c180ddf27082bc7d15f84c605004641bc6e48277ea061d0cddf02dee872657febab9fd84149688beb36a359864da22d9dd3ff3cfccd05dfbfe8b44b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ms/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ms/firefox-54.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "aa79ef859b97021d4813535fa0ab92af86594a0486444f2ace11176f00b963b456a7c11acf0c3821ba7553777ad464fd2364cf68901e3b6e56acb04db5ad3314"; + sha512 = "3ad92632ab4858581d1a3039c7ba73c94de38af920f95dd3eaff637d84d25b6925af04fddf400f2e33c5821ef9ba40b431eb66b2fac117aad56ad52850a651c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/nb-NO/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/my/firefox-54.0.tar.bz2"; + locale = "my"; + arch = "linux-i686"; + sha512 = "e99437ff5a9417b15eaaed82c68d49712d212b2062924f84857e80b030668654e423a270199e6d8b60eaa34918c935614e4a85020e2e93f963c37781e1e059cf"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nb-NO/firefox-54.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "7fc4c59b813029f55931265b65963145a0ab6460e0316dfe30810a7867243057e9dadf500224a5604381eb6b13506cf5ed54b91d673e3635c5ad4f253bc1a9ae"; + sha512 = "c342735a2470fe7e932c66e6a423bcf4b092966c9c89b1a2283a20583cec5f4d878ea35523e74c1405f69702339c453f96d3a52b3bbb851b9b1bf2ab2e304a21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/nl/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nl/firefox-54.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "991f9d18873ab9c451e0ad099f468eb7dc70a52ae70194a1133af98a293737a0846bc2cc48ef6a626bf324df2d2e5a20e0977deeccef6d34abdec463b8029a43"; + sha512 = "e4a68a804e0607431ec387faf5acce61d66e8bd7f39eb6834a3eceb43349f7b2bbc70fd5939dbaaf26b72232e3d1ffb1a71ad9cecdfc9e58afe2e332e67be4f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/nn-NO/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nn-NO/firefox-54.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "594b7c0de90609c9efa5b9081ade9028a21ac0e48dbe998b6dce8010159175698a091e3f06e1c996f81086a9e37a3792a55fd67f0a2435a48f4f103dfc2cf627"; + sha512 = "8df06d7a97df865099fa00b3c247bade0ea43975fe13d12904da62e0a84931a91e6555d96a5632ade139956837298b66c4b496cb6568e5794caf09236e23e64d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/or/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/or/firefox-54.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "f47de5cc05616ea138d13f29b46baaecc048e47c582c0b17a6d245acbba49dc4247eecd420616c7df62075cdabb49f014cc0028a52771b6cd7fa157e8900fe15"; + sha512 = "8db56055a775654b83cf0ff02f9c3c46296245c1a6c3544297495904ca632288bc96f4aecef6439d85706189be3ad1c6cfd6df1c113535dfb9af281a34fcf3e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pa-IN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pa-IN/firefox-54.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "608e53a64a367b34621ad1fedf762fbbcd52428e1d85aa123a24ba099b676f7ab6bde953a45d5598e393b7c0ef53fb80d6189841386c9cef46445560f68fdc69"; + sha512 = "a3aee571e2d4d5e4c198a58c4e0cf140fc7db77f8a86aca77166b1eda04117456f1518f79d8000ea961e9a2c7c54fba5db5838bd380724c29260cc494c81a978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pl/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pl/firefox-54.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "169b218f454660b3fed1c1b728d14872cc839d95cbdb962c8d8e3035cba4041a111a850bb517c37b90ba0fc211effbfe0359995e030484b6467ea2b333436205"; + sha512 = "39a69b56e20f6436e1dea3eba50d816c4aac496107da5a06f093e9f177eb3e11efb169cb25f27766c87f3347d00d9ac63c4028246ea31871b6861ecabccf511d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pt-BR/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pt-BR/firefox-54.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b9e41a078a4b73d30e1c13a6aea84e9268235229032377dca4c88607ea0c54b9addbfc0c4e5a1ad52f16033dc1d51c35150746d600220d27cc07e037ca3354da"; + sha512 = "02d450c530e1f219d97b894d2c3c9d2f376aeafb89edba9b2f65d5db5ef7ddf90f43fb4aecb98c0253777158f96b3f49b6adcb9c3fdbd1adf1448fb57420c401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pt-PT/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pt-PT/firefox-54.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "bfa18669b700abfb868265b7d5d045d4a8bcbed8b9c0d4430b8035ea9300c9c5270fb2f673d7ac5c1dfa570b4fd4a0d3c2ce43e56f19134f6004c9d5996cd3a4"; + sha512 = "319b5e765a3a561e54aa9ec967246e335e080c0008a102b1f023725f0905cb624e90dc5afa65e8a6d2209d9b04e59df50a6229f40c590041a5ad9abce9701ef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/rm/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/rm/firefox-54.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "67e7d274a0cac15f3d7955c1c63064f15a77d83bd3dd0d5916dd59c76affc59e1df3384c47dc5884ee7c988a3b4e21cb1363683b2b13afc03147125c85d2737d"; + sha512 = "66e70a6969a28f55276ec1a50e581b96b585b671bac733ebcdc5045c4c8473fb8c191ffcf43813cc0eeccd5dfe1068215c4731923a2e5fead423eb52ebd4724d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ro/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ro/firefox-54.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e2089b66e855015526ce1800ed93abe81b41b712474f6a29a58d7e7b814fb0838d833669cce24302f76983f1d11b90ec9e50437caf6f951be50f96ded4b22e4a"; + sha512 = "2372437efb96d9e62215d191d3201ea2ea54bb7a328137ceb0532ce08638aa67bd88573e8a2c9746074a91717f431acf68782b75773a81a34ece7ecb117c1c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ru/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ru/firefox-54.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e1cebc4fdd645ed6e013e189b83b923734bb910b422565a88eaea36f55bc95ce31543010c35b64198acef82618829e3de41254053242ac06ad2829b168bef5bc"; + sha512 = "aa8c61333efdd8808819c07b00301db4a16aff10a2cd2fb57f172df538ed58148e32b9be87ff0cff69a09306036df1aff13c55532c8a63aceeee93c7692ce8c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/si/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/si/firefox-54.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "65e792b47baa1de0def9e5a381c55ebbfa5e81101ce88e369c0b44781ed04671159bbbdf74461412fd87bb0ae8778f7358da357f73ecb8ed54096563b54be7ae"; + sha512 = "5f2ed1bc75093da1b3bd2355170575127709f61fd627e84c0170950e9991efe7d6511a29b20907f694fc797cc824fdbe793087e28dd998bd4aacab328151457f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sk/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sk/firefox-54.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "b5954bd0cb0b2184e3894d425c6af6bcc0750a302d19a220f379da848cc1faeb7d0a73809ac5d9190e19b955e354b62bb08310f06a08fe566fa90775070995f5"; + sha512 = "9eb52821878542601040b926ac80035f92cbc9b568d5fba5c79e49d53245b4e4480b5e1ece0b671d0d77e86d3596758f5defd2f87e640836d1722341f24eed15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sl/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sl/firefox-54.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "de7f5650e3723c4c1be6c85dfd184a47336e9912a3482b5367c734238073d73458fdf6db0350ec7fe229ac6268adb6b3c825b493f7e7c03fefaa538a9a3538e3"; + sha512 = "0f0d38df630f9e501e074d7fa1c0d7e8f4841a0e7a17aaee9d369432f2a7a14321011759c843fba3cea41f24a5aa929f94b47be8b76409d3b8931cb660dfe938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/son/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/son/firefox-54.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "6e751724307db69ff14ca3149bd919e1d0f203083e0d15087f10a5f25715416ba84b25eeb6d8146ed97bafb3f53889fc24ad225c06bc67fa47e07dcaee8655ef"; + sha512 = "1a68b374225b6dfe831ad090c26985abf309b788ac418baba20ba9296dd647e0d66ed6563235918dcba80839f06ec8f3e64e1d54b8d8baef9a10275f860b99bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sq/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sq/firefox-54.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "22e2ed05c946c91152d30bfbf0dd38396d07050690294eff0910c80cd3cd7970181b6019c22eec9dbc07f5511fbb14813e87445b04f8e4a9977c34ba242b8008"; + sha512 = "382fa3024f3a776ba18e10a66d6dd6b5b9640dab2b1f1088f1e6f385332dccf1fd5acf2f77881128444c36bdd4e82a311327755c8d469e7e02360b054a7b3c20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sr/firefox-54.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b8c6a818b0d4ea3830e5840c307f059857a323f094e32233560f34148ff7f889dc0e7af85997cbd39cc09a34ec4409e5cba8ad4a3700b9f296cc1655d76ca613"; + sha512 = "e31e17699727e40eb3be4f21b483163edc385c5ab19f1fe6bbe51b50525f17ff126d94937e2faf31d2c993730697d5911703bf6b9519338a995c1694a016da22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sv-SE/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sv-SE/firefox-54.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "8d6c1fb2c9f29c5821e7a104a131d8d18e7cca5bed59a67fb0fe7338f569b8ae514514cae3cee55cc9a28a42e429cdc3728fb73484deb85a2493c6f966de10fb"; + sha512 = "a7ec76ad1db4e9d0a472625ba476f410018f0df6a9c76b81079cff894300ef21b489e0be73107e349982aeb3fa496ac6aad99651228b001422270d97e8caf1a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ta/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ta/firefox-54.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5177a282aa879798962fdab652799739f30c66b5d56cae807dd2df1a58932968b1f668c4239c253fb81a4e2a51f014f17146d15f9534b8afd8f4ad76e0786325"; + sha512 = "cd47c0d9cdc92f91ec284aeb2f858317c6fc52afa183ebd2bdc6c038a8dc1d343f7881ceec53844c821c5a6786fc05b5344cd2e213f4ba598d5ae23a78c7a6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/te/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/te/firefox-54.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "524913d7bd13d930501a87e63461233a8afbe5ee8efeabff09a47ce835457dba0b197766bd92e1857c2a2d957e8a37c45819514b06cc9264b6be7a91c4112ce4"; + sha512 = "bd0b47f0f85a5b05bbc1a7640da9ce79f018cd7daee8d5fa2b011f8c91ded499305c4bb53290ec0a0224e69f500e5b9ad173898d10a4071e425c7004ed8fe5ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/th/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/th/firefox-54.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "3f56c618b406e8b7a9ad2bc8646bbe3d48d405b5ca960bede132c0b05558a85a09f9054055256a53a4fffdcb7e60a4265aed09522e432b6461581b444b003501"; + sha512 = "ecdbf45a5a5b1fdcbdc3fe52a69f7310dc3b1b76c758ed5a055daebe7b0aa47be398ad8cc6df403db93a9b49b85eba5611debeb6abceff4511a58ce6d71632c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/tr/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/tr/firefox-54.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "7dafa29e3663967a1fcad46395433d43e523cd48872bcd78292703610d39fd206646809f8126b87436424a3db2666585fabd2d6f8f431ba524217b4086d7ed47"; + sha512 = "dad56a8230094269fcc64d01f33b38d399fbbcedcafec26ea34e2c6edd6caac2f821b3aa2ba755ae9222400076f1753ed5a31c374a1c858cb53151a5af9614e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/uk/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/uk/firefox-54.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "6d304c4f822f650061dff8f41803c30c767a48dd73e8f32e5b164f63d9370243d5954c280ac6a19822b85836b7a0a9202ca1bb892319a51bdee7113cdfc10dbe"; + sha512 = "3ec96ff7b5ae14eb7331970899138c9cb12e3d369c48df1af970cf4805be9fb232c9197b0956dc69b48470eef29f85b6507dd7707da78c64611ee5229c82dd3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ur/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ur/firefox-54.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9bb203445fbc293a2f972b39569dd31b3b87d5f5e7be4ae5fca946fed828a05ccfe06ddc0ae34401471cc08a907e7ffa336727d25610729470e0842b4680bb1c"; + sha512 = "b02959b4f8c456fbc1017b36d468449aab678008e05bf73dbeed4b69becdc9688bdc6f1c404cd749327b7cabf44c4b969c2f851402ab9ac7196ab53b5c974c26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/uz/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/uz/firefox-54.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "71377fb8fda9ca8a0d606ae1944328195fabc51d57923edc9e9bcc10b08859141553c855ecd325fe02cf422a6af2f1a9b104bfbfb7d96399f0d7fbb1ac050bde"; + sha512 = "bff5034a765276f48aa43c0cf72ce1fc29ac8c39a296f72b330668ba6dd28cc32abf7eec4c31b247f12e7458f8f4640978fe0dc5a2d4a883b13e3335ede042a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/vi/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/vi/firefox-54.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "a1e62493b7629b5acc950e1f0ed18845d3dec9cf01b561058a9d67e3420418110391f245fc584535c500e8bace53218305a66e60439e781de340f9bac7085f39"; + sha512 = "172665812d4c239ab8d9bc7610744fd88e721801d1939eff27dd8f7bc1614ca09bbc67d0de2518b76617cc804c7b98080b4a4c673b0dcf880fe57e58f8e75dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xh/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/xh/firefox-54.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "948854c1ddd02f6dc0df035156481c66ff66c475988c9555cc2eb79dbebf9134291e4f4624a82e95736f08c1043e2d61077bbadb22b765682ee1a76338209d32"; + sha512 = "1a238fa435714d9e83a4d3e0d31f33350e40b2617d0b72698a6e381e7a8ece884a129fea5b7803b3564625089f26b4760e7547f497c964a9fce66fff11bbbd43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/zh-CN/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/zh-CN/firefox-54.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "79f2ed7038f129ea81fc20dd41d93b91731a38b0fd984f7ea2354b5d6391fda9301a99df9afc87e2130ffbb72b4efc1ba26678b2d7cf4c274f82407d6265961f"; + sha512 = "60fea3731a2d67b9480158011a2ea9df119b4db54018e0ac4194a1e86312f495647ee1861aa8ae1b9f6ff6cee28f925c061064c035f1fd23d37495211ad8744c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/zh-TW/firefox-53.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/zh-TW/firefox-54.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f8f081aaf28264a566909d36dd63d7bdafecc8b84f2238974eda749fb83c7f90b774d5bd46aba6e8a7e7bd14c57167123eddaf2a28fb83db7c5029cef886ca52"; + sha512 = "0462e6b2ba08a09ec422aadcef76ed2f406f57addd4ae4a8469e4801010d7a5fe89a69e9f201cdd2c5258cad4e381f2f0616dc1c1daed07d8ebf7fc1c036e143"; } ]; } From b707e8c78f5370ede2e0f5c077745eef1fc60883 Mon Sep 17 00:00:00 2001 From: Ekaterina Vaartis Date: Wed, 14 Jun 2017 15:18:56 +0300 Subject: [PATCH 099/152] perlPackages: init packages needed for bugzilla (#26569) perlPackages.EmailMIMEAttachmentStripper: init at 1.317 perlPackages.EmailReply: init at 1.204 perlPackages.PatchReader: init at 0.9.6 perlPackages.TemplateGD: init at 2.66 perlPackages.AuthenRadius: init at 0.26 perlPackages.Chart: init at 2.4.10 perlPackages.EmailMIMEModifier at 1.444 --- pkgs/top-level/perl-packages.nix | 102 ++++++++++++++++++++++++++++++- 1 file changed, 100 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b9eb8a82eef..2282cdc2f32 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -517,6 +517,20 @@ let self = _self // overrides; _self = with self; { }; }; + AuthenRadius = buildPerlPackage rec { + name = "Authen-Radius-0.26"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/P/PO/PORTAONE/${name}.tar.gz"; + sha256 = "4f272c19b8a9f6514a1107e98efae6773208233df4db11f2dc4764b4784b17c3"; + }; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ DataHexDump NetIP ]; + meta = { + description = "Provide simple Radius client facilities "; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + AuthenSASL = buildPerlPackage rec { name = "Authen-SASL-2.16"; src = fetchurl { @@ -1735,6 +1749,19 @@ let self = _self // overrides; _self = with self; { }; }; + Chart = buildPerlPackage rec { + name = "Chart-2.4.10"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/C/CH/CHARTGRP/${name}.tar.gz"; + sha256 = "84bd99a1a0ce72477b15e35881e6120398bb3f553aeeb5e8d72b088520e4f6bf"; + }; + propagatedBuildInputs = [ GD ]; + meta = { + description = "A series of charting modules"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ClassAccessor = buildPerlPackage { name = "Class-Accessor-0.34"; src = fetchurl { @@ -4510,6 +4537,20 @@ let self = _self // overrides; _self = with self; { }; }; + EmailReply = buildPerlPackage rec { + name = "Email-Reply-1.204"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "ba4fd80ac5017d6d132e0358c786b0ecd1c7adcbeee5c19fb3da2964791a56f0"; + }; + propagatedBuildInputs = [ EmailAbstract EmailAddress EmailMIME ]; + meta = { + homepage = "http://search.cpan.org/~rjbs/${name}"; + description = "Reply to an email message"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + EmailMessageID = buildPerlPackage { name = "Email-MessageID-1.404"; src = fetchurl { @@ -4540,6 +4581,22 @@ let self = _self // overrides; _self = with self; { }; }; + EmailMIMEAttachmentStripper = buildPerlPackage rec { + name = "Email-MIME-Attachment-Stripper-1.317"; + buildInputs = [ CaptureTiny TestPod ]; + propagatedBuildInputs = [ EmailAbstract EmailMIME ]; + + src = fetchurl { + url = "http://www.cpan.org/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "dcb98b09dc3e8f757ec3882a4234548108bb2d12e3cfadf95a26cef381a9e789"; + }; + meta = { + homepage = "http://search.cpan.org/dist/${name}"; + description = "Strip the attachments from an email"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + EmailMIMEContentType = buildPerlPackage rec { name = "Email-MIME-ContentType-1.018"; src = fetchurl { @@ -4569,6 +4626,21 @@ let self = _self // overrides; _self = with self; { }; }; + EmailMIMEModifier = buildPerlPackage rec { + doCheck = false; # tests are broken, it seems + name = "Email-MIME-Modifier-1.444"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "4521cf361527cd9b5e8b0db3d2e6c9588c52de6a8997e1daf5c21ed1eb7a4ba2"; + }; + propagatedBuildInputs = [ EmailMIME EmailMIMEContentType ]; + meta = { + homepage = "http://search.cpan.org/~rjbs/${name}"; + description = "Modify Email::MIME Objects Easily"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + EmailSend = buildPerlPackage rec { name = "Email-Send-2.201"; src = fetchurl { @@ -4761,7 +4833,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1vzpz6syb82ir8svp2wjh95x6lpf01lgkxn2xy60ixrszc24zdya"; }; }; - + EV = buildPerlPackage rec { name = "EV-4.22"; src = fetchurl { @@ -10406,6 +10478,19 @@ let self = _self // overrides; _self = with self; { }; }; + PatchReader = buildPerlPackage rec { + name = "PatchReader-0.9.6"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/T/TM/TMANNERM/${name}.tar.gz"; + sha256 = "b8de37460347bb5474dc01916ccb31dd2fe0cd92242c4a32d730e8eb087c323c"; + }; + meta = { + homepage = "http://search.cpan.org/~tmannerm/${name}"; + description = "Utilities to read and manipulate patches and CVS"; + license = with stdenv.lib.licenses; [ artistic1 ]; + }; + }; + PackageStash = buildPerlPackage { name = "Package-Stash-0.37"; src = fetchurl { @@ -11471,7 +11556,7 @@ let self = _self // overrides; _self = with self; { sha256 = "09c8xb43p1s6ala6g4274az51mf33phyjkp66dpvgkgbi1xfnawp"; }; }; - + RegexpGrammars = buildPerlPackage rec { name = "Regexp-Grammars-1.045"; src = fetchurl { @@ -12771,6 +12856,19 @@ let self = _self // overrides; _self = with self; { }; }; + TemplateGD = buildPerlPackage rec { + name = "Template-GD-2.66"; + src = fetchurl { + url = "http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${name}.tar.gz"; + sha256 = "98523c8192f2e8184042e5a2e172bd767ac289dd2e480f35f680dce32160905b"; + }; + propagatedBuildInputs = [ GD TemplateToolkit ]; + meta = { + description = "GD plugin(s) for the Template Toolkit"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermANSIColor = buildPerlPackage { name = "Term-ANSIColor-4.03"; src = fetchurl { From ceb34c6d95044b37605e49dc6b2ae73ef5be8210 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 14 Jun 2017 21:33:35 +0900 Subject: [PATCH 100/152] nspr: 4.13.1 -> 4.15 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 71a15b7e477..c2aea07d102 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , CoreServices ? null }: -let version = "4.13.1"; in +let version = "4.15"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab"; + sha256 = "101dksqm1z0hzd7ap82ccbxjr48s6q3xhshdl81qkj6hqdmy1p97"; }; outputs = [ "out" "dev" ]; From 0ed1aead70e8ba7394df9d32df50c0b54e0ed480 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 14 Jun 2017 21:45:07 +0900 Subject: [PATCH 101/152] nss: 3.30 -> 3.31 --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 396d795c5a4..80975c8ef5d 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.30"; + version = "3.31"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_30_RTM/src/${name}.tar.gz"; - sha256 = "a8c0000dae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9"; + url = "mirror://mozilla/security/nss/releases/NSS_3_31_RTM/src/${name}.tar.gz"; + sha256 = "0pd643a8ns7q5az5ai3ascrw666i2kbfiyy1c9hlhw9jd8jn21g9"; }; buildInputs = [ perl zlib sqlite ]; From 04e95882c0eadcfeaed91e1610e1d21921c02eba Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 14 Jun 2017 21:10:49 +0900 Subject: [PATCH 102/152] firefox: 53.0.3 -> 54.0 --- .../browsers/firefox/cargo-fix.patch | 33 ------------------- .../networking/browsers/firefox/packages.nix | 6 ++-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/cargo-fix.patch diff --git a/pkgs/applications/networking/browsers/firefox/cargo-fix.patch b/pkgs/applications/networking/browsers/firefox/cargo-fix.patch deleted file mode 100644 index bb19e9e45a3..00000000000 --- a/pkgs/applications/networking/browsers/firefox/cargo-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/media/libstagefright/binding/mp4parse-cargo.patch b/media/libstagefright/binding/mp4parse-cargo.patch -index 1dd13d2..f98b722 100644 ---- a/media/libstagefright/binding/mp4parse-cargo.patch -+++ b/media/libstagefright/binding/mp4parse-cargo.patch -@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libst - index aeeebc65..5c0836a 100644 - --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml - +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml --@@ -18,18 +18,10 @@ exclude = [ -+@@ -18,17 +18,12 @@ exclude = [ - "*.mp4", - ] - - -build = "build.rs" --- -++build = false -++ - [dependencies] - byteorder = "1.0.0" - "mp4parse" = {version = "0.6.0", path = "../mp4parse"} -diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml -index aee7ee9..d7e3f55 100644 ---- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml -+++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml -@@ -18,6 +18,8 @@ exclude = [ - "*.mp4", - ] - -+build = false -+ - [dependencies] - byteorder = "1.0.0" - "mp4parse" = {version = "0.6.0", path = "../mp4parse"} diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 8f117e1416b..3df6b9195bc 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,14 +6,12 @@ rec { firefox = common rec { pname = "firefox"; - version = "53.0.3"; + version = "54.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118"; + sha512 = "0ff6960804e7f6d3e15faeb14b237fee45acae31b4652a6cc5cafa1a1b1eab3537616c3e8ea6d8f3109c87dcc8f86f0df3da2627903b80061c8a62fb11598ed9"; }; - patches = [ ./cargo-fix.patch ]; - meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; From 930a00bc923dbd49e42cdae080e363245a55665a Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 14 Jun 2017 21:10:50 +0900 Subject: [PATCH 103/152] firefox-esr: 52.1.2esr -> 52.2.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 3df6b9195bc..bf33595b54c 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -25,10 +25,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.1.2esr"; + version = "52.2.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "76362738f6db82a41ff6af4e12a15a302068a5ce10d23739f29375f3279573d0ea43ecee9d2e46fce833a029e437efcfcceab9442c288560f476e0cff2ea9e1d"; + sha512 = "62a2bd47c9f4b325199b8a0b155a7a412ffbd493e8ca6ff246ade5b10aacea22bc806bc646824059f7c97b71d27e167025c600293c781fbad3fdefb8bbc8d18e"; }; meta = firefox.meta // { From ca17f3b8efc48af4f8a6128c1d5de7146053af40 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Wed, 14 Jun 2017 16:44:46 +0200 Subject: [PATCH 104/152] hostapd dependency fix for https://github.com/nixos/nixpkgs/issues/16090 (#26573) --- nixos/modules/services/networking/hostapd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index fd4545e88e2..bf2d0916fa3 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -164,7 +164,7 @@ in path = [ pkgs.hostapd ]; wantedBy = [ "network.target" ]; - after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service"]; + after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ]; serviceConfig = { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}"; From b2660fe3cca8fd87d1def86798423783726f1906 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 14 Jun 2017 10:44:33 -0500 Subject: [PATCH 105/152] mplayer: Use system ffmpeg instead of vendored version. (#26572) Fixes use of mplayer with https:// URL's. --- pkgs/applications/video/mplayer/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index ba02583a274..37b424d922b 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -93,6 +93,8 @@ stdenv.mkDerivation rec { prePatch = '' sed -i /^_install_strip/d configure + + rm -rf ffmpeg ''; buildInputs = with stdenv.lib; @@ -159,6 +161,7 @@ stdenv.mkDerivation rec { ${optionalString stdenv.isLinux "--enable-vidix"} ${optionalString stdenv.isLinux "--enable-fbdev"} --disable-ossaudio + --disable-ffmpeg_a ''; NIX_LDFLAGS = with stdenv.lib; From 13a8fa88011a45447ec26f81c473fe7f39172d02 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 14 Jun 2017 15:46:13 +0000 Subject: [PATCH 106/152] nixos-artwork: do not leak nix hashes to filenames in /share/artwork/gnome/ (#26566) * nixos-artwork: do not leak nix hashes to filenames /share/artwork/gnome/ * simplify --- pkgs/data/misc/nixos-artwork/wallpapers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 28bf0d40b39..254f13825ab 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -10,7 +10,7 @@ let installPhase = '' mkdir -p $out/share/artwork/gnome - ln -s $src $out/share/artwork/gnome/ + ln -s $src $out/share/artwork/gnome/${src.name} ''; meta = with stdenv.lib; { From 3a9c7c6c1880b6b09fd29074d64ba8ffb54896c4 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 14 Jun 2017 17:50:48 +0200 Subject: [PATCH 107/152] pythonPackages.netcdf4: add missing cython dependency (#26570) --- .../python-modules/{netcdf4.nix => netcdf4/default.nix} | 6 +++++- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) rename pkgs/development/python-modules/{netcdf4.nix => netcdf4/default.nix} (90%) diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4/default.nix similarity index 90% rename from pkgs/development/python-modules/netcdf4.nix rename to pkgs/development/python-modules/netcdf4/default.nix index b123921a1ce..8f06957bf22 100644 --- a/pkgs/development/python-modules/netcdf4.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchurl, isPyPy -, numpy, zlib, netcdf, hdf5, curl, libjpeg +, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython }: buildPythonPackage rec { pname = "netCDF4"; @@ -13,6 +13,10 @@ buildPythonPackage rec { sha256 = "31eb4eae5fd3b2bd8f828721142ddcefdbf10287281bf6f636764dd7957f8450"; }; + buildInputs = [ + cython + ]; + propagatedBuildInputs = [ numpy zlib diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55128c4aaa4..9e957218263 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8066,7 +8066,7 @@ in { }; }; - netcdf4 = callPackage ../development/python-modules/netcdf4.nix { }; + netcdf4 = callPackage ../development/python-modules/netcdf4 { }; Nikola = callPackage ../development/python-modules/Nikola { }; From 24d313e2039b6d89f8a1ba4c5be12b134479fe67 Mon Sep 17 00:00:00 2001 From: michael bishop Date: Wed, 14 Jun 2017 11:41:00 -0300 Subject: [PATCH 108/152] justStaticExecutables: enable -dead_strip on mac to shrink closure --- pkgs/development/haskell-modules/lib.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 6c718bafda5..30d82d3efc9 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -89,7 +89,10 @@ rec { isLibrary = false; doHaddock = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - }); + } // (if pkgs.stdenv.isDarwin then { + configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"]; + } else {}) + ); buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' From b7f4e04c18dd75a1fc0d51a0395150797fb44f23 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Jun 2017 18:04:23 +0000 Subject: [PATCH 109/152] ocamlPackages.mparser: 1.2.1 -> 1.2.3 --- pkgs/development/ocaml-modules/mparser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix index 6490eeb2f38..9a935cf4a5a 100644 --- a/pkgs/development/ocaml-modules/mparser/default.nix +++ b/pkgs/development/ocaml-modules/mparser/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-mparser-1.2.1"; + name = "ocaml${ocaml.version}-mparser-1.2.3"; src = fetchzip { - url = http://github.com/cakeplus/mparser/archive/1.2.1.tar.gz; - sha256 = "1g1r3p0inmm5xwh9i5mrc4s414b0j8l13a66hpvwhqcpp6qglfh3"; + url = http://github.com/cakeplus/mparser/archive/1.2.3.tar.gz; + sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw"; }; buildInputs = [ ocaml findlib ocamlbuild ]; From 3628ce4d67184a92576f795279bce1bf240d9b1d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 14 Jun 2017 19:23:13 +0200 Subject: [PATCH 110/152] intel-gpu-tools: 1.18 -> 1.19 --- pkgs/development/tools/misc/intel-gpu-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index f644160b9a3..d1aef990230 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -3,11 +3,11 @@ , procps, autoconf, automake }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.18"; + name = "intel-gpu-tools-1.19"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "1vp4czxp8xa6qk4pg3mrxhc2yadw2rv6p8r8247mkpcbb8dzjxyz"; + sha256 = "1wdhwf3im6ids95qw5r9hjj9hvp0qhzgi4llrlriy723q3kqm754"; }; nativeBuildInputs = [ pkgconfig autoconf automake ]; From fcf205024a642902648d80444a4df5a31b455bf5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 14 Jun 2017 20:14:07 +0200 Subject: [PATCH 111/152] jasper: 2.0.12 -> 2.0.13, fixes CVE-2017-6850 --- pkgs/development/libraries/jasper/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 34e7e4a761f..63dd931a139 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, libjpeg, cmake }: +{ stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }: stdenv.mkDerivation rec { - name = "jasper-2.0.12"; + name = "jasper-${version}"; + version = "2.0.13"; - src = fetchurl { - # You can find this code on Github at https://github.com/mdadams/jasper - # however note at https://www.ece.uvic.ca/~frodo/jasper/#download - # not all tagged releases are for distribution. - url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "1njdbxv7d4anzrd476wjww2qsi96dd8vfnp4hri0srrqxpszl92v"; + src = fetchFromGitHub { + repo = "jasper"; + owner = "mdadams"; + rev = "version-${version}"; + sha256 = "1kd2xiszg9bxfavs3fadi4gi27m876d9zjjy0ns6mmbcjk109c0a"; }; # newer reconf to recognize a multiout flag @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; platforms = platforms.unix; + maintainers = with maintainers; [ pSub ]; }; } From f59104bc736cd47d98814da073db772298ae32d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Jun 2017 21:28:28 +0200 Subject: [PATCH 112/152] vcsh: patch broken parser for $GIT_VERSION_MINOR --- pkgs/applications/version-management/vcsh/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 038e72e83a0..e15bc489beb 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }: +{ stdenv, fetchpatch, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }: stdenv.mkDerivation rec { version = "1.20170226"; # date of commit we're pulling @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln"; }; + patches = + [ (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch"; + sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k"; + }) + ]; + buildInputs = [ which git ronn perl ShellCommand TestMost ]; installPhase = "make install PREFIX=$out"; From 98c38d51b944e984805a6b150e2a80e7401c0e72 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Jun 2017 14:11:26 -0500 Subject: [PATCH 113/152] dropbox: 27.4.22 -> 28.4.14 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 9c68253cf42..12ed28979d2 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "27.4.22"; + version = "28.4.14"; sha256 = { - "x86_64-linux" = "1v1q799dj0bffg3s98ifzpsccjaajl221h5ckaqijlmpzr2q5hhh"; - "i686-linux" = "1qsw6c0mb0n0djz7xpfixispi9k68kbvf8dc92frpcbcvm0h845y"; + "x86_64-linux" = "02pfly33bg85c8y3igvkhyshra8ra089ghjibhzl1a4fmd45wf52"; + "i686-linux" = "10swkjbzkyf19cilzw7ja6byla4dllr52pbz19wjzb8rv088gcla"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From 4f909c4f3a4f3ba26fb205c4e0aaaafc64daaf3c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 14 Jun 2017 22:58:42 +0200 Subject: [PATCH 114/152] tor-browser-bundle-bin: 7.0 -> 7.0.1 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index d8ab6d5d1d1..09ca83b5acd 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -81,7 +81,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0"; + version = "7.0.1"; lang = "en-US"; @@ -91,7 +91,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1c9aiv4qdpi95yymmj86hkkinvkgbcdsa12vvdh9c18wsh4qrfvn"; + sha256 = "1zmczf1bpbd85zcrs5qw91d1xmplikbna5xs053jnjl6pbbq1fs9"; }; "i686-linux" = fetchurl { @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1znbywcwlrrl3hbvk4dvq92b00flr8niw2kqk5pwvwwbl1gxiyz0"; + sha256 = "0mdlgmqkryg0i55jgf3x1nnjni0x45g1xcjwsfacsck3m70v4flq"; }; }; in From 7ef9a9ffc17048f725836c9e95b33213af680068 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 14 Jun 2017 18:56:35 +0200 Subject: [PATCH 115/152] ddcutil: init at 0.8.2 --- pkgs/tools/misc/ddcutil/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/ddcutil/default.nix diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix new file mode 100644 index 00000000000..c45c85e4271 --- /dev/null +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }: + +stdenv.mkDerivation rec { + name = "ddcutil-${version}"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "rockowitz"; + repo = "ddcutil"; + rev = "v${version}"; + sha256 = "1hcdg54xyb1pfl03iqll14y9yglwmyvxyvhbql87hd9q0dywah6m"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ + i2c-tools udev libgudev + glib libusb libdrm xorg.libXrandr + ]; + + meta = with stdenv.lib; { + homepage = http://www.ddcutil.com/; + description = "Query and change Linux monitor settings using DDC/CI and USB"; + license = licenses.gpl2; + maintainer = with maintainers; [ rnhmjoj ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbe2a9bfc5c..2e9c53df192 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1544,6 +1544,8 @@ with pkgs; ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; + ddcutil = callPackage ../tools/misc/ddcutil { }; + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; From 3dcecf09fc1c7c32b88dab97a87591543300a48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 15 Jun 2017 06:41:45 +0200 Subject: [PATCH 116/152] Remove aiccu package and service due to sunsetting. https://www.sixxs.net/main/ --- nixos/doc/manual/release-notes/rl-1709.xml | 6 + nixos/modules/module-list.nix | 1 - nixos/modules/services/networking/aiccu.nix | 185 -------------------- pkgs/tools/networking/aiccu/default.nix | 43 ----- 4 files changed, 6 insertions(+), 229 deletions(-) delete mode 100644 nixos/modules/services/networking/aiccu.nix delete mode 100644 pkgs/tools/networking/aiccu/default.nix diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index c16499a0c1d..b1bef8ef1c2 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -55,6 +55,12 @@ has the following highlights: following incompatible changes: + + + aiccu package was removed. This is due to SixXS + sunsetting its IPv6 tunnel. + + Top-level idea package collection was renamed. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bdede1726a1..7f94d6569e9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -389,7 +389,6 @@ ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix - ./services/networking/aiccu.nix ./services/networking/amuled.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix diff --git a/nixos/modules/services/networking/aiccu.nix b/nixos/modules/services/networking/aiccu.nix deleted file mode 100644 index ac755270951..00000000000 --- a/nixos/modules/services/networking/aiccu.nix +++ /dev/null @@ -1,185 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.aiccu; - notNull = a: ! isNull a; - configFile = pkgs.writeText "aiccu.conf" '' - ${if notNull cfg.username then "username " + cfg.username else ""} - ${if notNull cfg.password then "password " + cfg.password else ""} - protocol ${cfg.protocol} - server ${cfg.server} - ipv6_interface ${cfg.interfaceName} - verbose ${boolToString cfg.verbose} - daemonize true - automatic ${boolToString cfg.automatic} - requiretls ${boolToString cfg.requireTLS} - pidfile ${cfg.pidFile} - defaultroute ${boolToString cfg.defaultRoute} - ${if notNull cfg.setupScript then cfg.setupScript else ""} - makebeats ${boolToString cfg.makeHeartBeats} - noconfigure ${boolToString cfg.noConfigure} - behindnat ${boolToString cfg.behindNAT} - ${if cfg.localIPv4Override then "local_ipv4_override" else ""} - ''; - -in { - - options = { - - services.aiccu = { - - enable = mkOption { - type = types.bool; - default = false; - description = "Enable aiccu IPv6 over IPv4 SiXXs tunnel"; - }; - - username = mkOption { - type = with types; nullOr str; - default = null; - example = "FAB5-SIXXS"; - description = "Login credential"; - }; - - password = mkOption { - type = with types; nullOr str; - default = null; - example = "TmAkRbBEr0"; - description = "Login credential"; - }; - - protocol = mkOption { - type = types.str; - default = "tic"; - example = "tic|tsp|l2tp"; - description = "Protocol to use for setting up the tunnel"; - }; - - server = mkOption { - type = types.str; - default = "tic.sixxs.net"; - example = "enabled.ipv6server.net"; - description = "Server to use for setting up the tunnel"; - }; - - interfaceName = mkOption { - type = types.str; - default = "aiccu"; - example = "sixxs"; - description = '' - The name of the interface that will be used as a tunnel interface. - On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels - or tunX (eg tun0) for AYIYA tunnels. - ''; - }; - - tunnelID = mkOption { - type = with types; nullOr str; - default = null; - example = "T12345"; - description = "The tunnel id to use, only required when there are multiple tunnels in the list"; - }; - - verbose = mkOption { - type = types.bool; - default = false; - description = "Be verbose?"; - }; - - automatic = mkOption { - type = types.bool; - default = true; - description = "Automatic Login and Tunnel activation"; - }; - - requireTLS = mkOption { - type = types.bool; - default = false; - description = '' - When set to true, if TLS is not supported on the server - the TIC transaction will fail. - When set to false, it will try a starttls, when that is - not supported it will continue. - In any case if AICCU is build with TLS support it will - try to do a 'starttls' to the TIC server to see if that - is supported. - ''; - }; - - pidFile = mkOption { - type = types.path; - default = "/run/aiccu.pid"; - example = "/var/lib/aiccu/aiccu.pid"; - description = "Location of PID File"; - }; - - defaultRoute = mkOption { - type = types.bool; - default = true; - description = "Add a default route"; - }; - - setupScript = mkOption { - type = with types; nullOr path; - default = null; - example = "/var/lib/aiccu/fix-subnets.sh"; - description = "Script to run after setting up the interfaces"; - }; - - makeHeartBeats = mkOption { - type = types.bool; - default = true; - description = '' - In general you don't want to turn this off - Of course only applies to AYIYA and heartbeat tunnels not to static ones - ''; - }; - - noConfigure = mkOption { - type = types.bool; - default = false; - description = "Don't configure anything"; - }; - - behindNAT = mkOption { - type = types.bool; - default = false; - description = "Notify the user that a NAT-kind network is detected"; - }; - - localIPv4Override = mkOption { - type = types.bool; - default = false; - description = '' - Overrides the IPv4 parameter received from TIC - This allows one to configure a NAT into "DMZ" mode and then - forwarding the proto-41 packets to an internal host. - - This is only needed for static proto-41 tunnels! - AYIYA and heartbeat tunnels don't require this. - ''; - }; - - }; - }; - - config = mkIf cfg.enable { - - systemd.services.aiccu = { - description = "Automatic IPv6 Connectivity Client Utility"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.aiccu}/bin/aiccu start ${configFile}"; - ExecStop = "${pkgs.aiccu}/bin/aiccu stop"; - Type = "forking"; - PIDFile = cfg.pidFile; - Restart = "no"; # aiccu startup errors are serious, do not pound the tic server or be banned. - }; - }; - - }; -} diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix deleted file mode 100644 index a821c6476f7..00000000000 --- a/pkgs/tools/networking/aiccu/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, gnutls, iproute, makeWrapper }: - -stdenv.mkDerivation rec { - - name = "aiccu-${version}"; - version = "20070115"; - - src = fetchurl { - url = "http://http.debian.net/debian/pool/main/a/aiccu/aiccu_20070115.orig.tar.gz"; - sha256 = "1k73vw7i25qzmnbvmsp3ci4pm6h8q70w70vnr512517s2q5gag6j"; - }; - - buildInputs = [ gnutls iproute makeWrapper ]; - - patches = [ - (fetchurl { - url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/gnutls-3.4.0.patch?h=packages/aiccu&id=cc6decc4e734420e4c5d0cd28652077f6bd88d84"; - sha256 = "1ni3lhwy3r54js124p7fhm1my82a703chvh07vrhslb4v4b71g5s"; - name = "gnutls-3.4.0.patch"; - }) - ]; - - configureFlags = "--prefix=$out"; - installPhase = '' - install -D -m 755 unix-console/aiccu $out/bin/aiccu - install -D -m 644 doc/aiccu.sgml $out/doc/aiccu.sgml - install -D -m 644 doc/aiccu.1 $out/share/man/man1/aiccu.1 - wrapProgram "$out/bin/aiccu" \ - --prefix PATH : "${iproute}/bin" - ''; - - meta = with stdenv.lib; { - description = "Automatic IPv6 Connectivity Configuration Utility"; - homepage = "https://www.sixxs.net/tools/aiccu/"; - longDescription = '' - A TIC+ heartbeart client for the public dynamic-IPv4 IPv6 tunnel beta test from the SixXS tunnel service provider. - ''; - maintainers = with maintainers; [ edwtjo ]; - license = "SixXS"; - platforms = with platforms; linux; - }; - -} From 4ef8313bb65696b0a39739a799b8231e6b925a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 15 Jun 2017 07:54:50 +0200 Subject: [PATCH 117/152] aiccu: remove leftover from 3dcecf09fc1c --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbe2a9bfc5c..86615203061 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -407,8 +407,6 @@ with pkgs; ahcpd = callPackage ../tools/networking/ahcpd { }; - aiccu = callPackage ../tools/networking/aiccu { }; - aide = callPackage ../tools/security/aide { }; aircrack-ng = callPackage ../tools/networking/aircrack-ng { }; From 0f9a2285b8abc4fd7fc9747dadfd3929d518c191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 15 Jun 2017 08:37:24 +0200 Subject: [PATCH 118/152] ezquake: init at 3.0.1 --- pkgs/games/ezquake/default.nix | 37 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/games/ezquake/default.nix diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix new file mode 100644 index 00000000000..a1560fb1934 --- /dev/null +++ b/pkgs/games/ezquake/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, curl, expat +, jansson, libpng, libjpeg, mesa, pcre +, pkgconfig, SDL2, vimNox }: + +stdenv.mkDerivation rec { + name = pname + "-" + version; + pname = "ezquake"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "ezQuake"; + repo = pname + "-source"; + rev = "v" + version; + sha256 = "14wck0r64z5haacp7g7qb2qrbhff3x6jfjmn4268dyb9dl5663f2"; + }; + + buildInputs = [ + expat curl jansson libpng libjpeg mesa pcre pkgconfig SDL2 vimNox + ]; + + installPhase = with stdenv.lib; let + sys = last (splitString "-" stdenv.system); + arch = head (splitString "-" stdenv.system); + in '' + mkdir -p $out/bin + find . + mv ezquake-${sys}-${arch} $out/bin/ezquake + ''; + + meta = with stdenv.lib; { + homepage = "http://ezquake.github.io/"; + description = "A modern QuakeWorld client focused on competitive online play."; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86615203061..d929c23dd8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6719,6 +6719,8 @@ with pkgs; eztrace = callPackage ../development/tools/profiling/EZTrace { }; + ezquake = callPackage ../games/ezquake { }; + findbugs = callPackage ../development/tools/analysis/findbugs { }; foreman = callPackage ../tools/system/foreman { }; From fe041692e2b871ac52be6dd3ac98abf3cb99a0e0 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 15 Jun 2017 10:08:08 +0200 Subject: [PATCH 119/152] git-standup: init at 2.1.8 --- .../node-packages/node-packages-v4.nix | 367 +-- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 2687 ++++++++++------- 3 files changed, 1778 insertions(+), 1277 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index b483c75cf6f..bbc0f2b8ad0 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -103,22 +103,22 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "brace-expansion-1.1.7" = { + "brace-expansion-1.1.8" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"; - sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; + sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; }; }; - "balanced-match-0.4.2" = { + "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; - version = "0.4.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; "concat-map-0.0.1" = { @@ -634,13 +634,13 @@ let sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; }; - "readable-stream-2.2.10" = { + "readable-stream-2.2.11" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.10"; + version = "2.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz"; - sha1 = "effe72bb7c884c0dd335e2379d526196d9d011ee"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz"; + sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72"; }; }; "xtend-4.0.1" = { @@ -670,22 +670,22 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; - "safe-buffer-5.1.0" = { + "safe-buffer-5.0.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz"; - sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; }; }; - "string_decoder-1.0.1" = { + "string_decoder-1.0.2" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz"; - sha1 = "62e200f039955a6810d8df0a33ffc0f013662d98"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz"; + sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179"; }; }; "util-deprecate-1.0.2" = { @@ -1012,13 +1012,13 @@ let sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; }; }; - "randomatic-1.1.6" = { + "randomatic-1.1.7" = { name = "randomatic"; packageName = "randomatic"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz"; - sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"; + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; + sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c"; }; }; "repeat-string-1.6.1" = { @@ -1030,13 +1030,22 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "is-posix-bracket-0.1.1" = { - name = "is-posix-bracket"; - packageName = "is-posix-bracket"; - version = "0.1.1"; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; - sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; }; }; "is-buffer-1.1.5" = { @@ -1048,13 +1057,22 @@ let sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; }; }; - "remove-trailing-separator-1.0.1" = { + "is-posix-bracket-0.1.1" = { + name = "is-posix-bracket"; + packageName = "is-posix-bracket"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + }; + "remove-trailing-separator-1.0.2" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz"; - sha1 = "615ebb96af559552d4bf4057c8436d486ab63cc4"; + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz"; + sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511"; }; }; "for-own-0.1.5" = { @@ -2002,6 +2020,15 @@ let sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; + "safe-buffer-5.1.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz"; + sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223"; + }; + }; "stringstream-0.0.5" = { name = "stringstream"; packageName = "stringstream"; @@ -2155,13 +2182,13 @@ let sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.13.0" = { + "sshpk-1.13.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz"; - sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; + sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; }; }; "assert-plus-1.0.0" = { @@ -2245,15 +2272,6 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; - }; - }; "ecc-jsbn-0.1.1" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -3235,15 +3253,6 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; - }; - }; "truncate-1.0.5" = { name = "truncate"; packageName = "truncate"; @@ -3424,13 +3433,13 @@ let sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; }; }; - "cacache-9.2.6" = { + "cacache-9.2.8" = { name = "cacache"; packageName = "cacache"; - version = "9.2.6"; + version = "9.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-9.2.6.tgz"; - sha1 = "ea5c7f2b6b514710a22a58a27f857fd972fdfa51"; + url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz"; + sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4"; }; }; "call-limit-1.1.0" = { @@ -3667,13 +3676,13 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-package-arg-5.1.1" = { + "npm-package-arg-5.1.2" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.1.tgz"; - sha1 = "a3d09053f2d8a0bfa562624507baa597737fc3bf"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; + sha1 = "fb18d17bb61e60900d6312619919bd753755ab37"; }; }; "npm-registry-client-8.3.0" = { @@ -3703,13 +3712,13 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; - "pacote-2.7.27" = { + "pacote-2.7.36" = { name = "pacote"; packageName = "pacote"; - version = "2.7.27"; + version = "2.7.36"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-2.7.27.tgz"; - sha1 = "ab3a7e6b584d351c9d19bfe76b0b420f7013eff6"; + url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz"; + sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c"; }; }; "path-is-inside-1.0.2" = { @@ -3820,13 +3829,13 @@ let sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; }; }; - "ssri-4.1.4" = { + "ssri-4.1.6" = { name = "ssri"; packageName = "ssri"; - version = "4.1.4"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-4.1.4.tgz"; - sha1 = "22be0659c075a612b622158872b585d5fe6b03af"; + url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; + sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b"; }; }; "text-table-0.2.0" = { @@ -4162,13 +4171,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "make-fetch-happen-2.4.10" = { + "make-fetch-happen-2.4.12" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.10.tgz"; - sha1 = "5e52244a4cd80be925f5c8118a38ad0c2ceb4a81"; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz"; + sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399"; }; }; "npm-pick-manifest-1.0.3" = { @@ -4198,13 +4207,13 @@ let sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; }; }; - "tar-fs-1.15.2" = { + "tar-fs-1.15.3" = { name = "tar-fs"; packageName = "tar-fs"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz"; - sha1 = "761f5b32932c7b39461a60d537faea0d8084830c"; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz"; + sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20"; }; }; "tar-stream-1.5.4" = { @@ -4216,13 +4225,13 @@ let sha1 = "36549cf04ed1aee9b2a30c0143252238daf94016"; }; }; - "agentkeepalive-3.1.0" = { + "agentkeepalive-3.2.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.1.0.tgz"; - sha1 = "0393a4f1e68f85d355887c2e71681b28f3b7df35"; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz"; + sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd"; }; }; "http-cache-semantics-3.7.3" = { @@ -4261,13 +4270,13 @@ let sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465"; }; }; - "socks-proxy-agent-2.1.0" = { + "socks-proxy-agent-2.1.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.0.tgz"; - sha1 = "ddfb01b5dbea5fc879490ca38a25fe87d3d15912"; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; + sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3"; }; }; "humanize-ms-1.2.1" = { @@ -4315,13 +4324,13 @@ let sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; }; }; - "iconv-lite-0.4.17" = { + "iconv-lite-0.4.18" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.17"; + version = "0.4.18"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz"; - sha1 = "4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"; + sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2"; }; }; "jju-1.3.0" = { @@ -5363,9 +5372,9 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -5495,14 +5504,14 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; }) @@ -5553,7 +5562,24 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.6" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.5" + ]; + }) + ]; + }) + (sources."kind-of-4.0.0" // { + dependencies = [ + sources."is-buffer-1.1.5" + ]; + }) + ]; + }) sources."repeat-string-1.6.1" ]; }) @@ -5578,7 +5604,7 @@ in }) (sources."normalize-path-2.1.1" // { dependencies = [ - sources."remove-trailing-separator-1.0.1" + sources."remove-trailing-separator-1.0.2" ]; }) (sources."object.omit-2.0.1" // { @@ -5742,9 +5768,9 @@ in }) (sources."minimatch-2.0.10" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -5864,9 +5890,9 @@ in sources."graceful-fs-4.1.11" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -5887,14 +5913,14 @@ in (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; }) @@ -5985,7 +6011,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -5993,7 +6019,6 @@ in sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" ]; @@ -6327,9 +6352,9 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -6392,14 +6417,14 @@ in (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; }) @@ -6484,7 +6509,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -6492,7 +6517,6 @@ in sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" ]; @@ -6534,9 +6558,9 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -6576,9 +6600,9 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -6591,14 +6615,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; }) @@ -6635,14 +6659,14 @@ in (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; }) @@ -6727,7 +6751,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -6735,7 +6759,6 @@ in sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" ]; @@ -6777,9 +6800,9 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -6819,9 +6842,9 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -6834,14 +6857,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; }) @@ -6943,14 +6966,14 @@ in (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; }) @@ -7043,7 +7066,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -7051,7 +7074,6 @@ in sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" ]; @@ -7093,9 +7115,9 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -7141,9 +7163,9 @@ in sources."inherits-2.0.3" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -7156,14 +7178,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; }) @@ -7182,10 +7204,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.0.2.tgz"; - sha1 = "139e6c29c5a4982af11dda04e48aea783156d190"; + url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz"; + sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -7201,7 +7223,7 @@ in sources."aproba-1.1.2" sources."archy-1.0.0" sources."bluebird-3.5.0" - (sources."cacache-9.2.6" // { + (sources."cacache-9.2.8" // { dependencies = [ sources."y18n-3.2.1" ]; @@ -7243,9 +7265,9 @@ in dependencies = [ (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -7260,9 +7282,9 @@ in sources."fs.realpath-1.0.0" (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -7355,9 +7377,9 @@ in dependencies = [ (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -7378,7 +7400,7 @@ in }) sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-5.1.1" + sources."npm-package-arg-5.1.2" (sources."npm-registry-client-8.3.0" // { dependencies = [ (sources."concat-stream-1.6.0" // { @@ -7425,11 +7447,11 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."pacote-2.7.27" // { + (sources."pacote-2.7.36" // { dependencies = [ - (sources."make-fetch-happen-2.4.10" // { + (sources."make-fetch-happen-2.4.12" // { dependencies = [ - (sources."agentkeepalive-3.1.0" // { + (sources."agentkeepalive-3.2.0" // { dependencies = [ (sources."humanize-ms-1.2.1" // { dependencies = [ @@ -7473,7 +7495,7 @@ in dependencies = [ (sources."encoding-0.1.12" // { dependencies = [ - sources."iconv-lite-0.4.17" + sources."iconv-lite-0.4.18" ]; }) (sources."json-parse-helpfulerror-1.0.3" // { @@ -7483,7 +7505,7 @@ in }) ]; }) - (sources."socks-proxy-agent-2.1.0" // { + (sources."socks-proxy-agent-2.1.1" // { dependencies = [ (sources."agent-base-2.1.1" // { dependencies = [ @@ -7503,9 +7525,9 @@ in }) (sources."minimatch-3.0.4" // { dependencies = [ - (sources."brace-expansion-1.1.7" // { + (sources."brace-expansion-1.1.8" // { dependencies = [ - sources."balanced-match-0.4.2" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; }) @@ -7522,7 +7544,7 @@ in sources."genfun-4.0.1" ]; }) - (sources."tar-fs-1.15.2" // { + (sources."tar-fs-1.15.3" // { dependencies = [ (sources."pump-1.0.2" // { dependencies = [ @@ -7563,12 +7585,13 @@ in ]; }) sources."read-package-tree-5.1.6" - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; }) @@ -7623,7 +7646,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -7631,7 +7654,6 @@ in sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" ]; @@ -7660,7 +7682,7 @@ in }) sources."retry-0.10.1" sources."rimraf-2.6.1" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.0" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" @@ -7685,7 +7707,7 @@ in }) ]; }) - sources."ssri-4.1.4" + sources."ssri-4.1.6" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -8054,7 +8076,7 @@ in sources."verror-1.3.6" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -8062,7 +8084,6 @@ in sources."getpass-0.1.7" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" ]; diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 1a83b7ae900..08b3445e3d4 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -18,6 +18,7 @@ , "fetch-bower" , "forever" , "git-run" +, "git-standup" , "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 6b6f878b908..5387a2acd05 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -13,40 +13,40 @@ let sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"; }; }; - "babel-core-6.24.1" = { + "babel-core-6.25.0" = { name = "babel-core"; packageName = "babel-core"; - version = "6.24.1"; + version = "6.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz"; - sha1 = "8c428564dce1e1f41fb337ec34f4c3b022b5ad83"; + url = "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz"; + sha1 = "7dd42b0463c742e9d5296deb3ec67a9322dad729"; }; }; - "babel-traverse-6.24.1" = { + "babel-traverse-6.25.0" = { name = "babel-traverse"; packageName = "babel-traverse"; - version = "6.24.1"; + version = "6.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz"; - sha1 = "ab36673fd356f9a0948659e7b338d5feadb31695"; + url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz"; + sha1 = "2257497e2fcd19b89edc13c4c91381f9512496f1"; }; }; - "babel-types-6.24.1" = { + "babel-types-6.25.0" = { name = "babel-types"; packageName = "babel-types"; - version = "6.24.1"; + version = "6.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"; - sha1 = "a136879dc15b3606bda0d90c1fc74304c2ff0975"; + url = "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz"; + sha1 = "70afb248d5660e5d18f811d91c8303b54134a18e"; }; }; - "babylon-6.17.2" = { + "babylon-6.17.3" = { name = "babylon"; packageName = "babylon"; - version = "6.17.2"; + version = "6.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/babylon/-/babylon-6.17.2.tgz"; - sha1 = "201d25ef5f892c41bae49488b08db0dd476e9f5c"; + url = "https://registry.npmjs.org/babylon/-/babylon-6.17.3.tgz"; + sha1 = "1327d709950b558f204e5352587fd0290f8d8e48"; }; }; "colors-0.6.0-1" = { @@ -67,13 +67,13 @@ let sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }; }; - "deasync-0.1.9" = { + "deasync-0.1.10" = { name = "deasync"; packageName = "deasync"; - version = "0.1.9"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.9.tgz"; - sha1 = "f58dd49fa63110c74bea8405a90a828be26d3a24"; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.10.tgz"; + sha1 = "4e4a6836fbe0477bd5f908308bd2a96557d5d7fe"; }; }; "ejs-2.3.4" = { @@ -193,13 +193,13 @@ let sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; }; }; - "babel-generator-6.24.1" = { + "babel-generator-6.25.0" = { name = "babel-generator"; packageName = "babel-generator"; - version = "6.24.1"; + version = "6.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz"; - sha1 = "e715f486c58ded25649d888944d52aa07c5d9497"; + url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz"; + sha1 = "33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc"; }; }; "babel-helpers-6.24.1" = { @@ -220,13 +220,13 @@ let sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; }; }; - "babel-template-6.24.1" = { + "babel-template-6.25.0" = { name = "babel-template"; packageName = "babel-template"; - version = "6.24.1"; + version = "6.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"; - sha1 = "04ae514f1f93b3a2537f2a0f60a5a45fb8308333"; + url = "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz"; + sha1 = "665241166b7c2aa4c619d71e192969552b10c071"; }; }; "babel-runtime-6.23.0" = { @@ -535,22 +535,22 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "brace-expansion-1.1.7" = { + "brace-expansion-1.1.8" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"; - sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; + sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; }; }; - "balanced-match-0.4.2" = { + "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; - version = "0.4.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; "concat-map-0.0.1" = { @@ -562,13 +562,13 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "globals-9.17.0" = { + "globals-9.18.0" = { name = "globals"; packageName = "globals"; - version = "9.17.0"; + version = "9.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz"; - sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286"; + url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; + sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; }; }; "invariant-2.2.2" = { @@ -868,13 +868,13 @@ let sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; - "azure-arm-compute-0.20.0" = { + "azure-arm-compute-3.0.0-preview" = { name = "azure-arm-compute"; packageName = "azure-arm-compute"; - version = "0.20.0"; + version = "3.0.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz"; - sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32"; + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-3.0.0-preview.tgz"; + sha1 = "f5f07792afcdff29ce0b7e16705342b6986f571b"; }; }; "azure-arm-datalake-analytics-1.0.2-preview" = { @@ -922,13 +922,13 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; - "azure-arm-iothub-0.1.4" = { + "azure-arm-iothub-1.0.1-preview" = { name = "azure-arm-iothub"; packageName = "azure-arm-iothub"; - version = "0.1.4"; + version = "1.0.1-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz"; - sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d"; + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-1.0.1-preview.tgz"; + sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91"; }; }; "azure-arm-servermanagement-0.1.2" = { @@ -940,13 +940,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.18.0" = { + "azure-arm-network-1.1.0-preview" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.18.0"; + version = "1.1.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.18.0.tgz"; - sha1 = "0ebfe1adbdfdc535d6c95e3713a5c54b5144932f"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-1.1.0-preview.tgz"; + sha1 = "e6ca3e27a0169ff49849f0378bc6c531b08a2b8b"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -958,13 +958,13 @@ let sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; }; }; - "azure-arm-trafficmanager-0.12.0" = { + "azure-arm-trafficmanager-1.1.0-preview" = { name = "azure-arm-trafficmanager"; packageName = "azure-arm-trafficmanager"; - version = "0.12.0"; + version = "1.1.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz"; - sha1 = "609e585c0253960a91deaf773dae1ce184ce414b"; + url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-1.1.0-preview.tgz"; + sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50"; }; }; "azure-arm-dns-0.11.1" = { @@ -1003,13 +1003,13 @@ let sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; }; }; - "azure-graph-1.1.1" = { + "azure-graph-2.1.0-preview" = { name = "azure-graph"; packageName = "azure-graph"; - version = "1.1.1"; + version = "2.1.0-preview"; src = fetchurl { - url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz"; - sha1 = "5277e750d223aec0fd2559e49149777fe1371708"; + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.1.0-preview.tgz"; + sha1 = "2005abb76d9193cbfb90f25ee92823cde87d4f5f"; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -1228,13 +1228,13 @@ let sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; }; }; - "easy-table-0.0.1" = { + "easy-table-1.1.0" = { name = "easy-table"; packageName = "easy-table"; - version = "0.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/easy-table/-/easy-table-0.0.1.tgz"; - sha1 = "dbd809177a1dd7afc06b4849d1ca7eff13e299eb"; + url = "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz"; + sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73"; }; }; "event-stream-3.1.5" = { @@ -1318,13 +1318,13 @@ let sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; }; }; - "kuduscript-1.0.13" = { + "kuduscript-1.0.15" = { name = "kuduscript"; packageName = "kuduscript"; - version = "1.0.13"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.13.tgz"; - sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e"; + url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.15.tgz"; + sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21"; }; }; "moment-2.18.1" = { @@ -1687,6 +1687,87 @@ let sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; + "ms-rest-2.2.0" = { + name = "ms-rest"; + packageName = "ms-rest"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.0.tgz"; + sha1 = "5f2507522f1585e26666815588dbacbcec7fb79f"; + }; + }; + "ms-rest-azure-2.1.2" = { + name = "ms-rest-azure"; + packageName = "ms-rest-azure"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.1.2.tgz"; + sha1 = "9774b1d4141c8a3a250ae5da36fc2654542be738"; + }; + }; + "@types/node-7.0.31" = { + name = "@types/node"; + packageName = "@types/node"; + version = "7.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-7.0.31.tgz"; + sha1 = "80ea4d175599b2a00149c29a10a4eb2dff592e86"; + }; + }; + "@types/request-0.0.42" = { + name = "@types/request"; + packageName = "@types/request"; + version = "0.0.42"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-0.0.42.tgz"; + sha1 = "e47a53bf0b130464854fb693297746a0c0479c31"; + }; + }; + "@types/uuid-2.0.30" = { + name = "@types/uuid"; + packageName = "@types/uuid"; + version = "2.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz"; + sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5"; + }; + }; + "is-buffer-1.1.5" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "@types/form-data-0.0.33" = { + name = "@types/form-data"; + packageName = "@types/form-data"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz"; + sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8"; + }; + }; + "async-0.2.7" = { + name = "async"; + packageName = "async"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; + sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; + }; + }; "moment-2.6.0" = { name = "moment"; packageName = "moment"; @@ -1840,6 +1921,33 @@ let sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; }; }; + "wcwidth-1.0.1" = { + name = "wcwidth"; + packageName = "wcwidth"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + }; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + }; + "clone-1.0.2" = { + name = "clone"; + packageName = "clone"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"; + sha1 = "260b7a99ebb1edfe247538175f783243cb19d149"; + }; + }; "from-0.1.7" = { name = "from"; packageName = "from"; @@ -1903,15 +2011,6 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "async-0.2.7" = { - name = "async"; - packageName = "async"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; - sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; - }; - }; "debug-0.7.4" = { name = "debug"; packageName = "debug"; @@ -2425,13 +2524,13 @@ let sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.13.0" = { + "sshpk-1.13.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz"; - sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz"; + sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3"; }; }; "assert-plus-1.0.0" = { @@ -2515,15 +2614,6 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; - }; - }; "ecc-jsbn-0.1.1" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -2587,13 +2677,13 @@ let sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; }; }; - "fibers-1.0.16" = { + "fibers-1.0.15" = { name = "fibers"; packageName = "fibers"; - version = "1.0.16"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/fibers/-/fibers-1.0.16.tgz"; - sha1 = "ccb48d58ec82eb646a769ab8278f514b85f34ca8"; + url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz"; + sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c"; }; }; "galaxy-0.1.12" = { @@ -2641,22 +2731,31 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.10" = { + "readable-stream-2.2.11" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.10"; + version = "2.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz"; - sha1 = "effe72bb7c884c0dd335e2379d526196d9d011ee"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz"; + sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72"; }; }; - "string_decoder-1.0.1" = { + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + }; + }; + "string_decoder-1.0.2" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz"; - sha1 = "62e200f039955a6810d8df0a33ffc0f013662d98"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz"; + sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179"; }; }; "http-basic-2.5.1" = { @@ -3568,13 +3667,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.7.1" = { + "stream-http-2.7.2" = { name = "stream-http"; packageName = "stream-http"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.1.tgz"; - sha1 = "546a51741ad5a6b07e9e31b0b10441a917df528a"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz"; + sha1 = "40a050ec8dc3b53b33d9909415c02c0bf1abfbad"; }; }; "subarg-1.0.0" = { @@ -3829,13 +3928,13 @@ let sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; }; }; - "randombytes-2.0.4" = { + "randombytes-2.0.5" = { name = "randombytes"; packageName = "randombytes"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.4.tgz"; - sha1 = "9551df208422c8f80eb58e2326dd0b840ff22efd"; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz"; + sha1 = "dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"; }; }; "browserify-aes-1.0.6" = { @@ -4027,15 +4126,6 @@ let sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771"; }; }; - "is-buffer-1.1.5" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; - }; - }; "lexical-scope-1.2.0" = { name = "lexical-scope"; packageName = "lexical-scope"; @@ -5107,13 +5197,13 @@ let sha1 = "50346e42a43b35daf2a86f414afb153629a854be"; }; }; - "random-access-file-1.7.3" = { + "random-access-file-1.8.1" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.7.3"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.7.3.tgz"; - sha1 = "e5e642cb85dfc13166bfeaa97f7ffc9f5609053d"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; + sha1 = "b1a54a0f924fbd4d45731a5771aea36be2166532"; }; }; "run-parallel-1.1.6" = { @@ -5449,15 +5539,6 @@ let sha1 = "6b94b3e447cb6a363f785eaf94af6359e8e81c80"; }; }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; - }; - }; "ultron-1.1.0" = { name = "ultron"; packageName = "ultron"; @@ -6268,13 +6349,13 @@ let sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; }; }; - "dependency-ls-1.1.0" = { + "dependency-ls-1.1.1" = { name = "dependency-ls"; packageName = "dependency-ls"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.0.tgz"; - sha1 = "94cfe674620f5e9f2924d0501f9c6e710fc90f55"; + url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz"; + sha1 = "0481b07f023d74ce311192e5c690d13e18600054"; }; }; "is-url-1.2.2" = { @@ -6286,13 +6367,13 @@ let sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; }; }; - "shelljs-0.7.7" = { + "shelljs-0.7.8" = { name = "shelljs"; packageName = "shelljs"; - version = "0.7.7"; + version = "0.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; - sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz"; + sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; "q-1.4.1" = { @@ -6736,13 +6817,13 @@ let sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; }; }; - "npm-package-arg-5.1.1" = { + "npm-package-arg-5.1.2" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.1.tgz"; - sha1 = "a3d09053f2d8a0bfa562624507baa597737fc3bf"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; + sha1 = "fb18d17bb61e60900d6312619919bd753755ab37"; }; }; "promzard-0.3.0" = { @@ -7222,33 +7303,6 @@ let sha1 = "b1f52dc2e8dc0e3cb04d187a25f758a38a90ca3b"; }; }; - "wcwidth-1.0.1" = { - name = "wcwidth"; - packageName = "wcwidth"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; - sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; - }; - }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; - }; - }; - "clone-1.0.2" = { - name = "clone"; - packageName = "clone"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"; - sha1 = "260b7a99ebb1edfe247538175f783243cb19d149"; - }; - }; "proto-list-1.2.4" = { name = "proto-list"; packageName = "proto-list"; @@ -7762,15 +7816,6 @@ let sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; - }; - }; "lowercase-keys-1.0.0" = { name = "lowercase-keys"; packageName = "lowercase-keys"; @@ -8276,13 +8321,13 @@ let sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; }; }; - "debug-1.0.4" = { + "debug-1.0.5" = { name = "debug"; packageName = "debug"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; - sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; + url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz"; + sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac"; }; }; "lodash-2.4.2" = { @@ -8321,15 +8366,6 @@ let sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; }; }; - "ms-0.6.2" = { - name = "ms"; - packageName = "ms"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }; - }; "better-curry-1.6.0" = { name = "better-curry"; packageName = "better-curry"; @@ -9017,13 +9053,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.62.0" = { + "aws-sdk-2.70.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.62.0"; + version = "2.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.62.0.tgz"; - sha1 = "98508d3f93aaf3f74f18ca3b8cfe3a11bdad1a5f"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.70.0.tgz"; + sha1 = "4163d94ac9e6a82f6a073ab74f8ae3c28a0a7534"; }; }; "request-2.81.0" = { @@ -9152,13 +9188,13 @@ let sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc"; }; }; - "conf-1.1.1" = { + "conf-1.1.2" = { name = "conf"; packageName = "conf"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-1.1.1.tgz"; - sha1 = "238d0a3090ac4916ed2d40c7e81d7a11667bc7ba"; + url = "https://registry.npmjs.org/conf/-/conf-1.1.2.tgz"; + sha1 = "a164003022dd1643cd5abd9653071bd3b0a19f50"; }; }; "got-6.7.1" = { @@ -9260,6 +9296,15 @@ let sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; }; }; + "lru-cache-4.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; + sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55"; + }; + }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -9440,13 +9485,13 @@ let sha1 = "c73d8d2909d22291e1a007a395804da8b665fe63"; }; }; - "escope-3.6.0" = { - name = "escope"; - packageName = "escope"; - version = "3.6.0"; + "eslint-scope-3.7.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; - sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; "espree-3.4.3" = { @@ -9494,13 +9539,13 @@ let sha1 = "432352e57accd87ab3110e82d3fea0e47812156d"; }; }; - "inquirer-0.12.0" = { + "inquirer-3.1.0" = { name = "inquirer"; packageName = "inquirer"; - version = "0.12.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; - sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.1.0.tgz"; + sha1 = "e05400d48b94937c2d3caa7038663ba9189aab01"; }; }; "is-resolvable-1.0.0" = { @@ -9548,13 +9593,22 @@ let sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; - "pluralize-1.2.1" = { + "pluralize-4.0.0" = { name = "pluralize"; packageName = "pluralize"; - version = "1.2.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; - sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + url = "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz"; + sha1 = "59b708c1c0190a2f692f1c7618c446b052fd1762"; + }; + }; + "progress-2.0.0" = { + name = "progress"; + packageName = "progress"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz"; + sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"; }; }; "require-uncached-1.0.3" = { @@ -9566,40 +9620,13 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - }; - "table-3.8.3" = { + "table-4.0.1" = { name = "table"; packageName = "table"; - version = "3.8.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; - sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; - }; - }; - "es6-map-0.1.5" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; - }; - }; - "es6-weak-map-2.0.2" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; - sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; + url = "https://registry.npmjs.org/table/-/table-4.0.1.tgz"; + sha1 = "a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"; }; }; "esrecurse-4.1.0" = { @@ -9611,60 +9638,6 @@ let sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220"; }; }; - "d-1.0.0" = { - name = "d"; - packageName = "d"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; - sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; - }; - }; - "es5-ext-0.10.22" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.22"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz"; - sha1 = "1876c51f990769c112c781ea3ebe89f84fd39071"; - }; - }; - "es6-iterator-2.0.1" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz"; - sha1 = "8e319c9f0453bf575d374940a655920e59ca5512"; - }; - }; - "es6-set-0.1.5" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; - sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; - }; - }; - "es6-symbol-3.1.1" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; - }; - }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; - }; - }; "estraverse-4.1.1" = { name = "estraverse"; packageName = "estraverse"; @@ -9791,6 +9764,24 @@ let sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; }; }; + "ansi-escapes-2.0.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz"; + sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b"; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; "cli-width-2.1.0" = { name = "cli-width"; packageName = "cli-width"; @@ -9800,13 +9791,121 @@ let sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a"; }; }; - "string-width-1.0.2" = { + "external-editor-2.0.4" = { + name = "external-editor"; + packageName = "external-editor"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz"; + sha1 = "1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + }; + "rx-lite-4.0.8" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"; + sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + }; + }; + "rx-lite-aggregates-4.0.8" = { + name = "rx-lite-aggregates"; + packageName = "rx-lite-aggregates"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; + sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + }; + }; + "string-width-2.0.0" = { name = "string-width"; packageName = "string-width"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz"; + sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; + "iconv-lite-0.4.18" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.18"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz"; + sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2"; + }; + }; + "jschardet-1.4.2" = { + name = "jschardet"; + packageName = "jschardet"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz"; + sha1 = "2aa107f142af4121d145659d44f50830961e699a"; + }; + }; + "tmp-0.0.31" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; + sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; + }; + }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; "tryit-1.0.3" = { @@ -9926,24 +10025,6 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "string-width-2.0.0" = { - name = "string-width"; - packageName = "string-width"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz"; - sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e"; - }; - }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - }; "eslint-3.19.0" = { name = "eslint"; packageName = "eslint"; @@ -9962,6 +10043,132 @@ let sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; + "escope-3.6.0" = { + name = "escope"; + packageName = "escope"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; + sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + }; + }; + "inquirer-0.12.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; + sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + }; + }; + "pluralize-1.2.1" = { + name = "pluralize"; + packageName = "pluralize"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; + sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "table-3.8.3" = { + name = "table"; + packageName = "table"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; + sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; + }; + }; + "es6-map-0.1.5" = { + name = "es6-map"; + packageName = "es6-map"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + }; + }; + "es6-weak-map-2.0.2" = { + name = "es6-weak-map"; + packageName = "es6-weak-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; + sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; + }; + }; + "d-1.0.0" = { + name = "d"; + packageName = "d"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; + sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; + }; + }; + "es5-ext-0.10.23" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.23"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz"; + sha1 = "7578b51be974207a5487821b56538c224e4e7b38"; + }; + }; + "es6-iterator-2.0.1" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz"; + sha1 = "8e319c9f0453bf575d374940a655920e59ca5512"; + }; + }; + "es6-set-0.1.5" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + }; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; "has-flag-1.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -10187,13 +10394,13 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "fsevents-1.1.1" = { + "fsevents-1.1.2" = { name = "fsevents"; packageName = "fsevents"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz"; - sha1 = "f19fd28f43eeaf761680e519a203c4d0b3d31aff"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz"; + sha1 = "3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"; }; }; "micromatch-2.3.11" = { @@ -10367,13 +10574,13 @@ let sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; }; }; - "randomatic-1.1.6" = { + "randomatic-1.1.7" = { name = "randomatic"; packageName = "randomatic"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz"; - sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"; + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; + sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c"; }; }; "repeat-string-1.6.1" = { @@ -10385,6 +10592,24 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -10394,13 +10619,13 @@ let sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; - "remove-trailing-separator-1.0.1" = { + "remove-trailing-separator-1.0.2" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz"; - sha1 = "615ebb96af559552d4bf4057c8436d486ab63cc4"; + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz"; + sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511"; }; }; "for-own-0.1.5" = { @@ -10746,13 +10971,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.26" = { + "clean-css-3.4.27" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.26"; + version = "3.4.27"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.26.tgz"; - sha1 = "55323b344ff3bcee684a2eac81c93df8fa73deeb"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.27.tgz"; + sha1 = "adef75b31c160ffa5d72f4de67966e2660c1a255"; }; }; "commander-2.6.0" = { @@ -10791,13 +11016,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.8.28" = { + "uglify-js-2.8.29" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.28"; + version = "2.8.29"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz"; - sha1 = "e335032df9bb20dcb918f164589d5af47f38834a"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; "void-elements-2.0.1" = { @@ -10845,15 +11070,6 @@ let sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; }; }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; "promise-6.1.0" = { name = "promise"; packageName = "promise"; @@ -12501,15 +12717,6 @@ let sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; }; }; - "tmp-0.0.31" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; - }; - }; "useragent-2.1.13" = { name = "useragent"; packageName = "useragent"; @@ -14382,13 +14589,13 @@ let sha1 = "52c074f42a32140132baea108d42cbcd0ef397d2"; }; }; - "node-red-node-rbe-0.1.9" = { + "node-red-node-rbe-0.1.10" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.1.9"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.9.tgz"; - sha1 = "d09795ebd9b6e4056b68b4843859fb65f5dff144"; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.10.tgz"; + sha1 = "f05f72ace39b1b6158a48ee19d5c6cc426719a8f"; }; }; "bcrypt-1.0.2" = { @@ -14958,13 +15165,13 @@ let sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "mimelib-0.3.0" = { + "mimelib-0.3.1" = { name = "mimelib"; packageName = "mimelib"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz"; - sha1 = "4b16d4b435403daf692bc227890c7165ff3de894"; + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.1.tgz"; + sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; }; }; "encoding-0.1.12" = { @@ -15651,13 +15858,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "cacache-9.2.6" = { + "cacache-9.2.8" = { name = "cacache"; packageName = "cacache"; - version = "9.2.6"; + version = "9.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-9.2.6.tgz"; - sha1 = "ea5c7f2b6b514710a22a58a27f857fd972fdfa51"; + url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz"; + sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4"; }; }; "call-limit-1.1.0" = { @@ -15795,13 +16002,13 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; - "pacote-2.7.27" = { + "pacote-2.7.36" = { name = "pacote"; packageName = "pacote"; - version = "2.7.27"; + version = "2.7.36"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-2.7.27.tgz"; - sha1 = "ab3a7e6b584d351c9d19bfe76b0b420f7013eff6"; + url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz"; + sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c"; }; }; "promise-inflight-1.0.1" = { @@ -15840,13 +16047,13 @@ let sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; }; }; - "ssri-4.1.4" = { + "ssri-4.1.6" = { name = "ssri"; packageName = "ssri"; - version = "4.1.4"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-4.1.4.tgz"; - sha1 = "22be0659c075a612b622158872b585d5fe6b03af"; + url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; + sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b"; }; }; "unique-filename-1.1.0" = { @@ -15975,13 +16182,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "make-fetch-happen-2.4.10" = { + "make-fetch-happen-2.4.12" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.10.tgz"; - sha1 = "5e52244a4cd80be925f5c8118a38ad0c2ceb4a81"; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz"; + sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399"; }; }; "npm-pick-manifest-1.0.3" = { @@ -16011,22 +16218,22 @@ let sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; }; }; - "tar-fs-1.15.2" = { + "tar-fs-1.15.3" = { name = "tar-fs"; packageName = "tar-fs"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz"; - sha1 = "761f5b32932c7b39461a60d537faea0d8084830c"; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz"; + sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20"; }; }; - "agentkeepalive-3.1.0" = { + "agentkeepalive-3.2.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.1.0.tgz"; - sha1 = "0393a4f1e68f85d355887c2e71681b28f3b7df35"; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz"; + sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd"; }; }; "http-cache-semantics-3.7.3" = { @@ -16065,13 +16272,13 @@ let sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465"; }; }; - "socks-proxy-agent-2.1.0" = { + "socks-proxy-agent-2.1.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.0.tgz"; - sha1 = "ddfb01b5dbea5fc879490ca38a25fe87d3d15912"; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; + sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3"; }; }; "humanize-ms-1.2.1" = { @@ -16101,15 +16308,6 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; - "iconv-lite-0.4.17" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.17"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz"; - sha1 = "4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"; - }; - }; "socks-1.1.10" = { name = "socks"; packageName = "socks"; @@ -16551,13 +16749,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.33.0" = { + "snyk-1.34.4" = { name = "snyk"; packageName = "snyk"; - version = "1.33.0"; + version = "1.34.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.33.0.tgz"; - sha1 = "8e31a889e26f58819ca5eb5b39f95600afa67ac1"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.34.4.tgz"; + sha1 = "9f0d50ab4f0544b125fa21c67dd162de1e7ce91b"; }; }; "spawn-please-0.2.0" = { @@ -16686,6 +16884,15 @@ let sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; }; }; + "snyk-python-plugin-1.0.0" = { + name = "snyk-python-plugin"; + packageName = "snyk-python-plugin"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.0.0.tgz"; + sha1 = "d3915fbd933305d9988d86a56a7381e73c4565f7"; + }; + }; "snyk-recursive-readdir-2.0.0" = { name = "snyk-recursive-readdir"; packageName = "snyk-recursive-readdir"; @@ -16758,15 +16965,6 @@ let sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; }; }; - "run-async-2.3.0" = { - name = "run-async"; - packageName = "run-async"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; - }; - }; "rx-4.1.0" = { name = "rx"; packageName = "rx"; @@ -17130,13 +17328,13 @@ let sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; }; }; - "dtrace-provider-0.8.2" = { + "dtrace-provider-0.8.3" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.2.tgz"; - sha1 = "f067c2773f15da1b61eb20dbc96aa1cabb3330bc"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.3.tgz"; + sha1 = "ba1bfc6493285ccfcfc6ab69cd5c61d74c2a43bf"; }; }; "mv-2.1.1" = { @@ -18644,6 +18842,15 @@ let sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37"; }; }; + "jodid25519-1.0.2" = { + name = "jodid25519"; + packageName = "jodid25519"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; + }; + }; "jsprim-0.3.0" = { name = "jsprim"; packageName = "jsprim"; @@ -18698,13 +18905,13 @@ let sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; }; }; - "coa-1.0.2" = { + "coa-1.0.3" = { name = "coa"; packageName = "coa"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-1.0.2.tgz"; - sha1 = "2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec"; + url = "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz"; + sha1 = "1b54a5e1dcf77c990455d4deea98c564416dc893"; }; }; "whet.extend-0.9.9" = { @@ -18725,13 +18932,13 @@ let sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85"; }; }; - "clap-1.1.3" = { + "clap-1.2.0" = { name = "clap"; packageName = "clap"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz"; - sha1 = "b3bd36e93dd4cbfb395a3c26896352445265c05b"; + url = "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz"; + sha1 = "59c90fe3e137104746ff19469a27a634ff68c857"; }; }; "enhanced-resolve-2.3.0" = { @@ -18950,13 +19157,13 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "yargs-8.0.1" = { + "yargs-8.0.2" = { name = "yargs"; packageName = "yargs"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.1.tgz"; - sha1 = "420ef75e840c1457a80adcca9bc6fa3849de51aa"; + url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; }; }; "color-convert-1.9.0" = { @@ -19472,15 +19679,6 @@ let sha1 = "7d8316c8d0571e1d08a5a79e46fff0afe8172b19"; }; }; - "inquirer-3.0.6" = { - name = "inquirer"; - packageName = "inquirer"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz"; - sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347"; - }; - }; "is-ci-1.0.10" = { name = "is-ci"; packageName = "is-ci"; @@ -19571,60 +19769,6 @@ let sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; }; }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; - }; - }; - "external-editor-2.0.4" = { - name = "external-editor"; - packageName = "external-editor"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz"; - sha1 = "1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"; - }; - }; - "figures-2.0.0" = { - name = "figures"; - packageName = "figures"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "jschardet-1.4.2" = { - name = "jschardet"; - packageName = "jschardet"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz"; - sha1 = "2aa107f142af4121d145659d44f50830961e699a"; - }; - }; "ci-info-1.0.0" = { name = "ci-info"; packageName = "ci-info"; @@ -19634,31 +19778,31 @@ let sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; }; }; - "cli-list-0.1.8" = { + "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; - version = "0.1.8"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-list/-/cli-list-0.1.8.tgz"; - sha1 = "aee6d45c4c59bf80068bb968089fb06f1aeddc0a"; + url = "https://registry.npmjs.org/cli-list/-/cli-list-0.2.0.tgz"; + sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cross-spawn-3.0.1" = { + "cross-spawn-5.1.0" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "3.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz"; - sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; }; - "fullname-2.1.0" = { + "fullname-3.3.0" = { name = "fullname"; packageName = "fullname"; - version = "2.1.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fullname/-/fullname-2.1.0.tgz"; - sha1 = "c46bf0f7c3f24fd5b3358d00e4a41380eef87350"; + url = "https://registry.npmjs.org/fullname/-/fullname-3.3.0.tgz"; + sha1 = "a08747d6921229610b8178b7614fce10cb185f5a"; }; }; "humanize-string-1.0.1" = { @@ -19670,22 +19814,13 @@ let sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; }; }; - "inquirer-0.11.4" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz"; - sha1 = "81e3374e8361beaff2d97016206d359d0b32fa4d"; - }; - }; - "insight-0.7.0" = { + "insight-0.8.4" = { name = "insight"; packageName = "insight"; - version = "0.7.0"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.7.0.tgz"; - sha1 = "061f9189835bd38a97a60c2b76ea0c6b30099ff6"; + url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; + sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; }; }; "npm-keyword-4.2.0" = { @@ -19697,13 +19832,13 @@ let sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0"; }; }; - "opn-3.0.3" = { + "opn-4.0.2" = { name = "opn"; packageName = "opn"; - version = "3.0.3"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz"; - sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a"; + url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"; + sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; }; }; "parse-help-0.1.1" = { @@ -19724,13 +19859,13 @@ let sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697"; }; }; - "sort-on-1.3.0" = { + "sort-on-2.0.0" = { name = "sort-on"; packageName = "sort-on"; - version = "1.3.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sort-on/-/sort-on-1.3.0.tgz"; - sha1 = "0dfd5b364b23df7f2acd86985daeb889e1a7c840"; + url = "https://registry.npmjs.org/sort-on/-/sort-on-2.0.0.tgz"; + sha1 = "0df42a679d7ae4aed9c30ba2f55807d979910fcc"; }; }; "tabtab-1.3.2" = { @@ -19751,6 +19886,15 @@ let sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; }; }; + "update-notifier-2.2.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; + sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; + }; + }; "yeoman-character-1.1.0" = { name = "yeoman-character"; packageName = "yeoman-character"; @@ -19769,31 +19913,121 @@ let sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; }; }; - "yeoman-environment-1.6.6" = { + "yeoman-environment-2.0.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "1.6.6"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-1.6.6.tgz"; - sha1 = "cd85fa67d156060e440d7807d7ef7cf0d2d1d671"; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.0.tgz"; + sha1 = "dafa2fc512c168cb8313453e5318e64731265915"; }; }; - "yosay-1.2.1" = { + "yosay-2.0.0" = { name = "yosay"; packageName = "yosay"; - version = "1.2.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yosay/-/yosay-1.2.1.tgz"; - sha1 = "9466ef969830e85b474e267b50f7688693ed3b5b"; + url = "https://registry.npmjs.org/yosay/-/yosay-2.0.0.tgz"; + sha1 = "0f3d2bb01f7f25362c127212f53c1572906333fe"; }; }; - "npmconf-2.1.2" = { - name = "npmconf"; - packageName = "npmconf"; - version = "2.1.2"; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"; - sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a"; + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "execa-0.6.3" = { + name = "execa"; + packageName = "execa"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; + sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; + }; + }; + "filter-obj-1.1.0" = { + name = "filter-obj"; + packageName = "filter-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; + sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; + }; + }; + "p-any-1.1.0" = { + name = "p-any"; + packageName = "p-any"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz"; + sha1 = "1d03835c7eed1e34b8e539c47b7b60d0d015d4e1"; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "passwd-user-2.1.0" = { + name = "passwd-user"; + packageName = "passwd-user"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passwd-user/-/passwd-user-2.1.0.tgz"; + sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; + }; + }; + "p-some-2.0.0" = { + name = "p-some"; + packageName = "p-some"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz"; + sha1 = "60b408e21f5da11a417fad13740bf20f9024ab3b"; + }; + }; + "aggregate-error-1.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; + sha1 = "888344dad0220a72e3af50906117f48771925fac"; + }; + }; + "clean-stack-1.3.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; + sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; + }; + }; + "indent-string-3.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.1.0.tgz"; + sha1 = "08ff4334603388399b329e6b9538dc7a3cf5de7d"; }; }; "execall-1.0.0" = { @@ -19877,13 +20111,13 @@ let sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; }; }; - "dot-prop-2.4.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "2.4.0"; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz"; - sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c"; + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; }; }; "bin-version-check-2.1.0" = { @@ -19967,22 +20201,13 @@ let sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; - "diff-2.2.3" = { - name = "diff"; - packageName = "diff"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; - sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; - }; - }; - "globby-4.1.0" = { + "globby-6.1.0" = { name = "globby"; packageName = "globby"; - version = "4.1.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz"; - sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; "grouped-queue-0.3.3" = { @@ -19994,6 +20219,15 @@ let sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; }; }; + "is-scoped-1.0.0" = { + name = "is-scoped"; + packageName = "is-scoped"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz"; + sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; + }; + }; "mem-fs-1.1.3" = { name = "mem-fs"; packageName = "mem-fs"; @@ -20003,6 +20237,24 @@ let sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; }; }; + "untildify-3.0.2" = { + name = "untildify"; + packageName = "untildify"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz"; + sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"; + }; + }; + "scoped-regex-1.0.0" = { + name = "scoped-regex"; + packageName = "scoped-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz"; + sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; + }; + }; "vinyl-file-2.0.0" = { name = "vinyl-file"; packageName = "vinyl-file"; @@ -20030,6 +20282,15 @@ let sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; }; }; + "ansi-styles-3.1.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz"; + sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750"; + }; + }; "pad-component-0.0.1" = { name = "pad-component"; packageName = "pad-component"; @@ -20061,17 +20322,17 @@ in }; dependencies = [ sources."async-2.4.1" - (sources."babel-core-6.24.1" // { + (sources."babel-core-6.25.0" // { dependencies = [ sources."source-map-0.5.6" ]; }) - sources."babel-traverse-6.24.1" - sources."babel-types-6.24.1" - sources."babylon-6.17.2" + sources."babel-traverse-6.25.0" + sources."babel-types-6.25.0" + sources."babylon-6.17.3" sources."colors-0.6.0-1" sources."commander-0.6.1" - sources."deasync-0.1.9" + sources."deasync-0.1.10" sources."ejs-2.3.4" sources."global-paths-0.1.2" sources."jsonlint-1.5.1" @@ -20085,14 +20346,14 @@ in sources."xmldom-0.1.19" sources."lodash-4.17.4" sources."babel-code-frame-6.22.0" - (sources."babel-generator-6.24.1" // { + (sources."babel-generator-6.25.0" // { dependencies = [ sources."source-map-0.5.6" ]; }) sources."babel-helpers-6.24.1" sources."babel-messages-6.23.0" - sources."babel-template-6.24.1" + sources."babel-template-6.25.0" sources."babel-runtime-6.23.0" sources."babel-register-6.24.1" sources."convert-source-map-1.5.0" @@ -20130,10 +20391,10 @@ in sources."os-tmpdir-1.0.2" sources."minimist-0.0.8" sources."ms-2.0.0" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."globals-9.17.0" + sources."globals-9.18.0" sources."invariant-2.2.2" sources."loose-envify-1.3.1" sources."to-fast-properties-1.0.3" @@ -20183,10 +20444,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.13"; + version = "0.10.14"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.13.tgz"; - sha1 = "7e98a46b058f436fb2a3fbed982d143d49557348"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.14.tgz"; + sha1 = "e702e81a68b2b52db11e707796b484001b22063e"; }; dependencies = [ sources."adal-node-0.1.21" @@ -20200,22 +20461,52 @@ in sources."azure-arm-authorization-2.0.0" sources."azure-arm-cdn-1.0.3" sources."azure-arm-commerce-0.2.0" - sources."azure-arm-compute-0.20.0" + (sources."azure-arm-compute-3.0.0-preview" // { + dependencies = [ + sources."ms-rest-2.2.0" + sources."ms-rest-azure-2.1.2" + sources."async-0.2.7" + ]; + }) sources."azure-arm-datalake-analytics-1.0.2-preview" sources."azure-arm-datalake-store-1.0.2-preview" sources."azure-arm-hdinsight-0.2.2" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" - sources."azure-arm-iothub-0.1.4" + (sources."azure-arm-iothub-1.0.1-preview" // { + dependencies = [ + sources."ms-rest-2.2.0" + sources."ms-rest-azure-2.1.2" + sources."async-0.2.7" + ]; + }) sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.18.0" + (sources."azure-arm-network-1.1.0-preview" // { + dependencies = [ + sources."ms-rest-2.2.0" + sources."ms-rest-azure-2.1.2" + sources."async-0.2.7" + ]; + }) sources."azure-arm-powerbiembedded-0.1.0" - sources."azure-arm-trafficmanager-0.12.0" + (sources."azure-arm-trafficmanager-1.1.0-preview" // { + dependencies = [ + sources."ms-rest-azure-2.1.2" + sources."ms-rest-2.2.0" + sources."async-0.2.7" + ]; + }) sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" sources."azure-arm-rediscache-0.2.3" sources."azure-arm-devtestlabs-0.1.0" - sources."azure-graph-1.1.1" + (sources."azure-graph-2.1.0-preview" // { + dependencies = [ + sources."ms-rest-azure-2.1.2" + sources."ms-rest-2.2.0" + sources."async-0.2.7" + ]; + }) sources."azure-gallery-2.0.0-pre.18" sources."azure-keyvault-0.11.0" sources."azure-asm-compute-0.18.0" @@ -20254,7 +20545,7 @@ in sources."colors-1.1.2" sources."commander-1.0.4" sources."date-utils-1.2.21" - sources."easy-table-0.0.1" + sources."easy-table-1.1.0" sources."event-stream-3.1.5" sources."eyes-0.1.8" sources."github-0.1.6" @@ -20264,7 +20555,7 @@ in sources."jsonminify-0.4.1" sources."jsrsasign-4.8.2" sources."jwt-decode-2.2.0" - (sources."kuduscript-1.0.13" // { + (sources."kuduscript-1.0.15" // { dependencies = [ sources."commander-1.1.1" sources."streamline-0.4.11" @@ -20340,6 +20631,12 @@ in sources."envconf-0.0.4" sources."duplexer-0.1.1" sources."sax-0.5.2" + sources."@types/node-7.0.31" + sources."@types/request-0.0.42" + sources."@types/uuid-2.0.30" + sources."is-buffer-1.1.5" + sources."is-stream-1.1.0" + sources."@types/form-data-0.0.33" sources."browserify-mime-1.2.9" sources."extend-1.2.1" sources."json-edm-parser-0.1.2" @@ -20354,6 +20651,9 @@ in sources."util-deprecate-1.0.2" sources."stack-trace-0.0.10" sources."keypress-0.1.0" + sources."wcwidth-1.0.1" + sources."defaults-1.0.3" + sources."clone-1.0.2" sources."from-0.1.7" sources."map-stream-0.1.0" sources."pause-stream-0.0.11" @@ -20391,8 +20691,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."cycle-1.0.3" sources."isstream-0.1.2" @@ -20454,7 +20754,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20475,20 +20775,20 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."ctype-0.5.2" sources."source-map-0.1.43" - sources."fibers-1.0.16" + sources."fibers-1.0.15" sources."galaxy-0.1.12" sources."amdefine-1.0.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.10" - sources."string_decoder-1.0.1" + sources."readable-stream-2.2.11" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) sources."http-response-object-1.1.0" @@ -20635,8 +20935,8 @@ in sources."minimatch-3.0.4" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."q-1.5.0" sources."debug-2.6.8" @@ -20709,13 +21009,21 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - sources."readable-stream-2.2.10" + (sources."readable-stream-2.2.11" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."resolve-1.3.3" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.7.1" - sources."string_decoder-1.0.1" + sources."stream-http-2.7.2" + (sources."string_decoder-1.0.2" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."subarg-1.0.0" sources."syntax-error-1.3.0" sources."through2-2.0.3" @@ -20758,7 +21066,7 @@ in sources."diffie-hellman-5.0.2" sources."pbkdf2-3.0.12" sources."public-encrypt-4.0.0" - sources."randombytes-2.0.4" + sources."randombytes-2.0.5" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" @@ -20786,8 +21094,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."function-bind-1.1.0" sources."is-buffer-1.1.5" @@ -21049,14 +21357,14 @@ in sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.1" - (sources."random-access-file-1.7.3" // { + (sources."random-access-file-1.8.1" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) - sources."randombytes-2.0.4" + sources."randombytes-2.0.5" sources."run-parallel-1.1.6" sources."buffer-alloc-unsafe-1.0.0" sources."inherits-2.0.3" @@ -21080,8 +21388,8 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -21110,18 +21418,19 @@ in sources."run-series-1.1.4" (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."ws-2.3.1" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) sources."string2compact-1.2.2" @@ -21170,9 +21479,10 @@ in sources."voc-0.5.0" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) sources."exit-on-epipe-1.0.0" @@ -21277,8 +21587,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."base64-js-0.0.8" sources."xmlbuilder-4.0.0" @@ -21294,7 +21604,7 @@ in (sources."cordova-fetch-1.1.0" // { dependencies = [ sources."q-1.5.0" - sources."shelljs-0.7.7" + sources."shelljs-0.7.8" sources."glob-7.1.2" ]; }) @@ -21361,7 +21671,7 @@ in sources."isarray-0.0.1" sources."object-keys-1.0.11" sources."cordova-app-hello-world-3.12.0" - (sources."dependency-ls-1.1.0" // { + (sources."dependency-ls-1.1.1" // { dependencies = [ sources."q-1.4.1" ]; @@ -21420,16 +21730,17 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.10" // { + (sources."readable-stream-2.2.11" // { dependencies = [ sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.7.1" + sources."stream-http-2.7.2" sources."string_decoder-0.10.31" (sources."subarg-1.0.0" // { dependencies = [ @@ -21477,7 +21788,7 @@ in sources."diffie-hellman-5.0.2" sources."pbkdf2-3.0.12" sources."public-encrypt-4.0.0" - sources."randombytes-2.0.4" + sources."randombytes-2.0.5" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" @@ -21591,7 +21902,7 @@ in sources."http-errors-1.6.1" sources."mime-1.3.4" sources."media-typer-0.3.0" - sources."npm-package-arg-5.1.1" + sources."npm-package-arg-5.1.2" sources."promzard-0.3.0" sources."read-1.0.7" (sources."read-package-json-2.0.5" // { @@ -21737,7 +22048,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21758,7 +22069,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."isexe-2.0.0" @@ -21880,9 +22190,9 @@ in sources."hiredis-0.4.1" (sources."json-rpc2-0.8.1" // { dependencies = [ - sources."debug-1.0.4" + sources."debug-1.0.5" sources."lodash-2.4.2" - sources."ms-0.6.2" + sources."ms-2.0.0" ]; }) sources."lodash-3.1.0" @@ -22057,9 +22367,9 @@ in sources."minimist-1.2.0" sources."split2-2.1.1" sources."through2-2.0.3" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."string_decoder-1.0.2" ]; }) sources."pump-1.0.2" @@ -22072,9 +22382,9 @@ in (sources."tar-stream-1.5.4" // { dependencies = [ sources."bl-1.2.1" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."string_decoder-1.0.2" ]; }) (sources."through2-0.6.5" // { @@ -22098,16 +22408,16 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."once-1.3.3" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."string_decoder-1.0.2" ]; }) sources."lru-cache-2.7.3" sources."stream-shift-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.0.1" sources."util-deprecate-1.0.2" sources."level-packager-0.18.0" sources."bytewise-1.1.0" @@ -22161,16 +22471,16 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.0.tgz"; - sha1 = "19aec66c4619e49a66dfa1106719819d9daecbc8"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.1.tgz"; + sha1 = "84218b1184cec4859e63ae2ef44b5a7d877e4fe4"; }; dependencies = [ sources."JSONStream-1.3.1" sources."async-2.4.1" sources."aws4-1.6.0" - sources."aws-sdk-2.62.0" + sources."aws-sdk-2.70.0" sources."ini-1.3.4" sources."optimist-0.6.1" sources."request-2.81.0" @@ -22232,7 +22542,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22253,7 +22563,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -22277,7 +22586,7 @@ in dependencies = [ sources."chalk-1.1.3" sources."clipboardy-0.1.2" - sources."conf-1.1.1" + sources."conf-1.1.2" (sources."got-6.7.1" // { dependencies = [ sources."get-stream-3.0.0" @@ -22302,7 +22611,7 @@ in sources."p-finally-1.0.0" sources."signal-exit-3.0.2" sources."strip-eof-1.0.0" - sources."lru-cache-4.0.2" + sources."lru-cache-4.1.1" sources."which-1.2.14" sources."pseudomap-1.0.2" sources."yallist-2.1.2" @@ -22392,10 +22701,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.19.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; - sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.0.0.tgz"; + sha1 = "7277c01437fdf41dccd168d5aa0e49b75ca1f260"; }; dependencies = [ sources."babel-code-frame-6.22.0" @@ -22403,17 +22712,17 @@ in sources."concat-stream-1.6.0" sources."debug-2.6.8" sources."doctrine-2.0.0" - sources."escope-3.6.0" + sources."eslint-scope-3.7.1" sources."espree-3.4.3" sources."esquery-1.0.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.1.2" - sources."globals-9.17.0" + sources."globals-9.18.0" sources."ignore-3.3.3" sources."imurmurhash-0.1.4" - sources."inquirer-0.12.0" + sources."inquirer-3.1.0" sources."is-my-json-valid-2.16.0" sources."is-resolvable-1.0.0" sources."js-yaml-3.8.4" @@ -22424,20 +22733,12 @@ in sources."natural-compare-1.4.0" sources."optionator-0.8.2" sources."path-is-inside-1.0.2" - sources."pluralize-1.2.1" - sources."progress-1.1.8" + sources."pluralize-4.0.0" + sources."progress-2.0.0" sources."require-uncached-1.0.3" - sources."shelljs-0.7.7" - sources."strip-bom-3.0.0" sources."strip-json-comments-2.0.1" - (sources."table-3.8.3" // { - dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."table-4.0.1" sources."text-table-0.2.0" - sources."user-home-2.0.0" sources."js-tokens-3.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -22447,27 +22748,19 @@ in sources."ansi-regex-2.1.1" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."ms-2.0.0" - sources."es6-map-0.1.5" - sources."es6-weak-map-2.0.2" (sources."esrecurse-4.1.0" // { dependencies = [ sources."estraverse-4.1.1" ]; }) - sources."d-1.0.0" - sources."es5-ext-0.10.22" - sources."es6-iterator-2.0.1" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" - sources."event-emitter-0.3.5" sources."object-assign-4.1.1" sources."acorn-5.0.3" (sources."acorn-jsx-3.0.1" // { @@ -22497,25 +22790,30 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" sources."cli-width-2.1.0" - sources."figures-1.7.0" - sources."readline2-1.0.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."string-width-1.0.2" + sources."external-editor-2.0.4" + sources."figures-2.0.0" + sources."mute-stream-0.0.7" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."string-width-2.0.0" sources."through-2.3.8" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.5" - sources."number-is-nan-1.0.1" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + sources."signal-exit-3.0.2" + sources."mimic-fn-1.1.0" + sources."iconv-lite-0.4.18" + sources."jschardet-1.4.2" + sources."tmp-0.0.31" + sources."os-tmpdir-1.0.2" + sources."is-promise-2.1.0" + sources."is-fullwidth-code-point-2.0.0" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -22535,15 +22833,10 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."interpret-1.0.3" - sources."rechoir-0.6.2" - sources."resolve-1.3.3" - sources."path-parse-1.0.5" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" sources."co-4.6.0" - sources."os-homedir-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -22587,7 +22880,7 @@ in sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.1.2" - sources."globals-9.17.0" + sources."globals-9.18.0" sources."ignore-3.3.3" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" @@ -22603,7 +22896,7 @@ in sources."pluralize-1.2.1" sources."progress-1.1.8" sources."require-uncached-1.0.3" - sources."shelljs-0.7.7" + sources."shelljs-0.7.8" sources."strip-bom-3.0.0" sources."strip-json-comments-2.0.1" (sources."table-3.8.3" // { @@ -22617,12 +22910,12 @@ in sources."js-tokens-3.0.1" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."ms-2.0.0" sources."es6-map-0.1.5" @@ -22633,7 +22926,7 @@ in ]; }) sources."d-1.0.0" - sources."es5-ext-0.10.22" + sources."es5-ext-0.10.23" sources."es6-iterator-2.0.1" sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" @@ -22667,8 +22960,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."ansi-escapes-1.4.0" sources."cli-cursor-1.0.2" @@ -22838,7 +23131,7 @@ in sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.1.1" + sources."fsevents-1.1.2" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -22860,12 +23153,21 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.6" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.5" - sources."remove-trailing-separator-1.0.1" + sources."is-posix-bracket-0.1.1" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -22875,12 +23177,12 @@ in sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" @@ -22965,7 +23267,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22986,7 +23288,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -23002,8 +23303,8 @@ in sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" sources."ms-2.0.0" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."event-stream-0.5.3" // { dependencies = [ @@ -23055,6 +23356,22 @@ in }; production = true; }; + git-standup = nodeEnv.buildNodePackage { + name = "git-standup"; + packageName = "git-standup"; + version = "2.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.8.tgz"; + sha1 = "4df13a13e9c49ba4cdbd5ad35a90457c8795e352"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Recall what you did on the last working day. Psst! or be nosy and find what someone else in your team did ;-)"; + homepage = "https://github.com/kamranahmedse/git-standup#readme"; + license = "MIT"; + }; + production = true; + }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; packageName = "grunt-cli"; @@ -23075,8 +23392,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."abbrev-1.1.0" ]; @@ -23108,7 +23425,7 @@ in sources."xml2js-0.4.17" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - (sources."clean-css-3.4.26" // { + (sources."clean-css-3.4.27" // { dependencies = [ sources."commander-2.8.1" ]; @@ -23125,7 +23442,7 @@ in sources."source-map-0.1.43" ]; }) - (sources."uglify-js-2.8.28" // { + (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.6" ]; @@ -23233,9 +23550,9 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."string_decoder-1.0.2" ]; }) sources."vinyl-0.5.3" @@ -23262,7 +23579,7 @@ in sources."inherits-2.0.3" sources."xtend-4.0.1" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.0.1" sources."util-deprecate-1.0.2" sources."clone-1.0.2" sources."clone-stats-0.0.1" @@ -23303,11 +23620,20 @@ in sources."isarray-1.0.0" ]; }) - sources."randomatic-1.1.6" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."repeat-string-1.6.1" - sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.5" - sources."remove-trailing-separator-1.0.1" + sources."is-posix-bracket-0.1.1" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -23365,8 +23691,8 @@ in sources."glob2base-0.0.12" sources."unique-stream-1.0.0" sources."inflight-1.0.6" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."find-index-0.1.1" sources."gaze-0.5.2" @@ -23445,8 +23771,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."cli-0.6.6" // { dependencies = [ @@ -23556,15 +23882,15 @@ in sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" ]; }) - (sources."uglify-js-2.8.28" // { + (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.6" ]; @@ -23659,8 +23985,8 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; buildInputs = globalBuildInputs; @@ -23842,7 +24168,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23863,7 +24189,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" @@ -23914,7 +24239,11 @@ in sources."parse-json-2.2.0" sources."pinkie-promise-2.0.1" sources."read-all-stream-3.1.0" - sources."readable-stream-2.2.10" + (sources."readable-stream-2.2.11" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."timed-out-3.1.3" sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" @@ -23925,7 +24254,11 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.1" + (sources."string_decoder-1.0.2" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."util-deprecate-1.0.2" sources."prepend-http-1.0.4" (sources."rc-1.2.1" // { @@ -24086,7 +24419,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.1.1" + sources."fsevents-1.1.2" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -24108,12 +24441,21 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.6" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.5" - sources."remove-trailing-separator-1.0.1" + sources."is-posix-bracket-0.1.1" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -24122,11 +24464,19 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" - sources."readable-stream-2.2.10" + (sources."readable-stream-2.2.11" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.1" + (sources."string_decoder-1.0.2" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."util-deprecate-1.0.2" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" @@ -24202,7 +24552,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24223,7 +24573,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" @@ -24246,8 +24595,8 @@ in sources."inflight-1.0.6" sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."wordwrap-0.0.3" (sources."engine.io-1.8.3" // { @@ -24496,14 +24845,14 @@ in sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-fs-2.4.4" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."xtend-4.0.1" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."clone-1.0.2" sources."clone-stats-0.0.1" @@ -24548,8 +24897,8 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."is-glob-3.1.0" sources."path-dirname-1.0.2" @@ -24581,11 +24930,20 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.6" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."repeat-string-1.6.1" - sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.5" - sources."remove-trailing-separator-1.0.1" + sources."is-posix-bracket-0.1.1" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -24680,8 +25038,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."lodash._baseassign-3.2.0" sources."lodash._basecreate-3.0.3" @@ -24768,12 +25126,12 @@ in sources."npmlog-3.1.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" sources."hosted-git-info-2.4.2" @@ -24822,7 +25180,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24843,7 +25201,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -24853,8 +25210,8 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" @@ -24932,8 +25289,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."minimist-0.0.8" sources."abbrev-1.1.0" @@ -24942,12 +25299,12 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" @@ -25000,7 +25357,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25021,7 +25378,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -25193,8 +25549,8 @@ in sources."minimatch-3.0.4" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."deep-extend-0.4.2" sources."ini-1.3.4" @@ -25225,11 +25581,11 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.1" + sources."string_decoder-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" sources."string-width-1.0.2" @@ -25274,7 +25630,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25295,7 +25651,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" @@ -25354,13 +25709,13 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" @@ -25414,7 +25769,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25435,7 +25790,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -25447,8 +25801,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.11" @@ -25497,7 +25851,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.1.1" + sources."fsevents-1.1.2" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -25519,12 +25873,21 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.6" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-posix-bracket-0.1.1" sources."is-buffer-1.1.5" - sources."remove-trailing-separator-1.0.1" + sources."is-posix-bracket-0.1.1" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -25534,12 +25897,12 @@ in sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" @@ -25618,7 +25981,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25639,7 +26002,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -25665,8 +26027,8 @@ in sources."lodash._getnative-3.9.1" sources."lodash.isarguments-3.1.0" sources."lodash.isarray-3.0.4" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."event-stream-3.3.4" sources."through-2.3.8" @@ -25800,7 +26162,7 @@ in sources."tunnel-agent-0.6.0" ]; }) - sources."node-red-node-rbe-0.1.9" + sources."node-red-node-rbe-0.1.10" sources."bcrypt-1.0.2" sources."bytes-2.4.0" sources."content-type-1.0.2" @@ -25845,12 +26207,12 @@ in sources."nth-check-1.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.4.1" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -25920,15 +26282,15 @@ in sources."is-negated-glob-1.0.0" sources."ordered-read-streams-1.0.1" sources."pumpify-1.3.5" - sources."remove-trailing-separator-1.0.1" + sources."remove-trailing-separator-1.0.2" sources."to-absolute-glob-2.0.1" sources."unique-stream-2.2.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."is-glob-3.1.0" sources."path-dirname-1.0.2" @@ -26040,7 +26402,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26061,7 +26423,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" @@ -26099,7 +26460,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."mimelib-0.3.0" // { + (sources."mimelib-0.3.1" // { dependencies = [ sources."addressparser-1.0.1" ]; @@ -26303,10 +26664,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.0.2.tgz"; - sha1 = "139e6c29c5a4982af11dda04e48aea783156d190"; + url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz"; + sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856"; }; dependencies = [ sources."JSONStream-1.3.1" @@ -26317,7 +26678,7 @@ in sources."aproba-1.1.2" sources."archy-1.0.0" sources."bluebird-3.5.0" - sources."cacache-9.2.6" + sources."cacache-9.2.8" sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" @@ -26359,14 +26720,14 @@ in sources."normalize-package-data-2.3.8" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-5.1.1" + sources."npm-package-arg-5.1.2" sources."npm-registry-client-8.3.0" sources."npm-user-validate-1.0.0" sources."npmlog-4.1.0" sources."once-1.4.0" sources."opener-1.4.3" sources."osenv-0.1.4" - sources."pacote-2.7.27" + sources."pacote-2.7.36" sources."path-is-inside-1.0.2" sources."promise-inflight-1.0.1" sources."read-1.0.7" @@ -26374,11 +26735,15 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.5" sources."read-package-tree-5.1.6" - sources."readable-stream-2.2.10" + (sources."readable-stream-2.2.11" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."request-2.81.0" sources."retry-0.10.1" sources."rimraf-2.6.1" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.0" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" @@ -26391,7 +26756,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."ssri-4.1.4" + sources."ssri-4.1.6" sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" @@ -26425,8 +26790,8 @@ in sources."asap-2.0.5" sources."fstream-ignore-1.0.5" sources."minimatch-3.0.4" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" @@ -26473,18 +26838,18 @@ in sources."number-is-nan-1.0.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."make-fetch-happen-2.4.10" + sources."make-fetch-happen-2.4.12" sources."npm-pick-manifest-1.0.3" sources."promise-retry-1.1.1" sources."protoduck-4.0.0" - sources."tar-fs-1.15.2" + sources."tar-fs-1.15.3" sources."tar-stream-1.5.4" - sources."agentkeepalive-3.1.0" + sources."agentkeepalive-3.2.0" sources."http-cache-semantics-3.7.3" sources."http-proxy-agent-1.0.0" sources."https-proxy-agent-1.0.0" sources."node-fetch-npm-2.0.1" - sources."socks-proxy-agent-2.1.0" + sources."socks-proxy-agent-2.1.1" sources."humanize-ms-1.2.1" sources."ms-2.0.0" (sources."agent-base-2.1.1" // { @@ -26496,7 +26861,7 @@ in sources."debug-2.6.8" sources."encoding-0.1.12" sources."json-parse-helpfulerror-1.0.3" - sources."iconv-lite-0.4.17" + sources."iconv-lite-0.4.18" sources."jju-1.3.0" sources."socks-1.1.10" sources."ip-1.1.5" @@ -26509,7 +26874,11 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.1" + (sources."string_decoder-1.0.2" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -26547,7 +26916,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26568,7 +26937,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -26739,7 +27107,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26760,7 +27128,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -26773,19 +27140,27 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.10" + (sources."readable-stream-2.2.11" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.1" + (sources."string_decoder-1.0.2" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."util-deprecate-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" @@ -26863,7 +27238,7 @@ in sources."require-dir-0.3.2" sources."semver-5.3.0" sources."semver-utils-1.1.1" - (sources."snyk-1.33.0" // { + (sources."snyk-1.34.4" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -27004,8 +27379,8 @@ in sources."proto-list-1.2.4" sources."fstream-ignore-1.0.5" sources."minimatch-3.0.4" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" @@ -27033,21 +27408,21 @@ in sources."es6-symbol-3.1.1" sources."ms-2.0.0" sources."d-1.0.0" - sources."es5-ext-0.10.22" + sources."es5-ext-0.10.23" sources."es6-iterator-2.0.1" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" ]; }) sources."typedarray-0.0.6" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -27098,7 +27473,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27119,7 +27494,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -27148,6 +27522,7 @@ in sources."snyk-config-1.0.1" sources."snyk-module-1.8.1" sources."snyk-policy-1.7.1" + sources."snyk-python-plugin-1.0.0" (sources."snyk-recursive-readdir-2.0.0" // { dependencies = [ sources."minimatch-3.0.2" @@ -27225,7 +27600,7 @@ in sources."window-size-0.2.0" ]; }) - sources."lru-cache-4.0.2" + sources."lru-cache-4.1.1" sources."lodash.defaults-4.2.0" sources."lodash.defaultsdeep-4.6.0" sources."lodash.mergewith-4.6.0" @@ -27451,12 +27826,12 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."optimist-0.6.1" sources."source-map-0.4.4" - (sources."uglify-js-2.8.28" // { + (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.6" sources."yargs-3.10.0" @@ -27526,7 +27901,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27547,7 +27922,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" @@ -27558,13 +27932,14 @@ in sources."hot-shots-4.5.0" (sources."limitation-0.2.0" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) sources."dnscache-1.0.1" - sources."dtrace-provider-0.8.2" + sources."dtrace-provider-0.8.3" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" @@ -27587,26 +27962,29 @@ in sources."hat-0.0.3" (sources."kad-fs-0.0.4" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) sources."kad-localstorage-0.0.7" (sources."kad-memstore-0.0.1" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) sources."lodash-3.10.1" sources."merge-1.2.0" (sources."msgpack5-3.4.1" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) sources."process-nextick-args-1.0.7" @@ -27614,9 +27992,10 @@ in sources."dom-storage-2.0.2" (sources."bl-1.2.1" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) sources."get-caller-file-1.0.2" @@ -27736,12 +28115,12 @@ in sources."big-integer-1.6.23" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."base64-js-0.0.8" sources."xmlbuilder-4.0.0" @@ -27867,14 +28246,18 @@ in sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.1" - (sources."random-access-file-1.7.3" // { + (sources."random-access-file-1.8.1" // { dependencies = [ sources."mkdirp-0.5.1" sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) - sources."randombytes-2.0.4" + (sources."randombytes-2.0.5" // { + dependencies = [ + sources."safe-buffer-5.1.0" + ]; + }) sources."run-parallel-1.1.6" sources."buffer-alloc-unsafe-1.0.0" sources."debug-2.6.8" @@ -27897,8 +28280,8 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -27929,7 +28312,6 @@ in (sources."simple-websocket-4.3.1" // { dependencies = [ sources."ws-2.3.1" - sources."safe-buffer-5.0.1" ]; }) sources."string2compact-1.2.2" @@ -28226,13 +28608,13 @@ in sources."rimraf-2.6.1" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.1" - (sources."random-access-file-1.7.3" // { + (sources."random-access-file-1.8.1" // { dependencies = [ sources."debug-2.6.8" sources."ms-2.0.0" ]; }) - sources."randombytes-2.0.4" + sources."randombytes-2.0.5" sources."run-parallel-1.1.6" sources."thunky-1.0.2" sources."buffer-alloc-unsafe-1.0.0" @@ -28252,8 +28634,8 @@ in sources."inflight-1.0.6" sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."bittorrent-dht-6.4.2" (sources."bittorrent-tracker-7.7.0" // { @@ -28284,18 +28666,19 @@ in sources."simple-get-2.6.0" (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."ws-2.3.1" sources."isarray-1.0.0" - sources."string_decoder-1.0.1" sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."ultron-1.1.0" ]; }) @@ -28361,8 +28744,8 @@ in sources."minimatch-3.0.4" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."is-stream-1.1.0" sources."pinkie-promise-2.0.1" @@ -28396,7 +28779,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28417,7 +28800,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."hoek-2.16.3" @@ -28454,10 +28836,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.4.2"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.4.2.tgz"; - sha1 = "bcdd95ed1eca434ac7f98ca26ea4d25a2af6a2ac"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.4.4.tgz"; + sha1 = "a8d1447b14c9bf67e6d420dcadd10fb9a4fad65a"; }; buildInputs = globalBuildInputs; meta = { @@ -28486,7 +28868,7 @@ in sources."detective-4.5.0" sources."glob-5.0.15" sources."graceful-fs-4.1.11" - sources."iconv-lite-0.4.17" + sources."iconv-lite-0.4.18" sources."mkdirp-0.5.1" sources."private-0.1.7" sources."q-1.5.0" @@ -28500,8 +28882,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."minimist-0.0.8" sources."ast-types-0.9.6" @@ -28636,7 +29018,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28657,7 +29039,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -28836,7 +29217,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28857,13 +29238,12 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" - sources."dtrace-provider-0.8.2" + sources."dtrace-provider-0.8.3" sources."mv-2.1.1" sources."safe-json-stringify-1.0.4" sources."moment-2.18.1" @@ -28879,8 +29259,8 @@ in sources."inherits-2.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."optimist-0.3.7" (sources."uglify-js-2.3.6" // { @@ -28899,7 +29279,8 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" + sources."safe-buffer-5.0.1" ]; }) sources."regexp-quote-0.0.0" @@ -28915,7 +29296,11 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.1" + (sources."string_decoder-1.0.2" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) sources."util-deprecate-1.0.2" sources."jsonparse-1.3.1" sources."through-2.3.8" @@ -28950,17 +29335,17 @@ in sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" sources."minimatch-3.0.4" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -29071,8 +29456,8 @@ in sources."inherits-2.0.3" sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."sshpk-agent-1.2.1" (sources."sshpk-1.7.1" // { @@ -29094,11 +29479,11 @@ in ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" @@ -29136,8 +29521,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."amdefine-1.0.1" ]; @@ -29159,7 +29544,7 @@ in }; dependencies = [ sources."sax-1.2.2" - sources."coa-1.0.2" + sources."coa-1.0.3" sources."js-yaml-3.7.0" sources."colors-1.1.2" sources."whet.extend-0.9.9" @@ -29170,7 +29555,7 @@ in sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."minimist-0.0.8" - sources."clap-1.1.3" + sources."clap-1.2.0" sources."source-map-0.5.6" sources."chalk-1.1.3" sources."ansi-styles-2.2.1" @@ -29207,22 +29592,22 @@ in sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" sources."errno-0.1.4" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."prr-0.0.0" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" ]; buildInputs = globalBuildInputs; @@ -29252,10 +29637,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.0.15"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.15.tgz"; - sha1 = "aacb323a846b234602270dead8a32441a8806f42"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.16.tgz"; + sha1 = "fe394c6708a79ffbf21ca15d6591b16334501aec"; }; dependencies = [ sources."commander-2.9.0" @@ -29394,7 +29779,7 @@ in sources."colors-1.0.3" ]; }) - (sources."yargs-8.0.1" // { + (sources."yargs-8.0.2" // { dependencies = [ sources."string-width-2.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -29600,7 +29985,7 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.5" sources."read-package-tree-5.1.6" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."realize-package-specifier-3.0.3" sources."retry-0.10.1" sources."sha-2.0.1" @@ -29650,8 +30035,8 @@ in sources."minimatch-3.0.4" ]; }) - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" @@ -29701,8 +30086,8 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -29727,7 +30112,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29748,7 +30133,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" @@ -29785,7 +30169,7 @@ in sources."execa-0.4.0" (sources."cross-spawn-async-2.2.5" // { dependencies = [ - sources."lru-cache-4.0.2" + sources."lru-cache-4.1.1" ]; }) sources."is-stream-1.1.0" @@ -29824,7 +30208,11 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."ssri-4.1.4" + (sources."ssri-4.1.6" // { + dependencies = [ + sources."safe-buffer-5.1.0" + ]; + }) sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" @@ -29920,7 +30308,7 @@ in sources."mem-1.1.0" (sources."cross-spawn-4.0.2" // { dependencies = [ - sources."lru-cache-4.0.2" + sources."lru-cache-4.1.1" ]; }) sources."p-finally-1.0.0" @@ -30019,8 +30407,8 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."minimatch-3.0.4" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."is-stream-1.1.0" sources."pinkie-promise-2.0.1" @@ -30054,7 +30442,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30075,7 +30463,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."hoek-2.16.3" @@ -30145,7 +30532,7 @@ in sources."source-map-0.5.6" sources."supports-color-3.2.3" sources."tapable-0.2.6" - (sources."uglify-js-2.8.28" // { + (sources."uglify-js-2.8.29" // { dependencies = [ sources."yargs-3.10.0" ]; @@ -30167,14 +30554,14 @@ in sources."big.js-3.1.3" sources."emojis-list-2.1.0" sources."errno-0.1.4" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."prr-0.0.0" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" sources."assert-1.4.1" @@ -30192,7 +30579,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.7.1" + sources."stream-http-2.7.2" sources."timers-browserify-2.0.2" sources."tty-browserify-0.0.0" (sources."url-0.11.0" // { @@ -30218,7 +30605,11 @@ in sources."diffie-hellman-5.0.2" sources."pbkdf2-3.0.12" sources."public-encrypt-4.0.0" - sources."randombytes-2.0.4" + (sources."randombytes-2.0.5" // { + dependencies = [ + sources."safe-buffer-5.1.0" + ]; + }) sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" @@ -30268,7 +30659,7 @@ in sources."is-glob-2.0.1" sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" - sources."fsevents-1.1.1" + sources."fsevents-1.1.2" sources."arrify-1.0.1" sources."micromatch-2.3.11" sources."arr-diff-2.0.0" @@ -30289,9 +30680,18 @@ in sources."fill-range-2.2.3" sources."is-number-2.1.0" sources."isobject-2.1.0" - sources."randomatic-1.1.6" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."is-posix-bracket-0.1.1" - sources."remove-trailing-separator-1.0.1" + sources."remove-trailing-separator-1.0.2" sources."for-own-0.1.5" sources."is-extendable-0.1.1" sources."for-in-1.0.2" @@ -30302,8 +30702,8 @@ in sources."binary-extensions-1.8.0" sources."minimatch-3.0.4" sources."set-immediate-shim-1.0.1" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" @@ -30375,7 +30775,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30396,7 +30796,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -30493,7 +30892,7 @@ in sources."detect-indent-5.0.0" sources."gunzip-maybe-1.4.0" sources."ini-1.3.4" - sources."inquirer-3.0.6" + sources."inquirer-3.1.0" sources."invariant-2.2.2" sources."is-builtin-module-1.0.0" sources."is-ci-1.0.10" @@ -30510,7 +30909,7 @@ in sources."rimraf-2.6.1" sources."semver-5.3.0" sources."strip-bom-3.0.0" - sources."tar-fs-1.15.2" + sources."tar-fs-1.15.3" sources."tar-stream-1.5.4" sources."uuid-3.0.1" sources."v8-compile-cache-1.1.0" @@ -30536,15 +30935,15 @@ in sources."duplexify-3.5.0" sources."end-of-stream-1.0.0" sources."inherits-2.0.3" - sources."readable-stream-2.2.10" + sources."readable-stream-2.2.11" sources."stream-shift-1.0.0" sources."once-1.3.3" sources."wrappy-1.0.2" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.2" sources."util-deprecate-1.0.2" (sources."pump-1.0.2" // { dependencies = [ @@ -30556,7 +30955,7 @@ in ]; }) sources."xtend-4.0.1" - sources."ansi-escapes-1.4.0" + sources."ansi-escapes-2.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.1.0" sources."external-editor-2.0.4" @@ -30564,14 +30963,15 @@ in sources."lodash-4.17.4" sources."mute-stream-0.0.7" sources."run-async-2.3.0" - sources."rx-4.1.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" sources."string-width-2.0.0" sources."through-2.3.8" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" - sources."iconv-lite-0.4.17" + sources."iconv-lite-0.4.18" sources."jschardet-1.4.2" sources."tmp-0.0.31" sources."os-tmpdir-1.0.2" @@ -30583,8 +30983,8 @@ in sources."ci-info-1.0.0" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."minimist-0.0.8" sources."string.prototype.codepointat-0.2.0" @@ -30626,7 +31026,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30647,7 +31047,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -30673,179 +31072,220 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "1.8.5"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-1.8.5.tgz"; - sha1 = "776ab9ec79a7882f8d4f7a9e10214fdab050d928"; + url = "https://registry.npmjs.org/yo/-/yo-2.0.0.tgz"; + sha1 = "0cd75211379ed87105f99510885759062147b517"; }; dependencies = [ - sources."async-1.5.2" + sources."async-2.4.1" sources."chalk-1.1.3" - sources."cli-list-0.1.8" - sources."configstore-1.4.0" - sources."cross-spawn-3.0.1" - sources."figures-1.7.0" - sources."fullname-2.1.0" - sources."got-5.7.1" + sources."cli-list-0.2.0" + sources."configstore-3.1.0" + sources."cross-spawn-5.1.0" + sources."figures-2.0.0" + sources."fullname-3.3.0" + sources."got-6.7.1" sources."humanize-string-1.0.1" - sources."inquirer-0.11.4" - (sources."insight-0.7.0" // { + sources."inquirer-3.1.0" + (sources."insight-0.8.4" // { dependencies = [ + sources."async-1.5.2" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) sources."inquirer-0.10.1" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" + sources."figures-1.7.0" + sources."lodash-3.10.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."restore-cursor-1.0.1" + sources."onetime-1.1.0" ]; }) - sources."lodash-3.10.1" + sources."lodash-4.17.4" (sources."meow-3.7.0" // { dependencies = [ - sources."minimist-1.2.0" + sources."read-pkg-up-1.0.1" ]; }) - sources."npm-keyword-4.2.0" - sources."opn-3.0.3" + (sources."npm-keyword-4.2.0" // { + dependencies = [ + sources."got-5.7.1" + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" + ]; + }) + sources."opn-4.0.2" (sources."package-json-2.4.0" // { dependencies = [ - sources."semver-5.3.0" + sources."got-5.7.1" + sources."timed-out-3.1.3" + sources."unzip-response-1.0.2" ]; }) sources."parse-help-0.1.1" - sources."read-pkg-up-1.0.1" - sources."repeating-2.0.1" + (sources."read-pkg-up-2.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."read-pkg-2.0.0" + sources."load-json-file-2.0.0" + sources."path-type-2.0.0" + sources."strip-bom-3.0.0" + ]; + }) sources."root-check-1.0.0" - sources."sort-on-1.3.0" + sources."sort-on-2.0.0" sources."string-length-1.0.1" (sources."tabtab-1.3.2" // { dependencies = [ sources."inquirer-1.2.3" - sources."minimist-1.2.0" - sources."cli-width-2.1.0" - sources."lodash-4.17.4" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."external-editor-1.1.1" + sources."figures-1.7.0" sources."mute-stream-0.0.6" - sources."run-async-2.3.0" + sources."string-width-1.0.2" + sources."restore-cursor-1.0.1" + sources."onetime-1.1.0" + sources."tmp-0.0.29" + sources."is-fullwidth-code-point-1.0.0" ]; }) sources."titleize-1.0.0" - (sources."update-notifier-0.6.3" // { - dependencies = [ - sources."configstore-2.1.0" - sources."dot-prop-3.0.0" - ]; - }) + sources."update-notifier-2.2.0" sources."user-home-2.0.0" (sources."yeoman-character-1.1.0" // { dependencies = [ sources."supports-color-3.2.3" ]; }) - (sources."yeoman-doctor-2.1.0" // { + sources."yeoman-doctor-2.1.0" + sources."yeoman-environment-2.0.0" + (sources."yosay-2.0.0" // { dependencies = [ - sources."semver-5.3.0" + sources."ansi-styles-3.1.0" ]; }) - (sources."yeoman-environment-1.6.6" // { - dependencies = [ - sources."inquirer-1.2.3" - sources."lodash-4.17.4" - sources."cli-width-2.1.0" - sources."mute-stream-0.0.6" - sources."run-async-2.3.0" - ]; - }) - sources."yosay-1.2.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" + sources."dot-prop-4.1.1" sources."graceful-fs-4.1.11" - sources."mkdirp-0.5.1" - sources."object-assign-4.1.1" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" - sources."uuid-2.0.3" - sources."write-file-atomic-1.3.4" - sources."xdg-basedir-2.0.0" - sources."minimist-0.0.8" - sources."os-homedir-1.0.2" + sources."make-dir-1.0.0" + sources."unique-string-1.0.0" + sources."write-file-atomic-2.1.0" + sources."xdg-basedir-3.0.0" + sources."is-obj-1.0.1" + sources."pify-2.3.0" + sources."crypto-random-string-1.0.0" sources."imurmurhash-0.1.4" sources."slide-1.1.6" - sources."lru-cache-4.0.2" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" sources."which-1.2.14" sources."pseudomap-1.0.2" sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" sources."isexe-2.0.0" - sources."npmconf-2.1.2" - sources."pify-2.3.0" - sources."pinkie-promise-2.0.1" - sources."config-chain-1.1.11" - sources."inherits-2.0.3" + sources."execa-0.6.3" + sources."filter-obj-1.1.0" + sources."mem-1.1.0" + sources."p-any-1.1.0" + sources."p-try-1.0.0" + (sources."passwd-user-2.1.0" // { + dependencies = [ + sources."execa-0.4.0" + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + ]; + }) + sources."rc-1.2.1" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" + sources."strip-eof-1.0.0" + sources."path-key-2.0.1" + sources."mimic-fn-1.1.0" + sources."p-some-2.0.0" + sources."aggregate-error-1.0.0" + sources."clean-stack-1.3.0" + sources."indent-string-3.1.0" + sources."cross-spawn-async-2.2.5" + sources."object-assign-4.1.1" + sources."deep-extend-0.4.2" sources."ini-1.3.4" - sources."nopt-3.0.6" - sources."once-1.3.3" - sources."semver-4.3.6" - sources."uid-number-0.0.5" - sources."proto-list-1.2.4" - sources."abbrev-1.1.0" - sources."wrappy-1.0.2" - sources."pinkie-2.0.4" + sources."minimist-1.2.0" + sources."strip-json-comments-2.0.1" sources."create-error-class-3.0.2" - sources."duplexer2-0.1.4" + sources."duplexer3-0.1.4" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" - sources."is-stream-1.1.0" sources."lowercase-keys-1.0.0" - sources."node-status-codes-1.0.0" - sources."parse-json-2.2.0" - sources."read-all-stream-3.1.0" - sources."readable-stream-2.2.10" - sources."timed-out-3.1.3" - sources."unzip-response-1.0.2" + sources."safe-buffer-5.1.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" - sources."error-ex-1.3.1" - sources."is-arrayish-0.2.1" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.0" - sources."string_decoder-1.0.1" - sources."util-deprecate-1.0.2" sources."prepend-http-1.0.4" sources."decamelize-1.2.0" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."cli-width-1.1.1" - sources."readline2-1.0.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."string-width-1.0.2" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.1.0" + sources."external-editor-2.0.4" + sources."mute-stream-0.0.7" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + sources."string-width-2.0.0" sources."through-2.3.8" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.5" - sources."number-is-nan-1.0.1" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + sources."iconv-lite-0.4.18" + sources."jschardet-1.4.2" + sources."tmp-0.0.31" + sources."os-tmpdir-1.0.2" + sources."is-promise-2.1.0" + sources."is-fullwidth-code-point-2.0.0" sources."lodash.debounce-3.1.1" sources."os-name-1.0.3" - (sources."request-2.81.0" // { - dependencies = [ - sources."uuid-3.0.1" - ]; - }) + sources."request-2.81.0" sources."tough-cookie-2.3.2" + sources."uuid-3.0.1" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + (sources."readline2-1.0.1" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."mute-stream-0.0.5" + ]; + }) + sources."exit-hook-1.1.1" + sources."code-point-at-1.1.0" + sources."number-is-nan-1.0.1" + sources."once-1.4.0" + sources."wrappy-1.0.2" sources."lodash._getnative-3.9.1" - (sources."osx-release-1.1.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - (sources."win-release-1.1.1" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) + sources."osx-release-1.1.0" + sources."win-release-1.1.1" + sources."semver-5.3.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" @@ -30882,7 +31322,7 @@ in sources."assert-plus-1.0.0" ]; }) - (sources."sshpk-1.13.0" // { + (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -30903,7 +31343,6 @@ in }) sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" @@ -30912,11 +31351,14 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."normalize-package-data-2.3.8" - sources."redent-1.0.0" + (sources."redent-1.0.0" // { + dependencies = [ + sources."indent-string-2.1.0" + ]; + }) sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" sources."hosted-git-info-2.4.2" sources."is-builtin-module-1.0.0" @@ -30925,49 +31367,67 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."indent-string-2.1.0" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."parse-json-2.2.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" sources."get-stdin-4.0.1" sources."registry-url-3.1.0" - (sources."rc-1.2.1" // { + sources."duplexer2-0.1.4" + sources."node-status-codes-1.0.0" + sources."read-all-stream-3.1.0" + (sources."readable-stream-2.2.11" // { dependencies = [ - sources."minimist-1.2.0" + sources."safe-buffer-5.0.1" ]; }) - sources."deep-extend-0.4.2" - sources."strip-json-comments-2.0.1" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + (sources."string_decoder-1.0.2" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) + sources."util-deprecate-1.0.2" sources."registry-auth-token-3.3.1" sources."execall-1.0.0" sources."clone-regexp-1.0.0" sources."is-regexp-1.0.0" sources."is-supported-regexp-flag-1.0.0" - sources."find-up-1.1.2" - sources."read-pkg-1.1.0" - sources."path-exists-2.1.0" - sources."load-json-file-1.1.0" - sources."path-type-1.1.0" - sources."strip-bom-2.0.0" - sources."is-utf8-0.2.1" - sources."is-finite-1.0.2" + (sources."locate-path-2.0.0" // { + dependencies = [ + sources."path-exists-3.0.0" + ]; + }) + sources."p-locate-2.0.0" + sources."p-limit-1.1.0" sources."downgrade-root-1.2.2" sources."sudo-block-1.2.0" sources."default-uid-1.0.0" sources."is-root-1.0.0" sources."is-docker-1.1.0" sources."arrify-1.0.1" - sources."dot-prop-2.4.0" - sources."is-obj-1.0.1" sources."debug-2.6.8" sources."npmlog-2.0.4" sources."ms-2.0.0" - sources."external-editor-1.1.1" sources."rx-4.1.0" sources."spawn-sync-1.0.15" - sources."tmp-0.0.29" sources."concat-stream-1.6.0" sources."os-shim-0.1.3" sources."typedarray-0.0.6" - sources."is-promise-2.1.0" sources."ansi-0.3.1" sources."are-we-there-yet-1.1.4" sources."gauge-1.2.7" @@ -30976,32 +31436,50 @@ in sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - sources."boxen-0.3.1" - sources."is-npm-1.0.0" - sources."latest-version-2.0.0" - (sources."semver-diff-2.1.0" // { + (sources."boxen-1.1.0" // { dependencies = [ - sources."semver-5.3.0" + sources."camelcase-4.1.0" + ]; + }) + sources."import-lazy-2.1.0" + sources."is-npm-1.0.0" + (sources."latest-version-3.1.0" // { + dependencies = [ + sources."package-json-4.0.1" + ]; + }) + sources."semver-diff-2.1.0" + sources."ansi-align-2.0.0" + sources."cli-boxes-1.0.0" + (sources."term-size-0.1.1" // { + dependencies = [ + sources."execa-0.4.0" + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + ]; + }) + (sources."widest-line-1.0.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" ]; }) - sources."filled-array-1.1.0" - sources."widest-line-1.0.0" sources."has-flag-1.0.0" (sources."bin-version-check-2.1.0" // { dependencies = [ - sources."minimist-1.2.0" + sources."semver-4.3.6" + ]; + }) + (sources."each-async-1.1.1" // { + dependencies = [ + sources."onetime-1.1.0" ]; }) - sources."each-async-1.1.1" sources."log-symbols-1.0.2" sources."object-values-1.0.0" sources."twig-0.8.9" sources."bin-version-1.0.4" - (sources."semver-truncate-1.1.2" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) + sources."semver-truncate-1.1.2" sources."find-versions-1.2.1" sources."array-uniq-1.0.3" sources."semver-regex-1.0.0" @@ -31009,23 +31487,22 @@ in sources."walk-2.3.9" sources."minimatch-3.0.4" sources."foreachasync-3.0.0" - sources."brace-expansion-1.1.7" - sources."balanced-match-0.4.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."diff-2.2.3" - sources."globby-4.1.0" - (sources."grouped-queue-0.3.3" // { - dependencies = [ - sources."lodash-4.17.4" - ]; - }) + sources."diff-3.2.0" + sources."globby-6.1.0" + sources."grouped-queue-0.3.3" + sources."is-scoped-1.0.0" sources."mem-fs-1.1.3" sources."text-table-0.2.0" - sources."untildify-2.1.0" + sources."untildify-3.0.2" sources."array-union-1.0.2" - sources."glob-6.0.4" + sources."glob-7.1.2" + sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."path-is-absolute-1.0.1" + sources."scoped-regex-1.0.0" sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-file-2.0.0" @@ -31035,14 +31512,16 @@ in sources."replace-ext-0.0.1" sources."strip-bom-stream-2.0.0" sources."first-chunk-stream-2.0.0" - sources."cli-boxes-1.0.0" sources."pad-component-0.0.1" - (sources."taketalk-1.0.0" // { + sources."taketalk-1.0.0" + (sources."wrap-ansi-2.1.0" // { dependencies = [ - sources."minimist-1.2.0" + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" ]; }) - sources."wrap-ansi-2.1.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.2" ]; buildInputs = globalBuildInputs; meta = { From 7c455b5b7e31fd53a27d029435cb4a04dc64cb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 15 Jun 2017 10:19:29 +0200 Subject: [PATCH 120/152] Revert "Fix #26441: avoid infinite recursion" This reverts commit 9cad7076d1bc5475a857fd2c6e9a56d9ed254252. See https://github.com/NixOS/nixpkgs/commit/9cad7076d1bc5475a857fd2c6e9a56d9ed254252#commitcomment-22548331 --- pkgs/development/haskell-modules/generic-stack-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index fbc586bd74c..53772b90dfb 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -5,7 +5,7 @@ with stdenv.lib; { buildInputs ? [] , extraArgs ? [] , LD_LIBRARY_PATH ? [] -, ghc' ? ghc +, ghc ? ghc , ... }@args: @@ -14,7 +14,7 @@ stdenv.mkDerivation (args // { buildInputs = buildInputs ++ optional stdenv.isLinux glibcLocales ++ - [ ghc' pkgconfig ]; + [ ghc pkgconfig ]; STACK_PLATFORM_VARIANT="nix"; STACK_IN_NIX_SHELL=1; From 72f530ba3310b8304b148b74ece9e6e75309666b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 15 Jun 2017 10:22:25 +0200 Subject: [PATCH 121/152] Fix #26441 second try: avoid infinite recursion --- pkgs/development/haskell-modules/generic-stack-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 53772b90dfb..7fbca53886e 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,11 +1,11 @@ -{ stdenv, ghc, pkgconfig, glibcLocales, cacert }: +{ stdenv, ghc, pkgconfig, glibcLocales, cacert }@depArgs: with stdenv.lib; { buildInputs ? [] , extraArgs ? [] , LD_LIBRARY_PATH ? [] -, ghc ? ghc +, ghc ? depArgs.ghc , ... }@args: From 5172e1afee2c5e5b686b03cfafb18a023934c03a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 15 Jun 2017 05:05:20 -0500 Subject: [PATCH 122/152] mendeley: 1.17.9 -> 1.17.10 (#26574) --- pkgs/applications/office/mendeley/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 0a14a87cf56..95286f3ab65 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -36,14 +36,14 @@ let then "i386" else "amd64"; - shortVersion = "1.17.9-stable"; + shortVersion = "1.17.10-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "0z04r3ipwp2vca3qhp3b1zj0m12h023ynmbjsz4sysnd1bb5f2yr" - else "0h3m6s3s5283g9w3sm4fszhhnzgmqw49nr0ihvdwyxrgawxmz4vg"; + then "0sc9fsprdpl39q8wqbjp59pnr10c1a8gss60b81h54agjni55yrg" + else "02ncfdxcrdwghpch2nlfhc7d0vgjsfqn8sxjkb5yn4bf5wi8z9bq"; deps = [ qt5.qtbase From c9802321c1dc4e9745e3bdad659031fc67a789b6 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 15 Jun 2017 12:11:48 +0200 Subject: [PATCH 123/152] cntlm service: cleanup non working config options (#26578) - extraConfig was not working - add possibility to add cntlm.conf in verbatime form - create cntlm user as system user - add no proxy option --- nixos/modules/services/networking/cntlm.nix | 158 +++++++++++--------- 1 file changed, 85 insertions(+), 73 deletions(-) diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 890ff508407..3978a1969ce 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -5,110 +5,122 @@ with lib; let cfg = config.services.cntlm; - uid = config.ids.uids.cntlm; + + configFile = if cfg.configText != "" then + pkgs.writeText "cntlm.conf" '' + ${cfg.configText} + '' + else + pkgs.writeText "lighttpd.conf" '' + # Cntlm Authentication Proxy Configuration + Username ${cfg.username} + Domain ${cfg.domain} + Password ${cfg.password} + ${optionalString (cfg.netbios_hostname != "") "Workstation ${cfg.netbios_hostname}"} + ${concatMapStrings (entry: "Proxy ${entry}\n") cfg.proxy} + ${optionalString (cfg.noproxy != []) "NoProxy ${concatStringsSep ", " cfg.noproxy}"} + + ${concatMapStrings (port: '' + Listen ${toString port} + '') cfg.port} + + ${cfg.extraConfig} + ''; in { - options = { + options.services.cntlm = { - services.cntlm = { + enable = mkOption { + default = false; + description = '' + Whether to enable the cntlm, which start a local proxy. + ''; + }; - enable = mkOption { - default = false; - description = '' - Whether to enable the cntlm, which start a local proxy. - ''; - }; + username = mkOption { + description = '' + Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally). + ''; + }; - username = mkOption { - description = '' - Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally). - ''; - }; + domain = mkOption { + description = ''Proxy account domain/workgroup name.''; + }; - domain = mkOption { - description = ''Proxy account domain/workgroup name.''; - }; + password = mkOption { + default = "/etc/cntlm.password"; + type = types.str; + description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.''; + }; - password = mkOption { - default = "/etc/cntlm.password"; - type = types.str; - description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.''; - }; + netbios_hostname = mkOption { + type = types.str; + default = ""; + description = '' + The hostname of your machine. + ''; + }; - netbios_hostname = mkOption { - type = types.str; - description = '' - The hostname of your machine. - ''; - }; + proxy = mkOption { + description = '' + A list of NTLM/NTLMv2 authenticating HTTP proxies. - proxy = mkOption { - description = '' - A list of NTLM/NTLMv2 authenticating HTTP proxies. + Parent proxy, which requires authentication. The same as proxy on the command-line, can be used more than once to specify unlimited + number of proxies. Should one proxy fail, cntlm automatically moves on to the next one. The connect request fails only if the whole + list of proxies is scanned and (for each request) and found to be invalid. Command-line takes precedence over the configuration file. + ''; + example = [ "proxy.example.com:81" ]; + }; - Parent proxy, which requires authentication. The same as proxy on the command-line, can be used more than once to specify unlimited - number of proxies. Should one proxy fail, cntlm automatically moves on to the next one. The connect request fails only if the whole - list of proxies is scanned and (for each request) and found to be invalid. Command-line takes precedence over the configuration file. - ''; - }; + noproxy = mkOption { + description = '' + A list of domains where the proxy is skipped. + ''; + default = []; + example = [ "*.example.com" "example.com" ]; + }; - port = mkOption { - default = [3128]; - description = "Specifies on which ports the cntlm daemon listens."; - }; + port = mkOption { + default = [3128]; + description = "Specifies on which ports the cntlm daemon listens."; + }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Verbatim contents of cntlm.conf."; - }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional config appended to the end of the generated cntlm.conf."; + }; + configText = mkOption { + type = types.lines; + default = ""; + description = "Verbatim contents of cntlm.conf."; }; }; - ###### implementation - config = mkIf config.services.cntlm.enable { + config = mkIf cfg.enable { systemd.services.cntlm = { description = "CNTLM is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - Type = "forking"; User = "cntlm"; ExecStart = '' - ${pkgs.cntlm}/bin/cntlm -U cntlm \ - -c ${pkgs.writeText "cntlm_config" cfg.extraConfig} + ${pkgs.cntlm}/bin/cntlm -U cntlm -c ${configFile} -v -f ''; - }; - }; - - services.cntlm.netbios_hostname = mkDefault config.networking.hostName; - - users.extraUsers.cntlm = { - name = "cntlm"; - description = "cntlm system-wide daemon"; - home = "/var/empty"; + }; }; - services.cntlm.extraConfig = - '' - # Cntlm Authentication Proxy Configuration - Username ${cfg.username} - Domain ${cfg.domain} - Password ${cfg.password} - Workstation ${cfg.netbios_hostname} - ${concatMapStrings (entry: "Proxy ${entry}\n") cfg.proxy} - - ${concatMapStrings (port: '' - Listen ${toString port} - '') cfg.port} - ''; + users.extraUsers.cntlm = { + name = "cntlm"; + description = "cntlm system-wide daemon"; + isSystemUser = true; + }; }; - } From 79c24a04f1eae738c437e131083bcb611af1c633 Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Thu, 15 Jun 2017 11:31:53 +0100 Subject: [PATCH 124/152] pythonPackages.defusedxml: 0.4.1 -> 0.5.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e957218263..44e6235535f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2516,10 +2516,10 @@ in { defusedxml = buildPythonPackage rec { name = "${pname}-${version}"; pname = "defusedxml"; - version = "0.4.1"; + version = "0.5.0"; src = pkgs.fetchurl { url = "mirror://pypi/d/${pname}/${name}.tar.gz"; - sha256 = "0y147zy3jqmk6ly7fbhqmzn1hf41xcb53f2vcc3m8x4ba5d1smfd"; + sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4"; }; }; From c0df448d542b5261507f178d062ebad5338cdd58 Mon Sep 17 00:00:00 2001 From: Ekaterina Vaartis Date: Thu, 15 Jun 2017 14:07:14 +0300 Subject: [PATCH 125/152] apache-httpd: fix mod_perl by refering to apacheHttpdPackages (#26579) --- nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index ed77e084476..1c3c7835d96 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -16,7 +16,7 @@ let phpMajorVersion = head (splitString "." php.version); - mod_perl = pkgs.mod_perl.override { apacheHttpd = httpd; }; + mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = httpd; }; defaultListen = cfg: if cfg.enableSSL then [{ip = "*"; port = 443;}] From 525c10ecbd38e3bdb8da8060eb9ff06c48c9f4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 15 Jun 2017 13:35:27 +0200 Subject: [PATCH 126/152] hackage2nix: purescript{,-bridge} compiles now --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9b017cad114..42334b380b7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7120,9 +7120,7 @@ dont-distribute-packages: pure-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bundle-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] - purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] pusher-http-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] From 4ac68216bd012aeb9629998bff09545768e09b4b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 13 Jun 2017 22:05:56 +0200 Subject: [PATCH 127/152] unbound: 1.6.2 -> 1.6.3 Also moves the header file into the lib output. --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 4d24a7f4e83..7fc5fb90173 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "171vbqijfk1crm04dbgbvw4052n6kwcvyvly3habg011qdr3schs"; + sha256 = "0pw4m4z5qspsagxzbjb61xq5bhd57amw26xqvqzi6b8d3mf6azjc"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB From cb59381eee5e89079cc855e52777dae7dc29263d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 15 Jun 2017 02:30:30 +0200 Subject: [PATCH 128/152] gnutls: remove dependency on unbound Unbound is used for DANE support but this requires the unbound trust anchor in /etc/unbound/root.key which we don't create in any NixOS module. --- pkgs/development/libraries/gnutls/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 3aef10df33e..48aa3fb9673 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring # Version dependent args @@ -40,7 +40,6 @@ stdenv.mkDerivation { buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers - ++ [ unbound ] ++ lib.optional guileBindings guile ++ buildInputs; From 72c36db003aa8ccebd7e5e673e5644f89cb45631 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 15 Jun 2017 02:15:45 +0200 Subject: [PATCH 129/152] bind: 9.10.5 -> 9.10.5-P1 for CVE-2017-3140 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 8ac9280b874..c18b7c46376 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.10.5"; in +let version = "9.10.5-P1"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "03ibhzy9577w78kgh6ynl90a2hlbnz0krygffm820hjf2cp8ss3i"; + sha256 = "1kg59a9118460k5wznqayxzqb6l3vbpybd8b1bdv9z97x5fqiyw2"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From 07edb44d15ab6daf4af75956694769e108fdb3a0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Jun 2017 08:52:26 -0400 Subject: [PATCH 130/152] linux: 4.4.71 -> 4.4.72 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 01309774dba..51cd396ac60 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.71"; + version = "4.4.72"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1az64a2qkx4yc0x4snhma9mvgkrgaj66z7pqs1zijcnzsqr5bka4"; + sha256 = "1s7d6mw4vjsjwdyxbj0p04yq1nsxs3b0b7bi04ilcn2zhldv8cs1"; }; kernelPatches = args.kernelPatches; From 901069c577a14997135b0edc5edcb188146d7b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 15 Jun 2017 14:52:14 +0200 Subject: [PATCH 131/152] ocamlPackages.ppx_tools_versioned: 5.0alpha -> 5.0.1 --- .../development/ocaml-modules/ppx_tools_versioned/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index c402c6be4f1..b680bcdd48c 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -2,7 +2,7 @@ buildOcaml rec { name = "ppx_tools_versioned"; - version = "5.0alpha"; + version = "5.0.1"; minimumSupportedOcamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildOcaml rec { owner = "let-def"; repo = "ppx_tools_versioned"; rev = version; - sha256 = "0sa3w0plpa0s202s9yjgz7dbk32xd2s6fymkjijrhj4lkvh08mba"; + sha256 = "1rpbxbhk3k7f61h7lr4qkllkc12gjpq0rg52q7i6hcrg2dxkhwh6"; }; propagatedBuildInputs = [ ocaml-migrate-parsetree ]; From a7efc9f0cdfec7c9854c4bcbfb848895663c3fe5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Jun 2017 08:53:35 -0400 Subject: [PATCH 132/152] linux: 4.9.31 -> 4.9.32 --- 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 aaffa40b353..ae1a4e4b120 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.31"; + version = "4.9.32"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0mlqr9ngpsg5i2rd2rqmh85y9ga1f3rpfyjv2m82bnhncavdiji8"; + sha256 = "0r87c65gf9j6shavsr0zviibpbvngccppw5k3wfmmxfjpdsnayf3"; }; kernelPatches = args.kernelPatches; From 8bc737d9d3cc56fac746deda75b5f882b49c054b Mon Sep 17 00:00:00 2001 From: danbst Date: Thu, 15 Jun 2017 15:53:41 +0300 Subject: [PATCH 133/152] zoom-us: fix facebook and SSO login Turns out, zoom couldn't launch QtWebEngineProcess because of wrong interpreter Also, there was a need for some extra deps, which I found when running debug version of zoom. --- .../instant-messengers/zoom-us/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index a1e94817b24..b3ea321d300 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, system, makeWrapper, alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg }: + libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat }: let @@ -35,6 +35,8 @@ in stdenv.mkDerivation { sqlite utillinux zlib + udev + expat xorg.libX11 xorg.libSM @@ -51,6 +53,7 @@ in stdenv.mkDerivation { xorg.libXi xorg.libXrender xorg.libXcomposite + xorg.libXScrnSaver stdenv.cc.cc ]; @@ -63,8 +66,10 @@ in stdenv.mkDerivation { mkdir -p $out/bin cp -ar * $packagePath - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $packagePath/zoom + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zoom + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/qtdiag + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zopen # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53 # it works for me without it, but, well... paxmark m $packagePath/zoom @@ -78,6 +83,11 @@ in stdenv.mkDerivation { --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" ln -s "$packagePath/zoom" "$out/bin/zoom-us" + cat > $packagePath/qt.conf < Date: Thu, 15 Jun 2017 08:54:55 -0400 Subject: [PATCH 134/152] linux: 4.11.4 -> 4.11.5 --- pkgs/os-specific/linux/kernel/linux-4.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix index ce3240ecb81..d6d18319804 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11.4"; + version = "4.11.5"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "144a8ianp6sy057pbhnssg6xs4f3dc5cwwkz8d4q9jzpd87fdm43"; + sha256 = "0k3dy4izi56nfkp2r0cps817zfnc14czghr9l5z5k8j8x5blqipp"; }; kernelPatches = args.kernelPatches; From 6d6d2fd3247b215d11f3ceeed933d9196305aa8a Mon Sep 17 00:00:00 2001 From: danbst Date: Thu, 15 Jun 2017 15:56:49 +0300 Subject: [PATCH 135/152] zoom-us: fix webcam video Webcam Logitech C270 showed black screen in zoom, but LD_PRELOADing v4l1compat.so fixed this. I hope, this wouldn't break camera for people, who were already able to see video, but I can't be 100% sure currently. --- .../networking/instant-messengers/zoom-us/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b3ea321d300..45fb10da391 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, system, makeWrapper, alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat }: + libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: let @@ -78,6 +78,7 @@ in stdenv.mkDerivation { # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it wrapProgram $packagePath/zoom \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ + --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" From 19f8213a3e49c0ba362c3715d90374e896d16068 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 15 Jun 2017 15:49:46 +0200 Subject: [PATCH 136/152] perl-Perl-Critic: 1.126 -> 1.128 --- pkgs/top-level/perl-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2282cdc2f32..5d8ae3ddc1d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10753,18 +10753,17 @@ let self = _self // overrides; _self = with self; { }; PerlCritic = buildPerlModule rec { - name = "Perl-Critic-1.126"; + name = "Perl-Critic-1.128"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TH/THALJEF/${name}.tar.gz"; - sha256 = "b1a6151cb3603aef8555195b807e831655c83003b81e2f64fff095ff7114f5af"; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + sha256 = "83ce563da0a950946367323214b6db30d72db7d006dce24c2a00a9ec13ddb9b4"; }; - buildInputs = [ TestDeep ]; + buildInputs = [ ModuleBuild TestDeep ]; propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ]; meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; From 8ac0e688091d7ce4e75c058918b4137b3fac2427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 15 Jun 2017 15:15:24 +0100 Subject: [PATCH 137/152] ocamlPackages.utop: allow utop to locate topfile fixes #16085 --- pkgs/development/tools/ocaml/utop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index c50e6a108bd..9e394751761 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -61,8 +61,8 @@ stdenv.mkDerivation rec { --argv0 "" \ --prefix CAML_LD_LIBRARY_PATH ":" "${get "CAML_LD_LIBRARY_PATH"}" \ --prefix OCAMLPATH ":" "${get "OCAMLPATH"}" \ - --prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH") - + --prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH") \ + --add-flags "-I ${findlib}/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib" done ''; From 2732104cc328b8ee064edf5705731e4f7cda1058 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 16 Jun 2017 00:05:20 +0900 Subject: [PATCH 138/152] thunderbird, thunderbird-bin: 52.1.1 -> 52.2.0 --- .../browsers/firefox-bin/default.nix | 4 + .../browsers/firefox-bin/update.nix | 7 +- .../mailreaders/thunderbird-bin/default.nix | 3 +- .../thunderbird-bin/release_sources.nix | 595 ++++++++++++++++++ .../mailreaders/thunderbird-bin/sources.nix | 595 ------------------ .../mailreaders/thunderbird/default.nix | 4 +- 6 files changed, 604 insertions(+), 604 deletions(-) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index dcb25dc1343..f59cb402720 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -170,6 +170,10 @@ stdenv.mkDerivation { passthru.ffmpegSupport = true; passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; + baseUrl = + if channel == "devedition" + then "http://archive.mozilla.org/pub/devedition/releases/" + else "http://archive.mozilla.org/pub/firefox/releases/"; }; meta = with stdenv.lib; { description = "Mozilla Firefox, free web browser (binary package)"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 9c29d1288d1..3bcc2ab003c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -9,15 +9,10 @@ , gnupg , baseName ? "firefox" , basePath ? "pkgs/applications/networking/browsers/firefox-bin" +, baseUrl }: let - - baseUrl = - if channel == "devedition" - then "http://archive.mozilla.org/pub/devedition/releases/" - else "http://archive.mozilla.org/pub/firefox/releases/"; - isBeta = channel != "release"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index aba121ba761..4f714cabf79 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -46,7 +46,7 @@ assert stdenv.isLinux; # imports `version` and `sources` -with (import ./sources.nix); +with (import ./release_sources.nix); let arch = if stdenv.system == "i686-linux" @@ -163,6 +163,7 @@ stdenv.mkDerivation { passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { inherit name writeScript xidel coreutils gnused gnugrep curl gnupg; baseName = "thunderbird"; + channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix new file mode 100644 index 00000000000..889d931c706 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -0,0 +1,595 @@ +{ + version = "52.2.0"; + sources = [ + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ar/thunderbird-52.2.0.tar.bz2"; + locale = "ar"; + arch = "linux-x86_64"; + sha512 = "d25bdeda7f5ee563176809811c5373d5232842ddb68315f31992754100e5cc96e5a2d0427897d245fcf9bbfc647331492e9b1fa79e0adb64f4f2169dd66ddc29"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ast/thunderbird-52.2.0.tar.bz2"; + locale = "ast"; + arch = "linux-x86_64"; + sha512 = "f7d3f2caa404fa5b97b7c966bb4ddd6fc0f26531802d4db9930d984d9b4ca635c41f9b025ca3c0ccba93a288da9c229b43b760759969b269082402584eed14f0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/be/thunderbird-52.2.0.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha512 = "baa46c3e1d07b284e6cbca0f6c61710d4760f2a33e829056b8fb4e05b63162e4e4c7c8414dd9b3733c6983b74765e2ed2129122feadeb5972f037a1a739eba1e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bg/thunderbird-52.2.0.tar.bz2"; + locale = "bg"; + arch = "linux-x86_64"; + sha512 = "166e64acbb8464142e78222ffb00e5ee421dbfee6789f544439963f4d3476e46795d53050e60195bbce648a3400f24edcef7a8f4cb47d5c3db0441ca564ad6d4"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bn-BD/thunderbird-52.2.0.tar.bz2"; + locale = "bn-BD"; + arch = "linux-x86_64"; + sha512 = "817202f39eb6b0f79d07da92b7ad62c6dda9e8d196021828303030ac5eff97d5574ba99ae8a2d236cddf2eaa6cda4c85a17f23a6f84461654e8f0856156dc6bb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/br/thunderbird-52.2.0.tar.bz2"; + locale = "br"; + arch = "linux-x86_64"; + sha512 = "46eab89538b48e02237950207ce8e3d955ba87c7ffa7a030812bafa4bb54da5113a3ff53bfa1e1b243a77c1dcf32b5aa475382e824538536a759da0448cca305"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ca/thunderbird-52.2.0.tar.bz2"; + locale = "ca"; + arch = "linux-x86_64"; + sha512 = "7bcb35886fd0344c18f29d5221d765a91da48db3c32f7be4c4ca0e9808dee2f6577bfafff32e8b9676a00e488f7617c66dc6e2cce5238569c24fc1679ac6c1d8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cs/thunderbird-52.2.0.tar.bz2"; + locale = "cs"; + arch = "linux-x86_64"; + sha512 = "8bda94fbe1043168894fb70edc3d87b670830377faee7397c26805bf8c2dd23bbbb5c4b1d797468875fb653fa02b8bc211aa3766793d3f9b21a139265651692b"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cy/thunderbird-52.2.0.tar.bz2"; + locale = "cy"; + arch = "linux-x86_64"; + sha512 = "65818715e994ab314ef4ac8a7d3e7c61e8918cd1d0d0ea4f51461f50d207d1c998c6452740c6f3fc07d70ebc1d24e5bebef622787d8e6f79f57ace1fc85e1e16"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/da/thunderbird-52.2.0.tar.bz2"; + locale = "da"; + arch = "linux-x86_64"; + sha512 = "1b7166d185ff6fc8cbe826d11e7b96ccc4528ce6421a7ad73f82d9c9c0f35a8de043b30fdec1e6ea3cc6d48645f42173b941cd6f8cc6d526264d4301c2943ade"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/de/thunderbird-52.2.0.tar.bz2"; + locale = "de"; + arch = "linux-x86_64"; + sha512 = "af6005f229a4cbc84c4f99ea1b13413d5a40ab506163786cacf513460170f77b3cb866a4b76b0691facc43cdccc39de68e9010550220f9d6cf288aac53909a40"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/dsb/thunderbird-52.2.0.tar.bz2"; + locale = "dsb"; + arch = "linux-x86_64"; + sha512 = "c326aa0c775e414fbfab466be742b804dbb364f60b084b4890c783f6c9e7bbe5da05b09b1608d51535ec3b60eaad5f775eb36834dd69d66f18a4746b7fe55c68"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/el/thunderbird-52.2.0.tar.bz2"; + locale = "el"; + arch = "linux-x86_64"; + sha512 = "b18fe1345c27095b2ea0afdec088b56d2cfccd57e285e881f1bbae4bd6eed6e39e76d24ada963d2337729eb93775d948195139815f694cb45978978a33682e08"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-GB/thunderbird-52.2.0.tar.bz2"; + locale = "en-GB"; + arch = "linux-x86_64"; + sha512 = "622c2c3979b30f724be73b5c6bc54f944f24a797cb1c3cafd11c2a08381e692621b29eadf64438b8207dd9254bddfa8b524211f7802e83453c1eeec99ab27108"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-US/thunderbird-52.2.0.tar.bz2"; + locale = "en-US"; + arch = "linux-x86_64"; + sha512 = "76505876b7a408cc296ee575dea6f89db9cafd31f58e961bd0c1c5cf021771cdaa8bb4dfa508a4bde386846f97be6eccbd499725dab8e5a692bfd48125f1bf82"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-AR/thunderbird-52.2.0.tar.bz2"; + locale = "es-AR"; + arch = "linux-x86_64"; + sha512 = "38f32cb430c679c63b8c6ab7d22bf5cb2af85bfa17fcbedc94d9fafa27874b917c7f34d7ddaa6a4dfa5d1674c09b3901cc19de5e217a965890eac5ef9246b22f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-ES/thunderbird-52.2.0.tar.bz2"; + locale = "es-ES"; + arch = "linux-x86_64"; + sha512 = "049e9445a850da0df09a0675cc9524d1bcb6ac4dc0ba8178df07ae4fcb9b4d9ff4677229968573119c5ca2c61a6f35da96167ece9d2da97e6b4e541bd9fc04b1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/et/thunderbird-52.2.0.tar.bz2"; + locale = "et"; + arch = "linux-x86_64"; + sha512 = "e2bb4aaa7e6a447f63456adbc35feb56e5e6ceac791ae54a2f34eb283cf3a61565c06cc09f66fcf01d722b8ed0972e51da33a94dfd333108fee2e967346eb9cd"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/eu/thunderbird-52.2.0.tar.bz2"; + locale = "eu"; + arch = "linux-x86_64"; + sha512 = "eacfbee76dc62b15e9a807db9409d63b2991f976faa109ef5991b2a6befadfeed8c341a448c0af84d1fc8f6914e4d515860294f2e54bb97f4ce2727c4d73a030"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fi/thunderbird-52.2.0.tar.bz2"; + locale = "fi"; + arch = "linux-x86_64"; + sha512 = "c6ba259c3729535199905773674800f2772bf952a8596e11eb73785a9176072434ae47abb40c35e8cb0f66b4c46162d48ae699985857ad9a208c645cf76f0189"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fr/thunderbird-52.2.0.tar.bz2"; + locale = "fr"; + arch = "linux-x86_64"; + sha512 = "eacdc3ce1967ef7913012c448c4a4898463c80fac41fb5bf16d924eb31ea2e68e7ad46ee88b5ce107e85a18789a19e05006ae4786a5d9e9a2f93c05013aa9f4a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fy-NL/thunderbird-52.2.0.tar.bz2"; + locale = "fy-NL"; + arch = "linux-x86_64"; + sha512 = "450011ce8012918dc8196b68a32f4b2ab27dd893a15ebd621fa17923ba5a63bff6fb634e1cc22cca3fa64d61dcc23565ceda518e04e7f92d91a0bc86fcd0dda7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ga-IE/thunderbird-52.2.0.tar.bz2"; + locale = "ga-IE"; + arch = "linux-x86_64"; + sha512 = "ba8271e67b61e92bb819b0739351cfbfb128ecd3842f1c7ad69f7e9c26f4d52c10cf71f5d8cb45dc1f30d3168dc0acb991be4ef208e6947c3c36f4e5c0071f69"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gd/thunderbird-52.2.0.tar.bz2"; + locale = "gd"; + arch = "linux-x86_64"; + sha512 = "324044728236a52fe136c62f250218d6d2e364bda7b9f781a5f1c05561e37e09c9180733be0dd69f170e2229924c9ff7f2db10def13b86a7d21d5801d171a3b0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gl/thunderbird-52.2.0.tar.bz2"; + locale = "gl"; + arch = "linux-x86_64"; + sha512 = "a31f01bf15d17d8efc645ebe4184bf4b5f02107f24765721eee87dc10463c7e8219a1ba3d60468e132f6b934f6f138b441f94d3d3e790f2fbad45107210f69d9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/he/thunderbird-52.2.0.tar.bz2"; + locale = "he"; + arch = "linux-x86_64"; + sha512 = "c8356bc183eb9837c3049288d63e1c13098143cf7a80cc5452d9852ffd2407eb85aa5ed574063700f93fb503c53c2b733a1bebc62cb890d408af75f8e4970856"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hr/thunderbird-52.2.0.tar.bz2"; + locale = "hr"; + arch = "linux-x86_64"; + sha512 = "8ed3f1c84f28a4435a3a6c9b136d4c27f6fdd3a41089b34afa04b74d5ca15cd535e179070cfdc862d3b3f5559fbafa7ae6c620f448afc8279765aa6518cdbd9c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hsb/thunderbird-52.2.0.tar.bz2"; + locale = "hsb"; + arch = "linux-x86_64"; + sha512 = "bd14c07d1c2f5b8aebbee64914db544823ab90b70cc2a4e5d9fda28e9611310a5d6a6fb0f17d07e60534e9d5082506f0ffe22b1b4da1351f5657620612add6b5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hu/thunderbird-52.2.0.tar.bz2"; + locale = "hu"; + arch = "linux-x86_64"; + sha512 = "9cb1430ef3036f4ce06d0734775e83ec09c551ce573cf3b50b5a2484f411e76ca09ae0295d6285d15e1f8a71f27c804f9dc328a4e4b534fbad34a97676ec2d7e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hy-AM/thunderbird-52.2.0.tar.bz2"; + locale = "hy-AM"; + arch = "linux-x86_64"; + sha512 = "0c1d84777286fb55c2d8d25d5f5abf5498575bd09261331cca680e1f18497dab80597e5a132618019c5d03350cc4d49f4856053b8d255f8a1d56d1029434b776"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/id/thunderbird-52.2.0.tar.bz2"; + locale = "id"; + arch = "linux-x86_64"; + sha512 = "8adfabb7885b2442c9dd8ee1128675865690bc632185da20caa894b38c388cfff34a696c4932ffaab2217dd4c742e8c35acb2e10bee39a561aa83b19cce1ad6d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/is/thunderbird-52.2.0.tar.bz2"; + locale = "is"; + arch = "linux-x86_64"; + sha512 = "b5608a993d5a2a50a38516ba346cef8aa5f173f81eda2b29c06b77e8cc8964dc174fbd9a67294a66caa366956a0ae79aaf8c0e0d612935e871174b1073647f70"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/it/thunderbird-52.2.0.tar.bz2"; + locale = "it"; + arch = "linux-x86_64"; + sha512 = "06bb846f018d1f8cc1bbda5e707b9aff31bf94ddd8a7aaa699c67f1c18ea8a4c92657587ae6c9a07571d2a6371d50e31b1000bec719aa432404924938a162274"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ja/thunderbird-52.2.0.tar.bz2"; + locale = "ja"; + arch = "linux-x86_64"; + sha512 = "9019ec44f39918796c5da7fb2b23e19918e20d5688b8e55aa986e2b8a4f2abaf6ae87149b1bbbdedd2227c3152f48e4042078c979930db5d521d3a641312599e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/kab/thunderbird-52.2.0.tar.bz2"; + locale = "kab"; + arch = "linux-x86_64"; + sha512 = "1ed0950fd1b5cf82efe2c031abbb8d34ab3a0ef93182467592a9f77610bf494ed61a2e1d0117132abd5bd0f835bdcad75bf202588097210acdfbd67a1be5caf0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ko/thunderbird-52.2.0.tar.bz2"; + locale = "ko"; + arch = "linux-x86_64"; + sha512 = "65ae48fbc79da6e3e20f5d325d4c93b2e945a95eaffe572c83cee08cefbe6718bd202c7e54095ef74d3069148b58aea1d2b0b795e94230b4da99b9a42fb39155"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/lt/thunderbird-52.2.0.tar.bz2"; + locale = "lt"; + arch = "linux-x86_64"; + sha512 = "f8870ee532dd73a0a387c00a1295209ebb965b3e7a63abcce7f17457c38636a07334ff7f4dd99c60349e748510645487ab3761efdbde985d1f3cd9038613cd05"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nb-NO/thunderbird-52.2.0.tar.bz2"; + locale = "nb-NO"; + arch = "linux-x86_64"; + sha512 = "d4316434d0e8a824b3502bd413abe112bdb9b6da28acb39127ca83b43f8fa3f7b80bdde15758f2ca5a5013abcb374382ce79dd16ea48342fb6f6283eb242e162"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nl/thunderbird-52.2.0.tar.bz2"; + locale = "nl"; + arch = "linux-x86_64"; + sha512 = "da6c7cf68f5502ea29a1600f2040953dcd064859a9b82856ae419472ae039bff5c2b31f56c282961eb02ae0c86c8ce63131fdc4aaaa712da03d76ee05726ba0c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nn-NO/thunderbird-52.2.0.tar.bz2"; + locale = "nn-NO"; + arch = "linux-x86_64"; + sha512 = "9a5203e6f451aab318500eea9b7fcbdf70fcd22d6cf42e838926fa9fae14176f1abee875ac085823adeb40d2fd2e2992d538c34ad817b408fdae19248302aa88"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pa-IN/thunderbird-52.2.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha512 = "43e86e758f547363bfd5bb1c9c16506bbf6314354aee4265fed588fc29759d87482a86c442ba9d3e16c50477c4a5542b02a1539de8833052ee23811d61bcdba8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pl/thunderbird-52.2.0.tar.bz2"; + locale = "pl"; + arch = "linux-x86_64"; + sha512 = "d418735505f1152a3cf1a1c2ff36d4cba4801327b1f01e3743c6411d30b7fdad7f0ae72fa78de9b356bfb712bc834c6eef46df9c251be7d18119f5da423f3ca1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-BR/thunderbird-52.2.0.tar.bz2"; + locale = "pt-BR"; + arch = "linux-x86_64"; + sha512 = "3e33431860b0f815153845ebde36de52d8bd0c2e1828e127009b467c33710c70d38c4b9f70c5572e09778b17c30f7688f1e802e48ce7cb0a6a015d0fa1e26648"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-PT/thunderbird-52.2.0.tar.bz2"; + locale = "pt-PT"; + arch = "linux-x86_64"; + sha512 = "953143e100d3ffcb76224da98ee5ae1d98342d2806565ab048fbb6d8de65f6a02c3b6dd87aec4cecff676ff724d4790964b2e82ebbc64a3eae8beb343ebab211"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/rm/thunderbird-52.2.0.tar.bz2"; + locale = "rm"; + arch = "linux-x86_64"; + sha512 = "b5aa940b99282bd84748e47d8f51a53e250d20cf0c7b68e5f66719ae88d9c241f290b2d637fe3e711948f9a6c6df8304cf9514599d73e387eb268a1c8f8c8397"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ro/thunderbird-52.2.0.tar.bz2"; + locale = "ro"; + arch = "linux-x86_64"; + sha512 = "26dc1b0c57b468ba815154b035c3fe382051b638bdc673db69a88c879a8524f55a24626c655026cb67c2688a29b6c946e2b495cd7dec4f16d8fbba21d5a493bb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ru/thunderbird-52.2.0.tar.bz2"; + locale = "ru"; + arch = "linux-x86_64"; + sha512 = "5d17e85ec3eeac8ea3916f0dc71be7560bb1c4877c505a1f29421a9d496d8aafe48b9236c225f1de48a4dffbc9ed536f91dffed7d6c823480ef1e0c5b6e400be"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/si/thunderbird-52.2.0.tar.bz2"; + locale = "si"; + arch = "linux-x86_64"; + sha512 = "d4599a3814173d8bce2f24b6b015492d7b24547d4e53d17cad45cc9c01c8b65be3447f8b89ab8ef2f573140ef7e1aae7eef7943102e21611525abc6efcd02694"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sk/thunderbird-52.2.0.tar.bz2"; + locale = "sk"; + arch = "linux-x86_64"; + sha512 = "a990104e68df9c2bf833c821eefdc1cbefc16f6e782bb8202683261f395f33c419afb967119ced710dc08966978043731c1adcf16dc716ff6eac8275b03f1834"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sl/thunderbird-52.2.0.tar.bz2"; + locale = "sl"; + arch = "linux-x86_64"; + sha512 = "2fab7f52ceebee1895e520c6d185bbb92793a31c52ed2398731c0cf36e3888a58d945d92f5777fc87a0a55b96418406a0be15cdd95b0f54482e821ea1cf29ced"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sq/thunderbird-52.2.0.tar.bz2"; + locale = "sq"; + arch = "linux-x86_64"; + sha512 = "f201861a30f993306378043ecab288970c4a311a91a3d232cdfe9a4d9339052f026ceb35bc6dbc2bb452f58faa5e3eccd273b87e96af5cfcf292dfcf94612077"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sr/thunderbird-52.2.0.tar.bz2"; + locale = "sr"; + arch = "linux-x86_64"; + sha512 = "6f8962d8c30086434764f0d037801bfefeef13c67e46f2b639bc4f5a93ac0094630af375bffcc54574d50ecd8c7b5c5decdd9e2083666dc4394e6237fac0b746"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sv-SE/thunderbird-52.2.0.tar.bz2"; + locale = "sv-SE"; + arch = "linux-x86_64"; + sha512 = "b29f506138f62350717ba2d2881cf8852dbef0c9797da64b9d5d9affa884cd1057483e2d0e357e967d9567ff4e861d1ad79596b39aa02a36087041e1f94d9d67"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ta-LK/thunderbird-52.2.0.tar.bz2"; + locale = "ta-LK"; + arch = "linux-x86_64"; + sha512 = "3bc50fdc95776aeca2de94fa1b895d5a17cedafb95aa08f2d0100fbb4c3acd31990b96a57fad451c82b56d8cab7ea5066642da7b000857f00ba8f0bf94051f5a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/tr/thunderbird-52.2.0.tar.bz2"; + locale = "tr"; + arch = "linux-x86_64"; + sha512 = "8e1481a03ba5de00bc64aa252f779dc0ceb14c238985d11bb49467a719ca88bc4e7946086b039951f03ed43e11a15a5bbe98139d158f63dc3cdbf01686ec91e2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/uk/thunderbird-52.2.0.tar.bz2"; + locale = "uk"; + arch = "linux-x86_64"; + sha512 = "e9bfce635b1d56d646baf06bc642a7914846a6a796e983c4b0f78b912833ccee850719f0857ceb7199d328415a976b436706d72c95f01da1d0d0b4c0c5d0d732"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/vi/thunderbird-52.2.0.tar.bz2"; + locale = "vi"; + arch = "linux-x86_64"; + sha512 = "ea989bcf275162c8d72ad595bee767b9652f192ac18f61119cae8f084f9a25c0d0a83caa14cbbf901fa675f1a0c0a6b40ef46454f9c8f1fc3d5173a0ef1397be"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-CN/thunderbird-52.2.0.tar.bz2"; + locale = "zh-CN"; + arch = "linux-x86_64"; + sha512 = "35637dedad6da1662057fc1506b2e21bc6269eb0256e332ff6b12bcdb71906e28dc0f361bd7aded2fa52d982589f0e319667acb7ccd405e2fbfa8ba991e5aeb2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-TW/thunderbird-52.2.0.tar.bz2"; + locale = "zh-TW"; + arch = "linux-x86_64"; + sha512 = "286ed00a024029f7e6ce30709cac3da3d6bf00576248622a09bd9ce1ae2e965a0fe158d718d35f1e088f51ac4e271d57aaa98446c87c0bdcdecfa0d36d988e92"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ar/thunderbird-52.2.0.tar.bz2"; + locale = "ar"; + arch = "linux-i686"; + sha512 = "8783d0cfba31ead11e49bf1a8afb5b66b1387b29681acf3c63217ba4a399a6fe496eb0357e0871c98e8b6465abc6539e6ccbd9d40e799e04674f3ab2dee25390"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ast/thunderbird-52.2.0.tar.bz2"; + locale = "ast"; + arch = "linux-i686"; + sha512 = "213f0457760072fd2e6cd2daa56677d8b67b8c345f44faebb2623f073ecf141ba4d30d2176fd5680efe91e46086b4add86462385fe5b9e72978cf2828eb8ed68"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/be/thunderbird-52.2.0.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha512 = "645d7eceac4d98ab37b8c85c2d0c58499bdba1c8db495690bc665c80b5aae414b0a8caad16931a74768137812f3ba8ce173f5080e95bd44e95e51d6f544cbf03"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bg/thunderbird-52.2.0.tar.bz2"; + locale = "bg"; + arch = "linux-i686"; + sha512 = "b9030a61e8d964dd18362e472d18d7a9d6a7636679c016bca82b254b06e221c6551aebb166f829977fb4f0d1809b18b820cb1d842e6949f44dd4e5becbf98651"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bn-BD/thunderbird-52.2.0.tar.bz2"; + locale = "bn-BD"; + arch = "linux-i686"; + sha512 = "fcf50581bb2f1548f4aab01b8f7a89e351e642a49ca76e05fc47d77b9e2459f2ff700501079180b92120727ab2ba74c3c6990fc7d6d9018b9ee4ec1d27c42aaf"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/br/thunderbird-52.2.0.tar.bz2"; + locale = "br"; + arch = "linux-i686"; + sha512 = "5359fa3b6f745db0da286a0180773d3fd43c446c78d8351cc0c5589ade332fec5ccb6106a84ed3bc96e34ec7ca2d72f93c22f6653aa39250df05b0e39108fa89"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ca/thunderbird-52.2.0.tar.bz2"; + locale = "ca"; + arch = "linux-i686"; + sha512 = "e5d6d77ad204d279abcd34b9734ef5489d5b8522558af7cfb26de77fc0d22a5ce669dd6ff9fce7046745aa9ef75323fadaa70ad3ca4fa0f05aad85add6c1e7fd"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cs/thunderbird-52.2.0.tar.bz2"; + locale = "cs"; + arch = "linux-i686"; + sha512 = "4bee0154e7f1658ea88c7cf7cb5d89e354d29516c727090bd704945ecb2c0988551e98de2c8b44d5899e44ae141a6e3c230550392d34b5dac121cd1c4d6ce994"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cy/thunderbird-52.2.0.tar.bz2"; + locale = "cy"; + arch = "linux-i686"; + sha512 = "23779727198092d4d8e7ed1d40615b020858999ae5023ebf81553dfdc62b7cc03cf864eae262450d75d6088f6b283ef7f791073901f5fda367df96e291e9537f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/da/thunderbird-52.2.0.tar.bz2"; + locale = "da"; + arch = "linux-i686"; + sha512 = "e780597823f156e273832ff731adb2cb39a58e6e232d910f9f0a3b05dee68411ee3e8345462137d74a8aa2a6dd0c3d5e93bb889bd425c051ed7befcd4da5c711"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/de/thunderbird-52.2.0.tar.bz2"; + locale = "de"; + arch = "linux-i686"; + sha512 = "1c35b4aab4bb27569955f3c29034e8c301c32d24547075c4662e162bfe1c19feb602b3fcc3c561956651328fa33605f60ed29ae52b50b06eecf39e43e82663e6"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/dsb/thunderbird-52.2.0.tar.bz2"; + locale = "dsb"; + arch = "linux-i686"; + sha512 = "59fb994bd8b2db74ae5024e8c2f6c859b93afd247a159c552bffe8c2337a0d4229bd17433635f8c87420af614c7725af7b0ecd144938654f9372fe6d39a4152c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/el/thunderbird-52.2.0.tar.bz2"; + locale = "el"; + arch = "linux-i686"; + sha512 = "87e43e3c66db44c6c1d659eff81b72bae4d6961045c37ce776531ab6e4f4a3e6c8d3774f39fd437e5ca4cc289bbae25fae8dbf8ed3e21aa2327cc166d4f17f47"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-GB/thunderbird-52.2.0.tar.bz2"; + locale = "en-GB"; + arch = "linux-i686"; + sha512 = "b397fb3142c0693282405d9e6d4515f368b3c6aba581e6eb0712c3d161f8fc9dbe034a913a67ea034dd89860b32072f82dbf2b767bd0c360f3bc9c0c8944d045"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-US/thunderbird-52.2.0.tar.bz2"; + locale = "en-US"; + arch = "linux-i686"; + sha512 = "05926a74f6ecef5caa43884a3fa2cdf85f40c53da58ffa24cdd2c8c31efd1b3e90a0d06ddba33d612a3b88f31d4c72fe92f49e31b4f3ba3479c510a02d91eb33"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-AR/thunderbird-52.2.0.tar.bz2"; + locale = "es-AR"; + arch = "linux-i686"; + sha512 = "4652c005c0c28760d1a2657b691b13fcf7882763cff4ff05313d1dc5786661e76ca74a4fa23e1e71e4315818c9c2a386407151a996fab4d2f3bf343a353038db"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-ES/thunderbird-52.2.0.tar.bz2"; + locale = "es-ES"; + arch = "linux-i686"; + sha512 = "64e8eedb59df8ebc5a568aa05d0df5217a3c91311455a090b4614dddbb2bd0d09add02e11c712b84696f3d203bb5503959dee9ec8e0aee7ba5d0ef2e606942a4"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/et/thunderbird-52.2.0.tar.bz2"; + locale = "et"; + arch = "linux-i686"; + sha512 = "2773894ea50cb0bc889ad1cd887bd7c34d594a19ae69fe48cc181d5bb31a9a15bf6e0e41fa1493ff86e481715e888d35db5b100b22516b187cbbb4e35f36fdbb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/eu/thunderbird-52.2.0.tar.bz2"; + locale = "eu"; + arch = "linux-i686"; + sha512 = "8a73144e9085f4f07db7d24da388808ebe94b4cbd2c3cb1f327ed0c44a3144c94fd61171b74c18c3e4ee72fd809791a8c942adc0a4b3bcaebaa2f02dbf26d572"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fi/thunderbird-52.2.0.tar.bz2"; + locale = "fi"; + arch = "linux-i686"; + sha512 = "ba53c735c136901bbcfebff6fa646d884aaeb919a77744c1ec412a109f39853b2d74d70a56f85e4bdc3b7780475283284c46b0db79c64980a7655eb8f0bbe0f6"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fr/thunderbird-52.2.0.tar.bz2"; + locale = "fr"; + arch = "linux-i686"; + sha512 = "fe93f41bbf357eb1b60c0418dd64afbb37310ec25aeb66521472f84eebc6205d87d19090df6f38de3d9fee29f7f961e68e9794a65f51a0fcd103a40a16a919fa"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fy-NL/thunderbird-52.2.0.tar.bz2"; + locale = "fy-NL"; + arch = "linux-i686"; + sha512 = "1739f96789414049ebb5a8fa47f0455a630bdfbc9757fd96f81a8fe0fbf6c0b522bdf04a315b590c968d1832ee2faa2bdd98fa4ef6e86cd8ab2d0a338e8a47f2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ga-IE/thunderbird-52.2.0.tar.bz2"; + locale = "ga-IE"; + arch = "linux-i686"; + sha512 = "b42fb3d2cb8ba5be74d3f4212aa80fbf2af0366bdd9eceba69555eb766f0a96c1a8092a3b1e39c0ddc8bae7cc7efb59f56806f90c0de95d3073db15e3d894a20"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gd/thunderbird-52.2.0.tar.bz2"; + locale = "gd"; + arch = "linux-i686"; + sha512 = "0921d25bd235d2a234c75f24297ef38568d0532fbe1dbfe98f2b9ca3641ea95db6c4df0dba3f8a8313a2fd169d2d86f7adab21db795a96f68fa566117db2c2e9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gl/thunderbird-52.2.0.tar.bz2"; + locale = "gl"; + arch = "linux-i686"; + sha512 = "7fe9346fcb26a7d4a96cb6cd2d804874bdf2f3f89c9b9791742f9a2a03a7a865fc20766f8618c04e7d7fbe1fcf0fc907b4db5834770218f4e1fbe8d8df37e94f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/he/thunderbird-52.2.0.tar.bz2"; + locale = "he"; + arch = "linux-i686"; + sha512 = "7082a591a52e8a0e7bf112dec08dc3e130791eebee6e7d39baf052f40b8b9fbc350518b7785f3bf7ec62df8dbe05a256fa322714ba7a4f704a9cddf40cd4b11c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hr/thunderbird-52.2.0.tar.bz2"; + locale = "hr"; + arch = "linux-i686"; + sha512 = "397a1214ab27b187df6129f6f2f863ec1b76ce2af41c0ef5650f255451c57f07741f6a7d0674ad38432c7ea9c95fc2b36606d31defc698fffa4b676549b2c197"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hsb/thunderbird-52.2.0.tar.bz2"; + locale = "hsb"; + arch = "linux-i686"; + sha512 = "f0c76d90ae2b47e8d5c66a536ee1b2572f60164f76424b61b491326e719f4454448a9af4b6ceb8e1055f7e44adb6490a0fc4df086c344d160861d877766e227f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hu/thunderbird-52.2.0.tar.bz2"; + locale = "hu"; + arch = "linux-i686"; + sha512 = "d26eb645574d9298c75bd334371fc7a4baaa9b358b37c5d8da6e61b6d8fdf3fe165a5ea1855a840a742c6b19e3a15fbe7879e43bb29b187daffa63c59a863e06"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hy-AM/thunderbird-52.2.0.tar.bz2"; + locale = "hy-AM"; + arch = "linux-i686"; + sha512 = "add66a00fd3a8be7c71276d02588ffafd0ed0a8b2e4875dab3b82e4fe9b2be3964096509ce6b0e67350f62cc814b7c7ed069f481516f72f19a8039967123346a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/id/thunderbird-52.2.0.tar.bz2"; + locale = "id"; + arch = "linux-i686"; + sha512 = "b793e65e9e9f8d30ad0193f019acf33bfbfb165313a960f120bfabeb4df0c769cc9fc5b7e34ea05eaa085a5c0872134d606862b381852d04748c2e97ed1bf9f7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/is/thunderbird-52.2.0.tar.bz2"; + locale = "is"; + arch = "linux-i686"; + sha512 = "d4f163358a2c8830e3a77a5a82b8ee42d2aff39f19fb95171a249d1cde5119c66ee29bc894f5e6ea023c34e030282194025b25c04af25f647df8745d2b8aa2b9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/it/thunderbird-52.2.0.tar.bz2"; + locale = "it"; + arch = "linux-i686"; + sha512 = "9e73d51cfac30480fe0ef46c02df12c771fdd827bf4c2971b99cad7b3db42d3d60a2355c20c0b3601c7d27be5b9c2d1748a1e3b8954523ef919d120429153103"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ja/thunderbird-52.2.0.tar.bz2"; + locale = "ja"; + arch = "linux-i686"; + sha512 = "ce3d8342c0fc63a9c6ab10a2d15f6ef79d8d827cbf542cf0eead9d01d1a26567edb48269ba2ed66dcf81bf83e35a120190614f740898181a3b2cd7fcbfd5e739"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/kab/thunderbird-52.2.0.tar.bz2"; + locale = "kab"; + arch = "linux-i686"; + sha512 = "9ef94353b58ade84737debbd58a26aca9b8c5358c3fb852f2dd925e9c8eec46f091d4edeb0a4fe46da45eb9860ab76f43a97605085907fa79d2ba90751ea64e7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ko/thunderbird-52.2.0.tar.bz2"; + locale = "ko"; + arch = "linux-i686"; + sha512 = "651ab9ae9b966e10f420802937140a689a3c925a67732cc3082e8f265d2f98fe88195188632386d64f892338b1c4ba659c7e475951810d5b6ee48a7339155413"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/lt/thunderbird-52.2.0.tar.bz2"; + locale = "lt"; + arch = "linux-i686"; + sha512 = "f64c0869033ac939538f982ff66b0a88cb566e7000838e549d63fa6509afe8a29865fce3cb6c7fea84c78b5ffd07a4f8b11b44b14c234ae957f22439f7a84a99"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nb-NO/thunderbird-52.2.0.tar.bz2"; + locale = "nb-NO"; + arch = "linux-i686"; + sha512 = "9dbd31177470ba94a646d7d63890dcc2465681a4c6fc684f7cbe61eeebc788c03a863ed5a01a1baeb26ffa61d7af4631bebd74261c22ee1a109ceaf928ce4925"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nl/thunderbird-52.2.0.tar.bz2"; + locale = "nl"; + arch = "linux-i686"; + sha512 = "3616bce4895db1c2f3b02773b05586bf6e38550ad7abd5beb3b31a6c5b414120972b5475c080bed782e7f2b09fe47bde3e5b41f4c3fdb7ffd823767c976dca0a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nn-NO/thunderbird-52.2.0.tar.bz2"; + locale = "nn-NO"; + arch = "linux-i686"; + sha512 = "4ec009d5aca053ffbbb6cd5c84572f0305f22f33cd24eec13eb3fd04aa4eccd3447701edb53e4929914ebd2f7acc8e3d7f8e5d91c9e7a7f0b9e9c18493f74d55"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pa-IN/thunderbird-52.2.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha512 = "584c5cf7fc62f4f6435d9ed2ba9aa200012aa65e7fcd249aae10dc2b3dde8b4db724b11beb206a727f3eb2f60e4a8c0e5e1abbd4e621645d651cba449bc4a474"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pl/thunderbird-52.2.0.tar.bz2"; + locale = "pl"; + arch = "linux-i686"; + sha512 = "aa02a2910513159c2621dc17aff373a8c2124bf9aebb24bf54c239d823d0080a1c05c330185af5dce21084d7ac9060a2b8daf890a3227650416d82afd0fa8e9a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-BR/thunderbird-52.2.0.tar.bz2"; + locale = "pt-BR"; + arch = "linux-i686"; + sha512 = "b5b2654bf153bd7f7c85534b95f836892550e519e254312584b22981bcdf7205f31babb5cf32033f7d676eee2bf2400f88503b52268f2ef10286da82b2713704"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-PT/thunderbird-52.2.0.tar.bz2"; + locale = "pt-PT"; + arch = "linux-i686"; + sha512 = "3d557b432531a757bad6f18754b9d2fb2359bdba49f20faf797f7eba821926aeb8476c89a93b475273514bf26a6f471637505c5eb8a1cc08d1cf830b28b21fca"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/rm/thunderbird-52.2.0.tar.bz2"; + locale = "rm"; + arch = "linux-i686"; + sha512 = "434122ff7524630ec45a7e6a0e5f90e74ea1397b31bf67ce9e3046f8a31114a8320e56a5dedf1686e2eebc8c648e4a94fd0cdbe523bdcd6312448100d548e302"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ro/thunderbird-52.2.0.tar.bz2"; + locale = "ro"; + arch = "linux-i686"; + sha512 = "6f2c74d119ad7380961c50d5bb91afd4bb9455737776a08eb5168c17e83143fefacfeaa3b98e1816d1fe96a7f2022256cd2acf7b697508e4139d792562be2176"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ru/thunderbird-52.2.0.tar.bz2"; + locale = "ru"; + arch = "linux-i686"; + sha512 = "d9eff15876619a1bf0b8467847df18b0dba20c598e05428037b81e0cd90797b8baafc44541fed2a29dfb27075da19730919159495712099a54c9b488a693e3ca"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/si/thunderbird-52.2.0.tar.bz2"; + locale = "si"; + arch = "linux-i686"; + sha512 = "a2e58a6b2632f8c2f6eaf6113e2af9e98ea222c5d2c98f0cfb4443804ce260bb3dba64bd5165590563fa946b500bbaed4341629eb25ea0c5388c61c69f4be5cf"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sk/thunderbird-52.2.0.tar.bz2"; + locale = "sk"; + arch = "linux-i686"; + sha512 = "0b26b3848864def3a5b485c2d67d3c907b58d9977ae91db58d91218da278243c04eeac781fe0063b762d0797809dcbee18010824aa5d25926f8f48011e2a5bb4"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sl/thunderbird-52.2.0.tar.bz2"; + locale = "sl"; + arch = "linux-i686"; + sha512 = "7158c776ec3776ac269402973482e2dfedb3c17aeac11fcae3bee6a982717443068223cc901ee71e6b7a42a8073f05d2a54047804997d992761fbe71d46bd223"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sq/thunderbird-52.2.0.tar.bz2"; + locale = "sq"; + arch = "linux-i686"; + sha512 = "1a838db31f4db574669987614dfcbd5f7f1eb061dc4f2fd0c9ca206d5a5291ac348efce3ce59b30f89fdc375e72467531d9d96b8ce43ffe28e92916f2864908c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sr/thunderbird-52.2.0.tar.bz2"; + locale = "sr"; + arch = "linux-i686"; + sha512 = "beb9eee26aa5474ac5e70c168e2ee32c84216d919528c9edce4d45ab6c522d5fc888ba2f8c57cfcd47d299367ddb7c367dafc9ccd3d29c5700de28eb2efe08fe"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sv-SE/thunderbird-52.2.0.tar.bz2"; + locale = "sv-SE"; + arch = "linux-i686"; + sha512 = "e4c2320e547b2e61991feb586b7f9e4180cbeb88dc90cd0dfd2c026b062e4e1858d1d1b331cfde1e373cacec2231f7cb2ba61b5e4ef02a36802edbc96b39cf72"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ta-LK/thunderbird-52.2.0.tar.bz2"; + locale = "ta-LK"; + arch = "linux-i686"; + sha512 = "aa42add8ba31edb5a40fd62304f10ac55006918d5196f71ca0330c3ca52dbbf4d9b5d39a07e977ee89c6b913e6ac4d4a4c9460da194b41760826d96e89e7bffb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/tr/thunderbird-52.2.0.tar.bz2"; + locale = "tr"; + arch = "linux-i686"; + sha512 = "ceb90e08e906d5a2520152c40c4e32ab85da31c746ea285280b6e9bfbd60e9178886799357f39d54e0e072c616059ae7fe1948c39f6152b5f0d1b196185c8475"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/uk/thunderbird-52.2.0.tar.bz2"; + locale = "uk"; + arch = "linux-i686"; + sha512 = "9d9fc486d556dbe3a216a3d4e822750cfa1cd0348af37ddaa5a19f9c390170e348a41b8251fff1499d2dc6d92feb34061286ff5400a4f9b6ed4fdee27064078c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/vi/thunderbird-52.2.0.tar.bz2"; + locale = "vi"; + arch = "linux-i686"; + sha512 = "010bc7ce4ee4329857291796e2077e0872593f2b52799b1524720fa7fca11f2f4b760610bc97db171421552eb59a36725f80d4852cd77d30c8e7eb6c6c523d2d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-CN/thunderbird-52.2.0.tar.bz2"; + locale = "zh-CN"; + arch = "linux-i686"; + sha512 = "c07d2559296acb160c19af2db9f516254d33e1d55c78b2397d2c28764a8296e3da0b74409d48702e889bbf34f06115b493bbcea2666ad8b4884ea01fed6ad12f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-TW/thunderbird-52.2.0.tar.bz2"; + locale = "zh-TW"; + arch = "linux-i686"; + sha512 = "8fa1da0c35584cfb8013df9e86a37268e6ffed1ee5ba4617d3db185975b874af5dba3f3af5498b8ebfdf85e40409fb9fee8d517f84f4942cf69deaa94f3c64a1"; + } + ]; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix deleted file mode 100644 index 78084753974..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ /dev/null @@ -1,595 +0,0 @@ -{ - version = "52.1.1"; - sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ar/thunderbird-52.1.1.tar.bz2"; - locale = "ar"; - arch = "linux-x86_64"; - sha512 = "41e7b02fa088054e59d68abf636b376837519502273ff9e25ba18d220e8e35927db2a7795354f997ba0f980f33a74338128999666dc0ea730babb4cb3077c17f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ast/thunderbird-52.1.1.tar.bz2"; - locale = "ast"; - arch = "linux-x86_64"; - sha512 = "772e90be4cd4d10c1fc98df69d20509c954feb29c64a801d907f4944c429844d375ec241b8c45fdac375cfaeec3adfe7db81c2fd10e592cceb066b6c23c2c2e8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/be/thunderbird-52.1.1.tar.bz2"; - locale = "be"; - arch = "linux-x86_64"; - sha512 = "76832c00106c68a9b48c4892a11f7b48384d7934e7cf410eb2d7891f79303af29a2a94a3ac377bcda36a0894baf9c3768cfc62c3ebef0c640291c1b70d23e55a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bg/thunderbird-52.1.1.tar.bz2"; - locale = "bg"; - arch = "linux-x86_64"; - sha512 = "a8776f1bb3c3d1c34b0a1d538cd70cfefb283031f372d0c7b1bc8bfe9dc39f240c746525a8a52968e060024282642a634488d7a8b30509b830232a63b3111fa9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bn-BD/thunderbird-52.1.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-x86_64"; - sha512 = "e0596b70e52733a01f7cbc073f444b5798e7beeed42effcb329fffe8a74de25fd69636624ef74f0bc31aa27a078a6a5c763f203eb3fdc275f59c3eccf49e0cc5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/br/thunderbird-52.1.1.tar.bz2"; - locale = "br"; - arch = "linux-x86_64"; - sha512 = "12269d34c5ea1836f8fc12f7c163b966ee57afacf8bab7a010fd1ce2315193a8dbbba201fa474c9dd2e642f418ffb64eef608eaa37a5991168faaceda818aa49"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ca/thunderbird-52.1.1.tar.bz2"; - locale = "ca"; - arch = "linux-x86_64"; - sha512 = "42180ce29e1e53aa08c22d71902cb792ffd212c42c7a3632d069907d7dfa1571d0beb16141ab5b91af9f637d10278a5f5f5a2bd56146ea848b7f88010655cb92"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cs/thunderbird-52.1.1.tar.bz2"; - locale = "cs"; - arch = "linux-x86_64"; - sha512 = "63e4c8ba853a1289e977ffc27627e69f4509addbf9dcc294be3a49ed7030eb56181cdc6630e6dc3d207d50e2060ef80d5aeb3aa58c3ff95890ad54f0b88a8fea"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cy/thunderbird-52.1.1.tar.bz2"; - locale = "cy"; - arch = "linux-x86_64"; - sha512 = "30110d9db650afb9b0d47efa25006f03b4a9d9863f7fd37a49d49cfc4f2d8b7735a27676d36c84ef390d8358e0069d4708e6ef9eceeb12a38d226f917c4a2c19"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/da/thunderbird-52.1.1.tar.bz2"; - locale = "da"; - arch = "linux-x86_64"; - sha512 = "1b0d6727f72cb8547f6b09c78d9375a63121d73959666e9500c01aa72253e923bc8f85f7a7738d9a0426c9a9e85bacfde3ad3e35b3101ae0af2c132841c60fa2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/de/thunderbird-52.1.1.tar.bz2"; - locale = "de"; - arch = "linux-x86_64"; - sha512 = "4e9c924cd763c15627494f9f247c76ad69fa719e1fec0aae1650949d0e13abdf7d4bdb86bf53cba0db7a124e97f8bb66895c00bbded00f324f8de06c9d1e9b55"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/dsb/thunderbird-52.1.1.tar.bz2"; - locale = "dsb"; - arch = "linux-x86_64"; - sha512 = "b1b5fd7176a5743cb7064cfb9c74c78eb29873978551a6afd6c80bde92744d9793e53ff4bfca2af1bd06f9285305774d7be0d72d6fdd9ec38dd05e0c58fd537a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/el/thunderbird-52.1.1.tar.bz2"; - locale = "el"; - arch = "linux-x86_64"; - sha512 = "f85bc8f35b59176c69e7dc8cfcd7dbbe649c54487d453e56f35c414ce98548127cdf973db7739f7481dca6476c0f9cc54cd42576a5b05abf03ca8a2a26fff229"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-GB/thunderbird-52.1.1.tar.bz2"; - locale = "en-GB"; - arch = "linux-x86_64"; - sha512 = "95249b37205cee0a1677c8fed8199b1a9a98d80b0dfbc513321d72e2a294a84e1d82f19b8732fe30189d9c508d9ebf98be9bf5deda87ddb83134f9b1e24834a3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-US/thunderbird-52.1.1.tar.bz2"; - locale = "en-US"; - arch = "linux-x86_64"; - sha512 = "dd13cf3e5e8ca042583fd134172a4dbcbcbaf8fe923d7f2c19e1f66d2802edc9901fad3a2593e382305b97bc17ae3b1266f3c2176648f8255894749db55ac8fb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-AR/thunderbird-52.1.1.tar.bz2"; - locale = "es-AR"; - arch = "linux-x86_64"; - sha512 = "ca300f267a36f1c5251c8eb5200d93ec558cebb22736c6939581f06bb3c00a9b617188be183bcde78afc6bef2c8a579c82d0085cb8cb0b8668c4975f3bd4578c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-ES/thunderbird-52.1.1.tar.bz2"; - locale = "es-ES"; - arch = "linux-x86_64"; - sha512 = "050a9b2468db62c306ff94eca093c9bebb3b55227bda653f4355915264a73a3da4ee930f46fac27ad932e67d8b37f125b33895cc759f5aa213b8b5f432e82339"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/et/thunderbird-52.1.1.tar.bz2"; - locale = "et"; - arch = "linux-x86_64"; - sha512 = "f07a8ddb278b697396a2988208cd28059fd1449044dfdce6330a058e060113c8748607c52443349bb59ee8851e6d17626830acb99a836f4102b30ba83e96d12e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/eu/thunderbird-52.1.1.tar.bz2"; - locale = "eu"; - arch = "linux-x86_64"; - sha512 = "20d04d59df7689d515ecdfb64f118efec8964b7034e0e0bed0225e8b63c7f46228086f1d63b636eb3a549226aecc944db61e3d8fb1273ed5bf669f538f56017f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fi/thunderbird-52.1.1.tar.bz2"; - locale = "fi"; - arch = "linux-x86_64"; - sha512 = "357ef2351d131fc4da8a4998cb3ca6147c3b2de638156d69a826d98c48d2fc8478905ba5c0a778280a2b29471f899d1851fa1cf8a7a010b0d7c7c8fcbf73f8c9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fr/thunderbird-52.1.1.tar.bz2"; - locale = "fr"; - arch = "linux-x86_64"; - sha512 = "279e46c579577643adbd671455c3053b96c97fad626392b755ebd173b4c09e46ff9f2b52a829b90850e12ebbaea2afa0520c21b5376389b80e5e4f4b09b25ed7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fy-NL/thunderbird-52.1.1.tar.bz2"; - locale = "fy-NL"; - arch = "linux-x86_64"; - sha512 = "ab4f11659e682eb78d14952ca60a1394a8cb7a982d182eaffce9a6c97cd9e6a6cdd1cfe1e278caee66a91a9fa85a28e9cb8daf06f4efc40fd36daef77b0ec2cf"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ga-IE/thunderbird-52.1.1.tar.bz2"; - locale = "ga-IE"; - arch = "linux-x86_64"; - sha512 = "31e8294c81955b1bd512c46d11659e9d95ef6e421060e37296e4e27d3a810ea3201c5ef01bec34a4161bb4e0a980063c546c4c8a2f23bbb7628dc6762857afc8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gd/thunderbird-52.1.1.tar.bz2"; - locale = "gd"; - arch = "linux-x86_64"; - sha512 = "88bf4276c8148e8e1809411706bfa3f5dbafaffee11d3a2e6cfe32e76a9c9d99c1d43aec5c9221d684ae446ec117704e501dce5790a1f16ce8c3ab6124df5bbf"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gl/thunderbird-52.1.1.tar.bz2"; - locale = "gl"; - arch = "linux-x86_64"; - sha512 = "d19ccbf5cde54e6d4d9813803c33cf4b8bfdce14611e56c364bc2bbed0c65ab6bdb06b9c81e1e22f8b17f341552ea822a61eee431da815ab2b1ce21c32aa6d77"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/he/thunderbird-52.1.1.tar.bz2"; - locale = "he"; - arch = "linux-x86_64"; - sha512 = "582654cd958b5ed3abe8a751dc085dcf47e3da92731512925144a9e7b77ac4efd05dc6414b61b63e107763f8149b9acb244913ab83014b45801da79c16d3ece4"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hr/thunderbird-52.1.1.tar.bz2"; - locale = "hr"; - arch = "linux-x86_64"; - sha512 = "61019566186e0d5c3ab8dc963472d010bff1d0ed705b2df17d3e545ebb7cb8d4caf1982cd11b530659413c5e7776b086da89df5fa52775654038eed1ba8826a1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hsb/thunderbird-52.1.1.tar.bz2"; - locale = "hsb"; - arch = "linux-x86_64"; - sha512 = "7b1987d86b6eb4d620b6989f3b40583db56653be1c9bba9ac7d2a3132267790fadfaa4c34755c8c0df2a0fdfae15f6b8e70fa81dee9fd3885699ab67518a2958"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hu/thunderbird-52.1.1.tar.bz2"; - locale = "hu"; - arch = "linux-x86_64"; - sha512 = "89b902b9bc281db85ba11904dd1b422a65ffaadcb41d933ebd5fcd7b7b3f97c2d050a8fdb78a6da88b29b47f0f7643511e90a4af133e528c38f63db326d13e86"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hy-AM/thunderbird-52.1.1.tar.bz2"; - locale = "hy-AM"; - arch = "linux-x86_64"; - sha512 = "0afb1d38f1e4ceec5ec0a9d28ea9ca41558d3cec0d1ad04691e11901996d875a2d7508440c6870264c05b12f3776b2d705470cbef83cb11a68c19ae923b75763"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/id/thunderbird-52.1.1.tar.bz2"; - locale = "id"; - arch = "linux-x86_64"; - sha512 = "34dd65c256900d0ad08db33272adc1761c190fc429de0e62d791f4160c241d9950d42efa03cd4e3aaa4ae5627b48ad2c9f0f0ad865f0d26233379d3b9a4e9f26"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/is/thunderbird-52.1.1.tar.bz2"; - locale = "is"; - arch = "linux-x86_64"; - sha512 = "1b651359c2ccf8249fa2ed951e69bc2d16bdef08db6d103dd5110305ec497cce4452d2764c814068c968bfdfe75bfaeea0d119f8457ba1d72c881097c22fd143"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/it/thunderbird-52.1.1.tar.bz2"; - locale = "it"; - arch = "linux-x86_64"; - sha512 = "15aaeacb1a0ab38297a179007039fb3fa5825618eae5e5d650f041bf5311e8f244dc0ef53d99b9513fc8e17b4f1d0a731cc06f08223b42d222be5e8f56b2a651"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ja/thunderbird-52.1.1.tar.bz2"; - locale = "ja"; - arch = "linux-x86_64"; - sha512 = "ab3fc3d0cf7be8e463c5e8f25ccac1cde2df9be15277bb81f253af15a0de53935cd5c53b8435e7ef5369cc43739b6e2fb8424bb2d7e1b153201b50a8385d1763"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/kab/thunderbird-52.1.1.tar.bz2"; - locale = "kab"; - arch = "linux-x86_64"; - sha512 = "60f2a58444b06ec8f7bd98ccada16b33b0e528bc59b73d33df370cd44283b2b0e65160aa1b5ab9cd0a7f7c628056e3bef4d7c293814837b6a7df17dd057b8ec8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ko/thunderbird-52.1.1.tar.bz2"; - locale = "ko"; - arch = "linux-x86_64"; - sha512 = "de7fedb8b379f54488c5ef6927c53e0c3651f08cb33b97a06359fa9c5a31b0d4a7717df8d493236b7e6cfcc5173d1faa3f07e938b65322ad6847f59c4061597e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/lt/thunderbird-52.1.1.tar.bz2"; - locale = "lt"; - arch = "linux-x86_64"; - sha512 = "9c4c9969a851509dbddf3fbf0118067b29f679b2e13c15f507579f232a311941c1345636714c94151323bfe726f760ab507def1dfd3a4a4053c60d533a3a2abe"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nb-NO/thunderbird-52.1.1.tar.bz2"; - locale = "nb-NO"; - arch = "linux-x86_64"; - sha512 = "61f6e4a840b8cbcb9b0706f121c93798924302184ecc92e4f6b4489178ae3d6962d6ecee52feee21fd4d89c5da7f349b383b5bef6f0b961e6e15a10f6dd5f2e8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nl/thunderbird-52.1.1.tar.bz2"; - locale = "nl"; - arch = "linux-x86_64"; - sha512 = "4de0257fa93e7450442cafcb3cb328928687b974303d3df9c4c37db843bc3379716a7c7058400dc11f25b632266f1f4f740de4c4ae099d6f88d810673856d562"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nn-NO/thunderbird-52.1.1.tar.bz2"; - locale = "nn-NO"; - arch = "linux-x86_64"; - sha512 = "ff6152e088e8f94f60c31b172502207609a9b0908057f8343177e9b7c6a079dd2c503928debeb2c133a77edd6ebac5f691a2078f54d572c2479f60327ba580d0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pa-IN/thunderbird-52.1.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha512 = "9a7876869b412efc3463eb2d161f4655804f740bbae0aee075d0f7e1466de6fbed21545bcfb93c5f03fcb837d3459a40882f4fceafae137f8aa4d3841010feeb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pl/thunderbird-52.1.1.tar.bz2"; - locale = "pl"; - arch = "linux-x86_64"; - sha512 = "9f897729f752126cf676a05672aaa35c620d025ca74ef8c611948b2b19e9239d39090a2983bf9568f796d0a20acba4fccd262ed04433c564791c5ef837955425"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-BR/thunderbird-52.1.1.tar.bz2"; - locale = "pt-BR"; - arch = "linux-x86_64"; - sha512 = "fba636db2837ee9835a35bc36af874e50b113be1edd123a74c9d71080b25be761500b8aeed7605f589cd06328d67659cb25fa25959e49c017a4c63a27be3df6f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-PT/thunderbird-52.1.1.tar.bz2"; - locale = "pt-PT"; - arch = "linux-x86_64"; - sha512 = "0ec0668509a19f52432c0de6450d14b20be01e0a26eedb316e63b33f44a001c3ff82c3b553ef51c9de740a164ad33ca25f9b4b2d64b792e89ed803b9d68d11fa"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/rm/thunderbird-52.1.1.tar.bz2"; - locale = "rm"; - arch = "linux-x86_64"; - sha512 = "fc75870ecccb5cac6533887e96a3be0b44a07b638b96c5993c7d6ede1cf0e501172ab83c85b2e5978d6818086c4e7802ae133da96a8331846456c184f3dfa34a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ro/thunderbird-52.1.1.tar.bz2"; - locale = "ro"; - arch = "linux-x86_64"; - sha512 = "bbb3f37e6559599022f3ac5aafb62ba9e62b67ee5165eb4aad2fb29e722206b7ddd0e4bfa1e5cf57453e0fb572b3829bba3c80e4ab0b3b14c91ce4f824f5150f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ru/thunderbird-52.1.1.tar.bz2"; - locale = "ru"; - arch = "linux-x86_64"; - sha512 = "f93506805c0d45f19a7b17f3eb82a6f8ce6beec11e4fd6ea09888bacbb90f258cfa15bf35a6b5868ce496491b1dd62cf12ad4877576f4b00117f169065061555"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/si/thunderbird-52.1.1.tar.bz2"; - locale = "si"; - arch = "linux-x86_64"; - sha512 = "09a1aa2393d95815cea16ecdc4a2abf7cc7782744e8ab39a447ee195feabf35102a7cbcc57761c1a8bab085036dea949a3ab2fc5cb3cd00cdd01047e1de0faee"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sk/thunderbird-52.1.1.tar.bz2"; - locale = "sk"; - arch = "linux-x86_64"; - sha512 = "d37c2fbc9c72b627278e8bc8073544f0a35bd175e7015f88bc037861a5513286627ca016ed643db490759d7a9b57feaa7d0bb8948545da67ac6fdb2580549e93"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sl/thunderbird-52.1.1.tar.bz2"; - locale = "sl"; - arch = "linux-x86_64"; - sha512 = "0134f110196af343e0fb3f24970caa74fa0a9f48c4c652e484bd79c2fd76f97eea86776c5b528c432ed98d24b2ce83529e7e68c3e4ff2533dd554465f24f701d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sq/thunderbird-52.1.1.tar.bz2"; - locale = "sq"; - arch = "linux-x86_64"; - sha512 = "9a85f94121e1af70e8eee2f0e56693807f881c288efbc9d4f4affe9353f0018145d2df03be74b76026dc0f51b28969cff69e19b639271df7bb34bbaeef21ffbe"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sr/thunderbird-52.1.1.tar.bz2"; - locale = "sr"; - arch = "linux-x86_64"; - sha512 = "a11ec69a7fa8f49c9fe98a53280f6e71cb4dddea4f8a5a4adcb7a95cfcaa548575b334a15ce7c06dcb6053d633a1f2bb09b77ab022a09c3987228fd5a9fce339"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sv-SE/thunderbird-52.1.1.tar.bz2"; - locale = "sv-SE"; - arch = "linux-x86_64"; - sha512 = "04215a4507f057151a9d3bbbc092e7c54a02bdf19af3e18c8042c0fdc477cf5739d3007beb4e28dd3354dae7ffc628fb601c18ad06e8898e5445c35855cdcf5f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ta-LK/thunderbird-52.1.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-x86_64"; - sha512 = "f04af1419a7175a2c15f65bcca7def7e1ef0a82d4e1f706599a8a2a731b07d7d554dfd859911836f586cb0da09c8c67452110eb8caa181e4cf1d39af39406f55"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/tr/thunderbird-52.1.1.tar.bz2"; - locale = "tr"; - arch = "linux-x86_64"; - sha512 = "44b3a06fded09732b1914ad6a373411eacd77defa23c29b1ac2d422f9f38eb3aaf5838915d96ae2400b35b6e751208f21b3f213fa92968887504187548f70431"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/uk/thunderbird-52.1.1.tar.bz2"; - locale = "uk"; - arch = "linux-x86_64"; - sha512 = "c7024c0394da23e067327f9db5cacb263ed02e5e23dfec0059a64383a331b8c9695d30f0e25b2892516e189e2a7e4796d91041e684f44a66d0d6bfd287499203"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/vi/thunderbird-52.1.1.tar.bz2"; - locale = "vi"; - arch = "linux-x86_64"; - sha512 = "d7718cbb734a11c82b4ec88e73174f34fc34819c0c398855897b7b11d811ef27c785d9588764dfd8c149adf61227ac416b8e64dac7d0a2bdfc1fefa5b980a4d2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-CN/thunderbird-52.1.1.tar.bz2"; - locale = "zh-CN"; - arch = "linux-x86_64"; - sha512 = "29b5183a5d824e6e5d4045b9e41403fb5b321ff7c05c73dd43357fe67c87fe05be26988f408788a7e0e1655f0068cbdb80311f396ba991801d0af462dade3432"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-TW/thunderbird-52.1.1.tar.bz2"; - locale = "zh-TW"; - arch = "linux-x86_64"; - sha512 = "0fa4d43ff9a1f32fdc9695075205bdd32932ef790f53e04da778309bd35f5dde56f2d51d972d8c998eee3117a287d16fe79a49435b5cdf6631fe65395bd184c7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ar/thunderbird-52.1.1.tar.bz2"; - locale = "ar"; - arch = "linux-i686"; - sha512 = "0234f231e1dbbe5776d9ea37a18e546d049470efe29eac34c2c4d05c59aaa81f509bf778b37d3865d117fbb43db17e33464090830b531ee434d7775b4020ab44"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ast/thunderbird-52.1.1.tar.bz2"; - locale = "ast"; - arch = "linux-i686"; - sha512 = "5ab2c379709ef07d82870da6259fb9354005235d485d6eed4d5a0b1d23c83903e7e6092cd49ac2439b01c5d4f1e663f121bff7a45ade72eb18d166787c4f62f5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/be/thunderbird-52.1.1.tar.bz2"; - locale = "be"; - arch = "linux-i686"; - sha512 = "69c596d711b91664031e52605c1510532f2600b3927afc4ea12a1c9332baf5b05982a09648be6b30ea42b763a18f495d8fa2274515f8088c0b2e07be60e0510e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bg/thunderbird-52.1.1.tar.bz2"; - locale = "bg"; - arch = "linux-i686"; - sha512 = "0de0dcdd70902f0f1eb8d8d361ce20383c8bec9ce9ea6ddd664876e6386075a424045478bbe6c88076085c97dc42bcf2205f6870e6b03f46dfa3872275ac195b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bn-BD/thunderbird-52.1.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-i686"; - sha512 = "73e82f771d90a4861b9b34adfe94714cab47dd2cc86b9dbad23390a2cef8c0150a654a26a05a6a0effd0efe79a3caf419fce748e35ab3c94610d42e2cb06686e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/br/thunderbird-52.1.1.tar.bz2"; - locale = "br"; - arch = "linux-i686"; - sha512 = "1abfcb8f361ccf5526f947ad8b7c497233d646913abb6fd345814355c548b4c93069a9710d27d2141c5e0045323522a6e76f9f3f53d7dff2c131ac94778545fb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ca/thunderbird-52.1.1.tar.bz2"; - locale = "ca"; - arch = "linux-i686"; - sha512 = "07a3436b009ba87180659345261de142d94500b8fb00fe21d9c48cffa43fc42f644c28bab739d420908342e28747f4f564eb46ae4e24222dea45f369a5caf3a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cs/thunderbird-52.1.1.tar.bz2"; - locale = "cs"; - arch = "linux-i686"; - sha512 = "58b90bdba30ad6626f285c73601faf30f45fefc1e670e013e7f9e6b92540647cb402ec69eb88ca00dc450801fe07589792bae6eb602ccc60479f3ee6e5104ee7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cy/thunderbird-52.1.1.tar.bz2"; - locale = "cy"; - arch = "linux-i686"; - sha512 = "d880dcce1b4dd47bb738d990886b71a858022b8ca76c67d33d8d97257e28cd4489d058526fce6b677cd6e925acdc2d04870e5ff6d84a89d82e2bc9f91469536a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/da/thunderbird-52.1.1.tar.bz2"; - locale = "da"; - arch = "linux-i686"; - sha512 = "31e26b2333544c950b69a631a4f889052c79f3411b3f55b8c02d7fa248d50409a363ab9935d57946b704b5b85819b3e30bbb8230871a582bb27b8f2c062ef1b7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/de/thunderbird-52.1.1.tar.bz2"; - locale = "de"; - arch = "linux-i686"; - sha512 = "c86681f6616d5f234f0878aa9370cca4c0fc5f38c131f2a3908d8529ab2e86e340558988c3ac5067a82edb99a3cacf316727652d181fcc0bc15ad7ecd713d11b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/dsb/thunderbird-52.1.1.tar.bz2"; - locale = "dsb"; - arch = "linux-i686"; - sha512 = "4f3b39c1023235579079a46a7d557d177c3f2e398a6e311c728ec1083952b2c67db0cdf539d8ae3abc54061d22e607c6849699008b76e9b01569d12d6600feee"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/el/thunderbird-52.1.1.tar.bz2"; - locale = "el"; - arch = "linux-i686"; - sha512 = "623205d1e326a0310c54a9c14e469fdbe156e538c2a09a770c872be8214611743b6d354b5a7b106db5105b8b278540d7f623c6fc56bc1fd450333ec774ded706"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-GB/thunderbird-52.1.1.tar.bz2"; - locale = "en-GB"; - arch = "linux-i686"; - sha512 = "b38b9e6350edd11e58c644ebe4c11aa6bfeba7e7aa6fdf40f9b9a4cb5845f5a2895b82ebf717ca78138a0f11cdc2f6f5aefe5636acbcff857ba99d27e258b824"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-US/thunderbird-52.1.1.tar.bz2"; - locale = "en-US"; - arch = "linux-i686"; - sha512 = "192f42fe4c7b9689743ec16191ef8576a19699812cfc4984e4b559fd847ab92c1dc002cbbdbb2212fb547fc9bfd77b4f58639d219ccc1ed86290b61f9effebf0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-AR/thunderbird-52.1.1.tar.bz2"; - locale = "es-AR"; - arch = "linux-i686"; - sha512 = "2022d12dd755e6583b3ccb068ffc53b91308702cff57f57ed455aee7299f8a7d4e614e600acc80be9da0e9df8e86c273b6cc7e99b94c5194420be367d5f12497"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-ES/thunderbird-52.1.1.tar.bz2"; - locale = "es-ES"; - arch = "linux-i686"; - sha512 = "058004f7a94b55a393d626869d7b7690d17fa5b51b0466d83c029c65ef3a49d9efdfc0df2c2110865282972b23fbd22a68f81785d098cbe3ba6c39c81f5e903f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/et/thunderbird-52.1.1.tar.bz2"; - locale = "et"; - arch = "linux-i686"; - sha512 = "95247bec1a365afcc5f6985ac635b0ebc02b2c345704749856ff5d9aa3d23e22fb274812617f3cd1648f80b9e47c95100fc10d41d5cbf0f8b7322e57adf48165"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/eu/thunderbird-52.1.1.tar.bz2"; - locale = "eu"; - arch = "linux-i686"; - sha512 = "e561dc2fd2f32dcdaba034f7486a55da8e332c7a67fa4948ccb073fea5a49910c02bac3b4f988366d0e4cf7da00efa52020eb1fd837119e95360e7418b65e37b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fi/thunderbird-52.1.1.tar.bz2"; - locale = "fi"; - arch = "linux-i686"; - sha512 = "d014aec796d7c4823748eb2d4a76df85a10fb6bba58d26fc9e46f72bbdc1457acbe473a563a1ebebed152c11242bd64b8c306c2fb43959ad2b649830bf50e95d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fr/thunderbird-52.1.1.tar.bz2"; - locale = "fr"; - arch = "linux-i686"; - sha512 = "e7bfe888ce1bffcb302c96bdb685bdbb7588521e9dec863175015622ebe13d0aa2b8a75c8fbe9ad6030be8303728a6a6718a837fc8fef8d0009fedad6ecd1b36"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fy-NL/thunderbird-52.1.1.tar.bz2"; - locale = "fy-NL"; - arch = "linux-i686"; - sha512 = "08bb1c4e4187e6a4f61f9ad88daa605186b341033c256506f9dc2c7626af842a628dfd59732084cf1b6bf94eb52e78af9942fcbbfb3c0a0c42568c94d3a874d7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ga-IE/thunderbird-52.1.1.tar.bz2"; - locale = "ga-IE"; - arch = "linux-i686"; - sha512 = "737af536b710b633b849ae0f7017bf9387daa6a3145409ed8cb315a0738083195992bac1fb4215b590784b7b2389f0611d89b55e17b5b02bedb79869e7caace9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gd/thunderbird-52.1.1.tar.bz2"; - locale = "gd"; - arch = "linux-i686"; - sha512 = "2ede5eebf73d7fa2f9ddf5a10b26649d43bc24512512b8f31b2998786c80de1c75890d3c825829ce1ee030ebb90e6bde1264cebc45d17475bfa5a343a5520491"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gl/thunderbird-52.1.1.tar.bz2"; - locale = "gl"; - arch = "linux-i686"; - sha512 = "b0ae9a3d08160024203b6bddfa6fb4a9a15c552cce91701d644636cc9f9c6add879a1b78138a0bdf3946c9f356dfb50d97293cbd070bbc2a9764b30a7a29263a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/he/thunderbird-52.1.1.tar.bz2"; - locale = "he"; - arch = "linux-i686"; - sha512 = "b1f5d4e299cc2d40397fb96b076625ea7e86faecc0ba6503276d675125373fe7eecfd531caf24241cb446bf47ba986c4ee497fbd115cf67160ef24b87f6ef19f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hr/thunderbird-52.1.1.tar.bz2"; - locale = "hr"; - arch = "linux-i686"; - sha512 = "7e52b5aeeaf9cd3c205555b1cf69c7a184b3a30605611a0cbc66a7591beb9d11a18b5e084adc9f88a7b74b24b06dd9b470bb966c6dc4fd946ab23b6565608ff4"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hsb/thunderbird-52.1.1.tar.bz2"; - locale = "hsb"; - arch = "linux-i686"; - sha512 = "49c718f7424337a6477b175446f3b532d0603ed8dd2bf789497706dd6c25f1d4968058facb61b2ea858e908911d0c04e87493a0956c33ad33df11d9990aaabb7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hu/thunderbird-52.1.1.tar.bz2"; - locale = "hu"; - arch = "linux-i686"; - sha512 = "e6ca202e31f41b7e57235172fb107ddc0707633ba5762651da62e9e55f433fe21de642f20bc3cbddf99ee8a9881dd646add04bb180e630364e45384a13e75ef0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hy-AM/thunderbird-52.1.1.tar.bz2"; - locale = "hy-AM"; - arch = "linux-i686"; - sha512 = "43aed794a82dc7e74f086bdc9e401ecfd59329098c8a9a650c485348977815f7419cd1cf913bc3fba025fbfcf1a15db6b883ef6bf483e16187a85dfdad9cb299"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/id/thunderbird-52.1.1.tar.bz2"; - locale = "id"; - arch = "linux-i686"; - sha512 = "3ce1c383d7640b9af2b7eae5e7689a200d27bc0a5527b3f3be1b1443ef3278cc58c0f2c0e3a9f94cb419fdc3b5797612fa96d78aa9a418b59fb066977955096a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/is/thunderbird-52.1.1.tar.bz2"; - locale = "is"; - arch = "linux-i686"; - sha512 = "365d5b4c78605df8869438eca9ad700ff2353bc18d64cfedf8905bc7307646b45c365813b537eb813806a25b8d1f121595df744ac60b1cb48cfcbe4395affc7f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/it/thunderbird-52.1.1.tar.bz2"; - locale = "it"; - arch = "linux-i686"; - sha512 = "ad0946bf1282f3ded23847b6fbbce55e620ca34b71bb3c7a12a6bb24e6e09a4d737503c39f5d634bdcd4c3a54418ef6b96a83fa997d911b85d8d05632d921711"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ja/thunderbird-52.1.1.tar.bz2"; - locale = "ja"; - arch = "linux-i686"; - sha512 = "34841d9c22e9b4d737bc56e23935f12a5a0bedcdbb127447a21ae9a837c9f61ef93b9613fa2123dafc39cbe7f9ec3cc0b92c7dc27f96ca3175ae359be3cfa1db"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/kab/thunderbird-52.1.1.tar.bz2"; - locale = "kab"; - arch = "linux-i686"; - sha512 = "19a40cf4ff9c0e34b4ae46a54364ca9b152aee18f2d4a438fe947cb225d9214f8316bd9aacfbec803076716668f100b0a02dd18b1f307498d086cfd6466f6433"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ko/thunderbird-52.1.1.tar.bz2"; - locale = "ko"; - arch = "linux-i686"; - sha512 = "1497535d1de169c0498837ef164434700a99d5dfe5032cfbef62de4535f47c2473ef335f9796c0d7adf5c7f2cde7c3a655aaa92d65651667afd7f3cdf7cde574"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/lt/thunderbird-52.1.1.tar.bz2"; - locale = "lt"; - arch = "linux-i686"; - sha512 = "54bdb2bfa2cf97e03c389a390ad018f485b5452c6c4e8acab9cc71c0076b830cfc7267a1e755f98ac54c87231511827ba7c64aa2502c502ab47d554fc5044856"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nb-NO/thunderbird-52.1.1.tar.bz2"; - locale = "nb-NO"; - arch = "linux-i686"; - sha512 = "20f5d2e7bbc083a990d9e9d8373d1485d58d62837c4d0d0d9d0955d3a9355c326d8eebbbfe0c61090c598fca11dad85d101ffb96b12f72b76da55fe72773ad03"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nl/thunderbird-52.1.1.tar.bz2"; - locale = "nl"; - arch = "linux-i686"; - sha512 = "c25e14b9d28f4985ffbb125b984168b4f073773c03bfc2af2bb845db19659b25d69e634896d9b0d92ad7f08ccd4523a5d58ee42fbf23ac25499f64e7da7463cd"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nn-NO/thunderbird-52.1.1.tar.bz2"; - locale = "nn-NO"; - arch = "linux-i686"; - sha512 = "9fe667f785abbdcf57890c3c19def43165a5574409342eae335ba32c2f9fa089eb4c2d443fc6254fe5d21ead0f0d04fa1e2250f54ef805c2668aae37b15a3f84"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pa-IN/thunderbird-52.1.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha512 = "cfd6c5d43ad9c78663f217b4ebc40b34d80cceed7e266f95dff1d70665b4e7187742621367085ae38718ba15e14bebaf8a32bc8e696fad0febbbbbf360abfd69"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pl/thunderbird-52.1.1.tar.bz2"; - locale = "pl"; - arch = "linux-i686"; - sha512 = "01dec9139816be174f14aa3f6e2165bcc52e53b8f681d8fbedb4db4f428a36128b832aa36fba7af096d15e83ecedb6b3570a447cde6bf10a722c2a452520852a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-BR/thunderbird-52.1.1.tar.bz2"; - locale = "pt-BR"; - arch = "linux-i686"; - sha512 = "2f616760f069944f43cc8517981a7fb793564cf30214ca62b42161aa3fcd332bf3f25761deae00697c8f544c84c3a500e9fac6b4424ef5481250fe2b8b6075a1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-PT/thunderbird-52.1.1.tar.bz2"; - locale = "pt-PT"; - arch = "linux-i686"; - sha512 = "0e27a359621fc08e1162f413aabaf406af4754e0e6947764d2b86c0c20b4d88c7eea336863ad9a9c670a6b05d84bda3678b9665f3c6c2d6b8ec71f2278f8a494"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/rm/thunderbird-52.1.1.tar.bz2"; - locale = "rm"; - arch = "linux-i686"; - sha512 = "84e58d1a7ce7e4d09ed30e83c6e46b88aac1419e719e1c55aa4cb5e1521ea3dd679e0bd41663de2a12d77c489d69f5ac0d5f5f0845fb2f9cc34d8f55ca278026"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ro/thunderbird-52.1.1.tar.bz2"; - locale = "ro"; - arch = "linux-i686"; - sha512 = "9272c9fba59beab72fb6f59c81180514ddfa6b6dbd050f6b789e5072beb34a0cc6c70ecc26e11bbc082e9368df98cc13923eea643daaf24051371755b0bb26ac"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ru/thunderbird-52.1.1.tar.bz2"; - locale = "ru"; - arch = "linux-i686"; - sha512 = "734b738d9712dc089db8460b72404be9bb6a97944ec9dc5a286a401531ef2a30f8b7c5fc22e689b98d1f80551515996c6d7ba1a7b72290e4071a95a4519c45b0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/si/thunderbird-52.1.1.tar.bz2"; - locale = "si"; - arch = "linux-i686"; - sha512 = "3868793813b2b09177ff7c5b36e44a289f7d7ae84f65c3194703f77e0067fd975a1397a289d3921b5ba7dcfe56c81280abec81c731b369692f2135f572dcdce6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sk/thunderbird-52.1.1.tar.bz2"; - locale = "sk"; - arch = "linux-i686"; - sha512 = "101f95b2bb118bb730117920099d1f5cc5f7744960a0148a1324043c17468d5b43c5d31fc5c45111fd3fc16a6e4d207548161fb600dbc4c4b92b015e342586fa"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sl/thunderbird-52.1.1.tar.bz2"; - locale = "sl"; - arch = "linux-i686"; - sha512 = "a019e01de194d51acc6695447c30fd5d9e179d91035f942b2f42a536b29d03244a7fffe2821c19e51133d39773e70b18fda79b6b19c2a33fba3d9917669b0748"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sq/thunderbird-52.1.1.tar.bz2"; - locale = "sq"; - arch = "linux-i686"; - sha512 = "64bdc99eb9bb3ece6fb5de9380fdc3d0a7e2598d36a66e7542c500a63c49f0d307ebdb99599b3bc72677a1053dd5d2aaf52088605236baa7d8d29dc2b377771d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sr/thunderbird-52.1.1.tar.bz2"; - locale = "sr"; - arch = "linux-i686"; - sha512 = "8d5d2ee0f5326b9cf76dcb1cfd2401350ca5aa39efbc2afcd822eb3c9a40e477d25e0d82d8f50e569b2fed487463c6a978d12284f63764b7259bd3f479b2461b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sv-SE/thunderbird-52.1.1.tar.bz2"; - locale = "sv-SE"; - arch = "linux-i686"; - sha512 = "0efd878da02ec1e81f373f7e8090445f45c11f2c9a1931ed29a52c3d8642a277be07a2d194d873f1a11dc8cdb79ed4100fd87b8f262f8fa2ea034d4c20e96e6e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ta-LK/thunderbird-52.1.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-i686"; - sha512 = "555c1b5862e71e7b9112b97b137375e0a38549ea91398b1631cb6000f5881f0adbbfe230612c2bd8765a20b1d14cf538e1b5c0e9ccfeb9fc7c1258afae54503b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/tr/thunderbird-52.1.1.tar.bz2"; - locale = "tr"; - arch = "linux-i686"; - sha512 = "e9c5333cd807f44d98c83514caa5fa81ef54a11362b7aee05c2496d8c79288c6707ff154229cc77d9a4e8097b13c53845a7516d04ff4c3336513183a8218ac3b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/uk/thunderbird-52.1.1.tar.bz2"; - locale = "uk"; - arch = "linux-i686"; - sha512 = "a7486ab5f63cece470b2850452cac236e153c3c797622cd2d87f6c4b276cea1c43d3770e7726c459334c5ca51034a8013d78176026375ac3d760c05e1cd9cd84"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/vi/thunderbird-52.1.1.tar.bz2"; - locale = "vi"; - arch = "linux-i686"; - sha512 = "6b815b2dc07fc6cb799bdf2266d6bfbef4f2623790814cae80ba1853075f7c561270e2463b1be571cc4495de5f2c36df4d716cf5754470198b97602ef3fe3979"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-CN/thunderbird-52.1.1.tar.bz2"; - locale = "zh-CN"; - arch = "linux-i686"; - sha512 = "7269d75bbec19be4045a6080c4e64679b5873a89039ffa9b633f40f41ca8d98a5f5f8a1b76233102b41a38ee307a49fe0c45206df1128b1526f490a417fb60c6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-TW/thunderbird-52.1.1.tar.bz2"; - locale = "zh-TW"; - arch = "linux-i686"; - sha512 = "3741d5ebd862706b212f90a9f81ea8f0c9f7b1a4eeb74acab420e287afb930cc74748db958debb698a49fbd9d8011107ea6a1bc917606700a80eea640b40ab1a"; - } - ]; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 0f6be0281f3..ccced87a550 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.1.1"; + version = "52.2.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "84b54ae4401c9728c38f32f58e0df24e049471b3613f9973981b305e0ed09b2e8c2c1b5a35d4fee85ce2cf1d6fa99e80418bc216ae0d35d40e9fdeef61a6c06e"; + sha512 = "e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89"; }; # New sed no longer tolerates this mistake. From 1b6176e45b05cbb89cac49359ba15a15c9187f68 Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Fri, 16 Jun 2017 03:40:09 +1000 Subject: [PATCH 139/152] gnupg module: Added extra and browser sockets (#26295) Also added dirmngr and made SSH support false by default due to programs.ssh.startAgent defaulting to true. --- nixos/modules/programs/gnupg.nix | 83 +++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index c5277f40d26..68adee94f79 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -21,13 +21,37 @@ in agent.enableSSHSupport = mkOption { type = types.bool; - default = true; + default = false; description = '' Enable SSH agent support in GnuPG agent. Also sets SSH_AUTH_SOCK environment variable correctly. This will disable socket-activation and thus always start a GnuPG agent per user session. ''; }; + + agent.enableExtraSocket = mkOption { + type = types.bool; + default = false; + description = '' + Enable extra socket for GnuPG agent. + ''; + }; + + agent.enableBrowserSocket = mkOption { + type = types.bool; + default = false; + description = '' + Enable browser socket for GnuPG agent. + ''; + }; + + dirmngr.enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables GnuPG network certificate management daemon with socket-activation for every user session. + ''; + }; }; config = mkIf cfg.agent.enable { @@ -38,15 +62,72 @@ in ("${pkgs.gnupg}/bin/gpg-agent --supervised " + optionalString cfg.agent.enableSSHSupport "--enable-ssh-support") ]; + ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload gpg-agent"; }; }; systemd.user.sockets.gpg-agent = { wantedBy = [ "sockets.target" ]; + listenStreams = [ "%t/gnupg/S.gpg-agent" ]; + socketConfig = { + FileDescriptorName = "std"; + SocketMode = "0600"; + DirectoryMode = "0700"; + }; }; systemd.user.sockets.gpg-agent-ssh = mkIf cfg.agent.enableSSHSupport { wantedBy = [ "sockets.target" ]; + listenStreams = [ "%t/gnupg/S.gpg-agent.ssh" ]; + socketConfig = { + FileDescriptorName = "ssh"; + Service = "gpg-agent.service"; + SocketMode = "0600"; + DirectoryMode = "0700"; + }; + }; + + systemd.user.sockets.gpg-agent-extra = mkIf cfg.agent.enableExtraSocket { + wantedBy = [ "sockets.target" ]; + listenStreams = [ "%t/gnupg/S.gpg-agent.extra" ]; + socketConfig = { + FileDescriptorName = "extra"; + Service = "gpg-agent.service"; + SocketMode = "0600"; + DirectoryMode = "0700"; + }; + }; + + systemd.user.sockets.gpg-agent-browser = mkIf cfg.agent.enableBrowserSocket { + wantedBy = [ "sockets.target" ]; + listenStreams = [ "%t/gnupg/S.gpg-agent.browser" ]; + socketConfig = { + FileDescriptorName = "browser"; + Service = "gpg-agent.service"; + SocketMode = "0600"; + DirectoryMode = "0700"; + }; + }; + + systemd.user.services.dirmngr = { + requires = [ "dirmngr.socket" ]; + after = [ "dirmngr.socket" ]; + unitConfig = { + RefuseManualStart = "true"; + }; + serviceConfig = { + ExecStart = "${pkgs.gnupg}/bin/dirmngr --supervised"; + ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload dirmngr"; + }; + }; + + systemd.user.sockets.dirmngr = { + wantedBy = [ "sockets.target" ]; + listenStreams = [ "%t/gnupg/S.dirmngr" ]; + socketConfig = { + SocketMode = "0600"; + DirectoryMode = "0700"; + }; }; systemd.packages = [ pkgs.gnupg ]; From 4a5c593e8000747e6fd06025f94e7563d915d204 Mon Sep 17 00:00:00 2001 From: Volth Date: Thu, 15 Jun 2017 17:48:30 +0000 Subject: [PATCH 140/152] vivaldi: fix space in sha256 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index da9f6472821..3489aeb4cf5 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -19,7 +19,7 @@ let sha256 = "0apkwgd98ld5k77nplzmk67nz6mb5pi8jyrnkp96m93mr41b08bq"; } else { arch = "i386"; - sha256 = "0xyf0z1cnzmb3pv6rgsbd7jdjf1v137priz4kkymr8jgmpq0mmfx "; + sha256 = "0xyf0z1cnzmb3pv6rgsbd7jdjf1v137priz4kkymr8jgmpq0mmfx"; }; in stdenv.mkDerivation rec { From 5f94d85e5eb33136b1fe3081fe448351347b8d26 Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Thu, 15 Jun 2017 18:22:29 +0200 Subject: [PATCH 141/152] ghc821: init at 8.2.1-rc2 (a.k.a., 8.2.0.20170507) The approach taken to add this package was to port over the definitions currently existing for HEAD, and making the necessesary changes to get this building. The Haskell package set associated with this compiler doesn't yet guarantee that all or most of the packages successfully build with this new compiler, but that will improve over time after this GHC 8.2.1 is officially released and the ecosystem catches up. --- pkgs/development/compilers/ghc/8.2.1.nix | 117 ++++++++++++++++++ .../configuration-ghc-8.2.x.nix | 60 +++++++++ pkgs/top-level/haskell-packages.nix | 15 +++ 3 files changed, 192 insertions(+) create mode 100644 pkgs/development/compilers/ghc/8.2.1.nix create mode 100644 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix new file mode 100644 index 00000000000..6b0cdf4fbdc --- /dev/null +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -0,0 +1,117 @@ +{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils +, autoconf, automake, happy, alex, python3, sphinx, hscolour +, buildPlatform, targetPlatform , selfPkgs, cross ? null + + # If enabled GHC will be build with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. +, enableIntegerSimple ? false, gmp +}: + +let + inherit (bootPkgs) ghc; + version = "8.2.1-rc2"; + preReleaseName = "ghc-8.2.0.20170507"; + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; + commonPreConfigure = '' + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/${preReleaseName}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString enableIntegerSimple '' + echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk + ''; +in stdenv.mkDerivation (rec { + inherit version; + name = "ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz"; + sha256 = "1hy3l6nzkyhzwy9mii4zs51jv048zwvdqk1q3188jznz35392zrn"; + }; + + postPatch = "patchShebangs ."; + + preConfigure = commonPreConfigure; + + buildInputs = commonBuildInputs; + + enableParallelBuilding = true; + + configureFlags = [ + "CC=${stdenv.cc}/bin/cc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional (! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + postInstall = '' + paxmark m $out/lib/${preReleaseName}/bin/{ghc,haddock} + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i + done + ''; + + outputs = [ "out" "doc" ]; + + passthru = { + inherit bootPkgs; + } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { + crossCompiler = selfPkgs.ghc.override { + cross = targetPlatform; + bootPkgs = selfPkgs; + }; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs (cross != null) { + name = "${cross.config}-ghc-${version}"; + + preConfigure = commonPreConfigure + '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; + + configureFlags = [ + "CC=${stdenv.ccCross}/bin/${cross.config}-cc" + "LD=${stdenv.binutils}/bin/${cross.config}-ld" + "AR=${stdenv.binutils}/bin/${cross.config}-ar" + "NM=${stdenv.binutils}/bin/${cross.config}-nm" + "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib" + "--target=${cross.config}" + "--enable-bootstrap-with-devel-snapshot" + ] ++ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; + + buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ]; + + dontSetConfigureCross = true; + + passthru = { + inherit bootPkgs cross; + cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; + ld = "${stdenv.binutils}/bin/${cross.config}-ld"; + }; +}) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix new file mode 100644 index 00000000000..e1bdfb776f3 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -0,0 +1,60 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_39; + + # Disable GHC 8.2.x core libraries. + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + terminfo = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + + # cabal-install can use the native Cabal library. + cabal-install = super.cabal-install.override { Cabal = null; }; + + # jailbreak-cabal can use the native Cabal library. + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + + # https://github.com/bmillwood/applicative-quoters/issues/6 + applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; + sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; + }); + + ## GHC > 8.0.2 + + # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 + vector-algorithms = dontCheck super.vector-algorithms; + + # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77 + yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2; + + +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2f21d2a5d74..099e45f1022 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -68,6 +68,13 @@ in rec { inherit (bootPkgs) hscolour; sphinx = pkgs.python27Packages.sphinx; }; + ghc821 = callPackage ../development/compilers/ghc/8.2.1.nix rec { + bootPkgs = packages.ghc802; + inherit (bootPkgs) hscolour alex happy; + inherit buildPlatform targetPlatform; + sphinx = pkgs.python3Packages.sphinx; + selfPkgs = packages.ghc821; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; @@ -156,6 +163,10 @@ in rec { ghc = compiler.ghc802; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; + ghc821 = callPackage ../development/haskell-modules { + ghc = compiler.ghc821; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; @@ -165,6 +176,10 @@ in rec { ghc = compiler.ghcHEAD.crossCompiler; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; + ghcCross821 = callPackage ../development/haskell-modules { + ghc = compiler.ghc821.crossCompiler; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + }; ghcjs = callPackage ../development/haskell-modules { ghc = compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; From 791f072384a18a821d998edcecb5d7b3cd78e4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 15 Jun 2017 20:28:02 +0200 Subject: [PATCH 142/152] Merge #26601: thunderbird*: 52.1.1 -> 52.2.0 (security) --- .../browsers/firefox-bin/default.nix | 4 + .../browsers/firefox-bin/update.nix | 7 +- .../mailreaders/thunderbird-bin/default.nix | 3 +- .../thunderbird-bin/release_sources.nix | 595 ++++++++++++++++++ .../mailreaders/thunderbird-bin/sources.nix | 595 ------------------ .../mailreaders/thunderbird/default.nix | 4 +- 6 files changed, 604 insertions(+), 604 deletions(-) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index dcb25dc1343..f59cb402720 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -170,6 +170,10 @@ stdenv.mkDerivation { passthru.ffmpegSupport = true; passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; + baseUrl = + if channel == "devedition" + then "http://archive.mozilla.org/pub/devedition/releases/" + else "http://archive.mozilla.org/pub/firefox/releases/"; }; meta = with stdenv.lib; { description = "Mozilla Firefox, free web browser (binary package)"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 9c29d1288d1..3bcc2ab003c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -9,15 +9,10 @@ , gnupg , baseName ? "firefox" , basePath ? "pkgs/applications/networking/browsers/firefox-bin" +, baseUrl }: let - - baseUrl = - if channel == "devedition" - then "http://archive.mozilla.org/pub/devedition/releases/" - else "http://archive.mozilla.org/pub/firefox/releases/"; - isBeta = channel != "release"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index aba121ba761..4f714cabf79 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -46,7 +46,7 @@ assert stdenv.isLinux; # imports `version` and `sources` -with (import ./sources.nix); +with (import ./release_sources.nix); let arch = if stdenv.system == "i686-linux" @@ -163,6 +163,7 @@ stdenv.mkDerivation { passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { inherit name writeScript xidel coreutils gnused gnugrep curl gnupg; baseName = "thunderbird"; + channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix new file mode 100644 index 00000000000..889d931c706 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -0,0 +1,595 @@ +{ + version = "52.2.0"; + sources = [ + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ar/thunderbird-52.2.0.tar.bz2"; + locale = "ar"; + arch = "linux-x86_64"; + sha512 = "d25bdeda7f5ee563176809811c5373d5232842ddb68315f31992754100e5cc96e5a2d0427897d245fcf9bbfc647331492e9b1fa79e0adb64f4f2169dd66ddc29"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ast/thunderbird-52.2.0.tar.bz2"; + locale = "ast"; + arch = "linux-x86_64"; + sha512 = "f7d3f2caa404fa5b97b7c966bb4ddd6fc0f26531802d4db9930d984d9b4ca635c41f9b025ca3c0ccba93a288da9c229b43b760759969b269082402584eed14f0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/be/thunderbird-52.2.0.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha512 = "baa46c3e1d07b284e6cbca0f6c61710d4760f2a33e829056b8fb4e05b63162e4e4c7c8414dd9b3733c6983b74765e2ed2129122feadeb5972f037a1a739eba1e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bg/thunderbird-52.2.0.tar.bz2"; + locale = "bg"; + arch = "linux-x86_64"; + sha512 = "166e64acbb8464142e78222ffb00e5ee421dbfee6789f544439963f4d3476e46795d53050e60195bbce648a3400f24edcef7a8f4cb47d5c3db0441ca564ad6d4"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bn-BD/thunderbird-52.2.0.tar.bz2"; + locale = "bn-BD"; + arch = "linux-x86_64"; + sha512 = "817202f39eb6b0f79d07da92b7ad62c6dda9e8d196021828303030ac5eff97d5574ba99ae8a2d236cddf2eaa6cda4c85a17f23a6f84461654e8f0856156dc6bb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/br/thunderbird-52.2.0.tar.bz2"; + locale = "br"; + arch = "linux-x86_64"; + sha512 = "46eab89538b48e02237950207ce8e3d955ba87c7ffa7a030812bafa4bb54da5113a3ff53bfa1e1b243a77c1dcf32b5aa475382e824538536a759da0448cca305"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ca/thunderbird-52.2.0.tar.bz2"; + locale = "ca"; + arch = "linux-x86_64"; + sha512 = "7bcb35886fd0344c18f29d5221d765a91da48db3c32f7be4c4ca0e9808dee2f6577bfafff32e8b9676a00e488f7617c66dc6e2cce5238569c24fc1679ac6c1d8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cs/thunderbird-52.2.0.tar.bz2"; + locale = "cs"; + arch = "linux-x86_64"; + sha512 = "8bda94fbe1043168894fb70edc3d87b670830377faee7397c26805bf8c2dd23bbbb5c4b1d797468875fb653fa02b8bc211aa3766793d3f9b21a139265651692b"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cy/thunderbird-52.2.0.tar.bz2"; + locale = "cy"; + arch = "linux-x86_64"; + sha512 = "65818715e994ab314ef4ac8a7d3e7c61e8918cd1d0d0ea4f51461f50d207d1c998c6452740c6f3fc07d70ebc1d24e5bebef622787d8e6f79f57ace1fc85e1e16"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/da/thunderbird-52.2.0.tar.bz2"; + locale = "da"; + arch = "linux-x86_64"; + sha512 = "1b7166d185ff6fc8cbe826d11e7b96ccc4528ce6421a7ad73f82d9c9c0f35a8de043b30fdec1e6ea3cc6d48645f42173b941cd6f8cc6d526264d4301c2943ade"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/de/thunderbird-52.2.0.tar.bz2"; + locale = "de"; + arch = "linux-x86_64"; + sha512 = "af6005f229a4cbc84c4f99ea1b13413d5a40ab506163786cacf513460170f77b3cb866a4b76b0691facc43cdccc39de68e9010550220f9d6cf288aac53909a40"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/dsb/thunderbird-52.2.0.tar.bz2"; + locale = "dsb"; + arch = "linux-x86_64"; + sha512 = "c326aa0c775e414fbfab466be742b804dbb364f60b084b4890c783f6c9e7bbe5da05b09b1608d51535ec3b60eaad5f775eb36834dd69d66f18a4746b7fe55c68"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/el/thunderbird-52.2.0.tar.bz2"; + locale = "el"; + arch = "linux-x86_64"; + sha512 = "b18fe1345c27095b2ea0afdec088b56d2cfccd57e285e881f1bbae4bd6eed6e39e76d24ada963d2337729eb93775d948195139815f694cb45978978a33682e08"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-GB/thunderbird-52.2.0.tar.bz2"; + locale = "en-GB"; + arch = "linux-x86_64"; + sha512 = "622c2c3979b30f724be73b5c6bc54f944f24a797cb1c3cafd11c2a08381e692621b29eadf64438b8207dd9254bddfa8b524211f7802e83453c1eeec99ab27108"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-US/thunderbird-52.2.0.tar.bz2"; + locale = "en-US"; + arch = "linux-x86_64"; + sha512 = "76505876b7a408cc296ee575dea6f89db9cafd31f58e961bd0c1c5cf021771cdaa8bb4dfa508a4bde386846f97be6eccbd499725dab8e5a692bfd48125f1bf82"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-AR/thunderbird-52.2.0.tar.bz2"; + locale = "es-AR"; + arch = "linux-x86_64"; + sha512 = "38f32cb430c679c63b8c6ab7d22bf5cb2af85bfa17fcbedc94d9fafa27874b917c7f34d7ddaa6a4dfa5d1674c09b3901cc19de5e217a965890eac5ef9246b22f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-ES/thunderbird-52.2.0.tar.bz2"; + locale = "es-ES"; + arch = "linux-x86_64"; + sha512 = "049e9445a850da0df09a0675cc9524d1bcb6ac4dc0ba8178df07ae4fcb9b4d9ff4677229968573119c5ca2c61a6f35da96167ece9d2da97e6b4e541bd9fc04b1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/et/thunderbird-52.2.0.tar.bz2"; + locale = "et"; + arch = "linux-x86_64"; + sha512 = "e2bb4aaa7e6a447f63456adbc35feb56e5e6ceac791ae54a2f34eb283cf3a61565c06cc09f66fcf01d722b8ed0972e51da33a94dfd333108fee2e967346eb9cd"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/eu/thunderbird-52.2.0.tar.bz2"; + locale = "eu"; + arch = "linux-x86_64"; + sha512 = "eacfbee76dc62b15e9a807db9409d63b2991f976faa109ef5991b2a6befadfeed8c341a448c0af84d1fc8f6914e4d515860294f2e54bb97f4ce2727c4d73a030"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fi/thunderbird-52.2.0.tar.bz2"; + locale = "fi"; + arch = "linux-x86_64"; + sha512 = "c6ba259c3729535199905773674800f2772bf952a8596e11eb73785a9176072434ae47abb40c35e8cb0f66b4c46162d48ae699985857ad9a208c645cf76f0189"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fr/thunderbird-52.2.0.tar.bz2"; + locale = "fr"; + arch = "linux-x86_64"; + sha512 = "eacdc3ce1967ef7913012c448c4a4898463c80fac41fb5bf16d924eb31ea2e68e7ad46ee88b5ce107e85a18789a19e05006ae4786a5d9e9a2f93c05013aa9f4a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fy-NL/thunderbird-52.2.0.tar.bz2"; + locale = "fy-NL"; + arch = "linux-x86_64"; + sha512 = "450011ce8012918dc8196b68a32f4b2ab27dd893a15ebd621fa17923ba5a63bff6fb634e1cc22cca3fa64d61dcc23565ceda518e04e7f92d91a0bc86fcd0dda7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ga-IE/thunderbird-52.2.0.tar.bz2"; + locale = "ga-IE"; + arch = "linux-x86_64"; + sha512 = "ba8271e67b61e92bb819b0739351cfbfb128ecd3842f1c7ad69f7e9c26f4d52c10cf71f5d8cb45dc1f30d3168dc0acb991be4ef208e6947c3c36f4e5c0071f69"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gd/thunderbird-52.2.0.tar.bz2"; + locale = "gd"; + arch = "linux-x86_64"; + sha512 = "324044728236a52fe136c62f250218d6d2e364bda7b9f781a5f1c05561e37e09c9180733be0dd69f170e2229924c9ff7f2db10def13b86a7d21d5801d171a3b0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gl/thunderbird-52.2.0.tar.bz2"; + locale = "gl"; + arch = "linux-x86_64"; + sha512 = "a31f01bf15d17d8efc645ebe4184bf4b5f02107f24765721eee87dc10463c7e8219a1ba3d60468e132f6b934f6f138b441f94d3d3e790f2fbad45107210f69d9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/he/thunderbird-52.2.0.tar.bz2"; + locale = "he"; + arch = "linux-x86_64"; + sha512 = "c8356bc183eb9837c3049288d63e1c13098143cf7a80cc5452d9852ffd2407eb85aa5ed574063700f93fb503c53c2b733a1bebc62cb890d408af75f8e4970856"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hr/thunderbird-52.2.0.tar.bz2"; + locale = "hr"; + arch = "linux-x86_64"; + sha512 = "8ed3f1c84f28a4435a3a6c9b136d4c27f6fdd3a41089b34afa04b74d5ca15cd535e179070cfdc862d3b3f5559fbafa7ae6c620f448afc8279765aa6518cdbd9c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hsb/thunderbird-52.2.0.tar.bz2"; + locale = "hsb"; + arch = "linux-x86_64"; + sha512 = "bd14c07d1c2f5b8aebbee64914db544823ab90b70cc2a4e5d9fda28e9611310a5d6a6fb0f17d07e60534e9d5082506f0ffe22b1b4da1351f5657620612add6b5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hu/thunderbird-52.2.0.tar.bz2"; + locale = "hu"; + arch = "linux-x86_64"; + sha512 = "9cb1430ef3036f4ce06d0734775e83ec09c551ce573cf3b50b5a2484f411e76ca09ae0295d6285d15e1f8a71f27c804f9dc328a4e4b534fbad34a97676ec2d7e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hy-AM/thunderbird-52.2.0.tar.bz2"; + locale = "hy-AM"; + arch = "linux-x86_64"; + sha512 = "0c1d84777286fb55c2d8d25d5f5abf5498575bd09261331cca680e1f18497dab80597e5a132618019c5d03350cc4d49f4856053b8d255f8a1d56d1029434b776"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/id/thunderbird-52.2.0.tar.bz2"; + locale = "id"; + arch = "linux-x86_64"; + sha512 = "8adfabb7885b2442c9dd8ee1128675865690bc632185da20caa894b38c388cfff34a696c4932ffaab2217dd4c742e8c35acb2e10bee39a561aa83b19cce1ad6d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/is/thunderbird-52.2.0.tar.bz2"; + locale = "is"; + arch = "linux-x86_64"; + sha512 = "b5608a993d5a2a50a38516ba346cef8aa5f173f81eda2b29c06b77e8cc8964dc174fbd9a67294a66caa366956a0ae79aaf8c0e0d612935e871174b1073647f70"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/it/thunderbird-52.2.0.tar.bz2"; + locale = "it"; + arch = "linux-x86_64"; + sha512 = "06bb846f018d1f8cc1bbda5e707b9aff31bf94ddd8a7aaa699c67f1c18ea8a4c92657587ae6c9a07571d2a6371d50e31b1000bec719aa432404924938a162274"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ja/thunderbird-52.2.0.tar.bz2"; + locale = "ja"; + arch = "linux-x86_64"; + sha512 = "9019ec44f39918796c5da7fb2b23e19918e20d5688b8e55aa986e2b8a4f2abaf6ae87149b1bbbdedd2227c3152f48e4042078c979930db5d521d3a641312599e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/kab/thunderbird-52.2.0.tar.bz2"; + locale = "kab"; + arch = "linux-x86_64"; + sha512 = "1ed0950fd1b5cf82efe2c031abbb8d34ab3a0ef93182467592a9f77610bf494ed61a2e1d0117132abd5bd0f835bdcad75bf202588097210acdfbd67a1be5caf0"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ko/thunderbird-52.2.0.tar.bz2"; + locale = "ko"; + arch = "linux-x86_64"; + sha512 = "65ae48fbc79da6e3e20f5d325d4c93b2e945a95eaffe572c83cee08cefbe6718bd202c7e54095ef74d3069148b58aea1d2b0b795e94230b4da99b9a42fb39155"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/lt/thunderbird-52.2.0.tar.bz2"; + locale = "lt"; + arch = "linux-x86_64"; + sha512 = "f8870ee532dd73a0a387c00a1295209ebb965b3e7a63abcce7f17457c38636a07334ff7f4dd99c60349e748510645487ab3761efdbde985d1f3cd9038613cd05"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nb-NO/thunderbird-52.2.0.tar.bz2"; + locale = "nb-NO"; + arch = "linux-x86_64"; + sha512 = "d4316434d0e8a824b3502bd413abe112bdb9b6da28acb39127ca83b43f8fa3f7b80bdde15758f2ca5a5013abcb374382ce79dd16ea48342fb6f6283eb242e162"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nl/thunderbird-52.2.0.tar.bz2"; + locale = "nl"; + arch = "linux-x86_64"; + sha512 = "da6c7cf68f5502ea29a1600f2040953dcd064859a9b82856ae419472ae039bff5c2b31f56c282961eb02ae0c86c8ce63131fdc4aaaa712da03d76ee05726ba0c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nn-NO/thunderbird-52.2.0.tar.bz2"; + locale = "nn-NO"; + arch = "linux-x86_64"; + sha512 = "9a5203e6f451aab318500eea9b7fcbdf70fcd22d6cf42e838926fa9fae14176f1abee875ac085823adeb40d2fd2e2992d538c34ad817b408fdae19248302aa88"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pa-IN/thunderbird-52.2.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha512 = "43e86e758f547363bfd5bb1c9c16506bbf6314354aee4265fed588fc29759d87482a86c442ba9d3e16c50477c4a5542b02a1539de8833052ee23811d61bcdba8"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pl/thunderbird-52.2.0.tar.bz2"; + locale = "pl"; + arch = "linux-x86_64"; + sha512 = "d418735505f1152a3cf1a1c2ff36d4cba4801327b1f01e3743c6411d30b7fdad7f0ae72fa78de9b356bfb712bc834c6eef46df9c251be7d18119f5da423f3ca1"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-BR/thunderbird-52.2.0.tar.bz2"; + locale = "pt-BR"; + arch = "linux-x86_64"; + sha512 = "3e33431860b0f815153845ebde36de52d8bd0c2e1828e127009b467c33710c70d38c4b9f70c5572e09778b17c30f7688f1e802e48ce7cb0a6a015d0fa1e26648"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-PT/thunderbird-52.2.0.tar.bz2"; + locale = "pt-PT"; + arch = "linux-x86_64"; + sha512 = "953143e100d3ffcb76224da98ee5ae1d98342d2806565ab048fbb6d8de65f6a02c3b6dd87aec4cecff676ff724d4790964b2e82ebbc64a3eae8beb343ebab211"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/rm/thunderbird-52.2.0.tar.bz2"; + locale = "rm"; + arch = "linux-x86_64"; + sha512 = "b5aa940b99282bd84748e47d8f51a53e250d20cf0c7b68e5f66719ae88d9c241f290b2d637fe3e711948f9a6c6df8304cf9514599d73e387eb268a1c8f8c8397"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ro/thunderbird-52.2.0.tar.bz2"; + locale = "ro"; + arch = "linux-x86_64"; + sha512 = "26dc1b0c57b468ba815154b035c3fe382051b638bdc673db69a88c879a8524f55a24626c655026cb67c2688a29b6c946e2b495cd7dec4f16d8fbba21d5a493bb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ru/thunderbird-52.2.0.tar.bz2"; + locale = "ru"; + arch = "linux-x86_64"; + sha512 = "5d17e85ec3eeac8ea3916f0dc71be7560bb1c4877c505a1f29421a9d496d8aafe48b9236c225f1de48a4dffbc9ed536f91dffed7d6c823480ef1e0c5b6e400be"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/si/thunderbird-52.2.0.tar.bz2"; + locale = "si"; + arch = "linux-x86_64"; + sha512 = "d4599a3814173d8bce2f24b6b015492d7b24547d4e53d17cad45cc9c01c8b65be3447f8b89ab8ef2f573140ef7e1aae7eef7943102e21611525abc6efcd02694"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sk/thunderbird-52.2.0.tar.bz2"; + locale = "sk"; + arch = "linux-x86_64"; + sha512 = "a990104e68df9c2bf833c821eefdc1cbefc16f6e782bb8202683261f395f33c419afb967119ced710dc08966978043731c1adcf16dc716ff6eac8275b03f1834"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sl/thunderbird-52.2.0.tar.bz2"; + locale = "sl"; + arch = "linux-x86_64"; + sha512 = "2fab7f52ceebee1895e520c6d185bbb92793a31c52ed2398731c0cf36e3888a58d945d92f5777fc87a0a55b96418406a0be15cdd95b0f54482e821ea1cf29ced"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sq/thunderbird-52.2.0.tar.bz2"; + locale = "sq"; + arch = "linux-x86_64"; + sha512 = "f201861a30f993306378043ecab288970c4a311a91a3d232cdfe9a4d9339052f026ceb35bc6dbc2bb452f58faa5e3eccd273b87e96af5cfcf292dfcf94612077"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sr/thunderbird-52.2.0.tar.bz2"; + locale = "sr"; + arch = "linux-x86_64"; + sha512 = "6f8962d8c30086434764f0d037801bfefeef13c67e46f2b639bc4f5a93ac0094630af375bffcc54574d50ecd8c7b5c5decdd9e2083666dc4394e6237fac0b746"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sv-SE/thunderbird-52.2.0.tar.bz2"; + locale = "sv-SE"; + arch = "linux-x86_64"; + sha512 = "b29f506138f62350717ba2d2881cf8852dbef0c9797da64b9d5d9affa884cd1057483e2d0e357e967d9567ff4e861d1ad79596b39aa02a36087041e1f94d9d67"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ta-LK/thunderbird-52.2.0.tar.bz2"; + locale = "ta-LK"; + arch = "linux-x86_64"; + sha512 = "3bc50fdc95776aeca2de94fa1b895d5a17cedafb95aa08f2d0100fbb4c3acd31990b96a57fad451c82b56d8cab7ea5066642da7b000857f00ba8f0bf94051f5a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/tr/thunderbird-52.2.0.tar.bz2"; + locale = "tr"; + arch = "linux-x86_64"; + sha512 = "8e1481a03ba5de00bc64aa252f779dc0ceb14c238985d11bb49467a719ca88bc4e7946086b039951f03ed43e11a15a5bbe98139d158f63dc3cdbf01686ec91e2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/uk/thunderbird-52.2.0.tar.bz2"; + locale = "uk"; + arch = "linux-x86_64"; + sha512 = "e9bfce635b1d56d646baf06bc642a7914846a6a796e983c4b0f78b912833ccee850719f0857ceb7199d328415a976b436706d72c95f01da1d0d0b4c0c5d0d732"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/vi/thunderbird-52.2.0.tar.bz2"; + locale = "vi"; + arch = "linux-x86_64"; + sha512 = "ea989bcf275162c8d72ad595bee767b9652f192ac18f61119cae8f084f9a25c0d0a83caa14cbbf901fa675f1a0c0a6b40ef46454f9c8f1fc3d5173a0ef1397be"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-CN/thunderbird-52.2.0.tar.bz2"; + locale = "zh-CN"; + arch = "linux-x86_64"; + sha512 = "35637dedad6da1662057fc1506b2e21bc6269eb0256e332ff6b12bcdb71906e28dc0f361bd7aded2fa52d982589f0e319667acb7ccd405e2fbfa8ba991e5aeb2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-TW/thunderbird-52.2.0.tar.bz2"; + locale = "zh-TW"; + arch = "linux-x86_64"; + sha512 = "286ed00a024029f7e6ce30709cac3da3d6bf00576248622a09bd9ce1ae2e965a0fe158d718d35f1e088f51ac4e271d57aaa98446c87c0bdcdecfa0d36d988e92"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ar/thunderbird-52.2.0.tar.bz2"; + locale = "ar"; + arch = "linux-i686"; + sha512 = "8783d0cfba31ead11e49bf1a8afb5b66b1387b29681acf3c63217ba4a399a6fe496eb0357e0871c98e8b6465abc6539e6ccbd9d40e799e04674f3ab2dee25390"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ast/thunderbird-52.2.0.tar.bz2"; + locale = "ast"; + arch = "linux-i686"; + sha512 = "213f0457760072fd2e6cd2daa56677d8b67b8c345f44faebb2623f073ecf141ba4d30d2176fd5680efe91e46086b4add86462385fe5b9e72978cf2828eb8ed68"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/be/thunderbird-52.2.0.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha512 = "645d7eceac4d98ab37b8c85c2d0c58499bdba1c8db495690bc665c80b5aae414b0a8caad16931a74768137812f3ba8ce173f5080e95bd44e95e51d6f544cbf03"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bg/thunderbird-52.2.0.tar.bz2"; + locale = "bg"; + arch = "linux-i686"; + sha512 = "b9030a61e8d964dd18362e472d18d7a9d6a7636679c016bca82b254b06e221c6551aebb166f829977fb4f0d1809b18b820cb1d842e6949f44dd4e5becbf98651"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bn-BD/thunderbird-52.2.0.tar.bz2"; + locale = "bn-BD"; + arch = "linux-i686"; + sha512 = "fcf50581bb2f1548f4aab01b8f7a89e351e642a49ca76e05fc47d77b9e2459f2ff700501079180b92120727ab2ba74c3c6990fc7d6d9018b9ee4ec1d27c42aaf"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/br/thunderbird-52.2.0.tar.bz2"; + locale = "br"; + arch = "linux-i686"; + sha512 = "5359fa3b6f745db0da286a0180773d3fd43c446c78d8351cc0c5589ade332fec5ccb6106a84ed3bc96e34ec7ca2d72f93c22f6653aa39250df05b0e39108fa89"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ca/thunderbird-52.2.0.tar.bz2"; + locale = "ca"; + arch = "linux-i686"; + sha512 = "e5d6d77ad204d279abcd34b9734ef5489d5b8522558af7cfb26de77fc0d22a5ce669dd6ff9fce7046745aa9ef75323fadaa70ad3ca4fa0f05aad85add6c1e7fd"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cs/thunderbird-52.2.0.tar.bz2"; + locale = "cs"; + arch = "linux-i686"; + sha512 = "4bee0154e7f1658ea88c7cf7cb5d89e354d29516c727090bd704945ecb2c0988551e98de2c8b44d5899e44ae141a6e3c230550392d34b5dac121cd1c4d6ce994"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cy/thunderbird-52.2.0.tar.bz2"; + locale = "cy"; + arch = "linux-i686"; + sha512 = "23779727198092d4d8e7ed1d40615b020858999ae5023ebf81553dfdc62b7cc03cf864eae262450d75d6088f6b283ef7f791073901f5fda367df96e291e9537f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/da/thunderbird-52.2.0.tar.bz2"; + locale = "da"; + arch = "linux-i686"; + sha512 = "e780597823f156e273832ff731adb2cb39a58e6e232d910f9f0a3b05dee68411ee3e8345462137d74a8aa2a6dd0c3d5e93bb889bd425c051ed7befcd4da5c711"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/de/thunderbird-52.2.0.tar.bz2"; + locale = "de"; + arch = "linux-i686"; + sha512 = "1c35b4aab4bb27569955f3c29034e8c301c32d24547075c4662e162bfe1c19feb602b3fcc3c561956651328fa33605f60ed29ae52b50b06eecf39e43e82663e6"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/dsb/thunderbird-52.2.0.tar.bz2"; + locale = "dsb"; + arch = "linux-i686"; + sha512 = "59fb994bd8b2db74ae5024e8c2f6c859b93afd247a159c552bffe8c2337a0d4229bd17433635f8c87420af614c7725af7b0ecd144938654f9372fe6d39a4152c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/el/thunderbird-52.2.0.tar.bz2"; + locale = "el"; + arch = "linux-i686"; + sha512 = "87e43e3c66db44c6c1d659eff81b72bae4d6961045c37ce776531ab6e4f4a3e6c8d3774f39fd437e5ca4cc289bbae25fae8dbf8ed3e21aa2327cc166d4f17f47"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-GB/thunderbird-52.2.0.tar.bz2"; + locale = "en-GB"; + arch = "linux-i686"; + sha512 = "b397fb3142c0693282405d9e6d4515f368b3c6aba581e6eb0712c3d161f8fc9dbe034a913a67ea034dd89860b32072f82dbf2b767bd0c360f3bc9c0c8944d045"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-US/thunderbird-52.2.0.tar.bz2"; + locale = "en-US"; + arch = "linux-i686"; + sha512 = "05926a74f6ecef5caa43884a3fa2cdf85f40c53da58ffa24cdd2c8c31efd1b3e90a0d06ddba33d612a3b88f31d4c72fe92f49e31b4f3ba3479c510a02d91eb33"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-AR/thunderbird-52.2.0.tar.bz2"; + locale = "es-AR"; + arch = "linux-i686"; + sha512 = "4652c005c0c28760d1a2657b691b13fcf7882763cff4ff05313d1dc5786661e76ca74a4fa23e1e71e4315818c9c2a386407151a996fab4d2f3bf343a353038db"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-ES/thunderbird-52.2.0.tar.bz2"; + locale = "es-ES"; + arch = "linux-i686"; + sha512 = "64e8eedb59df8ebc5a568aa05d0df5217a3c91311455a090b4614dddbb2bd0d09add02e11c712b84696f3d203bb5503959dee9ec8e0aee7ba5d0ef2e606942a4"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/et/thunderbird-52.2.0.tar.bz2"; + locale = "et"; + arch = "linux-i686"; + sha512 = "2773894ea50cb0bc889ad1cd887bd7c34d594a19ae69fe48cc181d5bb31a9a15bf6e0e41fa1493ff86e481715e888d35db5b100b22516b187cbbb4e35f36fdbb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/eu/thunderbird-52.2.0.tar.bz2"; + locale = "eu"; + arch = "linux-i686"; + sha512 = "8a73144e9085f4f07db7d24da388808ebe94b4cbd2c3cb1f327ed0c44a3144c94fd61171b74c18c3e4ee72fd809791a8c942adc0a4b3bcaebaa2f02dbf26d572"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fi/thunderbird-52.2.0.tar.bz2"; + locale = "fi"; + arch = "linux-i686"; + sha512 = "ba53c735c136901bbcfebff6fa646d884aaeb919a77744c1ec412a109f39853b2d74d70a56f85e4bdc3b7780475283284c46b0db79c64980a7655eb8f0bbe0f6"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fr/thunderbird-52.2.0.tar.bz2"; + locale = "fr"; + arch = "linux-i686"; + sha512 = "fe93f41bbf357eb1b60c0418dd64afbb37310ec25aeb66521472f84eebc6205d87d19090df6f38de3d9fee29f7f961e68e9794a65f51a0fcd103a40a16a919fa"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fy-NL/thunderbird-52.2.0.tar.bz2"; + locale = "fy-NL"; + arch = "linux-i686"; + sha512 = "1739f96789414049ebb5a8fa47f0455a630bdfbc9757fd96f81a8fe0fbf6c0b522bdf04a315b590c968d1832ee2faa2bdd98fa4ef6e86cd8ab2d0a338e8a47f2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ga-IE/thunderbird-52.2.0.tar.bz2"; + locale = "ga-IE"; + arch = "linux-i686"; + sha512 = "b42fb3d2cb8ba5be74d3f4212aa80fbf2af0366bdd9eceba69555eb766f0a96c1a8092a3b1e39c0ddc8bae7cc7efb59f56806f90c0de95d3073db15e3d894a20"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gd/thunderbird-52.2.0.tar.bz2"; + locale = "gd"; + arch = "linux-i686"; + sha512 = "0921d25bd235d2a234c75f24297ef38568d0532fbe1dbfe98f2b9ca3641ea95db6c4df0dba3f8a8313a2fd169d2d86f7adab21db795a96f68fa566117db2c2e9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gl/thunderbird-52.2.0.tar.bz2"; + locale = "gl"; + arch = "linux-i686"; + sha512 = "7fe9346fcb26a7d4a96cb6cd2d804874bdf2f3f89c9b9791742f9a2a03a7a865fc20766f8618c04e7d7fbe1fcf0fc907b4db5834770218f4e1fbe8d8df37e94f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/he/thunderbird-52.2.0.tar.bz2"; + locale = "he"; + arch = "linux-i686"; + sha512 = "7082a591a52e8a0e7bf112dec08dc3e130791eebee6e7d39baf052f40b8b9fbc350518b7785f3bf7ec62df8dbe05a256fa322714ba7a4f704a9cddf40cd4b11c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hr/thunderbird-52.2.0.tar.bz2"; + locale = "hr"; + arch = "linux-i686"; + sha512 = "397a1214ab27b187df6129f6f2f863ec1b76ce2af41c0ef5650f255451c57f07741f6a7d0674ad38432c7ea9c95fc2b36606d31defc698fffa4b676549b2c197"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hsb/thunderbird-52.2.0.tar.bz2"; + locale = "hsb"; + arch = "linux-i686"; + sha512 = "f0c76d90ae2b47e8d5c66a536ee1b2572f60164f76424b61b491326e719f4454448a9af4b6ceb8e1055f7e44adb6490a0fc4df086c344d160861d877766e227f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hu/thunderbird-52.2.0.tar.bz2"; + locale = "hu"; + arch = "linux-i686"; + sha512 = "d26eb645574d9298c75bd334371fc7a4baaa9b358b37c5d8da6e61b6d8fdf3fe165a5ea1855a840a742c6b19e3a15fbe7879e43bb29b187daffa63c59a863e06"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hy-AM/thunderbird-52.2.0.tar.bz2"; + locale = "hy-AM"; + arch = "linux-i686"; + sha512 = "add66a00fd3a8be7c71276d02588ffafd0ed0a8b2e4875dab3b82e4fe9b2be3964096509ce6b0e67350f62cc814b7c7ed069f481516f72f19a8039967123346a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/id/thunderbird-52.2.0.tar.bz2"; + locale = "id"; + arch = "linux-i686"; + sha512 = "b793e65e9e9f8d30ad0193f019acf33bfbfb165313a960f120bfabeb4df0c769cc9fc5b7e34ea05eaa085a5c0872134d606862b381852d04748c2e97ed1bf9f7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/is/thunderbird-52.2.0.tar.bz2"; + locale = "is"; + arch = "linux-i686"; + sha512 = "d4f163358a2c8830e3a77a5a82b8ee42d2aff39f19fb95171a249d1cde5119c66ee29bc894f5e6ea023c34e030282194025b25c04af25f647df8745d2b8aa2b9"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/it/thunderbird-52.2.0.tar.bz2"; + locale = "it"; + arch = "linux-i686"; + sha512 = "9e73d51cfac30480fe0ef46c02df12c771fdd827bf4c2971b99cad7b3db42d3d60a2355c20c0b3601c7d27be5b9c2d1748a1e3b8954523ef919d120429153103"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ja/thunderbird-52.2.0.tar.bz2"; + locale = "ja"; + arch = "linux-i686"; + sha512 = "ce3d8342c0fc63a9c6ab10a2d15f6ef79d8d827cbf542cf0eead9d01d1a26567edb48269ba2ed66dcf81bf83e35a120190614f740898181a3b2cd7fcbfd5e739"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/kab/thunderbird-52.2.0.tar.bz2"; + locale = "kab"; + arch = "linux-i686"; + sha512 = "9ef94353b58ade84737debbd58a26aca9b8c5358c3fb852f2dd925e9c8eec46f091d4edeb0a4fe46da45eb9860ab76f43a97605085907fa79d2ba90751ea64e7"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ko/thunderbird-52.2.0.tar.bz2"; + locale = "ko"; + arch = "linux-i686"; + sha512 = "651ab9ae9b966e10f420802937140a689a3c925a67732cc3082e8f265d2f98fe88195188632386d64f892338b1c4ba659c7e475951810d5b6ee48a7339155413"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/lt/thunderbird-52.2.0.tar.bz2"; + locale = "lt"; + arch = "linux-i686"; + sha512 = "f64c0869033ac939538f982ff66b0a88cb566e7000838e549d63fa6509afe8a29865fce3cb6c7fea84c78b5ffd07a4f8b11b44b14c234ae957f22439f7a84a99"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nb-NO/thunderbird-52.2.0.tar.bz2"; + locale = "nb-NO"; + arch = "linux-i686"; + sha512 = "9dbd31177470ba94a646d7d63890dcc2465681a4c6fc684f7cbe61eeebc788c03a863ed5a01a1baeb26ffa61d7af4631bebd74261c22ee1a109ceaf928ce4925"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nl/thunderbird-52.2.0.tar.bz2"; + locale = "nl"; + arch = "linux-i686"; + sha512 = "3616bce4895db1c2f3b02773b05586bf6e38550ad7abd5beb3b31a6c5b414120972b5475c080bed782e7f2b09fe47bde3e5b41f4c3fdb7ffd823767c976dca0a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nn-NO/thunderbird-52.2.0.tar.bz2"; + locale = "nn-NO"; + arch = "linux-i686"; + sha512 = "4ec009d5aca053ffbbb6cd5c84572f0305f22f33cd24eec13eb3fd04aa4eccd3447701edb53e4929914ebd2f7acc8e3d7f8e5d91c9e7a7f0b9e9c18493f74d55"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pa-IN/thunderbird-52.2.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha512 = "584c5cf7fc62f4f6435d9ed2ba9aa200012aa65e7fcd249aae10dc2b3dde8b4db724b11beb206a727f3eb2f60e4a8c0e5e1abbd4e621645d651cba449bc4a474"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pl/thunderbird-52.2.0.tar.bz2"; + locale = "pl"; + arch = "linux-i686"; + sha512 = "aa02a2910513159c2621dc17aff373a8c2124bf9aebb24bf54c239d823d0080a1c05c330185af5dce21084d7ac9060a2b8daf890a3227650416d82afd0fa8e9a"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-BR/thunderbird-52.2.0.tar.bz2"; + locale = "pt-BR"; + arch = "linux-i686"; + sha512 = "b5b2654bf153bd7f7c85534b95f836892550e519e254312584b22981bcdf7205f31babb5cf32033f7d676eee2bf2400f88503b52268f2ef10286da82b2713704"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-PT/thunderbird-52.2.0.tar.bz2"; + locale = "pt-PT"; + arch = "linux-i686"; + sha512 = "3d557b432531a757bad6f18754b9d2fb2359bdba49f20faf797f7eba821926aeb8476c89a93b475273514bf26a6f471637505c5eb8a1cc08d1cf830b28b21fca"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/rm/thunderbird-52.2.0.tar.bz2"; + locale = "rm"; + arch = "linux-i686"; + sha512 = "434122ff7524630ec45a7e6a0e5f90e74ea1397b31bf67ce9e3046f8a31114a8320e56a5dedf1686e2eebc8c648e4a94fd0cdbe523bdcd6312448100d548e302"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ro/thunderbird-52.2.0.tar.bz2"; + locale = "ro"; + arch = "linux-i686"; + sha512 = "6f2c74d119ad7380961c50d5bb91afd4bb9455737776a08eb5168c17e83143fefacfeaa3b98e1816d1fe96a7f2022256cd2acf7b697508e4139d792562be2176"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ru/thunderbird-52.2.0.tar.bz2"; + locale = "ru"; + arch = "linux-i686"; + sha512 = "d9eff15876619a1bf0b8467847df18b0dba20c598e05428037b81e0cd90797b8baafc44541fed2a29dfb27075da19730919159495712099a54c9b488a693e3ca"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/si/thunderbird-52.2.0.tar.bz2"; + locale = "si"; + arch = "linux-i686"; + sha512 = "a2e58a6b2632f8c2f6eaf6113e2af9e98ea222c5d2c98f0cfb4443804ce260bb3dba64bd5165590563fa946b500bbaed4341629eb25ea0c5388c61c69f4be5cf"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sk/thunderbird-52.2.0.tar.bz2"; + locale = "sk"; + arch = "linux-i686"; + sha512 = "0b26b3848864def3a5b485c2d67d3c907b58d9977ae91db58d91218da278243c04eeac781fe0063b762d0797809dcbee18010824aa5d25926f8f48011e2a5bb4"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sl/thunderbird-52.2.0.tar.bz2"; + locale = "sl"; + arch = "linux-i686"; + sha512 = "7158c776ec3776ac269402973482e2dfedb3c17aeac11fcae3bee6a982717443068223cc901ee71e6b7a42a8073f05d2a54047804997d992761fbe71d46bd223"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sq/thunderbird-52.2.0.tar.bz2"; + locale = "sq"; + arch = "linux-i686"; + sha512 = "1a838db31f4db574669987614dfcbd5f7f1eb061dc4f2fd0c9ca206d5a5291ac348efce3ce59b30f89fdc375e72467531d9d96b8ce43ffe28e92916f2864908c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sr/thunderbird-52.2.0.tar.bz2"; + locale = "sr"; + arch = "linux-i686"; + sha512 = "beb9eee26aa5474ac5e70c168e2ee32c84216d919528c9edce4d45ab6c522d5fc888ba2f8c57cfcd47d299367ddb7c367dafc9ccd3d29c5700de28eb2efe08fe"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sv-SE/thunderbird-52.2.0.tar.bz2"; + locale = "sv-SE"; + arch = "linux-i686"; + sha512 = "e4c2320e547b2e61991feb586b7f9e4180cbeb88dc90cd0dfd2c026b062e4e1858d1d1b331cfde1e373cacec2231f7cb2ba61b5e4ef02a36802edbc96b39cf72"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ta-LK/thunderbird-52.2.0.tar.bz2"; + locale = "ta-LK"; + arch = "linux-i686"; + sha512 = "aa42add8ba31edb5a40fd62304f10ac55006918d5196f71ca0330c3ca52dbbf4d9b5d39a07e977ee89c6b913e6ac4d4a4c9460da194b41760826d96e89e7bffb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/tr/thunderbird-52.2.0.tar.bz2"; + locale = "tr"; + arch = "linux-i686"; + sha512 = "ceb90e08e906d5a2520152c40c4e32ab85da31c746ea285280b6e9bfbd60e9178886799357f39d54e0e072c616059ae7fe1948c39f6152b5f0d1b196185c8475"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/uk/thunderbird-52.2.0.tar.bz2"; + locale = "uk"; + arch = "linux-i686"; + sha512 = "9d9fc486d556dbe3a216a3d4e822750cfa1cd0348af37ddaa5a19f9c390170e348a41b8251fff1499d2dc6d92feb34061286ff5400a4f9b6ed4fdee27064078c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/vi/thunderbird-52.2.0.tar.bz2"; + locale = "vi"; + arch = "linux-i686"; + sha512 = "010bc7ce4ee4329857291796e2077e0872593f2b52799b1524720fa7fca11f2f4b760610bc97db171421552eb59a36725f80d4852cd77d30c8e7eb6c6c523d2d"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-CN/thunderbird-52.2.0.tar.bz2"; + locale = "zh-CN"; + arch = "linux-i686"; + sha512 = "c07d2559296acb160c19af2db9f516254d33e1d55c78b2397d2c28764a8296e3da0b74409d48702e889bbf34f06115b493bbcea2666ad8b4884ea01fed6ad12f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-TW/thunderbird-52.2.0.tar.bz2"; + locale = "zh-TW"; + arch = "linux-i686"; + sha512 = "8fa1da0c35584cfb8013df9e86a37268e6ffed1ee5ba4617d3db185975b874af5dba3f3af5498b8ebfdf85e40409fb9fee8d517f84f4942cf69deaa94f3c64a1"; + } + ]; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix deleted file mode 100644 index 78084753974..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ /dev/null @@ -1,595 +0,0 @@ -{ - version = "52.1.1"; - sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ar/thunderbird-52.1.1.tar.bz2"; - locale = "ar"; - arch = "linux-x86_64"; - sha512 = "41e7b02fa088054e59d68abf636b376837519502273ff9e25ba18d220e8e35927db2a7795354f997ba0f980f33a74338128999666dc0ea730babb4cb3077c17f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ast/thunderbird-52.1.1.tar.bz2"; - locale = "ast"; - arch = "linux-x86_64"; - sha512 = "772e90be4cd4d10c1fc98df69d20509c954feb29c64a801d907f4944c429844d375ec241b8c45fdac375cfaeec3adfe7db81c2fd10e592cceb066b6c23c2c2e8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/be/thunderbird-52.1.1.tar.bz2"; - locale = "be"; - arch = "linux-x86_64"; - sha512 = "76832c00106c68a9b48c4892a11f7b48384d7934e7cf410eb2d7891f79303af29a2a94a3ac377bcda36a0894baf9c3768cfc62c3ebef0c640291c1b70d23e55a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bg/thunderbird-52.1.1.tar.bz2"; - locale = "bg"; - arch = "linux-x86_64"; - sha512 = "a8776f1bb3c3d1c34b0a1d538cd70cfefb283031f372d0c7b1bc8bfe9dc39f240c746525a8a52968e060024282642a634488d7a8b30509b830232a63b3111fa9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bn-BD/thunderbird-52.1.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-x86_64"; - sha512 = "e0596b70e52733a01f7cbc073f444b5798e7beeed42effcb329fffe8a74de25fd69636624ef74f0bc31aa27a078a6a5c763f203eb3fdc275f59c3eccf49e0cc5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/br/thunderbird-52.1.1.tar.bz2"; - locale = "br"; - arch = "linux-x86_64"; - sha512 = "12269d34c5ea1836f8fc12f7c163b966ee57afacf8bab7a010fd1ce2315193a8dbbba201fa474c9dd2e642f418ffb64eef608eaa37a5991168faaceda818aa49"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ca/thunderbird-52.1.1.tar.bz2"; - locale = "ca"; - arch = "linux-x86_64"; - sha512 = "42180ce29e1e53aa08c22d71902cb792ffd212c42c7a3632d069907d7dfa1571d0beb16141ab5b91af9f637d10278a5f5f5a2bd56146ea848b7f88010655cb92"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cs/thunderbird-52.1.1.tar.bz2"; - locale = "cs"; - arch = "linux-x86_64"; - sha512 = "63e4c8ba853a1289e977ffc27627e69f4509addbf9dcc294be3a49ed7030eb56181cdc6630e6dc3d207d50e2060ef80d5aeb3aa58c3ff95890ad54f0b88a8fea"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cy/thunderbird-52.1.1.tar.bz2"; - locale = "cy"; - arch = "linux-x86_64"; - sha512 = "30110d9db650afb9b0d47efa25006f03b4a9d9863f7fd37a49d49cfc4f2d8b7735a27676d36c84ef390d8358e0069d4708e6ef9eceeb12a38d226f917c4a2c19"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/da/thunderbird-52.1.1.tar.bz2"; - locale = "da"; - arch = "linux-x86_64"; - sha512 = "1b0d6727f72cb8547f6b09c78d9375a63121d73959666e9500c01aa72253e923bc8f85f7a7738d9a0426c9a9e85bacfde3ad3e35b3101ae0af2c132841c60fa2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/de/thunderbird-52.1.1.tar.bz2"; - locale = "de"; - arch = "linux-x86_64"; - sha512 = "4e9c924cd763c15627494f9f247c76ad69fa719e1fec0aae1650949d0e13abdf7d4bdb86bf53cba0db7a124e97f8bb66895c00bbded00f324f8de06c9d1e9b55"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/dsb/thunderbird-52.1.1.tar.bz2"; - locale = "dsb"; - arch = "linux-x86_64"; - sha512 = "b1b5fd7176a5743cb7064cfb9c74c78eb29873978551a6afd6c80bde92744d9793e53ff4bfca2af1bd06f9285305774d7be0d72d6fdd9ec38dd05e0c58fd537a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/el/thunderbird-52.1.1.tar.bz2"; - locale = "el"; - arch = "linux-x86_64"; - sha512 = "f85bc8f35b59176c69e7dc8cfcd7dbbe649c54487d453e56f35c414ce98548127cdf973db7739f7481dca6476c0f9cc54cd42576a5b05abf03ca8a2a26fff229"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-GB/thunderbird-52.1.1.tar.bz2"; - locale = "en-GB"; - arch = "linux-x86_64"; - sha512 = "95249b37205cee0a1677c8fed8199b1a9a98d80b0dfbc513321d72e2a294a84e1d82f19b8732fe30189d9c508d9ebf98be9bf5deda87ddb83134f9b1e24834a3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-US/thunderbird-52.1.1.tar.bz2"; - locale = "en-US"; - arch = "linux-x86_64"; - sha512 = "dd13cf3e5e8ca042583fd134172a4dbcbcbaf8fe923d7f2c19e1f66d2802edc9901fad3a2593e382305b97bc17ae3b1266f3c2176648f8255894749db55ac8fb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-AR/thunderbird-52.1.1.tar.bz2"; - locale = "es-AR"; - arch = "linux-x86_64"; - sha512 = "ca300f267a36f1c5251c8eb5200d93ec558cebb22736c6939581f06bb3c00a9b617188be183bcde78afc6bef2c8a579c82d0085cb8cb0b8668c4975f3bd4578c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-ES/thunderbird-52.1.1.tar.bz2"; - locale = "es-ES"; - arch = "linux-x86_64"; - sha512 = "050a9b2468db62c306ff94eca093c9bebb3b55227bda653f4355915264a73a3da4ee930f46fac27ad932e67d8b37f125b33895cc759f5aa213b8b5f432e82339"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/et/thunderbird-52.1.1.tar.bz2"; - locale = "et"; - arch = "linux-x86_64"; - sha512 = "f07a8ddb278b697396a2988208cd28059fd1449044dfdce6330a058e060113c8748607c52443349bb59ee8851e6d17626830acb99a836f4102b30ba83e96d12e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/eu/thunderbird-52.1.1.tar.bz2"; - locale = "eu"; - arch = "linux-x86_64"; - sha512 = "20d04d59df7689d515ecdfb64f118efec8964b7034e0e0bed0225e8b63c7f46228086f1d63b636eb3a549226aecc944db61e3d8fb1273ed5bf669f538f56017f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fi/thunderbird-52.1.1.tar.bz2"; - locale = "fi"; - arch = "linux-x86_64"; - sha512 = "357ef2351d131fc4da8a4998cb3ca6147c3b2de638156d69a826d98c48d2fc8478905ba5c0a778280a2b29471f899d1851fa1cf8a7a010b0d7c7c8fcbf73f8c9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fr/thunderbird-52.1.1.tar.bz2"; - locale = "fr"; - arch = "linux-x86_64"; - sha512 = "279e46c579577643adbd671455c3053b96c97fad626392b755ebd173b4c09e46ff9f2b52a829b90850e12ebbaea2afa0520c21b5376389b80e5e4f4b09b25ed7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fy-NL/thunderbird-52.1.1.tar.bz2"; - locale = "fy-NL"; - arch = "linux-x86_64"; - sha512 = "ab4f11659e682eb78d14952ca60a1394a8cb7a982d182eaffce9a6c97cd9e6a6cdd1cfe1e278caee66a91a9fa85a28e9cb8daf06f4efc40fd36daef77b0ec2cf"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ga-IE/thunderbird-52.1.1.tar.bz2"; - locale = "ga-IE"; - arch = "linux-x86_64"; - sha512 = "31e8294c81955b1bd512c46d11659e9d95ef6e421060e37296e4e27d3a810ea3201c5ef01bec34a4161bb4e0a980063c546c4c8a2f23bbb7628dc6762857afc8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gd/thunderbird-52.1.1.tar.bz2"; - locale = "gd"; - arch = "linux-x86_64"; - sha512 = "88bf4276c8148e8e1809411706bfa3f5dbafaffee11d3a2e6cfe32e76a9c9d99c1d43aec5c9221d684ae446ec117704e501dce5790a1f16ce8c3ab6124df5bbf"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gl/thunderbird-52.1.1.tar.bz2"; - locale = "gl"; - arch = "linux-x86_64"; - sha512 = "d19ccbf5cde54e6d4d9813803c33cf4b8bfdce14611e56c364bc2bbed0c65ab6bdb06b9c81e1e22f8b17f341552ea822a61eee431da815ab2b1ce21c32aa6d77"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/he/thunderbird-52.1.1.tar.bz2"; - locale = "he"; - arch = "linux-x86_64"; - sha512 = "582654cd958b5ed3abe8a751dc085dcf47e3da92731512925144a9e7b77ac4efd05dc6414b61b63e107763f8149b9acb244913ab83014b45801da79c16d3ece4"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hr/thunderbird-52.1.1.tar.bz2"; - locale = "hr"; - arch = "linux-x86_64"; - sha512 = "61019566186e0d5c3ab8dc963472d010bff1d0ed705b2df17d3e545ebb7cb8d4caf1982cd11b530659413c5e7776b086da89df5fa52775654038eed1ba8826a1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hsb/thunderbird-52.1.1.tar.bz2"; - locale = "hsb"; - arch = "linux-x86_64"; - sha512 = "7b1987d86b6eb4d620b6989f3b40583db56653be1c9bba9ac7d2a3132267790fadfaa4c34755c8c0df2a0fdfae15f6b8e70fa81dee9fd3885699ab67518a2958"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hu/thunderbird-52.1.1.tar.bz2"; - locale = "hu"; - arch = "linux-x86_64"; - sha512 = "89b902b9bc281db85ba11904dd1b422a65ffaadcb41d933ebd5fcd7b7b3f97c2d050a8fdb78a6da88b29b47f0f7643511e90a4af133e528c38f63db326d13e86"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hy-AM/thunderbird-52.1.1.tar.bz2"; - locale = "hy-AM"; - arch = "linux-x86_64"; - sha512 = "0afb1d38f1e4ceec5ec0a9d28ea9ca41558d3cec0d1ad04691e11901996d875a2d7508440c6870264c05b12f3776b2d705470cbef83cb11a68c19ae923b75763"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/id/thunderbird-52.1.1.tar.bz2"; - locale = "id"; - arch = "linux-x86_64"; - sha512 = "34dd65c256900d0ad08db33272adc1761c190fc429de0e62d791f4160c241d9950d42efa03cd4e3aaa4ae5627b48ad2c9f0f0ad865f0d26233379d3b9a4e9f26"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/is/thunderbird-52.1.1.tar.bz2"; - locale = "is"; - arch = "linux-x86_64"; - sha512 = "1b651359c2ccf8249fa2ed951e69bc2d16bdef08db6d103dd5110305ec497cce4452d2764c814068c968bfdfe75bfaeea0d119f8457ba1d72c881097c22fd143"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/it/thunderbird-52.1.1.tar.bz2"; - locale = "it"; - arch = "linux-x86_64"; - sha512 = "15aaeacb1a0ab38297a179007039fb3fa5825618eae5e5d650f041bf5311e8f244dc0ef53d99b9513fc8e17b4f1d0a731cc06f08223b42d222be5e8f56b2a651"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ja/thunderbird-52.1.1.tar.bz2"; - locale = "ja"; - arch = "linux-x86_64"; - sha512 = "ab3fc3d0cf7be8e463c5e8f25ccac1cde2df9be15277bb81f253af15a0de53935cd5c53b8435e7ef5369cc43739b6e2fb8424bb2d7e1b153201b50a8385d1763"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/kab/thunderbird-52.1.1.tar.bz2"; - locale = "kab"; - arch = "linux-x86_64"; - sha512 = "60f2a58444b06ec8f7bd98ccada16b33b0e528bc59b73d33df370cd44283b2b0e65160aa1b5ab9cd0a7f7c628056e3bef4d7c293814837b6a7df17dd057b8ec8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ko/thunderbird-52.1.1.tar.bz2"; - locale = "ko"; - arch = "linux-x86_64"; - sha512 = "de7fedb8b379f54488c5ef6927c53e0c3651f08cb33b97a06359fa9c5a31b0d4a7717df8d493236b7e6cfcc5173d1faa3f07e938b65322ad6847f59c4061597e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/lt/thunderbird-52.1.1.tar.bz2"; - locale = "lt"; - arch = "linux-x86_64"; - sha512 = "9c4c9969a851509dbddf3fbf0118067b29f679b2e13c15f507579f232a311941c1345636714c94151323bfe726f760ab507def1dfd3a4a4053c60d533a3a2abe"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nb-NO/thunderbird-52.1.1.tar.bz2"; - locale = "nb-NO"; - arch = "linux-x86_64"; - sha512 = "61f6e4a840b8cbcb9b0706f121c93798924302184ecc92e4f6b4489178ae3d6962d6ecee52feee21fd4d89c5da7f349b383b5bef6f0b961e6e15a10f6dd5f2e8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nl/thunderbird-52.1.1.tar.bz2"; - locale = "nl"; - arch = "linux-x86_64"; - sha512 = "4de0257fa93e7450442cafcb3cb328928687b974303d3df9c4c37db843bc3379716a7c7058400dc11f25b632266f1f4f740de4c4ae099d6f88d810673856d562"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nn-NO/thunderbird-52.1.1.tar.bz2"; - locale = "nn-NO"; - arch = "linux-x86_64"; - sha512 = "ff6152e088e8f94f60c31b172502207609a9b0908057f8343177e9b7c6a079dd2c503928debeb2c133a77edd6ebac5f691a2078f54d572c2479f60327ba580d0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pa-IN/thunderbird-52.1.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha512 = "9a7876869b412efc3463eb2d161f4655804f740bbae0aee075d0f7e1466de6fbed21545bcfb93c5f03fcb837d3459a40882f4fceafae137f8aa4d3841010feeb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pl/thunderbird-52.1.1.tar.bz2"; - locale = "pl"; - arch = "linux-x86_64"; - sha512 = "9f897729f752126cf676a05672aaa35c620d025ca74ef8c611948b2b19e9239d39090a2983bf9568f796d0a20acba4fccd262ed04433c564791c5ef837955425"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-BR/thunderbird-52.1.1.tar.bz2"; - locale = "pt-BR"; - arch = "linux-x86_64"; - sha512 = "fba636db2837ee9835a35bc36af874e50b113be1edd123a74c9d71080b25be761500b8aeed7605f589cd06328d67659cb25fa25959e49c017a4c63a27be3df6f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-PT/thunderbird-52.1.1.tar.bz2"; - locale = "pt-PT"; - arch = "linux-x86_64"; - sha512 = "0ec0668509a19f52432c0de6450d14b20be01e0a26eedb316e63b33f44a001c3ff82c3b553ef51c9de740a164ad33ca25f9b4b2d64b792e89ed803b9d68d11fa"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/rm/thunderbird-52.1.1.tar.bz2"; - locale = "rm"; - arch = "linux-x86_64"; - sha512 = "fc75870ecccb5cac6533887e96a3be0b44a07b638b96c5993c7d6ede1cf0e501172ab83c85b2e5978d6818086c4e7802ae133da96a8331846456c184f3dfa34a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ro/thunderbird-52.1.1.tar.bz2"; - locale = "ro"; - arch = "linux-x86_64"; - sha512 = "bbb3f37e6559599022f3ac5aafb62ba9e62b67ee5165eb4aad2fb29e722206b7ddd0e4bfa1e5cf57453e0fb572b3829bba3c80e4ab0b3b14c91ce4f824f5150f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ru/thunderbird-52.1.1.tar.bz2"; - locale = "ru"; - arch = "linux-x86_64"; - sha512 = "f93506805c0d45f19a7b17f3eb82a6f8ce6beec11e4fd6ea09888bacbb90f258cfa15bf35a6b5868ce496491b1dd62cf12ad4877576f4b00117f169065061555"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/si/thunderbird-52.1.1.tar.bz2"; - locale = "si"; - arch = "linux-x86_64"; - sha512 = "09a1aa2393d95815cea16ecdc4a2abf7cc7782744e8ab39a447ee195feabf35102a7cbcc57761c1a8bab085036dea949a3ab2fc5cb3cd00cdd01047e1de0faee"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sk/thunderbird-52.1.1.tar.bz2"; - locale = "sk"; - arch = "linux-x86_64"; - sha512 = "d37c2fbc9c72b627278e8bc8073544f0a35bd175e7015f88bc037861a5513286627ca016ed643db490759d7a9b57feaa7d0bb8948545da67ac6fdb2580549e93"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sl/thunderbird-52.1.1.tar.bz2"; - locale = "sl"; - arch = "linux-x86_64"; - sha512 = "0134f110196af343e0fb3f24970caa74fa0a9f48c4c652e484bd79c2fd76f97eea86776c5b528c432ed98d24b2ce83529e7e68c3e4ff2533dd554465f24f701d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sq/thunderbird-52.1.1.tar.bz2"; - locale = "sq"; - arch = "linux-x86_64"; - sha512 = "9a85f94121e1af70e8eee2f0e56693807f881c288efbc9d4f4affe9353f0018145d2df03be74b76026dc0f51b28969cff69e19b639271df7bb34bbaeef21ffbe"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sr/thunderbird-52.1.1.tar.bz2"; - locale = "sr"; - arch = "linux-x86_64"; - sha512 = "a11ec69a7fa8f49c9fe98a53280f6e71cb4dddea4f8a5a4adcb7a95cfcaa548575b334a15ce7c06dcb6053d633a1f2bb09b77ab022a09c3987228fd5a9fce339"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sv-SE/thunderbird-52.1.1.tar.bz2"; - locale = "sv-SE"; - arch = "linux-x86_64"; - sha512 = "04215a4507f057151a9d3bbbc092e7c54a02bdf19af3e18c8042c0fdc477cf5739d3007beb4e28dd3354dae7ffc628fb601c18ad06e8898e5445c35855cdcf5f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ta-LK/thunderbird-52.1.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-x86_64"; - sha512 = "f04af1419a7175a2c15f65bcca7def7e1ef0a82d4e1f706599a8a2a731b07d7d554dfd859911836f586cb0da09c8c67452110eb8caa181e4cf1d39af39406f55"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/tr/thunderbird-52.1.1.tar.bz2"; - locale = "tr"; - arch = "linux-x86_64"; - sha512 = "44b3a06fded09732b1914ad6a373411eacd77defa23c29b1ac2d422f9f38eb3aaf5838915d96ae2400b35b6e751208f21b3f213fa92968887504187548f70431"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/uk/thunderbird-52.1.1.tar.bz2"; - locale = "uk"; - arch = "linux-x86_64"; - sha512 = "c7024c0394da23e067327f9db5cacb263ed02e5e23dfec0059a64383a331b8c9695d30f0e25b2892516e189e2a7e4796d91041e684f44a66d0d6bfd287499203"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/vi/thunderbird-52.1.1.tar.bz2"; - locale = "vi"; - arch = "linux-x86_64"; - sha512 = "d7718cbb734a11c82b4ec88e73174f34fc34819c0c398855897b7b11d811ef27c785d9588764dfd8c149adf61227ac416b8e64dac7d0a2bdfc1fefa5b980a4d2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-CN/thunderbird-52.1.1.tar.bz2"; - locale = "zh-CN"; - arch = "linux-x86_64"; - sha512 = "29b5183a5d824e6e5d4045b9e41403fb5b321ff7c05c73dd43357fe67c87fe05be26988f408788a7e0e1655f0068cbdb80311f396ba991801d0af462dade3432"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-TW/thunderbird-52.1.1.tar.bz2"; - locale = "zh-TW"; - arch = "linux-x86_64"; - sha512 = "0fa4d43ff9a1f32fdc9695075205bdd32932ef790f53e04da778309bd35f5dde56f2d51d972d8c998eee3117a287d16fe79a49435b5cdf6631fe65395bd184c7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ar/thunderbird-52.1.1.tar.bz2"; - locale = "ar"; - arch = "linux-i686"; - sha512 = "0234f231e1dbbe5776d9ea37a18e546d049470efe29eac34c2c4d05c59aaa81f509bf778b37d3865d117fbb43db17e33464090830b531ee434d7775b4020ab44"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ast/thunderbird-52.1.1.tar.bz2"; - locale = "ast"; - arch = "linux-i686"; - sha512 = "5ab2c379709ef07d82870da6259fb9354005235d485d6eed4d5a0b1d23c83903e7e6092cd49ac2439b01c5d4f1e663f121bff7a45ade72eb18d166787c4f62f5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/be/thunderbird-52.1.1.tar.bz2"; - locale = "be"; - arch = "linux-i686"; - sha512 = "69c596d711b91664031e52605c1510532f2600b3927afc4ea12a1c9332baf5b05982a09648be6b30ea42b763a18f495d8fa2274515f8088c0b2e07be60e0510e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bg/thunderbird-52.1.1.tar.bz2"; - locale = "bg"; - arch = "linux-i686"; - sha512 = "0de0dcdd70902f0f1eb8d8d361ce20383c8bec9ce9ea6ddd664876e6386075a424045478bbe6c88076085c97dc42bcf2205f6870e6b03f46dfa3872275ac195b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bn-BD/thunderbird-52.1.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-i686"; - sha512 = "73e82f771d90a4861b9b34adfe94714cab47dd2cc86b9dbad23390a2cef8c0150a654a26a05a6a0effd0efe79a3caf419fce748e35ab3c94610d42e2cb06686e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/br/thunderbird-52.1.1.tar.bz2"; - locale = "br"; - arch = "linux-i686"; - sha512 = "1abfcb8f361ccf5526f947ad8b7c497233d646913abb6fd345814355c548b4c93069a9710d27d2141c5e0045323522a6e76f9f3f53d7dff2c131ac94778545fb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ca/thunderbird-52.1.1.tar.bz2"; - locale = "ca"; - arch = "linux-i686"; - sha512 = "07a3436b009ba87180659345261de142d94500b8fb00fe21d9c48cffa43fc42f644c28bab739d420908342e28747f4f564eb46ae4e24222dea45f369a5caf3a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cs/thunderbird-52.1.1.tar.bz2"; - locale = "cs"; - arch = "linux-i686"; - sha512 = "58b90bdba30ad6626f285c73601faf30f45fefc1e670e013e7f9e6b92540647cb402ec69eb88ca00dc450801fe07589792bae6eb602ccc60479f3ee6e5104ee7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cy/thunderbird-52.1.1.tar.bz2"; - locale = "cy"; - arch = "linux-i686"; - sha512 = "d880dcce1b4dd47bb738d990886b71a858022b8ca76c67d33d8d97257e28cd4489d058526fce6b677cd6e925acdc2d04870e5ff6d84a89d82e2bc9f91469536a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/da/thunderbird-52.1.1.tar.bz2"; - locale = "da"; - arch = "linux-i686"; - sha512 = "31e26b2333544c950b69a631a4f889052c79f3411b3f55b8c02d7fa248d50409a363ab9935d57946b704b5b85819b3e30bbb8230871a582bb27b8f2c062ef1b7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/de/thunderbird-52.1.1.tar.bz2"; - locale = "de"; - arch = "linux-i686"; - sha512 = "c86681f6616d5f234f0878aa9370cca4c0fc5f38c131f2a3908d8529ab2e86e340558988c3ac5067a82edb99a3cacf316727652d181fcc0bc15ad7ecd713d11b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/dsb/thunderbird-52.1.1.tar.bz2"; - locale = "dsb"; - arch = "linux-i686"; - sha512 = "4f3b39c1023235579079a46a7d557d177c3f2e398a6e311c728ec1083952b2c67db0cdf539d8ae3abc54061d22e607c6849699008b76e9b01569d12d6600feee"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/el/thunderbird-52.1.1.tar.bz2"; - locale = "el"; - arch = "linux-i686"; - sha512 = "623205d1e326a0310c54a9c14e469fdbe156e538c2a09a770c872be8214611743b6d354b5a7b106db5105b8b278540d7f623c6fc56bc1fd450333ec774ded706"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-GB/thunderbird-52.1.1.tar.bz2"; - locale = "en-GB"; - arch = "linux-i686"; - sha512 = "b38b9e6350edd11e58c644ebe4c11aa6bfeba7e7aa6fdf40f9b9a4cb5845f5a2895b82ebf717ca78138a0f11cdc2f6f5aefe5636acbcff857ba99d27e258b824"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-US/thunderbird-52.1.1.tar.bz2"; - locale = "en-US"; - arch = "linux-i686"; - sha512 = "192f42fe4c7b9689743ec16191ef8576a19699812cfc4984e4b559fd847ab92c1dc002cbbdbb2212fb547fc9bfd77b4f58639d219ccc1ed86290b61f9effebf0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-AR/thunderbird-52.1.1.tar.bz2"; - locale = "es-AR"; - arch = "linux-i686"; - sha512 = "2022d12dd755e6583b3ccb068ffc53b91308702cff57f57ed455aee7299f8a7d4e614e600acc80be9da0e9df8e86c273b6cc7e99b94c5194420be367d5f12497"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-ES/thunderbird-52.1.1.tar.bz2"; - locale = "es-ES"; - arch = "linux-i686"; - sha512 = "058004f7a94b55a393d626869d7b7690d17fa5b51b0466d83c029c65ef3a49d9efdfc0df2c2110865282972b23fbd22a68f81785d098cbe3ba6c39c81f5e903f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/et/thunderbird-52.1.1.tar.bz2"; - locale = "et"; - arch = "linux-i686"; - sha512 = "95247bec1a365afcc5f6985ac635b0ebc02b2c345704749856ff5d9aa3d23e22fb274812617f3cd1648f80b9e47c95100fc10d41d5cbf0f8b7322e57adf48165"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/eu/thunderbird-52.1.1.tar.bz2"; - locale = "eu"; - arch = "linux-i686"; - sha512 = "e561dc2fd2f32dcdaba034f7486a55da8e332c7a67fa4948ccb073fea5a49910c02bac3b4f988366d0e4cf7da00efa52020eb1fd837119e95360e7418b65e37b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fi/thunderbird-52.1.1.tar.bz2"; - locale = "fi"; - arch = "linux-i686"; - sha512 = "d014aec796d7c4823748eb2d4a76df85a10fb6bba58d26fc9e46f72bbdc1457acbe473a563a1ebebed152c11242bd64b8c306c2fb43959ad2b649830bf50e95d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fr/thunderbird-52.1.1.tar.bz2"; - locale = "fr"; - arch = "linux-i686"; - sha512 = "e7bfe888ce1bffcb302c96bdb685bdbb7588521e9dec863175015622ebe13d0aa2b8a75c8fbe9ad6030be8303728a6a6718a837fc8fef8d0009fedad6ecd1b36"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fy-NL/thunderbird-52.1.1.tar.bz2"; - locale = "fy-NL"; - arch = "linux-i686"; - sha512 = "08bb1c4e4187e6a4f61f9ad88daa605186b341033c256506f9dc2c7626af842a628dfd59732084cf1b6bf94eb52e78af9942fcbbfb3c0a0c42568c94d3a874d7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ga-IE/thunderbird-52.1.1.tar.bz2"; - locale = "ga-IE"; - arch = "linux-i686"; - sha512 = "737af536b710b633b849ae0f7017bf9387daa6a3145409ed8cb315a0738083195992bac1fb4215b590784b7b2389f0611d89b55e17b5b02bedb79869e7caace9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gd/thunderbird-52.1.1.tar.bz2"; - locale = "gd"; - arch = "linux-i686"; - sha512 = "2ede5eebf73d7fa2f9ddf5a10b26649d43bc24512512b8f31b2998786c80de1c75890d3c825829ce1ee030ebb90e6bde1264cebc45d17475bfa5a343a5520491"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gl/thunderbird-52.1.1.tar.bz2"; - locale = "gl"; - arch = "linux-i686"; - sha512 = "b0ae9a3d08160024203b6bddfa6fb4a9a15c552cce91701d644636cc9f9c6add879a1b78138a0bdf3946c9f356dfb50d97293cbd070bbc2a9764b30a7a29263a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/he/thunderbird-52.1.1.tar.bz2"; - locale = "he"; - arch = "linux-i686"; - sha512 = "b1f5d4e299cc2d40397fb96b076625ea7e86faecc0ba6503276d675125373fe7eecfd531caf24241cb446bf47ba986c4ee497fbd115cf67160ef24b87f6ef19f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hr/thunderbird-52.1.1.tar.bz2"; - locale = "hr"; - arch = "linux-i686"; - sha512 = "7e52b5aeeaf9cd3c205555b1cf69c7a184b3a30605611a0cbc66a7591beb9d11a18b5e084adc9f88a7b74b24b06dd9b470bb966c6dc4fd946ab23b6565608ff4"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hsb/thunderbird-52.1.1.tar.bz2"; - locale = "hsb"; - arch = "linux-i686"; - sha512 = "49c718f7424337a6477b175446f3b532d0603ed8dd2bf789497706dd6c25f1d4968058facb61b2ea858e908911d0c04e87493a0956c33ad33df11d9990aaabb7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hu/thunderbird-52.1.1.tar.bz2"; - locale = "hu"; - arch = "linux-i686"; - sha512 = "e6ca202e31f41b7e57235172fb107ddc0707633ba5762651da62e9e55f433fe21de642f20bc3cbddf99ee8a9881dd646add04bb180e630364e45384a13e75ef0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hy-AM/thunderbird-52.1.1.tar.bz2"; - locale = "hy-AM"; - arch = "linux-i686"; - sha512 = "43aed794a82dc7e74f086bdc9e401ecfd59329098c8a9a650c485348977815f7419cd1cf913bc3fba025fbfcf1a15db6b883ef6bf483e16187a85dfdad9cb299"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/id/thunderbird-52.1.1.tar.bz2"; - locale = "id"; - arch = "linux-i686"; - sha512 = "3ce1c383d7640b9af2b7eae5e7689a200d27bc0a5527b3f3be1b1443ef3278cc58c0f2c0e3a9f94cb419fdc3b5797612fa96d78aa9a418b59fb066977955096a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/is/thunderbird-52.1.1.tar.bz2"; - locale = "is"; - arch = "linux-i686"; - sha512 = "365d5b4c78605df8869438eca9ad700ff2353bc18d64cfedf8905bc7307646b45c365813b537eb813806a25b8d1f121595df744ac60b1cb48cfcbe4395affc7f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/it/thunderbird-52.1.1.tar.bz2"; - locale = "it"; - arch = "linux-i686"; - sha512 = "ad0946bf1282f3ded23847b6fbbce55e620ca34b71bb3c7a12a6bb24e6e09a4d737503c39f5d634bdcd4c3a54418ef6b96a83fa997d911b85d8d05632d921711"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ja/thunderbird-52.1.1.tar.bz2"; - locale = "ja"; - arch = "linux-i686"; - sha512 = "34841d9c22e9b4d737bc56e23935f12a5a0bedcdbb127447a21ae9a837c9f61ef93b9613fa2123dafc39cbe7f9ec3cc0b92c7dc27f96ca3175ae359be3cfa1db"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/kab/thunderbird-52.1.1.tar.bz2"; - locale = "kab"; - arch = "linux-i686"; - sha512 = "19a40cf4ff9c0e34b4ae46a54364ca9b152aee18f2d4a438fe947cb225d9214f8316bd9aacfbec803076716668f100b0a02dd18b1f307498d086cfd6466f6433"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ko/thunderbird-52.1.1.tar.bz2"; - locale = "ko"; - arch = "linux-i686"; - sha512 = "1497535d1de169c0498837ef164434700a99d5dfe5032cfbef62de4535f47c2473ef335f9796c0d7adf5c7f2cde7c3a655aaa92d65651667afd7f3cdf7cde574"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/lt/thunderbird-52.1.1.tar.bz2"; - locale = "lt"; - arch = "linux-i686"; - sha512 = "54bdb2bfa2cf97e03c389a390ad018f485b5452c6c4e8acab9cc71c0076b830cfc7267a1e755f98ac54c87231511827ba7c64aa2502c502ab47d554fc5044856"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nb-NO/thunderbird-52.1.1.tar.bz2"; - locale = "nb-NO"; - arch = "linux-i686"; - sha512 = "20f5d2e7bbc083a990d9e9d8373d1485d58d62837c4d0d0d9d0955d3a9355c326d8eebbbfe0c61090c598fca11dad85d101ffb96b12f72b76da55fe72773ad03"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nl/thunderbird-52.1.1.tar.bz2"; - locale = "nl"; - arch = "linux-i686"; - sha512 = "c25e14b9d28f4985ffbb125b984168b4f073773c03bfc2af2bb845db19659b25d69e634896d9b0d92ad7f08ccd4523a5d58ee42fbf23ac25499f64e7da7463cd"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nn-NO/thunderbird-52.1.1.tar.bz2"; - locale = "nn-NO"; - arch = "linux-i686"; - sha512 = "9fe667f785abbdcf57890c3c19def43165a5574409342eae335ba32c2f9fa089eb4c2d443fc6254fe5d21ead0f0d04fa1e2250f54ef805c2668aae37b15a3f84"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pa-IN/thunderbird-52.1.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha512 = "cfd6c5d43ad9c78663f217b4ebc40b34d80cceed7e266f95dff1d70665b4e7187742621367085ae38718ba15e14bebaf8a32bc8e696fad0febbbbbf360abfd69"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pl/thunderbird-52.1.1.tar.bz2"; - locale = "pl"; - arch = "linux-i686"; - sha512 = "01dec9139816be174f14aa3f6e2165bcc52e53b8f681d8fbedb4db4f428a36128b832aa36fba7af096d15e83ecedb6b3570a447cde6bf10a722c2a452520852a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-BR/thunderbird-52.1.1.tar.bz2"; - locale = "pt-BR"; - arch = "linux-i686"; - sha512 = "2f616760f069944f43cc8517981a7fb793564cf30214ca62b42161aa3fcd332bf3f25761deae00697c8f544c84c3a500e9fac6b4424ef5481250fe2b8b6075a1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-PT/thunderbird-52.1.1.tar.bz2"; - locale = "pt-PT"; - arch = "linux-i686"; - sha512 = "0e27a359621fc08e1162f413aabaf406af4754e0e6947764d2b86c0c20b4d88c7eea336863ad9a9c670a6b05d84bda3678b9665f3c6c2d6b8ec71f2278f8a494"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/rm/thunderbird-52.1.1.tar.bz2"; - locale = "rm"; - arch = "linux-i686"; - sha512 = "84e58d1a7ce7e4d09ed30e83c6e46b88aac1419e719e1c55aa4cb5e1521ea3dd679e0bd41663de2a12d77c489d69f5ac0d5f5f0845fb2f9cc34d8f55ca278026"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ro/thunderbird-52.1.1.tar.bz2"; - locale = "ro"; - arch = "linux-i686"; - sha512 = "9272c9fba59beab72fb6f59c81180514ddfa6b6dbd050f6b789e5072beb34a0cc6c70ecc26e11bbc082e9368df98cc13923eea643daaf24051371755b0bb26ac"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ru/thunderbird-52.1.1.tar.bz2"; - locale = "ru"; - arch = "linux-i686"; - sha512 = "734b738d9712dc089db8460b72404be9bb6a97944ec9dc5a286a401531ef2a30f8b7c5fc22e689b98d1f80551515996c6d7ba1a7b72290e4071a95a4519c45b0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/si/thunderbird-52.1.1.tar.bz2"; - locale = "si"; - arch = "linux-i686"; - sha512 = "3868793813b2b09177ff7c5b36e44a289f7d7ae84f65c3194703f77e0067fd975a1397a289d3921b5ba7dcfe56c81280abec81c731b369692f2135f572dcdce6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sk/thunderbird-52.1.1.tar.bz2"; - locale = "sk"; - arch = "linux-i686"; - sha512 = "101f95b2bb118bb730117920099d1f5cc5f7744960a0148a1324043c17468d5b43c5d31fc5c45111fd3fc16a6e4d207548161fb600dbc4c4b92b015e342586fa"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sl/thunderbird-52.1.1.tar.bz2"; - locale = "sl"; - arch = "linux-i686"; - sha512 = "a019e01de194d51acc6695447c30fd5d9e179d91035f942b2f42a536b29d03244a7fffe2821c19e51133d39773e70b18fda79b6b19c2a33fba3d9917669b0748"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sq/thunderbird-52.1.1.tar.bz2"; - locale = "sq"; - arch = "linux-i686"; - sha512 = "64bdc99eb9bb3ece6fb5de9380fdc3d0a7e2598d36a66e7542c500a63c49f0d307ebdb99599b3bc72677a1053dd5d2aaf52088605236baa7d8d29dc2b377771d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sr/thunderbird-52.1.1.tar.bz2"; - locale = "sr"; - arch = "linux-i686"; - sha512 = "8d5d2ee0f5326b9cf76dcb1cfd2401350ca5aa39efbc2afcd822eb3c9a40e477d25e0d82d8f50e569b2fed487463c6a978d12284f63764b7259bd3f479b2461b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sv-SE/thunderbird-52.1.1.tar.bz2"; - locale = "sv-SE"; - arch = "linux-i686"; - sha512 = "0efd878da02ec1e81f373f7e8090445f45c11f2c9a1931ed29a52c3d8642a277be07a2d194d873f1a11dc8cdb79ed4100fd87b8f262f8fa2ea034d4c20e96e6e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ta-LK/thunderbird-52.1.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-i686"; - sha512 = "555c1b5862e71e7b9112b97b137375e0a38549ea91398b1631cb6000f5881f0adbbfe230612c2bd8765a20b1d14cf538e1b5c0e9ccfeb9fc7c1258afae54503b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/tr/thunderbird-52.1.1.tar.bz2"; - locale = "tr"; - arch = "linux-i686"; - sha512 = "e9c5333cd807f44d98c83514caa5fa81ef54a11362b7aee05c2496d8c79288c6707ff154229cc77d9a4e8097b13c53845a7516d04ff4c3336513183a8218ac3b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/uk/thunderbird-52.1.1.tar.bz2"; - locale = "uk"; - arch = "linux-i686"; - sha512 = "a7486ab5f63cece470b2850452cac236e153c3c797622cd2d87f6c4b276cea1c43d3770e7726c459334c5ca51034a8013d78176026375ac3d760c05e1cd9cd84"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/vi/thunderbird-52.1.1.tar.bz2"; - locale = "vi"; - arch = "linux-i686"; - sha512 = "6b815b2dc07fc6cb799bdf2266d6bfbef4f2623790814cae80ba1853075f7c561270e2463b1be571cc4495de5f2c36df4d716cf5754470198b97602ef3fe3979"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-CN/thunderbird-52.1.1.tar.bz2"; - locale = "zh-CN"; - arch = "linux-i686"; - sha512 = "7269d75bbec19be4045a6080c4e64679b5873a89039ffa9b633f40f41ca8d98a5f5f8a1b76233102b41a38ee307a49fe0c45206df1128b1526f490a417fb60c6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-TW/thunderbird-52.1.1.tar.bz2"; - locale = "zh-TW"; - arch = "linux-i686"; - sha512 = "3741d5ebd862706b212f90a9f81ea8f0c9f7b1a4eeb74acab420e287afb930cc74748db958debb698a49fbd9d8011107ea6a1bc917606700a80eea640b40ab1a"; - } - ]; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 0f6be0281f3..ccced87a550 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.1.1"; + version = "52.2.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "84b54ae4401c9728c38f32f58e0df24e049471b3613f9973981b305e0ed09b2e8c2c1b5a35d4fee85ce2cf1d6fa99e80418bc216ae0d35d40e9fdeef61a6c06e"; + sha512 = "e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89"; }; # New sed no longer tolerates this mistake. From 9ffbebfeb0d1e680e7c9fce3f76559ea7d6c7062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 15 Jun 2017 19:37:43 +0100 Subject: [PATCH 143/152] ocamlPackages.camlidl: export c header and libs. --- pkgs/development/tools/ocaml/camlidl/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 780862b6727..7cdf7dc9396 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, ocaml, ncurses }: +{ stdenv, fetchurl, makeWrapper, ocaml, ncurses, writeText }: let pname = "camlidl"; @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { ln -s $out/camlidl $out/bin ''; + setupHook = writeText "setupHook.sh" '' + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" + export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" + export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" + ''; + meta = { description = "A stub code generator and COM binding for Objective Caml"; homepage = "${webpage}"; From ba9c71b999b1aa28dd2af6d23359d2db7b5da8ac Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 15 Jun 2017 19:57:00 -0400 Subject: [PATCH 144/152] rustc.bootstrap: 1.17.0 -> 1.16.0 bootstrapping rust requires the prior version of rust according to #rust-internals they theorize this could be causing the build problems on i686 --- pkgs/development/compilers/rust/bootstrap.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 409bf465630..ad49b130570 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -12,16 +12,17 @@ let then "x86_64-apple-darwin" else throw "missing bootstrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.17.0` + # fetch hashes by patching print-hashes.sh to not use the "$DATE" variable + # then running `print-hashes.sh 1.16.0` bootstrapHash = if stdenv.system == "i686-linux" - then "39d16ce0f618ba37ee1024b83e4822a2d38e6ba9f341ff2020d34df94c7a6beb" + then "b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5" else if stdenv.system == "x86_64-linux" - then "bbb0e249a7a3e8143b569706c7d2e7e5f51932c753b7fd26c58ccd2015b02c6b" + then "48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd" else if stdenv.system == "i686-darwin" - then "308132b33d4002f95a725c2d31b975ff37905e3644894ed86e614b03ded70265" + then "26356b14164354725bd0351e8084f9b164abab134fb05cddb7758af35aad2065" else if stdenv.system == "x86_64-darwin" - then "1689060c07ec727e9756f19c9373045668471ab56fd8f53e92701150bbe2032b" + then "2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926" else throw "missing bootstrap hash for platform ${stdenv.system}"; src = fetchurl { @@ -29,7 +30,9 @@ let sha256 = bootstrapHash; }; - version = "1.17.0"; + # Note: the version MUST be one version prior to the version we're + # building + version = "1.16.0"; in import ./binaryBuild.nix { inherit stdenv fetchurl makeWrapper cacert zlib curl; buildRustPackage = null; From 7272f8096e63b6561cd4dadbc0487009d8d3b025 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Jun 2017 05:21:52 +0200 Subject: [PATCH 145/152] nmap: 7.40 -> 7.50 --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index aefa82128ac..6495634da33 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.40"; + version = "7.50"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "121i9mgyc28ra2825akd0ix5qyssv4xc2qlx296mam6hzxgnc54y"; + sha256 = "1ckl2qxqxkrfa2qxdrqyaa4k1hhj273aqckrc46fijdz0a76mag9"; }; patches = ./zenmap.patch; From fd0384b4c2b5ad6e55e2d2fd31d000dc4fc54a40 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Jun 2017 01:21:29 +0200 Subject: [PATCH 146/152] pythonPackages.glances: 2.9.1 -> 2.10 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e182abf1c11..39d9555d22a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11654,14 +11654,14 @@ in { glances = buildPythonPackage rec { name = "glances-${version}"; - version = "2.9.1"; + version = "2.10"; disabled = isPyPy; src = pkgs.fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "13pnim8zxqbw5b1jkl1ggqn2rg5kfwhznw42ckizrhg73ngy9yyp"; + sha256 = "0hxs9bplxvj6grq9dqinr4f5ip6ray6mrw54scrcaqal8f3c8ah2"; }; doCheck = false; From aa645b51ba2f6df37903e3c4c71debceb8e70974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 16 Jun 2017 07:09:32 +0000 Subject: [PATCH 147/152] jenkins service: Add extraJavaOptions. This is useful for the common case of passing arguments to the JVM that runs Jenkins. --- .../continuous-integration/jenkins/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 11adf74b9ed..c14aa416723 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -125,6 +125,15 @@ in { Additional command line arguments to pass to Jenkins. ''; }; + + extraJavaOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "-Xmx80m" ]; + description = '' + Additional command line arguments to pass to the Java run time (as opposed to Jenkins). + ''; + }; }; }; @@ -185,7 +194,7 @@ in { ''; script = '' - ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ + ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ ${concatStringsSep " " cfg.extraOptions} From ca8eed1732e3a6b879bfc93284092aa2c96b6754 Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Thu, 15 Jun 2017 13:36:42 +0300 Subject: [PATCH 148/152] flow: 0.46.0 -> 0.48.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index d356caad1f6..9987996c95d 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.46.0"; + version = "0.48.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "05rnlckwiynkh0300f27xhrn53pf0hxlkb0iz3nlb81xmsk005a4"; + sha256 = "13f9z4jg1v34jpaswa8kvbxkfp7flabv616vyqfvy9hafgfyisff"; }; installPhase = '' From 2f45c376461ec1153ebab48d87b074a82e143497 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 15 Jun 2017 06:47:07 -0400 Subject: [PATCH 149/152] gerbil: 0.10 -> 0.11 --- pkgs/development/compilers/gerbil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 1bffd1bd1c8..7ea403715a5 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "gerbil-${version}"; - version = "0.10"; + version = "0.11"; src = fetchurl { url = "https://github.com/vyzo/gerbil/archive/v${version}.tar.gz"; - sha256 = "14wzdnifr99g1mvm2xwks97nhaq62hfx43pxcw9gs647i7cymbly"; + sha256 = "0mqg6cqdcf5qr7vk79x5zkls7z2wm8i3lhwn0b7i0g1m6yyyyff7"; }; buildInputs = [ gambit openssl zlib coreutils rsync bash ]; @@ -46,7 +46,7 @@ EOF dontStrip = true; meta = { - description = "Gerbil"; + description = "Gerbil Scheme"; homepage = "https://github.com/vyzo/gerbil"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; From 3f97bcaf2dcf232859536ada8d6252878fbdc3d8 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Fri, 16 Jun 2017 01:56:31 -0700 Subject: [PATCH 150/152] hugo: 0.22.1 -> 0.23 This release includes a move to a new github organization. --- pkgs/applications/misc/hugo/default.nix | 6 +++--- pkgs/applications/misc/hugo/deps.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 8d14db09c3f..4fe62179b25 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.22.1"; + version = "0.23"; - goPackagePath = "github.com/spf13/hugo"; + goPackagePath = "github.com/gohugoio/hugo"; src = fetchFromGitHub { owner = "spf13"; repo = "hugo"; rev = "v${version}"; - sha256 = "0m459np11izsflwdja6k0znaxvd8zpgivvswnq9501m49h8m4x7q"; + sha256 = "0phw5pcmrmryxb83jzifhqh3vx20qiwh4dkk802v38fw07z1hvki"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 1daab7854d8..2b844943865 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -31,8 +31,8 @@ fetch = { type = "git"; url = "https://github.com/bep/gitmap"; - rev = "dcb907b39a0690430d435eb8f63cd8811961231f"; - sha256 = "0bw4spyiidrvd8rls9g57mwxykfmv57qi9mcnjadbqrpv92br856"; + rev = "de8030ebafb76c6e84d50ee6d143382637c00598"; + sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami"; }; } { @@ -247,8 +247,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "0ba0f2b6ed7c475a92e4df8641825cb7a11d1fa3"; - sha256 = "0jj9zkk64sxs8vpfhz95y9li30q6qnxm7sncsfjn2ykcdgs252f7"; + rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae"; + sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137"; }; } { From 11b113541d26dc8f701ebc9810bf242fb70ecaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 16 Jun 2017 11:53:23 +0200 Subject: [PATCH 151/152] rustRegistry: 2017-05-31 -> 2017-06-16 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 2fa9ac926d7..45e4d8e812e 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-05-31"; - rev = "d85037df75a945b5a368d6ceaa7e030b67473a51"; - sha256 = "0567lfjxvbn4pb39557yfdq1nm4ssgbvzvzkrdqnx9sx5xyx7n4s"; + version = "2017-06-16"; + rev = "cda0f689f844710a3d73c7ff459efa64997f73b5"; + sha256 = "1b3brl9nn3qqaysd8lx9gaazd863grqx547iw7y9j6mkcc7sakvc"; src = fetchFromGitHub { inherit rev; From 72ff321f9ca92c9ad54d006ee78751e2a3739535 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 16 Jun 2017 07:09:40 -0400 Subject: [PATCH 152/152] rustc: re-enable static_in_const We saw this error when building main.rs:error: this needs a 'static lifetime or the static_in_const feature, see #35897 --- pkgs/development/compilers/rust/rustc.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a8ba933b52f..4e0d0971cb6 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -93,11 +93,6 @@ stdenv.mkDerivation { rm src/test/debuginfo/vec-slices.rs rm src/test/debuginfo/vec.rs - # this can probably be removed when rust is updated beyond 1.17 - # fixes a warning in the test harness (I think?) which fails the build due - # to strict warnings - sed -i '/static_in_const/d' src/tools/compiletest/src/main.rs - # Useful debugging parameter # export VERBOSE=1 ''