From 776de2556b154484be5a506f756c343d6721d99d Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 29 Jul 2017 11:31:40 +0200 Subject: [PATCH 001/797] freecad: Add desktop entry file and mime xml --- .../applications/graphics/freecad/default.nix | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index c58d9e0bda1..94953e8f094 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper }: +, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper, makeDesktopItem }: let pythonPackages = python27Packages; @@ -32,8 +32,40 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \ --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 + + mkdir -p $out/share/mime/packages + cat << EOF > $out/share/mime/packages/freecad.xml + + + + + FreeCAD Document + + + + EOF + + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications/ + for entry in $out/share/applications/*.desktop; do + substituteAllInPlace $entry + done ''; + desktopItem = makeDesktopItem { + name = "freecad"; + desktopName = "FreeCAD"; + genericName = "CAD Application"; + comment = meta.description; + exec = "@out@/bin/FreeCAD %F"; + categories = "Science;Education;Engineering;"; + startupNotify = "true"; + mimeType = "application/x-extension-fcstd;"; + extraEntries = '' + Path=@out@/share/freecad + ''; + }; + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; homepage = http://www.freecadweb.org/; From 9f9039983eb4b79106860cea51ceb8b0a155fa2f Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 29 Jul 2017 11:35:49 +0200 Subject: [PATCH 002/797] ddccontrol: Add desktop entry file for gddccontrol --- pkgs/tools/misc/ddccontrol/default.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 26c5a6b2139..fe47009eeb3 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2 , pciutils, pkgconfig, gtk2, ddccontrol-db +, makeDesktopItem }: let version = "0.4.2"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ddccontrol-${version}"; src = fetchurl { @@ -32,6 +33,24 @@ stdenv.mkDerivation { sed -e "s/chmod 4711/chmod 0711/" -i src/ddcpci/Makefile* ''; + postInstall = '' + mkdir -p $out/share/applications/ + cp $desktopItem/share/applications/* $out/share/applications/ + for entry in $out/share/applications/*.desktop; do + substituteAllInPlace $entry + done + ''; + + desktopItem = makeDesktopItem { + name = "gddccontrol"; + desktopName = "gddccontrol"; + genericName = "DDC/CI control"; + comment = meta.description; + exec = "@out@/bin/gddccontrol"; + icon = "gddccontrol"; + categories = "Settings;HardwareSettings;"; + }; + meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; homepage = "http://ddccontrol.sourceforge.net/"; From 5ce0f5aa38477a5d7700bdb1f086c328d826f2b5 Mon Sep 17 00:00:00 2001 From: Alexey Lebedeff Date: Mon, 6 Nov 2017 11:03:30 +0100 Subject: [PATCH 003/797] emacs-packages: Cleanup and document for overrides This removes some stale code that was a no-op for some time and adds some docs/examples to help people with explicitly and consistently choosing versions of some emacs packages (to help with problems similar to #27083). --- doc/package-notes.xml | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/emacs-packages.nix | 4 +--- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 184bee089ae..19b476597de 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -660,6 +660,32 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el passing -q to the Emacs command. + + Sometimes emacsWithPackages is not enough, as + this package set has some priorities imposed on packages (with + the lowest priority assigned to Melpa Unstable, and the highest for + packages manually defined in + pkgs/top-level/emacs-packages.nix). But you + can't control this priorities when some package is installed as a + dependency. You can override it on per-package-basis, providing all + the required dependencies manually - but it's tedious and there is + always a possibility that an unwanted dependency will sneak in + through some other package. To completely override such a package + you can use overrideScope. + + + +overrides = super: self: rec { + haskell-mode = self.melpaPackages.haskell-mode; + ... +}; +((emacsPackagesNgGen emacs).overrideScope overrides).emacsWithPackages (p: with p; [ + # here both these package will use haskell-mode of our own choice + ghc-mod + dante +]) + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebb9831d3ff..bb559038b3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14409,8 +14409,6 @@ with pkgs; emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { - overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl; inherit emacs texinfo makeWrapper runCommand; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 4ff8d23424c..57610c3827c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -32,9 +32,7 @@ # `meta` with `platforms` and `homepage` set to something you are # unlikely to want to override for most packages -{ overrides - -, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand +{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand , emacs, texinfo, lndir, makeWrapper , trivialBuild From 47b9934a99bb5b539dd87813f2f2c104349652b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 25 Nov 2017 22:23:57 +0100 Subject: [PATCH 004/797] lirc: 0.9.4 -> 0.9.4d + more driver * added a bunch of optional libraries to get more IR drivers built * removed deprecated configure flags * unneeded make flags * simplified install flags --- pkgs/development/libraries/lirc/default.nix | 32 ++++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 960c8cc2494..0be49915f21 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,31 +1,41 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper +, python3Packages, libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { - name = "lirc-0.9.4"; + name = "lirc-0.9.4d"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "19c6ldjsdnk1md66q3nb035ja1xj217k8iabhxpsb8rs10a6kwi6"; + sha256 = "1as19rnaz9vpp58kbk9q2lch51vf2fdi27bl19f8d6s8bg1ii3y6"; }; - preBuild = "patchShebangs ."; + postPatch = '' + patchShebangs . + + # fix overriding PYTHONPATH + sed -i 's,PYTHONPATH=,PYTHONPATH=$(PYTHONPATH):,' \ + doc/Makefile.in + ''; + + preConfigure = '' + # use empty inc file instead of a from linux kernel generated one + touch lib/lirc/input_map.inc + ''; nativeBuildInputs = [ pkgconfig help2man ]; - buildInputs = [ alsaLib xlibsWrapper python3 libxslt ]; + buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ] + ++ (with python3Packages; [ python pyyaml ]); configureFlags = [ - "--with-driver=devinput" "--sysconfdir=/etc" "--localstatedir=/var" - "--enable-sandboxed" + "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ]; - makeFlags = [ "m4dir=$(out)/m4" ]; - installFlags = [ - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" + "sysconfdir=$out/etc" + "localstatedir=$TMPDIR" ]; meta = with stdenv.lib; { From bf5ca637d654f7187d416e294da29b3158cd22e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 7 Dec 2017 19:18:22 +0100 Subject: [PATCH 005/797] use python3.pkgs instead of python3Packages incoporated review comment reported by FRidh --- pkgs/development/libraries/lirc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 0be49915f21..bdde4a93d3c 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper -, python3Packages, libxslt, systemd, libusb, libftdi1 }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3 +, libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { name = "lirc-0.9.4d"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig help2man ]; buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ] - ++ (with python3Packages; [ python pyyaml ]); + ++ (with python3.pkgs; [ python pyyaml ]); configureFlags = [ "--sysconfdir=/etc" From e369aa52444cbda7ff1e909ce5bb404a2e1871a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 9 Dec 2017 23:35:13 +0100 Subject: [PATCH 006/797] lirc: 0.9.4d -> 0.10.0 --- pkgs/development/libraries/lirc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index bdde4a93d3c..d6ab09d835c 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -2,17 +2,19 @@ , libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { - name = "lirc-0.9.4d"; + name = "lirc-0.10.0"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "1as19rnaz9vpp58kbk9q2lch51vf2fdi27bl19f8d6s8bg1ii3y6"; + sha256 = "0lzmqcw0sc28s19yd4bqvl52p4f77razq50w7z92a4xrn7l2sz75"; }; postPatch = '' patchShebangs . # fix overriding PYTHONPATH + sed -i 's,^PYTHONPATH *= *,PYTHONPATH := $(PYTHONPATH):,' \ + Makefile.in sed -i 's,PYTHONPATH=,PYTHONPATH=$(PYTHONPATH):,' \ doc/Makefile.in ''; @@ -25,12 +27,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig help2man ]; buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ] - ++ (with python3.pkgs; [ python pyyaml ]); + ++ (with python3.pkgs; [ python pyyaml setuptools ]); configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-systemdsystemunitdir=$(out)/lib/systemd/system" + "--enable-uinput" # explicite activation because build env has no uinput + "--enable-devinput" # explicite activation because build env has not /dev/input ]; installFlags = [ From cefec62a277cdbb737ada4555d38e921e1d2cf4c Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 11 Dec 2017 21:53:19 +0000 Subject: [PATCH 007/797] lwan: init at 0.1 --- pkgs/servers/http/lwan/default.nix | 35 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/http/lwan/default.nix diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix new file mode 100644 index 00000000000..878211ebf02 --- /dev/null +++ b/pkgs/servers/http/lwan/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, pkgconfig, zlib, cmake, jemalloc }: + +stdenv.mkDerivation rec { + pname = "lwan"; + version = "0.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "lpereira"; + repo = pname; + rev = "v${version}"; + sha256 = "1mckryzb06smky0bx2bkqwqzpnq4pb8vlgmmwsvqmwi4mmw9wmi1"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ jemalloc zlib ]; + + meta = with stdenv.lib; { + description = "Lightweight high-performance multi-threaded web server"; + longDescription = "A lightweight and speedy web server with a low memory + footprint (~500KiB for 10k idle connections), with minimal system calls and + memory allocation. Lwan contains a hand-crafted HTTP request parser. Files are + served using the most efficient way according to their size: no copies between + kernel and userland for files larger than 16KiB. Smaller files are sent using + vectored I/O of memory-mapped buffers. Header overhead is considered before + compressing small files. Features include: mustache templating engine and IPv6 + support. + "; + homepage = "https://lwan.ws/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58f5b38bb76..b301b55d4f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11792,6 +11792,8 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; + lwan = callPackage ../servers/http/lwan { }; + mailman = callPackage ../servers/mail/mailman { }; mattermost = callPackage ../servers/mattermost { }; From 92538f0a5439b7155dc46e10d10631cef68943c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Tue, 26 Dec 2017 10:55:17 +0100 Subject: [PATCH 008/797] idris: fix modules --- pkgs/development/idris-modules/idris-wrapper.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index 32424ba1f86..5e3eb511bd3 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -5,10 +5,10 @@ symlinkJoin { src = idris.src; paths = [ idris ]; buildInputs = [ makeWrapper ]; + meta.platforms = idris.meta.platforms; postBuild = '' wrapProgram $out/bin/idris \ --suffix PATH : ${ stdenv.lib.makeBinPath path } \ --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} - ''; - } - + ''; +} From 9cfe7e74e0c2b8e160ef10dd9249ba9c98306a32 Mon Sep 17 00:00:00 2001 From: exfalso <0slemi0@gmail.com> Date: Tue, 26 Dec 2017 18:39:45 +0000 Subject: [PATCH 009/797] subdl: init at 4cf5789 --- lib/maintainers.nix | 1 + pkgs/applications/video/subdl/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/applications/video/subdl/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d584645a72c..5d065fd5ac8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -218,6 +218,7 @@ ertes = "Ertugrul Söylemez "; ethercrow = "Dmitry Ivanov "; etu = "Elis Hirwing "; + exfalso = "Andras Slemmer <0slemi0@gmail.com>"; exi = "Reno Reckling "; exlevan = "Alexey Levan "; expipiplus1 = "Joe Hermaszewski "; diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix new file mode 100644 index 00000000000..5f800ed8414 --- /dev/null +++ b/pkgs/applications/video/subdl/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + name = "subdl"; + + src = fetchFromGitHub { + owner = "alexanderwink"; + repo = "subdl"; + rev = "4cf5789b11f0ff3f863b704b336190bf968cd471"; + sha256 = "0kmk5ck1j49q4ww0lvas2767kwnzhkq0vdwkmjypdx5zkxz73fn8"; + }; + + meta = { + homepage = https://github.com/alexanderwink/subdl; + description = "A command-line tool to download subtitles from opensubtitles.org"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.exfalso ]; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + install -vD subdl $out/bin/subdl + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 547e0704d39..85c46bdf7d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10944,6 +10944,8 @@ with pkgs; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; + subdl = callPackage ../applications/video/subdl { }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; suil-qt4 = callPackage ../development/libraries/audio/suil { From 6d9dfdc86d1dda3132482a155c5eaa18e87efa2d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 20 Dec 2017 09:41:52 +0800 Subject: [PATCH 010/797] qsyncthingtray: build with native browser to allow for Qt > 5.6 --- .../misc/qsyncthingtray/default.nix | 20 ++++++++++++++----- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index bc909742c6d..763435da564 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,8 +1,9 @@ -{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null +{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null , qtbase, qtwebengine, qtwebkit , cmake , syncthing, syncthing-inotify ? null -, preferQWebView ? false }: +, preferQWebView ? false +, preferNative ? true }: mkDerivation rec { version = "0.5.8"; @@ -16,11 +17,18 @@ mkDerivation rec { }; buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; + nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"; + cmakeFlags = [ ] + ++ lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1" + ++ lib.optional preferNative "-DQST_BUILD_NATIVEBROWSER=1"; - patches = [ ./qsyncthingtray-0.5.8-qt-5.6.3.patch ]; + patches = [ (fetchpatch { + name = "support_native_browser.patch"; + url = "https://patch-diff.githubusercontent.com/raw/sieren/QSyncthingTray/pull/225.patch"; + sha256 = "0w665xdlsbjxs977pdpzaclxpswf7xys1q3rxriz181lhk2y66yy"; + }) ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch; postPatch = '' ${lib.optionalString stdenv.isLinux '' @@ -60,6 +68,8 @@ mkDerivation rec { maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 - broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; + # but qt > 5.6 works when only using the native browser + # https://github.com/sieren/QSyncthingTray/issues/223 + broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 547e0704d39..99f0bee0251 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16539,8 +16539,7 @@ with pkgs; qt = qt4; }; - # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 - qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = callPackage ../applications/video/qstopmotion { }; From 07eb3a2c9f287230f37520a7359466e0387cfd17 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 30 Dec 2017 09:56:21 +0100 Subject: [PATCH 011/797] exim: add optional LDAP support --- pkgs/servers/mail/exim/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 45ac738c5bb..818e6ee8638 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,6 @@ -{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: +{ coreutils, db, fetchurl, openldap, openssl, pcre, perl, pkgconfig, stdenv +, enableLDAP ? false +}: stdenv.mkDerivation rec { name = "exim-4.90"; @@ -9,7 +11,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ coreutils db openssl pcre perl ]; + buildInputs = [ coreutils db openssl pcre perl ] + ++ stdenv.lib.optional enableLDAP openldap; preBuild = '' sed ' @@ -33,6 +36,11 @@ stdenv.mkDerivation rec { s:^# \(RM_COMMAND\)=.*:\1=${coreutils}/bin/rm: s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: + ${stdenv.lib.optionalString enableLDAP '' + s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1: + s:^# \(LOOKUP_LDAP=yes\)$:\1: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap: + ''} #/^\s*#.*/d #/^\s*$/d ' < src/EDITME > Local/Makefile From fa085fc07b3db36ae9e5bf13ed7398ba6ca1e5d2 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 1 Jan 2018 19:16:23 -0500 Subject: [PATCH 012/797] haskell: Recommend use of hoogle --local This works around the browser security restriction of disallowing links from http:// to file://. --- doc/languages-frameworks/haskell.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 629db289ab1..764fae3ce93 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -334,14 +334,10 @@ navigate there. Finally, you can run ```shell -hoogle server -p 8080 +hoogle server -p 8080 --local ``` and navigate to http://localhost:8080/ for your own local -[Hoogle](https://www.haskell.org/hoogle/). Note, however, that Firefox and -possibly other browsers disallow navigation from `http:` to `file:` URIs for -security reasons, which might be quite an inconvenience. See [this -page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for -workarounds. +[Hoogle](https://www.haskell.org/hoogle/). ### How to build a Haskell project using Stack From dbc414a8a52acb71dcb7bcc4d0d36e9490433511 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 12 Dec 2017 01:14:00 +0100 Subject: [PATCH 013/797] yabar: add module To make the configuration of `yabar` more pleasant and easier to validate, a NixOS module will be quite helpful. An example config could look like this: ``` { programs.yabar = { enable = true; bars.top.indicators.exec = "YA_DATE"; }; } ``` The module adds a user-controlled systemd service which runs `yabar` after starting up X. --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/yabar.nix | 149 +++++++++++++++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/yabar.nix | 25 ++++++ 4 files changed, 176 insertions(+) create mode 100644 nixos/modules/programs/yabar.nix create mode 100644 nixos/tests/yabar.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fdd3bb844c2..78dd1ee6c71 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -110,6 +110,7 @@ ./programs/wireshark.nix ./programs/xfs_quota.nix ./programs/xonsh.nix + ./programs/yabar.nix ./programs/zsh/oh-my-zsh.nix ./programs/zsh/zsh.nix ./programs/zsh/zsh-syntax-highlighting.nix diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix new file mode 100644 index 00000000000..a01083c3ace --- /dev/null +++ b/nixos/modules/programs/yabar.nix @@ -0,0 +1,149 @@ +{ lib, pkgs, config, ... }: + +with lib; + +let + cfg = config.programs.yabar; + + mapExtra = v: lib.concatStringsSep "\n" (mapAttrsToList ( + key: val: "${key} = ${if (isString val) then "\"${val}\"" else "${builtins.toString val}"};" + ) v); + + listKeys = r: concatStringsSep "," (map (n: "\"${n}\"") (attrNames r)); + + configFile = let + bars = mapAttrsToList ( + name: cfg: '' + ${name}: { + font: "${cfg.font}"; + position: "${cfg.position}"; + + ${mapExtra cfg.extra} + + block-list: [${listKeys cfg.indicators}] + + ${concatStringsSep "\n" (mapAttrsToList ( + name: cfg: '' + ${name}: { + exec: "${cfg.exec}"; + align: "${cfg.align}"; + ${mapExtra cfg.extra} + }; + '' + ) cfg.indicators)} + }; + '' + ) cfg.bars; + in pkgs.writeText "yabar.conf" '' + bar-list = [${listKeys cfg.bars}]; + ${concatStringsSep "\n" bars} + ''; +in + { + options.programs.yabar = { + enable = mkEnableOption "yabar"; + + package = mkOption { + default = pkgs.yabar; + example = literalExample "pkgs.yabar-unstable"; + type = types.package; + + description = '' + The package which contains the `yabar` binary. + + Nixpkgs provides the `yabar` and `yabar-unstable` + derivations since 18.03, so it's possible to choose. + ''; + }; + + bars = mkOption { + default = {}; + type = types.attrsOf(types.submodule { + options = { + font = mkOption { + default = "sans bold 9"; + example = "Droid Sans, FontAwesome Bold 9"; + type = types.string; + + description = '' + The font that will be used to draw the status bar. + ''; + }; + + position = mkOption { + default = "top"; + example = "bottom"; + type = types.enum [ "top" "bottom" ]; + + description = '' + The position where the bar will be rendered. + ''; + }; + + extra = mkOption { + default = {}; + type = types.attrsOf types.string; + + description = '' + An attribute set which contains further attributes of a bar. + ''; + }; + + indicators = mkOption { + default = {}; + type = types.attrsOf(types.submodule { + options.exec = mkOption { + example = "YABAR_DATE"; + type = types.string; + description = '' + The type of the indicator to be executed. + ''; + }; + + options.align = mkOption { + default = "left"; + example = "right"; + type = types.enum [ "left" "center" "right" ]; + + description = '' + Whether to align the indicator at the left or right of the bar. + ''; + }; + + options.extra = mkOption { + default = {}; + type = types.attrsOf (types.either types.string types.int); + + description = '' + An attribute set which contains further attributes of a indicator. + ''; + }; + }); + + description = '' + Indicators that should be rendered by yabar. + ''; + }; + }; + }); + + description = '' + List of bars that should be rendered by yabar. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.yabar = { + description = "yabar service"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + + script = '' + ${cfg.package}/bin/yabar -c ${configFile} + ''; + + serviceConfig.Restart = "always"; + }; + }; + } diff --git a/nixos/release.nix b/nixos/release.nix index cf3fe6abd48..c6fe633cdd1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -356,6 +356,7 @@ in rec { tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; + tests.yabar = callTest tests/yabar.nix {}; tests.zookeeper = callTest tests/zookeeper.nix {}; /* Build a bunch of typical closures so that Hydra can keep track of diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix new file mode 100644 index 00000000000..40ca91e8064 --- /dev/null +++ b/nixos/tests/yabar.nix @@ -0,0 +1,25 @@ +import ./make-test.nix ({ pkgs, lib }: + +with lib; + +{ + name = "yabar"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + nodes.yabar = { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + + services.xserver.displayManager.auto.user = "bob"; + + programs.yabar.enable = true; + }; + + testScript = '' + $yabar->start; + $yabar->waitForX; + + $yabar->waitForUnit("yabar.service", "bob"); + ''; +}) From 1543c8cc01a4501ec9286e03ccf92965deff611e Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 4 Jan 2018 11:16:35 +0100 Subject: [PATCH 014/797] emacs: Add more documentation to `site-start.el` `site-start.el` is the file loaded on startup, containing nix-specific customizations like adding paths in `NIX_PROFILES` to the emacs-specific search-path (`load-path`) or making man-pages in these directories discoverable. --- pkgs/applications/editors/emacs/site-start.el | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index b41ca92db08..004b917ebb6 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -1,18 +1,28 @@ -;;; NixOS specific load-path +(defun nix--profile-paths () + "Returns a list of all paths in the NIX_PROFILES environment +variable, ordered from more-specific (the user profile) to the +least specific (the system profile)" + (reverse (split-string (or (getenv "NIX_PROFILES") "")))) + +;;; Extend `load-path' to search for elisp files in subdirectories of +;;; all folders in `NIX_PROFILES' (setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (or (getenv "NIX_PROFILES") "")))) + (append (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) + (nix--profile-paths)) load-path)) ;;; Make `woman' find the man pages (eval-after-load 'woman '(setq woman-manpath - (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) - (split-string (or (getenv "NIX_PROFILES") "")))) + (append (mapcar (lambda (x) (concat x "/share/man/")) + (nix--profile-paths)) woman-manpath))) ;;; Make tramp work for remote NixOS machines (eval-after-load 'tramp + ;; TODO: We should also add the other `NIX_PROFILES' to this path. + ;; However, these are user-specific, so we would need to discover + ;; them dynamically after connecting via `tramp' '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) ;;; C source directory @@ -22,9 +32,9 @@ ;;; from: /nix/store/-emacs-/share/emacs/site-lisp/site-start.el ;;; to: /nix/store/-emacs-/share/emacs//src/ (let ((emacs - (file-name-directory ;; .../emacs/ - (directory-file-name ;; .../emacs/site-lisp - (file-name-directory load-file-name)))) ;; .../emacs/site-lisp/ + (file-name-directory ; .../emacs/ + (directory-file-name ; .../emacs/site-lisp + (file-name-directory load-file-name)))) ; .../emacs/site-lisp/ (version (file-name-as-directory (concat From 7cfdb2b1b56f25c166feee2780d7b1b59eea8923 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 4 Jan 2018 11:48:25 +0100 Subject: [PATCH 015/797] emacs: Search subdirectories of `site-lisp` in `NIX_PROFILES` This adds subdirectories of `share/emacs/site-lisp/` in every path in `NIX_PROFILES` to `load-path` to allow loading of more complex libraries like `mu4e`. Fixes #33412 --- pkgs/applications/editors/emacs/site-start.el | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 004b917ebb6..cc1ab1d0e30 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -5,11 +5,22 @@ least specific (the system profile)" (reverse (split-string (or (getenv "NIX_PROFILES") "")))) ;;; Extend `load-path' to search for elisp files in subdirectories of -;;; all folders in `NIX_PROFILES' -(setq load-path - (append (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (nix--profile-paths)) - load-path)) +;;; all folders in `NIX_PROFILES'. Also search for one level of +;;; subdirectories in these directories to handle multi-file libraries +;;; like `mu4e'.' +(require 'seq) +(let* ((subdirectory-sites (lambda (site-lisp) + (when (file-exists-p site-lisp) + (seq-filter (lambda (f) (file-directory-p (file-truename f))) + ;; Returns all files in `site-lisp', excluding `.' and `..' + (directory-files site-lisp 'full "^\\([^.]\\|\\.[^.]\\|\\.\\..\\)"))))) + (paths (apply #'append + (mapcar (lambda (profile-dir) + (let ((site-lisp (concat profile-dir "/share/emacs/site-lisp/"))) + (cons site-lisp (funcall subdirectory-sites site-lisp)))) + (nix--profile-paths))))) + (setq load-path (append paths load-path))) + ;;; Make `woman' find the man pages (eval-after-load 'woman From 31eedb3084fa1f73fb2262222edfd8a6e157a33e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 11 Jan 2018 11:17:18 +0100 Subject: [PATCH 016/797] gzip: 1.8 -> 1.9 See http://lists.gnu.org/archive/html/info-gnu/2018-01/msg00004.html for release informations. --- pkgs/tools/compression/gzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index bb9555fa600..49d1b614f3b 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gzip-${version}"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "mirror://gnu/gzip/${name}.tar.xz"; - sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz"; + sha256 = "16h8g4acy7fgfxcjacr3wijjsnixwsfd2jhz3zwdi2qrzi262l5f"; }; patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; From 8c0558dbb2469b7799515abd108d2fa4adbc4636 Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sun, 14 Jan 2018 18:15:46 +0100 Subject: [PATCH 017/797] sg/newgrp should always be available, not chfn sg and newgrp only changes the current user session and should be available to users even if the "users.mutableUsers" option is set. These are common, useful commands. chfn does modify the /etc/passwd GECOS field which is also controlled by the option "users.users..description", so it's less appropriate to make it available when "users.mutableUsers" is set. However, because CHFN_RESTRICT in login.defs is never set in current NixOS the chfn functionality is never available to users anyway and may as well have its SUID disabled, as only root is able to use it. This is recommended in the chfn man page in this case. --- nixos/modules/programs/shadow.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 0f3f42901ba..8ec4169207d 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -26,8 +26,9 @@ let # Ensure privacy for newly created home directories. UMASK 077 - # Uncomment this to allow non-root users to change their account - #information. This should be made configurable. + # Uncomment this and install chfn SUID to allow non-root + # users to change their account GECOS information. + # This should be made configurable. #CHFN_RESTRICT frwh ''; @@ -103,13 +104,12 @@ in security.wrappers = { su.source = "${pkgs.shadow.su}/bin/su"; - chfn.source = "${pkgs.shadow.out}/bin/chfn"; + sg.source = "${pkgs.shadow.out}/bin/sg"; + newgrp.source = "${pkgs.shadow.out}/bin/newgrp"; newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap"; newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap"; } // (if config.users.mutableUsers then { passwd.source = "${pkgs.shadow.out}/bin/passwd"; - sg.source = "${pkgs.shadow.out}/bin/sg"; - newgrp.source = "${pkgs.shadow.out}/bin/newgrp"; } else {}); }; } From b13230ce24848d5b8bd54d7aaaecbd1c3316742b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 15 Jan 2018 08:51:09 +0100 Subject: [PATCH 018/797] wildmidi: 0.3.9 -> 0.4.2 0.4.2 fixes the following CVEs: CVE-2017-11661 CVE-2017-11662 CVE-2017-11663 CVE-2017-11664 Fixes #33877. --- pkgs/development/libraries/wildmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 9d22833e1c0..06a4e48827e 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, alsaLib, freepats }: stdenv.mkDerivation rec { - name = "wildmidi-0.3.9"; + name = "wildmidi-0.4.2"; src = fetchurl { url = "https://github.com/Mindwerks/wildmidi/archive/${name}.tar.gz"; - sha256 = "1fbcsvzn8akvvy7vg6vmnikcc8gh405b4gp1r016bq7yginljwwp"; + sha256 = "178hm2wh5h7apkcb1a0dyla2ia8569php8ikz62rh0g6dp5l67am"; }; nativeBuildInputs = [ cmake ]; From c946c101d6dad31897c13a6ba3d6ff75ade1c81d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 15 Jan 2018 12:10:23 +0100 Subject: [PATCH 019/797] avoid package attributes starting with a digit --- nixos/modules/services/x11/window-managers/2bwm.nix | 4 ++-- pkgs/top-level/aliases.nix | 6 +++++- pkgs/top-level/all-packages.nix | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix index e3f5ec7dbe6..fdbdf35b0f5 100644 --- a/nixos/modules/services/x11/window-managers/2bwm.nix +++ b/nixos/modules/services/x11/window-managers/2bwm.nix @@ -25,12 +25,12 @@ in { name = "2bwm"; start = '' - ${pkgs."2bwm"}/bin/2bwm & + ${pkgs._2bwm}/bin/2bwm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs."2bwm" ]; + environment.systemPackages = [ pkgs._2bwm ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f0054b9841b..6ee622d2eef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -24,7 +24,11 @@ in ### Deprecated aliases - for backward compatibility mapAliases (rec { - accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 + _2048-in-terminal = "2048-in-terminal"; # added 2017-01-16 + _2bwm = "2bwm"; # added 2017-01-16 + _389-ds-base = "389-ds-base"; # added 2017-01-16 + _90secondportraits = "90secondsportraits"; # added 2017-01-16 + accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; # added 2013-11-04 aircrackng = aircrack-ng; # added 2016-01-14 ammonite-repl = ammonite; # added 2017-05-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06a6eaec0a2..4c946882633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7313,7 +7313,7 @@ with pkgs; cide = callPackage ../development/tools/continuous-integration/cide { }; - "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; + cl-launch = callPackage ../development/tools/misc/cl-launch {}; cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; @@ -11739,7 +11739,7 @@ with pkgs; ### SERVERS - "389-ds-base" = callPackage ../servers/ldap/389 { + _389-ds-base = callPackage ../servers/ldap/389 { kerberos = libkrb5; }; @@ -14040,7 +14040,7 @@ with pkgs; ### APPLICATIONS - "2bwm" = callPackage ../applications/window-managers/2bwm { + _2bwm = callPackage ../applications/window-managers/2bwm { patches = config."2bwm".patches or []; }; @@ -18052,9 +18052,9 @@ with pkgs; ### GAMES - "2048-in-terminal" = callPackage ../games/2048-in-terminal { }; + _2048-in-terminal = callPackage ../games/2048-in-terminal { }; - "90secondportraits" = callPackage ../games/90secondportraits { love = love_0_10; }; + _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; adom = callPackage ../games/adom { }; From aff5137fc0c927f380d4c1ae7bcf001a3a303a05 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 15 Jan 2018 12:38:45 +0100 Subject: [PATCH 020/797] docs: document changes regarding package attribute with a digit --- nixos/doc/manual/release-notes/rl-1803.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index e7e0e4e8f25..938080d9a29 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -88,6 +88,28 @@ following incompatible changes: . + + + Package attributes starting with a digit have been prefixed with an + underscore sign. This is to avoid quoting in the configuration and + other issues with command-line tools like nix-env. + The change affects the following packages: + + + 2048-in-terminal → _2048-in-terminal + + + 90secondportraits → _90secondportraits + + + 2bwm → _2bwm + + + 389-ds-base → _389-ds-base + + + + From 256d14793111bee1184cbc82d7774d8ed50d6c2b Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Sun, 14 Jan 2018 03:04:08 -0500 Subject: [PATCH 021/797] teleport: init at v2.4.0 --- pkgs/servers/teleport/default.nix | 40 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/servers/teleport/default.nix diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix new file mode 100644 index 00000000000..ae8ea331716 --- /dev/null +++ b/pkgs/servers/teleport/default.nix @@ -0,0 +1,40 @@ +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +{ stdenv, buildGoPackage, zip, fetchurl }: + +buildGoPackage rec { + name = "teleport-${version}"; + version = "2.4.0"; + + goPackagePath = "github.com/gravitational/teleport"; + subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; + buildInputs = [ zip ]; + postBuild = '' + pushd . + cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport + mkdir -p build + echo "making webassets" + make build/webassets.zip + cat build/webassets.zip >> $NIX_BUILD_TOP/go/bin/teleport + rm -fr build/webassets.zip + cd $NIX_BUILD_TOP/go/bin + zip -q -A teleport + popd + ''; + + dontStrip = true; + + # This repo has a private submodule "e" which fetchgit cannot handle + # without failing. Using fetchurl instead on the latest tagged release. + src = fetchurl { + url = "https://github.com/gravitational/teleport/archive/v2.4.0.tar.gz"; + sha256 = "01qcr6vml3ias3gbkqjnb5fmc6ap1fd5mi52ygn3agafy63jb5rd"; + }; + + meta = { + description = "A SSH CA management suite"; + homepage = "https://gravitational.com/teleport/"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.tomberek ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2d5bb5d22e..d8ea449d773 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4783,6 +4783,8 @@ with pkgs; telegraf = callPackage ../servers/monitoring/telegraf { }; + teleport = callPackage ../servers/teleport {}; + telepresence = callPackage ../tools/networking/telepresence { }; texmacs = callPackage ../applications/editors/texmacs { From 62dcb3d5d0d22f10a128a20a3acf099b2b66bf79 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 18 Jan 2018 00:00:20 +0900 Subject: [PATCH 022/797] buildRustCrate: Allow arbitrary attributes in crateOverrides --- pkgs/build-support/rust/build-rust-crate.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix index 72bb3b80492..e36fab36bf9 100644 --- a/pkgs/build-support/rust/build-rust-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate.nix @@ -297,9 +297,15 @@ in crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides }: let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_); + processedAttrs = [ + "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath" + "buildDependencies" "dependencies" "features" + "crateName" "version" "build" "authors" "colors" + ]; + extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; buildInputs_ = buildInputs; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { inherit (crate) crateName; @@ -372,7 +378,7 @@ stdenv.mkDerivation rec { }; installPhase = installCrate crateName; -}) { +} // extraDerivationAttrs)) { rust = rustc; release = true; verbose = true; From be797f7e1c48dd17cd4a03b9232a2d88557baac6 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 18 Jan 2018 00:01:04 +0900 Subject: [PATCH 023/797] cargo-vendor: Build from source using carnix Removes a binary bootstrap, and enables cargo-vendor on aarch64. --- pkgs/build-support/rust/cargo-vendor.nix | 34 - .../rust/cargo-vendor/cargo-vendor.nix | 1487 +++++++++++++++++ .../rust/cargo-vendor/default.nix | 10 + .../rust/default-crate-overrides.nix | 31 +- pkgs/build-support/rust/default.nix | 6 +- 5 files changed, 1529 insertions(+), 39 deletions(-) delete mode 100644 pkgs/build-support/rust/cargo-vendor.nix create mode 100644 pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix create mode 100644 pkgs/build-support/rust/cargo-vendor/default.nix diff --git a/pkgs/build-support/rust/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor.nix deleted file mode 100644 index 9c379eaa333..00000000000 --- a/pkgs/build-support/rust/cargo-vendor.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchurl, stdenv }: -let - inherit (stdenv) system; - - version = "0.1.12"; - - hashes = { - x86_64-linux = "1hxlavcxy374yypfamlkygjg662lhll8j434qcvdawkvlidg5ii5"; - x86_64-darwin = "1jkvhh710gwjnnjx59kaplx2ncfvkx9agfa76rr94sbjqq4igddm"; - }; - hash = hashes. ${system} or badSystem; - - badSystem = throw "missing bootstrap hash for platform ${system}"; - - platforms = { - x86_64-linux = "x86_64-unknown-linux-musl"; - x86_64-darwin = "x86_64-apple-darwin"; - }; - platform = platforms . ${system} or badSystem; - -in stdenv.mkDerivation { - name = "cargo-vendor-${version}"; - - src = fetchurl { - url = "https://github.com/alexcrichton/cargo-vendor/releases/download/${version}/cargo-vendor-${version}-${platform}.tar.gz"; - sha256 = hash; - }; - - phases = "unpackPhase installPhase"; - - installPhase = '' - install -Dm755 cargo-vendor $out/bin/cargo-vendor - ''; -} diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix new file mode 100644 index 00000000000..ac6bb6ab1bd --- /dev/null +++ b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix @@ -0,0 +1,1487 @@ +# Generated by carnix 0.5.2: carnix Cargo.lock -o cargo-vendor.nix +{ lib, buildPlatform, buildRustCrate, fetchgit }: +let kernel = buildPlatform.parsed.kernel.name; + abi = buildPlatform.parsed.abi.name; + hasFeature = feature: + lib.lists.any + (originName: feature.${originName}) + (builtins.attrNames feature); + + hasDefault = feature: + let defaultFeatures = builtins.attrNames (feature."default" or {}); in + (defaultFeatures == []) + || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); + + mkFeatures = feat: lib.lists.foldl (features: featureName: + if featureName != "" && hasFeature feat.${featureName} then + [ featureName ] ++ features + else + features + ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); + advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "advapi32-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7"; + libName = "advapi32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; + }; + atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.3"; + authors = [ "softprops " ]; + sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; + inherit dependencies buildDependencies features; + }; + backtrace_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.3"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "0invfdxkj85v8zyrjs3amfxjdk2a36x8irq7wq7kny6q49hh8y0z"; + inherit dependencies buildDependencies features; + }; + backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.16"; + authors = [ "Alex Crichton " ]; + sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; + }; + bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + inherit dependencies buildDependencies features; + }; + cargo_0_22_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cargo"; + version = "0.22.0"; + authors = [ "Yehuda Katz " "Carl Lerche " "Alex Crichton " ]; + sha256 = "1a47jzkxydsrcyybdqv7wd6a2f258c8bb8rb2jv5n4apxz5qhycl"; + libPath = "src/cargo/lib.rs"; + crateBin = [ { name = "cargo"; } ]; + inherit dependencies buildDependencies features; + }; + cargo_vendor_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cargo-vendor"; + version = "0.1.13"; + authors = [ "Alex Crichton " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.3"; + authors = [ "Alex Crichton " ]; + sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr"; + inherit dependencies buildDependencies features; + }; + cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; + inherit dependencies buildDependencies features; + }; + cmake_0_1_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cmake"; + version = "0.1.26"; + authors = [ "Alex Crichton " ]; + sha256 = "0qi1vb1fzlngxr4mzklg58jjmvwj08059pjvh0yh1azzj2mcmgx6"; + inherit dependencies buildDependencies features; + }; + core_foundation_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation"; + version = "0.4.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "1vn9cdbihjnqrlznrbvw0yggz5grb4wqll5xq080w28xxhnayyhx"; + inherit dependencies buildDependencies features; + }; + core_foundation_sys_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "core-foundation-sys"; + version = "0.4.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "022i015jzjmv85vr25l9caxz211649d8rnbcsmr0gh9k4ygm7pqk"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + crates_io_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crates-io"; + version = "0.11.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1xxhbka89bk1kkhl8nsnlp9ih64fzv904dyb7jyws7lizcvq77wm"; + libPath = "lib.rs"; + libName = "crates_io"; + inherit dependencies buildDependencies features; + }; + crossbeam_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "crossbeam"; + version = "0.2.10"; + authors = [ "Aaron Turon " ]; + sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq"; + inherit dependencies buildDependencies features; + }; + curl_0_4_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "curl"; + version = "0.4.8"; + authors = [ "Carl Lerche " "Alex Crichton " ]; + sha256 = "0pxg1bpplm1bp8b8gzlvs4pmd36m02gjhskvwrd161hh9pslczv5"; + inherit dependencies buildDependencies features; + }; + curl_sys_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "curl-sys"; + version = "0.3.15"; + authors = [ "Carl Lerche " "Alex Crichton " ]; + sha256 = "0x2ysxhpwg1a7srf74v4qcy516jzf0kjg87hsl6cfnasxplz5x1g"; + libPath = "lib.rs"; + libName = "curl_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbghelp-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq"; + libName = "dbghelp"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + docopt_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "docopt"; + version = "0.8.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "0kmqy534qgcc2hh81nd248jmnvdjb5y4wclddd7y2jjm27rzibss"; + crateBin = [ { name = "docopt-wordlist"; path = "src/wordlist.rs"; } ]; + inherit dependencies buildDependencies features; + }; + dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + inherit dependencies buildDependencies features; + }; + env_logger_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "env_logger"; + version = "0.4.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0nrx04p4xa86d5kc7aq4fwvipbqji9cmgy449h47nc9f1chafhgg"; + inherit dependencies buildDependencies features; + }; + error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.11.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; + inherit dependencies buildDependencies features; + }; + filetime_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "filetime"; + version = "0.1.14"; + authors = [ "Alex Crichton " ]; + sha256 = "0i6dvc3ba7vl1iccc91k7c9bv9j5md98mbvlmfy0kicikx0ffn08"; + inherit dependencies buildDependencies features; + }; + flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "flate2"; + version = "0.2.20"; + authors = [ "Alex Crichton " ]; + sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; + inherit dependencies buildDependencies features; + }; + fnv_1_0_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fnv"; + version = "1.0.5"; + authors = [ "Alex Crichton " ]; + sha256 = "164832m16b3hdm3jfrda03ps3ayi5qb855irpm9sqpnw1awpy2a2"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + foreign_types_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "foreign-types"; + version = "0.2.0"; + authors = [ "Steven Fackler " ]; + sha256 = "1sznwg2py4xi7hyrx0gg1sirlwgh87wsanvjx3zb475g6c4139jh"; + inherit dependencies buildDependencies features; + }; + fs2_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fs2"; + version = "0.4.2"; + authors = [ "Dan Burkert " ]; + sha256 = "034s52pmqvrkafmmlnklysqx6gl08rl63ycngbav9hs0mrq22qvf"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.2.1"; + authors = [ "Raph Levien " ]; + sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; + inherit dependencies buildDependencies features; + }; + fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.2.0"; + authors = [ "Raph Levien " ]; + sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; + inherit dependencies buildDependencies features; + }; + git2_0_6_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "git2"; + version = "0.6.8"; + authors = [ "Alex Crichton " ]; + sha256 = "1si82zg35a1az91wa2zjwlkmbd4pdia8wf87j6hz4bs8l55y8fd9"; + inherit dependencies buildDependencies features; + }; + git2_curl_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "git2-curl"; + version = "0.7.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1k36py61r3g7xz79ms02c1zb9x5c60g4wnjg2ffwz2j7kqzw9cc8"; + inherit dependencies buildDependencies features; + }; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; + }; + globset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "globset"; + version = "0.2.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "02dycdz001g33rs2jygiq7yqqswmy1in5rczfl44clq1p118fis0"; + inherit dependencies buildDependencies features; + }; + hex_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hex"; + version = "0.2.0"; + authors = [ "KokaKiwi " ]; + sha256 = "0yd68d709w1z8133n9hny9dfj2fvil0r6802c3bb63czyis8rfbp"; + inherit dependencies buildDependencies features; + }; + home_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "home"; + version = "0.3.0"; + authors = [ "Brian Anderson " ]; + sha256 = "1dzc0wd2i82zqq1s8j4mpy2almaq5fcas22s4asn38pm86k40zf2"; + inherit dependencies buildDependencies features; + }; + idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "idna"; + version = "0.1.4"; + authors = [ "The rust-url developers" ]; + sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336"; + inherit dependencies buildDependencies features; + }; + ignore_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ignore"; + version = "0.2.2"; + authors = [ "Andrew Gallant " ]; + sha256 = "1b9wc8q25jwbipxmrysaps7sykbhyh6hdl8ihqzlwfvg39dy7mjc"; + inherit dependencies buildDependencies features; + }; + itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.4"; + authors = [ "David Tolnay " ]; + sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + inherit dependencies buildDependencies features; + }; + jobserver_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jobserver"; + version = "0.1.8"; + authors = [ "Alex Crichton " ]; + sha256 = "0rscjndafcrldrlb5nax2jgnc6fk298awqc6yzi9lbnbybm6r004"; + inherit dependencies buildDependencies features; + }; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + lazy_static_0_2_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.9"; + authors = [ "Marvin Löbel " ]; + sha256 = "08ldzr5292y3hvi6l6v8l4i6v95lm1aysmnfln65h10sqrfh6iw7"; + inherit dependencies buildDependencies features; + }; + libc_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1l7synziccnvarsq2kk22vps720ih6chmn016bhr2bq54hblbnl1"; + inherit dependencies buildDependencies features; + }; + libgit2_sys_0_6_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libgit2-sys"; + version = "0.6.16"; + authors = [ "Alex Crichton " ]; + sha256 = "05axjdwkm7z8z6c7s96cakdigjiq9sfah8z48868bhby6v1q30n9"; + libPath = "lib.rs"; + libName = "libgit2_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + libssh2_sys_0_2_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libssh2-sys"; + version = "0.2.6"; + authors = [ "Alex Crichton " ]; + sha256 = "0pvdgr3lg9x8xyjmfwifr9dxirvrzjvq7i3clix50rwp7ck21jh7"; + libPath = "lib.rs"; + libName = "libssh2_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + libz_sys_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libz-sys"; + version = "1.0.18"; + authors = [ "Alex Crichton " ]; + sha256 = "0lr0rvmmfbfa4g7mhi0l93i8jq86pfcssdv4d40kzfy45ajdcgim"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.8"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; + inherit dependencies buildDependencies features; + }; + matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "matches"; + version = "0.1.6"; + authors = [ "Simon Sapin " ]; + sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "1.0.2"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; + inherit dependencies buildDependencies features; + }; + memchr_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "2.0.0"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "182svm4sr8b7l38ss6ph5wkj3p7ypp08jq65fm83mxpylxziih9p"; + inherit dependencies buildDependencies features; + }; + miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miniz-sys"; + version = "0.1.10"; + authors = [ "Alex Crichton " ]; + sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; + libPath = "lib.rs"; + libName = "miniz_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miow"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; + inherit dependencies buildDependencies features; + }; + net2_0_2_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "net2"; + version = "0.2.31"; + authors = [ "Alex Crichton " ]; + sha256 = "13mphllfcbybsdqyi1jb3kyqx65m8ch07drr59a4wb3yl89awm7y"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.7.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0231xmd65ma3pqfiw8pkv9dvm9x708z4xlrwp3i0sgiwv408dz3f"; + inherit dependencies buildDependencies features; + }; + openssl_0_9_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl"; + version = "0.9.20"; + authors = [ "Steven Fackler " ]; + sha256 = "0dbj6k6z828c3sqbxidw5zfval29k8dlsr8qn8fizhc1alli18gx"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + openssl_probe_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl-probe"; + version = "0.1.1"; + authors = [ "Alex Crichton " ]; + sha256 = "19ykmqfnbmq56nadir0kvap4q1rpcjpmrfpnbc1qkj195dnh66na"; + inherit dependencies buildDependencies features; + }; + openssl_sys_0_9_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "openssl-sys"; + version = "0.9.20"; + authors = [ "Alex Crichton " "Steven Fackler " ]; + sha256 = "05q6qagvy7lim9vkq2v00vpm34j1dq4xy9pchs7fb6yy803vx24m"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + percent_encoding_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.0"; + authors = [ "The rust-url developers" ]; + sha256 = "0c91wp8inj7z270i2kilxjl00kcagqalxxnnjg7fsdlimdwb7q1z"; + libPath = "lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + psapi_sys_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "psapi-sys"; + version = "0.1.0"; + authors = [ "Peter Atashian " ]; + sha256 = "091sbrcwbnhq1mwx6rc5w5kkwzg2ph78rhwjkdy9aqnzj7yj5ppm"; + libName = "psapi"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + authors = [ "David Tolnay " ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + inherit dependencies buildDependencies features; + }; + rand_0_3_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.18"; + authors = [ "The Rust Project Developers" ]; + sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv"; + inherit dependencies buildDependencies features; + }; + redox_syscall_0_1_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.31"; + authors = [ "Jeremy Soller " ]; + sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4"; + libName = "syscall"; + inherit dependencies buildDependencies features; + }; + redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.2.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.4.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls"; + inherit dependencies buildDependencies features; + }; + rustc_demangle_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.5"; + authors = [ "Alex Crichton " ]; + sha256 = "096kkcx9j747700fhxj1s4rlwkj21pqjmvj64psdj6bakb2q13nc"; + inherit dependencies buildDependencies features; + }; + same_file_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "same-file"; + version = "0.1.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "01hdnxblb1hlysr47nwdv7r8vs7p63ia08v5h4lcffmzqvl5zzn9"; + inherit dependencies buildDependencies features; + }; + scoped_tls_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped-tls"; + version = "0.1.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1j8azxa15srljafrg7wc221npvxb3700sbfk6jjav0rw2zclsnf5"; + inherit dependencies buildDependencies features; + }; + scopeguard_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scopeguard"; + version = "0.1.2"; + authors = [ "bluss" ]; + sha256 = "00b3jrxlrzqv7qqzdd18m6p5skj1xwb4nw6bhch2ikg0hnfv5zdb"; + inherit dependencies buildDependencies features; + }; + semver_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.7.0"; + authors = [ "Steve Klabnik " "The Rust Project Developers" ]; + sha256 = "079944bh20ldr41i96nk9b31igj555dl2d8mg51m4h0ccwric4l8"; + inherit dependencies buildDependencies features; + }; + semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver-parser"; + version = "0.7.0"; + authors = [ "Steve Klabnik " ]; + sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; + inherit dependencies buildDependencies features; + }; + serde_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "1.0.18"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "14cczcvmfwgbm8447k93aggi7fbx0ix5f7dz16fxzs9l3riac5vq"; + inherit dependencies buildDependencies features; + }; + serde_derive_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.18"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1kx8zjcc9mxib6ipb9ygjjgxdniff93pwazvj4vqb859paqazdsj"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + serde_derive_internals_0_16_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive_internals"; + version = "0.16.0"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1k96ypwlhnvmaksimkx1pd5rwvjaanfcdzpgndhy994hx03xplhs"; + inherit dependencies buildDependencies features; + }; + serde_ignored_0_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_ignored"; + version = "0.0.3"; + authors = [ "David Tolnay " ]; + sha256 = "0yz81jz6rqbzbhznmkygl9rdq1xq43jsgv10mmd5m24vh4j00icc"; + inherit dependencies buildDependencies features; + }; + serde_json_1_0_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.5"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1yka3aa2gfi30415jpf0935k54r08jhyw6r7rjz2nv1kqgbw2brs"; + inherit dependencies buildDependencies features; + }; + shell_escape_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "shell-escape"; + version = "0.1.3"; + authors = [ "Steven Fackler " ]; + sha256 = "0r3pj7kl40iqjbivwh4kd6agjdhbf5avzp7i8v42xvpc1zrzrq77"; + inherit dependencies buildDependencies features; + }; + socket2_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "socket2"; + version = "0.2.4"; + authors = [ "Alex Crichton " ]; + sha256 = "1pdwqlx4wnabgv549i3pb3whbk8ggcq4kg0lfx9cpcazcjk5p6iz"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + authors = [ "David Tolnay " ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + inherit dependencies buildDependencies features; + }; + synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + authors = [ "David Tolnay " ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + inherit dependencies buildDependencies features; + }; + tar_0_4_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tar"; + version = "0.4.13"; + authors = [ "Alex Crichton " ]; + sha256 = "1m425d07h0i6h2vbpxnh067zmc16l9yr9bii17zxw4z2inkfyfc4"; + inherit dependencies buildDependencies features; + }; + tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz"; + inherit dependencies buildDependencies features; + }; + termcolor_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termcolor"; + version = "0.3.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1rb853jzvkbwm62373dhls4x4r3r5cvfcsxvqh0i75rhx5j8kwsz"; + inherit dependencies buildDependencies features; + }; + termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + inherit dependencies buildDependencies features; + }; + thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.4"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; + inherit dependencies buildDependencies features; + }; + toml_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.4.5"; + authors = [ "Alex Crichton " ]; + sha256 = "06zxqhn3y58yzjfaykhcrvlf7p2dnn54kn3g4apmja3cn5b18lkk"; + inherit dependencies buildDependencies features; + }; + unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + inherit dependencies buildDependencies features; + }; + unicode_normalization_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.5"; + authors = [ "kwantam " ]; + sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5"; + inherit dependencies buildDependencies features; + }; + unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + inherit dependencies buildDependencies features; + }; + unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + authors = [ "Jonathan Reem " ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + inherit dependencies buildDependencies features; + }; + url_1_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "url"; + version = "1.6.0"; + authors = [ "The rust-url developers" ]; + sha256 = "1bvzl4dvjj84h46ai3x23wyafa2wwhchj08vr2brf25dxwc7mg18"; + inherit dependencies buildDependencies features; + }; + userenv_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "userenv-sys"; + version = "0.2.0"; + authors = [ "Peter Atashian " ]; + sha256 = "19l85k56y30likj69ri83jspsf4n9q4d03pi4mbs7cimlzn8lvzj"; + libName = "userenv"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; + inherit dependencies buildDependencies features; + }; + vcpkg_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.2"; + authors = [ "Jim McGrath " ]; + sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + walkdir_1_0_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "walkdir"; + version = "1.0.7"; + authors = [ "Andrew Gallant " ]; + sha256 = "1ygsc59m8mbnlz0psjxdzm1xjndxpywjwalqcd3pwdarzk1gy1vr"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + wincolor_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wincolor"; + version = "0.1.4"; + authors = [ "Andrew Gallant " ]; + sha256 = "0cxv6hadnj5vffb8a73y7055p59n20bpqd524df85cm29dcjl38a"; + inherit dependencies buildDependencies features; + }; + ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ws2_32-sys"; + version = "0.2.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; + libName = "ws2_32"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + +in +rec { + advapi32_sys_0_2_0 = advapi32_sys_0_2_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_advapi32_sys_0_2_0__default_ = true; + winapi_build_0_1_1_features."default".from_advapi32_sys_0_2_0__default_ = true; + aho_corasick_0_6_3 = aho_corasick_0_6_3_ rec { + dependencies = [ memchr_1_0_2 ]; + }; + memchr_1_0_2_features."default".from_aho_corasick_0_6_3__default_ = true; + atty_0_2_3 = atty_0_2_3_ rec { + dependencies = (if kernel == "redox" then [ termion_1_5_1 ] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + kernel32_sys_0_2_2_features."default".from_atty_0_2_3__default_ = true; + libc_0_2_33_features."default".from_atty_0_2_3__default_ = false; + termion_1_5_1_features."default".from_atty_0_2_3__default_ = true; + winapi_0_2_8_features."default".from_atty_0_2_3__default_ = true; + backtrace_0_3_3 = backtrace_0_3_3_ rec { + dependencies = [ cfg_if_0_1_2 rustc_demangle_0_1_5 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then [ backtrace_sys_0_1_16 ] + ++ (if lib.lists.any (x: x == "backtrace-sys") features then [backtrace_sys_0_1_16] else []) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ dbghelp_sys_0_2_0 kernel32_sys_0_2_2 winapi_0_2_8 ] + ++ (if lib.lists.any (x: x == "dbghelp-sys") features then [dbghelp_sys_0_2_0] else []) + ++ (if lib.lists.any (x: x == "kernel32-sys") features then [kernel32_sys_0_2_2] else []) + ++ (if lib.lists.any (x: x == "winapi") features then [winapi_0_2_8] else []) else []); + features = mkFeatures backtrace_0_3_3_features; + }; + backtrace_0_3_3_features."".self = true; + backtrace_0_3_3_features."kernel32-sys".self_dbghelp = hasFeature (backtrace_0_3_3_features."dbghelp" or {}); + backtrace_0_3_3_features."winapi".self_dbghelp = hasFeature (backtrace_0_3_3_features."dbghelp" or {}); + backtrace_0_3_3_features."dbghelp-sys".self_dbghelp = hasFeature (backtrace_0_3_3_features."dbghelp" or {}); + backtrace_0_3_3_features."libunwind".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."libbacktrace".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."coresymbolication".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."dladdr".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."dbghelp".self_default = hasDefault backtrace_0_3_3_features; + backtrace_0_3_3_features."addr2line".self_gimli-symbolize = hasFeature (backtrace_0_3_3_features."gimli-symbolize" or {}); + backtrace_0_3_3_features."findshlibs".self_gimli-symbolize = hasFeature (backtrace_0_3_3_features."gimli-symbolize" or {}); + backtrace_0_3_3_features."backtrace-sys".self_libbacktrace = hasFeature (backtrace_0_3_3_features."libbacktrace" or {}); + backtrace_0_3_3_features."rustc-serialize".self_serialize-rustc = hasFeature (backtrace_0_3_3_features."serialize-rustc" or {}); + backtrace_0_3_3_features."serde".self_serialize-serde = hasFeature (backtrace_0_3_3_features."serialize-serde" or {}); + backtrace_0_3_3_features."serde_derive".self_serialize-serde = hasFeature (backtrace_0_3_3_features."serialize-serde" or {}); + addr2line_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + backtrace_sys_0_1_16_features."default".from_backtrace_0_3_3__default_ = true; + cfg_if_0_1_2_features."default".from_backtrace_0_3_3__default_ = true; + cpp_demangle_0_0_0_features."default".from_backtrace_0_3_3__default_ = false; + dbghelp_sys_0_2_0_features."default".from_backtrace_0_3_3__default_ = true; + findshlibs_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + kernel32_sys_0_2_2_features."default".from_backtrace_0_3_3__default_ = true; + libc_0_2_33_features."default".from_backtrace_0_3_3__default_ = true; + rustc_demangle_0_1_5_features."default".from_backtrace_0_3_3__default_ = true; + rustc_serialize_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + serde_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + serde_derive_0_0_0_features."default".from_backtrace_0_3_3__default_ = true; + winapi_0_2_8_features."default".from_backtrace_0_3_3__default_ = true; + backtrace_sys_0_1_16 = backtrace_sys_0_1_16_ rec { + dependencies = [ libc_0_2_33 ]; + buildDependencies = [ cc_1_0_3 ]; + }; + cc_1_0_3_features."default".from_backtrace_sys_0_1_16__default_ = true; + libc_0_2_33_features."default".from_backtrace_sys_0_1_16__default_ = true; + bitflags_0_7_0 = bitflags_0_7_0_ rec {}; + bitflags_0_9_1 = bitflags_0_9_1_ rec { + features = mkFeatures bitflags_0_9_1_features; + }; + bitflags_0_9_1_features."example_generated".self_default = hasDefault bitflags_0_9_1_features; + cargo_0_22_0 = cargo_0_22_0_ rec { + dependencies = [ atty_0_2_3 crates_io_0_11_0 crossbeam_0_2_10 curl_0_4_8 docopt_0_8_1 env_logger_0_4_3 error_chain_0_11_0 filetime_0_1_14 flate2_0_2_20 fs2_0_4_2 git2_0_6_8 git2_curl_0_7_0 glob_0_2_11 hex_0_2_0 home_0_3_0 ignore_0_2_2 jobserver_0_1_8 libc_0_2_33 libgit2_sys_0_6_16 log_0_3_8 num_cpus_1_7_0 same_file_0_1_3 scoped_tls_0_1_0 semver_0_7_0 serde_1_0_18 serde_derive_1_0_18 serde_ignored_0_0_3 serde_json_1_0_5 shell_escape_0_1_3 tar_0_4_13 tempdir_0_3_5 termcolor_0_3_3 toml_0_4_5 url_1_6_0 ] + ++ (if kernel == "darwin" then [ core_foundation_0_4_4 ] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ openssl_0_9_20 ] else []) + ++ (if kernel == "windows" then [ advapi32_sys_0_2_0 kernel32_sys_0_2_2 miow_0_2_1 psapi_sys_0_1_0 winapi_0_2_8 ] else []); + }; + semver_0_7_0_features."serde".from_cargo_0_22_0 = true; + core_foundation_0_4_4_features."mac_os_10_7_support".from_cargo_0_22_0 = true; + advapi32_sys_0_2_0_features."default".from_cargo_0_22_0__default_ = true; + atty_0_2_3_features."default".from_cargo_0_22_0__default_ = true; + core_foundation_0_4_4_features."default".from_cargo_0_22_0__default_ = true; + crates_io_0_11_0_features."default".from_cargo_0_22_0__default_ = true; + crossbeam_0_2_10_features."default".from_cargo_0_22_0__default_ = true; + curl_0_4_8_features."default".from_cargo_0_22_0__default_ = true; + docopt_0_8_1_features."default".from_cargo_0_22_0__default_ = true; + env_logger_0_4_3_features."default".from_cargo_0_22_0__default_ = true; + error_chain_0_11_0_features."default".from_cargo_0_22_0__default_ = true; + filetime_0_1_14_features."default".from_cargo_0_22_0__default_ = true; + flate2_0_2_20_features."default".from_cargo_0_22_0__default_ = true; + fs2_0_4_2_features."default".from_cargo_0_22_0__default_ = true; + git2_0_6_8_features."default".from_cargo_0_22_0__default_ = true; + git2_curl_0_7_0_features."default".from_cargo_0_22_0__default_ = true; + glob_0_2_11_features."default".from_cargo_0_22_0__default_ = true; + hex_0_2_0_features."default".from_cargo_0_22_0__default_ = true; + home_0_3_0_features."default".from_cargo_0_22_0__default_ = true; + ignore_0_2_2_features."default".from_cargo_0_22_0__default_ = true; + jobserver_0_1_8_features."default".from_cargo_0_22_0__default_ = true; + kernel32_sys_0_2_2_features."default".from_cargo_0_22_0__default_ = true; + libc_0_2_33_features."default".from_cargo_0_22_0__default_ = true; + libgit2_sys_0_6_16_features."default".from_cargo_0_22_0__default_ = true; + log_0_3_8_features."default".from_cargo_0_22_0__default_ = true; + miow_0_2_1_features."default".from_cargo_0_22_0__default_ = true; + num_cpus_1_7_0_features."default".from_cargo_0_22_0__default_ = true; + openssl_0_9_20_features."default".from_cargo_0_22_0__default_ = true; + psapi_sys_0_1_0_features."default".from_cargo_0_22_0__default_ = true; + same_file_0_1_3_features."default".from_cargo_0_22_0__default_ = true; + scoped_tls_0_1_0_features."default".from_cargo_0_22_0__default_ = true; + semver_0_7_0_features."default".from_cargo_0_22_0__default_ = true; + serde_1_0_18_features."default".from_cargo_0_22_0__default_ = true; + serde_derive_1_0_18_features."default".from_cargo_0_22_0__default_ = true; + serde_ignored_0_0_3_features."default".from_cargo_0_22_0__default_ = true; + serde_json_1_0_5_features."default".from_cargo_0_22_0__default_ = true; + shell_escape_0_1_3_features."default".from_cargo_0_22_0__default_ = true; + tar_0_4_13_features."default".from_cargo_0_22_0__default_ = false; + tempdir_0_3_5_features."default".from_cargo_0_22_0__default_ = true; + termcolor_0_3_3_features."default".from_cargo_0_22_0__default_ = true; + toml_0_4_5_features."default".from_cargo_0_22_0__default_ = true; + url_1_6_0_features."default".from_cargo_0_22_0__default_ = true; + winapi_0_2_8_features."default".from_cargo_0_22_0__default_ = true; + cargo_vendor_0_1_13 = cargo_vendor_0_1_13_ rec { + dependencies = [ cargo_0_22_0 env_logger_0_4_3 serde_1_0_18 serde_derive_1_0_18 serde_json_1_0_5 toml_0_4_5 ]; + }; + cargo_0_22_0_features."default".from_cargo_vendor_0_1_13__default_ = true; + env_logger_0_4_3_features."default".from_cargo_vendor_0_1_13__default_ = true; + serde_1_0_18_features."default".from_cargo_vendor_0_1_13__default_ = true; + serde_derive_1_0_18_features."default".from_cargo_vendor_0_1_13__default_ = true; + serde_json_1_0_5_features."default".from_cargo_vendor_0_1_13__default_ = true; + toml_0_4_5_features."default".from_cargo_vendor_0_1_13__default_ = true; + cc_1_0_3 = cc_1_0_3_ rec { + dependencies = []; + features = mkFeatures cc_1_0_3_features; + }; + cc_1_0_3_features."rayon".self_parallel = hasFeature (cc_1_0_3_features."parallel" or {}); + rayon_0_0_0_features."default".from_cc_1_0_3__default_ = true; + cfg_if_0_1_2 = cfg_if_0_1_2_ rec {}; + cmake_0_1_26 = cmake_0_1_26_ rec { + dependencies = [ cc_1_0_3 ]; + }; + cc_1_0_3_features."default".from_cmake_0_1_26__default_ = true; + core_foundation_0_4_4 = core_foundation_0_4_4_ rec { + dependencies = [ core_foundation_sys_0_4_4 libc_0_2_33 ]; + features = mkFeatures core_foundation_0_4_4_features; + }; + core_foundation_0_4_4_features."".self = true; + core_foundation_sys_0_4_4_features."mac_os_10_7_support".from_core_foundation_0_4_4__mac_os_10_7_support = hasFeature (core_foundation_0_4_4_features."mac_os_10_7_support" or {}); + core_foundation_sys_0_4_4_features."mac_os_10_8_features".from_core_foundation_0_4_4__mac_os_10_8_features = hasFeature (core_foundation_0_4_4_features."mac_os_10_8_features" or {}); + core_foundation_sys_0_4_4_features."default".from_core_foundation_0_4_4__default_ = true; + libc_0_2_33_features."default".from_core_foundation_0_4_4__default_ = true; + core_foundation_sys_0_4_4 = core_foundation_sys_0_4_4_ rec { + dependencies = [ libc_0_2_33 ]; + features = mkFeatures core_foundation_sys_0_4_4_features; + }; + core_foundation_sys_0_4_4_features."".self = true; + libc_0_2_33_features."default".from_core_foundation_sys_0_4_4__default_ = true; + crates_io_0_11_0 = crates_io_0_11_0_ rec { + dependencies = [ curl_0_4_8 error_chain_0_11_0 serde_1_0_18 serde_derive_1_0_18 serde_json_1_0_5 url_1_6_0 ]; + }; + curl_0_4_8_features."default".from_crates_io_0_11_0__default_ = true; + error_chain_0_11_0_features."default".from_crates_io_0_11_0__default_ = true; + serde_1_0_18_features."default".from_crates_io_0_11_0__default_ = true; + serde_derive_1_0_18_features."default".from_crates_io_0_11_0__default_ = true; + serde_json_1_0_5_features."default".from_crates_io_0_11_0__default_ = true; + url_1_6_0_features."default".from_crates_io_0_11_0__default_ = true; + crossbeam_0_2_10 = crossbeam_0_2_10_ rec { + features = mkFeatures crossbeam_0_2_10_features; + }; + crossbeam_0_2_10_features."".self = true; + curl_0_4_8 = curl_0_4_8_ rec { + dependencies = [ curl_sys_0_3_15 libc_0_2_33 socket2_0_2_4 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then [ openssl_probe_0_1_1 openssl_sys_0_9_20 ] else []) + ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []); + }; + curl_sys_0_3_15_features."default".from_curl_0_4_8__default_ = true; + libc_0_2_33_features."default".from_curl_0_4_8__default_ = true; + openssl_probe_0_1_1_features."default".from_curl_0_4_8__default_ = true; + openssl_sys_0_9_20_features."default".from_curl_0_4_8__default_ = true; + socket2_0_2_4_features."default".from_curl_0_4_8__default_ = true; + winapi_0_2_8_features."default".from_curl_0_4_8__default_ = true; + curl_sys_0_3_15 = curl_sys_0_3_15_ rec { + dependencies = [ libc_0_2_33 libz_sys_1_0_18 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then [ openssl_sys_0_9_20 ] else []) + ++ (if abi == "msvc" then [] else []) + ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []); + buildDependencies = [ cc_1_0_3 pkg_config_0_3_9 ]; + }; + cc_1_0_3_features."default".from_curl_sys_0_3_15__default_ = true; + libc_0_2_33_features."default".from_curl_sys_0_3_15__default_ = true; + libz_sys_1_0_18_features."default".from_curl_sys_0_3_15__default_ = true; + openssl_sys_0_9_20_features."default".from_curl_sys_0_3_15__default_ = true; + pkg_config_0_3_9_features."default".from_curl_sys_0_3_15__default_ = true; + winapi_0_2_8_features."default".from_curl_sys_0_3_15__default_ = true; + dbghelp_sys_0_2_0 = dbghelp_sys_0_2_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_dbghelp_sys_0_2_0__default_ = true; + winapi_build_0_1_1_features."default".from_dbghelp_sys_0_2_0__default_ = true; + docopt_0_8_1 = docopt_0_8_1_ rec { + dependencies = [ lazy_static_0_2_9 regex_0_2_2 serde_1_0_18 serde_derive_1_0_18 strsim_0_6_0 ]; + }; + lazy_static_0_2_9_features."default".from_docopt_0_8_1__default_ = true; + regex_0_2_2_features."default".from_docopt_0_8_1__default_ = true; + serde_1_0_18_features."default".from_docopt_0_8_1__default_ = true; + serde_derive_1_0_18_features."default".from_docopt_0_8_1__default_ = true; + strsim_0_6_0_features."default".from_docopt_0_8_1__default_ = true; + dtoa_0_4_2 = dtoa_0_4_2_ rec {}; + env_logger_0_4_3 = env_logger_0_4_3_ rec { + dependencies = [ log_0_3_8 regex_0_2_2 ] + ++ (if lib.lists.any (x: x == "regex") features then [regex_0_2_2] else []); + features = mkFeatures env_logger_0_4_3_features; + }; + env_logger_0_4_3_features."".self = true; + env_logger_0_4_3_features."regex".self_default = hasDefault env_logger_0_4_3_features; + log_0_3_8_features."default".from_env_logger_0_4_3__default_ = true; + regex_0_2_2_features."default".from_env_logger_0_4_3__default_ = true; + error_chain_0_11_0 = error_chain_0_11_0_ rec { + dependencies = [ backtrace_0_3_3 ] + ++ (if lib.lists.any (x: x == "backtrace") features then [backtrace_0_3_3] else []); + features = mkFeatures error_chain_0_11_0_features; + }; + error_chain_0_11_0_features."".self = true; + error_chain_0_11_0_features."backtrace".self_default = hasDefault error_chain_0_11_0_features; + error_chain_0_11_0_features."example_generated".self_default = hasDefault error_chain_0_11_0_features; + backtrace_0_3_3_features."default".from_error_chain_0_11_0__default_ = true; + filetime_0_1_14 = filetime_0_1_14_ rec { + dependencies = [ cfg_if_0_1_2 ] + ++ (if kernel == "redox" then [ redox_syscall_0_1_31 ] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []); + }; + cfg_if_0_1_2_features."default".from_filetime_0_1_14__default_ = true; + libc_0_2_33_features."default".from_filetime_0_1_14__default_ = true; + redox_syscall_0_1_31_features."default".from_filetime_0_1_14__default_ = true; + flate2_0_2_20 = flate2_0_2_20_ rec { + dependencies = [ libc_0_2_33 miniz_sys_0_1_10 ] + ++ (if lib.lists.any (x: x == "miniz-sys") features then [miniz_sys_0_1_10] else []); + features = mkFeatures flate2_0_2_20_features; + }; + flate2_0_2_20_features."".self = true; + flate2_0_2_20_features."miniz-sys".self_default = hasDefault flate2_0_2_20_features; + flate2_0_2_20_features."tokio-io".self_tokio = hasFeature (flate2_0_2_20_features."tokio" or {}); + flate2_0_2_20_features."futures".self_tokio = hasFeature (flate2_0_2_20_features."tokio" or {}); + flate2_0_2_20_features."libz-sys".self_zlib = hasFeature (flate2_0_2_20_features."zlib" or {}); + futures_0_0_0_features."default".from_flate2_0_2_20__default_ = true; + libc_0_2_33_features."default".from_flate2_0_2_20__default_ = true; + libz_sys_0_0_0_features."default".from_flate2_0_2_20__default_ = true; + miniz_sys_0_1_10_features."default".from_flate2_0_2_20__default_ = true; + tokio_io_0_0_0_features."default".from_flate2_0_2_20__default_ = true; + fnv_1_0_5 = fnv_1_0_5_ rec {}; + foreign_types_0_2_0 = foreign_types_0_2_0_ rec {}; + fs2_0_4_2 = fs2_0_4_2_ rec { + dependencies = (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + kernel32_sys_0_2_2_features."default".from_fs2_0_4_2__default_ = true; + libc_0_2_33_features."default".from_fs2_0_4_2__default_ = true; + winapi_0_2_8_features."default".from_fs2_0_4_2__default_ = true; + fuchsia_zircon_0_2_1 = fuchsia_zircon_0_2_1_ rec { + dependencies = [ fuchsia_zircon_sys_0_2_0 ]; + }; + fuchsia_zircon_sys_0_2_0_features."default".from_fuchsia_zircon_0_2_1__default_ = true; + fuchsia_zircon_sys_0_2_0 = fuchsia_zircon_sys_0_2_0_ rec { + dependencies = [ bitflags_0_7_0 ]; + }; + bitflags_0_7_0_features."default".from_fuchsia_zircon_sys_0_2_0__default_ = true; + git2_0_6_8 = git2_0_6_8_ rec { + dependencies = [ bitflags_0_9_1 libc_0_2_33 libgit2_sys_0_6_16 url_1_6_0 ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then [ openssl_probe_0_1_1 openssl_sys_0_9_20 ] + ++ (if lib.lists.any (x: x == "openssl-probe") features then [openssl_probe_0_1_1] else []) + ++ (if lib.lists.any (x: x == "openssl-sys") features then [openssl_sys_0_9_20] else []) else []); + features = mkFeatures git2_0_6_8_features; + }; + git2_0_6_8_features."".self = true; + git2_0_6_8_features."ssh".self_default = hasDefault git2_0_6_8_features; + git2_0_6_8_features."https".self_default = hasDefault git2_0_6_8_features; + git2_0_6_8_features."curl".self_default = hasDefault git2_0_6_8_features; + git2_0_6_8_features."openssl-sys".self_https = hasFeature (git2_0_6_8_features."https" or {}); + git2_0_6_8_features."openssl-probe".self_https = hasFeature (git2_0_6_8_features."https" or {}); + libgit2_sys_0_6_16_features."curl".from_git2_0_6_8__curl = hasFeature (git2_0_6_8_features."curl" or {}); + libgit2_sys_0_6_16_features."https".from_git2_0_6_8__https = hasFeature (git2_0_6_8_features."https" or {}); + libgit2_sys_0_6_16_features."ssh".from_git2_0_6_8__ssh = hasFeature (git2_0_6_8_features."ssh" or {}); + bitflags_0_9_1_features."default".from_git2_0_6_8__default_ = true; + libc_0_2_33_features."default".from_git2_0_6_8__default_ = true; + libgit2_sys_0_6_16_features."default".from_git2_0_6_8__default_ = true; + openssl_probe_0_1_1_features."default".from_git2_0_6_8__default_ = true; + openssl_sys_0_9_20_features."default".from_git2_0_6_8__default_ = true; + url_1_6_0_features."default".from_git2_0_6_8__default_ = true; + git2_curl_0_7_0 = git2_curl_0_7_0_ rec { + dependencies = [ curl_0_4_8 git2_0_6_8 log_0_3_8 url_1_6_0 ]; + }; + curl_0_4_8_features."default".from_git2_curl_0_7_0__default_ = true; + git2_0_6_8_features."default".from_git2_curl_0_7_0__default_ = false; + log_0_3_8_features."default".from_git2_curl_0_7_0__default_ = true; + url_1_6_0_features."default".from_git2_curl_0_7_0__default_ = true; + glob_0_2_11 = glob_0_2_11_ rec {}; + globset_0_2_1 = globset_0_2_1_ rec { + dependencies = [ aho_corasick_0_6_3 fnv_1_0_5 log_0_3_8 memchr_2_0_0 regex_0_2_2 ]; + features = mkFeatures globset_0_2_1_features; + }; + globset_0_2_1_features."".self = true; + regex_0_2_2_features."simd-accel".from_globset_0_2_1__simd-accel = hasFeature (globset_0_2_1_features."simd-accel" or {}); + aho_corasick_0_6_3_features."default".from_globset_0_2_1__default_ = true; + fnv_1_0_5_features."default".from_globset_0_2_1__default_ = true; + log_0_3_8_features."default".from_globset_0_2_1__default_ = true; + memchr_2_0_0_features."default".from_globset_0_2_1__default_ = true; + regex_0_2_2_features."default".from_globset_0_2_1__default_ = true; + hex_0_2_0 = hex_0_2_0_ rec {}; + home_0_3_0 = home_0_3_0_ rec { + dependencies = (if kernel == "windows" then [ advapi32_sys_0_2_0 kernel32_sys_0_2_2 scopeguard_0_1_2 userenv_sys_0_2_0 winapi_0_2_8 ] else []); + }; + advapi32_sys_0_2_0_features."default".from_home_0_3_0__default_ = true; + kernel32_sys_0_2_2_features."default".from_home_0_3_0__default_ = true; + scopeguard_0_1_2_features."default".from_home_0_3_0__default_ = true; + userenv_sys_0_2_0_features."default".from_home_0_3_0__default_ = true; + winapi_0_2_8_features."default".from_home_0_3_0__default_ = true; + idna_0_1_4 = idna_0_1_4_ rec { + dependencies = [ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_5 ]; + }; + matches_0_1_6_features."default".from_idna_0_1_4__default_ = true; + unicode_bidi_0_3_4_features."default".from_idna_0_1_4__default_ = true; + unicode_normalization_0_1_5_features."default".from_idna_0_1_4__default_ = true; + ignore_0_2_2 = ignore_0_2_2_ rec { + dependencies = [ crossbeam_0_2_10 globset_0_2_1 lazy_static_0_2_9 log_0_3_8 memchr_1_0_2 regex_0_2_2 thread_local_0_3_4 walkdir_1_0_7 ]; + features = mkFeatures ignore_0_2_2_features; + }; + ignore_0_2_2_features."".self = true; + globset_0_2_1_features."simd-accel".from_ignore_0_2_2__simd-accel = hasFeature (ignore_0_2_2_features."simd-accel" or {}); + crossbeam_0_2_10_features."default".from_ignore_0_2_2__default_ = true; + globset_0_2_1_features."default".from_ignore_0_2_2__default_ = true; + lazy_static_0_2_9_features."default".from_ignore_0_2_2__default_ = true; + log_0_3_8_features."default".from_ignore_0_2_2__default_ = true; + memchr_1_0_2_features."default".from_ignore_0_2_2__default_ = true; + regex_0_2_2_features."default".from_ignore_0_2_2__default_ = true; + thread_local_0_3_4_features."default".from_ignore_0_2_2__default_ = true; + walkdir_1_0_7_features."default".from_ignore_0_2_2__default_ = true; + itoa_0_3_4 = itoa_0_3_4_ rec { + features = mkFeatures itoa_0_3_4_features; + }; + itoa_0_3_4_features."".self = true; + jobserver_0_1_8 = jobserver_0_1_8_ rec { + dependencies = (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ rand_0_3_18 ] else []); + }; + libc_0_2_33_features."default".from_jobserver_0_1_8__default_ = true; + rand_0_3_18_features."default".from_jobserver_0_1_8__default_ = true; + kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default_ = true; + winapi_build_0_1_1_features."default".from_kernel32_sys_0_2_2__default_ = true; + lazy_static_0_2_9 = lazy_static_0_2_9_ rec { + dependencies = []; + features = mkFeatures lazy_static_0_2_9_features; + }; + lazy_static_0_2_9_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_9_features."spin_no_std" or {}); + lazy_static_0_2_9_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_9_features."spin_no_std" or {}); + spin_0_0_0_features."default".from_lazy_static_0_2_9__default_ = true; + libc_0_2_33 = libc_0_2_33_ rec { + features = mkFeatures libc_0_2_33_features; + }; + libc_0_2_33_features."use_std".self_default = hasDefault libc_0_2_33_features; + libgit2_sys_0_6_16 = libgit2_sys_0_6_16_ rec { + dependencies = [ curl_sys_0_3_15 libc_0_2_33 libssh2_sys_0_2_6 libz_sys_1_0_18 ] + ++ (if lib.lists.any (x: x == "curl-sys") features then [curl_sys_0_3_15] else []) + ++ (if lib.lists.any (x: x == "libssh2-sys") features then [libssh2_sys_0_2_6] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ openssl_sys_0_9_20 ] + ++ (if lib.lists.any (x: x == "openssl-sys") features then [openssl_sys_0_9_20] else []) else []); + buildDependencies = [ cc_1_0_3 cmake_0_1_26 pkg_config_0_3_9 ]; + features = mkFeatures libgit2_sys_0_6_16_features; + }; + libgit2_sys_0_6_16_features."".self = true; + libgit2_sys_0_6_16_features."curl-sys".self_curl = hasFeature (libgit2_sys_0_6_16_features."curl" or {}); + libgit2_sys_0_6_16_features."openssl-sys".self_https = hasFeature (libgit2_sys_0_6_16_features."https" or {}); + libgit2_sys_0_6_16_features."libssh2-sys".self_ssh = hasFeature (libgit2_sys_0_6_16_features."ssh" or {}); + cc_1_0_3_features."default".from_libgit2_sys_0_6_16__default_ = true; + cmake_0_1_26_features."default".from_libgit2_sys_0_6_16__default_ = true; + curl_sys_0_3_15_features."default".from_libgit2_sys_0_6_16__default_ = true; + libc_0_2_33_features."default".from_libgit2_sys_0_6_16__default_ = true; + libssh2_sys_0_2_6_features."default".from_libgit2_sys_0_6_16__default_ = true; + libz_sys_1_0_18_features."default".from_libgit2_sys_0_6_16__default_ = true; + openssl_sys_0_9_20_features."default".from_libgit2_sys_0_6_16__default_ = true; + pkg_config_0_3_9_features."default".from_libgit2_sys_0_6_16__default_ = true; + libssh2_sys_0_2_6 = libssh2_sys_0_2_6_ rec { + dependencies = [ libc_0_2_33 libz_sys_1_0_18 ] + ++ (if (kernel == "linux" || kernel == "darwin") then [ openssl_sys_0_9_20 ] else []); + buildDependencies = [ cmake_0_1_26 pkg_config_0_3_9 ]; + }; + cmake_0_1_26_features."default".from_libssh2_sys_0_2_6__default_ = true; + libc_0_2_33_features."default".from_libssh2_sys_0_2_6__default_ = true; + libz_sys_1_0_18_features."default".from_libssh2_sys_0_2_6__default_ = true; + openssl_sys_0_9_20_features."default".from_libssh2_sys_0_2_6__default_ = true; + pkg_config_0_3_9_features."default".from_libssh2_sys_0_2_6__default_ = true; + libz_sys_1_0_18 = libz_sys_1_0_18_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if abi == "msvc" then [] else []); + buildDependencies = [ cc_1_0_3 pkg_config_0_3_9 ]; + }; + cc_1_0_3_features."default".from_libz_sys_1_0_18__default_ = true; + libc_0_2_33_features."default".from_libz_sys_1_0_18__default_ = true; + pkg_config_0_3_9_features."default".from_libz_sys_1_0_18__default_ = true; + log_0_3_8 = log_0_3_8_ rec { + features = mkFeatures log_0_3_8_features; + }; + log_0_3_8_features."use_std".self_default = hasDefault log_0_3_8_features; + matches_0_1_6 = matches_0_1_6_ rec {}; + memchr_1_0_2 = memchr_1_0_2_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_33] else []); + features = mkFeatures memchr_1_0_2_features; + }; + memchr_1_0_2_features."".self = true; + memchr_1_0_2_features."use_std".self_default = hasDefault memchr_1_0_2_features; + memchr_1_0_2_features."libc".self_default = hasDefault memchr_1_0_2_features; + memchr_1_0_2_features."libc".self_use_std = hasFeature (memchr_1_0_2_features."use_std" or {}); + libc_0_2_33_features."use_std".from_memchr_1_0_2__use_std = hasFeature (memchr_1_0_2_features."use_std" or {}); + libc_0_2_33_features."default".from_memchr_1_0_2__default_ = false; + memchr_2_0_0 = memchr_2_0_0_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_33] else []); + features = mkFeatures memchr_2_0_0_features; + }; + memchr_2_0_0_features."".self = true; + memchr_2_0_0_features."use_std".self_default = hasDefault memchr_2_0_0_features; + memchr_2_0_0_features."libc".self_default = hasDefault memchr_2_0_0_features; + memchr_2_0_0_features."libc".self_use_std = hasFeature (memchr_2_0_0_features."use_std" or {}); + libc_0_2_33_features."use_std".from_memchr_2_0_0__use_std = hasFeature (memchr_2_0_0_features."use_std" or {}); + libc_0_2_33_features."default".from_memchr_2_0_0__default_ = false; + miniz_sys_0_1_10 = miniz_sys_0_1_10_ rec { + dependencies = [ libc_0_2_33 ]; + buildDependencies = [ cc_1_0_3 ]; + }; + cc_1_0_3_features."default".from_miniz_sys_0_1_10__default_ = true; + libc_0_2_33_features."default".from_miniz_sys_0_1_10__default_ = true; + miow_0_2_1 = miow_0_2_1_ rec { + dependencies = [ kernel32_sys_0_2_2 net2_0_2_31 winapi_0_2_8 ws2_32_sys_0_2_1 ]; + }; + kernel32_sys_0_2_2_features."default".from_miow_0_2_1__default_ = true; + net2_0_2_31_features."default".from_miow_0_2_1__default_ = false; + winapi_0_2_8_features."default".from_miow_0_2_1__default_ = true; + ws2_32_sys_0_2_1_features."default".from_miow_0_2_1__default_ = true; + net2_0_2_31 = net2_0_2_31_ rec { + dependencies = [ cfg_if_0_1_2 ] + ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ws2_32_sys_0_2_1 ] else []) + ++ (if kernel == "i686-apple-darwin" then [ libc_0_2_33 ] else []) + ++ (if kernel == "i686-unknown-linux-gnu" then [ libc_0_2_33 ] else []) + ++ (if kernel == "x86_64-apple-darwin" then [ libc_0_2_33 ] else []) + ++ (if kernel == "x86_64-unknown-linux-gnu" then [ libc_0_2_33 ] else []); + features = mkFeatures net2_0_2_31_features; + }; + net2_0_2_31_features."duration".self_default = hasDefault net2_0_2_31_features; + cfg_if_0_1_2_features."default".from_net2_0_2_31__default_ = true; + kernel32_sys_0_2_2_features."default".from_net2_0_2_31__default_ = true; + libc_0_2_33_features."default".from_net2_0_2_31__default_ = true; + winapi_0_2_8_features."default".from_net2_0_2_31__default_ = true; + ws2_32_sys_0_2_1_features."default".from_net2_0_2_31__default_ = true; + num_traits_0_1_40 = num_traits_0_1_40_ rec {}; + num_cpus_1_7_0 = num_cpus_1_7_0_ rec { + dependencies = [ libc_0_2_33 ]; + }; + libc_0_2_33_features."default".from_num_cpus_1_7_0__default_ = true; + openssl_0_9_20 = openssl_0_9_20_ rec { + dependencies = [ bitflags_0_9_1 foreign_types_0_2_0 lazy_static_0_2_9 libc_0_2_33 openssl_sys_0_9_20 ]; + features = mkFeatures openssl_0_9_20_features; + }; + openssl_0_9_20_features."".self = true; + bitflags_0_9_1_features."default".from_openssl_0_9_20__default_ = true; + foreign_types_0_2_0_features."default".from_openssl_0_9_20__default_ = true; + lazy_static_0_2_9_features."default".from_openssl_0_9_20__default_ = true; + libc_0_2_33_features."default".from_openssl_0_9_20__default_ = true; + openssl_sys_0_9_20_features."default".from_openssl_0_9_20__default_ = true; + openssl_probe_0_1_1 = openssl_probe_0_1_1_ rec {}; + openssl_sys_0_9_20 = openssl_sys_0_9_20_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if abi == "msvc" then [] else []); + buildDependencies = [ cc_1_0_3 pkg_config_0_3_9 ]; + }; + cc_1_0_3_features."default".from_openssl_sys_0_9_20__default_ = true; + libc_0_2_33_features."default".from_openssl_sys_0_9_20__default_ = true; + pkg_config_0_3_9_features."default".from_openssl_sys_0_9_20__default_ = true; + percent_encoding_1_0_0 = percent_encoding_1_0_0_ rec {}; + pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; + psapi_sys_0_1_0 = psapi_sys_0_1_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_psapi_sys_0_1_0__default_ = true; + winapi_build_0_1_1_features."default".from_psapi_sys_0_1_0__default_ = true; + quote_0_3_15 = quote_0_3_15_ rec {}; + rand_0_3_18 = rand_0_3_18_ rec { + dependencies = [ libc_0_2_33 ] + ++ (if kernel == "fuchsia" then [ fuchsia_zircon_0_2_1 ] else []); + features = mkFeatures rand_0_3_18_features; + }; + rand_0_3_18_features."i128_support".self_nightly = hasFeature (rand_0_3_18_features."nightly" or {}); + fuchsia_zircon_0_2_1_features."default".from_rand_0_3_18__default_ = true; + libc_0_2_33_features."default".from_rand_0_3_18__default_ = true; + redox_syscall_0_1_31 = redox_syscall_0_1_31_ rec {}; + redox_termios_0_1_1 = redox_termios_0_1_1_ rec { + dependencies = [ redox_syscall_0_1_31 ]; + }; + redox_syscall_0_1_31_features."default".from_redox_termios_0_1_1__default_ = true; + regex_0_2_2 = regex_0_2_2_ rec { + dependencies = [ aho_corasick_0_6_3 memchr_1_0_2 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]; + features = mkFeatures regex_0_2_2_features; + }; + regex_0_2_2_features."simd".self_simd-accel = hasFeature (regex_0_2_2_features."simd-accel" or {}); + aho_corasick_0_6_3_features."default".from_regex_0_2_2__default_ = true; + memchr_1_0_2_features."default".from_regex_0_2_2__default_ = true; + regex_syntax_0_4_1_features."default".from_regex_0_2_2__default_ = true; + simd_0_0_0_features."default".from_regex_0_2_2__default_ = true; + thread_local_0_3_4_features."default".from_regex_0_2_2__default_ = true; + utf8_ranges_1_0_0_features."default".from_regex_0_2_2__default_ = true; + regex_syntax_0_4_1 = regex_syntax_0_4_1_ rec {}; + rustc_demangle_0_1_5 = rustc_demangle_0_1_5_ rec {}; + same_file_0_1_3 = same_file_0_1_3_ rec { + dependencies = (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + kernel32_sys_0_2_2_features."default".from_same_file_0_1_3__default_ = true; + winapi_0_2_8_features."default".from_same_file_0_1_3__default_ = true; + scoped_tls_0_1_0 = scoped_tls_0_1_0_ rec {}; + scopeguard_0_1_2 = scopeguard_0_1_2_ rec {}; + semver_0_7_0 = semver_0_7_0_ rec { + dependencies = [ semver_parser_0_7_0 serde_1_0_18 ] + ++ (if lib.lists.any (x: x == "serde") features then [serde_1_0_18] else []); + features = mkFeatures semver_0_7_0_features; + }; + semver_0_7_0_features."".self = true; + semver_0_7_0_features."serde".self_ci = hasFeature (semver_0_7_0_features."ci" or {}); + semver_parser_0_7_0_features."default".from_semver_0_7_0__default_ = true; + serde_1_0_18_features."default".from_semver_0_7_0__default_ = true; + semver_parser_0_7_0 = semver_parser_0_7_0_ rec {}; + serde_1_0_18 = serde_1_0_18_ rec { + dependencies = []; + features = mkFeatures serde_1_0_18_features; + }; + serde_1_0_18_features."unstable".self_alloc = hasFeature (serde_1_0_18_features."alloc" or {}); + serde_1_0_18_features."std".self_default = hasDefault serde_1_0_18_features; + serde_1_0_18_features."serde_derive".self_derive = hasFeature (serde_1_0_18_features."derive" or {}); + serde_1_0_18_features."serde_derive".self_playground = hasFeature (serde_1_0_18_features."playground" or {}); + serde_derive_0_0_0_features."default".from_serde_1_0_18__default_ = true; + serde_derive_1_0_18 = serde_derive_1_0_18_ rec { + dependencies = [ quote_0_3_15 serde_derive_internals_0_16_0 syn_0_11_11 ]; + }; + syn_0_11_11_features."visit".from_serde_derive_1_0_18 = true; + quote_0_3_15_features."default".from_serde_derive_1_0_18__default_ = true; + serde_derive_internals_0_16_0_features."default".from_serde_derive_1_0_18__default_ = false; + syn_0_11_11_features."default".from_serde_derive_1_0_18__default_ = true; + serde_derive_internals_0_16_0 = serde_derive_internals_0_16_0_ rec { + dependencies = [ syn_0_11_11 synom_0_11_3 ]; + }; + syn_0_11_11_features."parsing".from_serde_derive_internals_0_16_0 = true; + syn_0_11_11_features."default".from_serde_derive_internals_0_16_0__default_ = false; + synom_0_11_3_features."default".from_serde_derive_internals_0_16_0__default_ = true; + serde_ignored_0_0_3 = serde_ignored_0_0_3_ rec { + dependencies = [ serde_1_0_18 ]; + }; + serde_1_0_18_features."default".from_serde_ignored_0_0_3__default_ = true; + serde_json_1_0_5 = serde_json_1_0_5_ rec { + dependencies = [ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_18 ]; + features = mkFeatures serde_json_1_0_5_features; + }; + serde_json_1_0_5_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_1_0_5_features."preserve_order" or {}); + dtoa_0_4_2_features."default".from_serde_json_1_0_5__default_ = true; + itoa_0_3_4_features."default".from_serde_json_1_0_5__default_ = true; + linked_hash_map_0_0_0_features."default".from_serde_json_1_0_5__default_ = true; + num_traits_0_1_40_features."default".from_serde_json_1_0_5__default_ = true; + serde_1_0_18_features."default".from_serde_json_1_0_5__default_ = true; + shell_escape_0_1_3 = shell_escape_0_1_3_ rec {}; + socket2_0_2_4 = socket2_0_2_4_ rec { + dependencies = (if (kernel == "linux" || kernel == "darwin") then [ cfg_if_0_1_2 libc_0_2_33 ] else []) + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ws2_32_sys_0_2_1 ] else []); + features = mkFeatures socket2_0_2_4_features; + }; + socket2_0_2_4_features."".self = true; + cfg_if_0_1_2_features."default".from_socket2_0_2_4__default_ = true; + kernel32_sys_0_2_2_features."default".from_socket2_0_2_4__default_ = true; + libc_0_2_33_features."default".from_socket2_0_2_4__default_ = true; + winapi_0_2_8_features."default".from_socket2_0_2_4__default_ = true; + ws2_32_sys_0_2_1_features."default".from_socket2_0_2_4__default_ = true; + strsim_0_6_0 = strsim_0_6_0_ rec {}; + syn_0_11_11 = syn_0_11_11_ rec { + dependencies = [ quote_0_3_15 synom_0_11_3 unicode_xid_0_0_4 ] + ++ (if lib.lists.any (x: x == "quote") features then [quote_0_3_15] else []) + ++ (if lib.lists.any (x: x == "synom") features then [synom_0_11_3] else []) + ++ (if lib.lists.any (x: x == "unicode-xid") features then [unicode_xid_0_0_4] else []); + features = mkFeatures syn_0_11_11_features; + }; + syn_0_11_11_features."".self = true; + syn_0_11_11_features."parsing".self_default = hasDefault syn_0_11_11_features; + syn_0_11_11_features."printing".self_default = hasDefault syn_0_11_11_features; + syn_0_11_11_features."unicode-xid".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {}); + syn_0_11_11_features."synom".self_parsing = hasFeature (syn_0_11_11_features."parsing" or {}); + syn_0_11_11_features."quote".self_printing = hasFeature (syn_0_11_11_features."printing" or {}); + quote_0_3_15_features."default".from_syn_0_11_11__default_ = true; + synom_0_11_3_features."default".from_syn_0_11_11__default_ = true; + unicode_xid_0_0_4_features."default".from_syn_0_11_11__default_ = true; + synom_0_11_3 = synom_0_11_3_ rec { + dependencies = [ unicode_xid_0_0_4 ]; + }; + unicode_xid_0_0_4_features."default".from_synom_0_11_3__default_ = true; + tar_0_4_13 = tar_0_4_13_ rec { + dependencies = [ filetime_0_1_14 libc_0_2_33 ] + ++ (if (kernel == "linux" || kernel == "darwin") then [] else []); + }; + tar_0_4_13_features."xattr".self_default = hasDefault tar_0_4_13_features; + filetime_0_1_14_features."default".from_tar_0_4_13__default_ = true; + libc_0_2_33_features."default".from_tar_0_4_13__default_ = true; + xattr_0_0_0_features."default".from_tar_0_4_13__default_ = true; + tempdir_0_3_5 = tempdir_0_3_5_ rec { + dependencies = [ rand_0_3_18 ]; + }; + rand_0_3_18_features."default".from_tempdir_0_3_5__default_ = true; + termcolor_0_3_3 = termcolor_0_3_3_ rec { + dependencies = (if kernel == "windows" then [ wincolor_0_1_4 ] else []); + }; + wincolor_0_1_4_features."default".from_termcolor_0_3_3__default_ = true; + termion_1_5_1 = termion_1_5_1_ rec { + dependencies = (if !(kernel == "redox") then [ libc_0_2_33 ] else []) + ++ (if kernel == "redox" then [ redox_syscall_0_1_31 redox_termios_0_1_1 ] else []); + }; + libc_0_2_33_features."default".from_termion_1_5_1__default_ = true; + redox_syscall_0_1_31_features."default".from_termion_1_5_1__default_ = true; + redox_termios_0_1_1_features."default".from_termion_1_5_1__default_ = true; + thread_local_0_3_4 = thread_local_0_3_4_ rec { + dependencies = [ lazy_static_0_2_9 unreachable_1_0_0 ]; + }; + lazy_static_0_2_9_features."default".from_thread_local_0_3_4__default_ = true; + unreachable_1_0_0_features."default".from_thread_local_0_3_4__default_ = true; + toml_0_4_5 = toml_0_4_5_ rec { + dependencies = [ serde_1_0_18 ]; + }; + serde_1_0_18_features."default".from_toml_0_4_5__default_ = true; + unicode_bidi_0_3_4 = unicode_bidi_0_3_4_ rec { + dependencies = [ matches_0_1_6 ]; + features = mkFeatures unicode_bidi_0_3_4_features; + }; + unicode_bidi_0_3_4_features."flame".self_flame_it = hasFeature (unicode_bidi_0_3_4_features."flame_it" or {}); + unicode_bidi_0_3_4_features."flamer".self_flame_it = hasFeature (unicode_bidi_0_3_4_features."flame_it" or {}); + unicode_bidi_0_3_4_features."serde".self_with_serde = hasFeature (unicode_bidi_0_3_4_features."with_serde" or {}); + serde_0_0_0_features."derive".from_unicode_bidi_0_3_4 = true; + flame_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true; + flamer_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true; + matches_0_1_6_features."default".from_unicode_bidi_0_3_4__default_ = true; + serde_0_0_0_features."default".from_unicode_bidi_0_3_4__default_ = true; + unicode_normalization_0_1_5 = unicode_normalization_0_1_5_ rec {}; + unicode_xid_0_0_4 = unicode_xid_0_0_4_ rec { + features = mkFeatures unicode_xid_0_0_4_features; + }; + unicode_xid_0_0_4_features."".self = true; + unreachable_1_0_0 = unreachable_1_0_0_ rec { + dependencies = [ void_1_0_2 ]; + }; + void_1_0_2_features."default".from_unreachable_1_0_0__default_ = false; + url_1_6_0 = url_1_6_0_ rec { + dependencies = [ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_0 ]; + features = mkFeatures url_1_6_0_features; + }; + url_1_6_0_features."heapsize".self_heap_size = hasFeature (url_1_6_0_features."heap_size" or {}); + url_1_6_0_features."encoding".self_query_encoding = hasFeature (url_1_6_0_features."query_encoding" or {}); + encoding_0_0_0_features."default".from_url_1_6_0__default_ = true; + heapsize_0_0_0_features."default".from_url_1_6_0__default_ = true; + idna_0_1_4_features."default".from_url_1_6_0__default_ = true; + matches_0_1_6_features."default".from_url_1_6_0__default_ = true; + percent_encoding_1_0_0_features."default".from_url_1_6_0__default_ = true; + rustc_serialize_0_0_0_features."default".from_url_1_6_0__default_ = true; + serde_0_0_0_features."default".from_url_1_6_0__default_ = true; + userenv_sys_0_2_0 = userenv_sys_0_2_0_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_userenv_sys_0_2_0__default_ = true; + winapi_build_0_1_1_features."default".from_userenv_sys_0_2_0__default_ = true; + utf8_ranges_1_0_0 = utf8_ranges_1_0_0_ rec {}; + vcpkg_0_2_2 = vcpkg_0_2_2_ rec {}; + void_1_0_2 = void_1_0_2_ rec { + features = mkFeatures void_1_0_2_features; + }; + void_1_0_2_features."std".self_default = hasDefault void_1_0_2_features; + walkdir_1_0_7 = walkdir_1_0_7_ rec { + dependencies = [ same_file_0_1_3 ] + ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + }; + kernel32_sys_0_2_2_features."default".from_walkdir_1_0_7__default_ = true; + same_file_0_1_3_features."default".from_walkdir_1_0_7__default_ = true; + winapi_0_2_8_features."default".from_walkdir_1_0_7__default_ = true; + winapi_0_2_8 = winapi_0_2_8_ rec {}; + winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; + wincolor_0_1_4 = wincolor_0_1_4_ rec { + dependencies = [ kernel32_sys_0_2_2 winapi_0_2_8 ]; + }; + kernel32_sys_0_2_2_features."default".from_wincolor_0_1_4__default_ = true; + winapi_0_2_8_features."default".from_wincolor_0_1_4__default_ = true; + ws2_32_sys_0_2_1 = ws2_32_sys_0_2_1_ rec { + dependencies = [ winapi_0_2_8 ]; + buildDependencies = [ winapi_build_0_1_1 ]; + }; + winapi_0_2_8_features."default".from_ws2_32_sys_0_2_1__default_ = true; + winapi_build_0_1_1_features."default".from_ws2_32_sys_0_2_1__default_ = true; +} diff --git a/pkgs/build-support/rust/cargo-vendor/default.nix b/pkgs/build-support/rust/cargo-vendor/default.nix new file mode 100644 index 00000000000..faeb6e03743 --- /dev/null +++ b/pkgs/build-support/rust/cargo-vendor/default.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchFromGitHub }: + +(callPackage ./cargo-vendor.nix {}).cargo_vendor_0_1_13.overrideAttrs (attrs: { + src = fetchFromGitHub { + owner = "alexcrichton"; + repo = "cargo-vendor"; + rev = "0.1.13"; + sha256 = "0ljh2d65zpxp26a95b3czy5ai2z2dm87x7ndfdc1s0v1fsy69kn4"; + }; +}) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index c074d46a7f7..f4020ab3096 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,9 +1,38 @@ -{ pkgconfig, sqlite, openssl, ... }: +{ stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, + openssl, sqlite, zlib, ... }: +let + inherit (darwin.apple_sdk.frameworks) CoreFoundation; +in { + cargo = attrs: { + buildInputs = [ openssl zlib curl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; + # TODO: buildRustCrate seems to use incorrect default inference + crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ]; + }; + cargo-vendor = attrs: { + buildInputs = [ openssl zlib curl ]; + # TODO: this defaults to cargo_vendor; needs to be cargo-vendor to + # be considered a cargo subcommand. + crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; + }; + curl-sys = attrs: { + buildInputs = [ pkgconfig curl ]; + }; + libgit2-sys = attrs: { + LIBGIT2_SYS_USE_PKG_CONFIG = true; + buildInputs = [ pkgconfig openssl zlib libgit2 ]; + }; libsqlite3-sys = attrs: { buildInputs = [ pkgconfig sqlite ]; }; + libssh2-sys = attrs: { + buildInputs = [ pkgconfig openssl zlib libssh2 ]; + }; + openssl = attrs: { + buildInputs = [ openssl ]; + }; openssl-sys = attrs: { buildInputs = [ pkgconfig openssl ]; }; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 57948c33bbc..ce89b42176e 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,8 +1,6 @@ -{ fetchurl, stdenv, path, cacert, git, rust }: +{ callPackage, fetchurl, stdenv, path, cacert, git, rust }: let - cargoVendor = import ./cargo-vendor.nix { - inherit fetchurl stdenv; - }; + cargoVendor = callPackage ./cargo-vendor {}; fetchcargo = import ./fetchcargo.nix { inherit stdenv cacert git rust cargoVendor; From 684fec002aa70b2c9c8fac4ec9dc9ac83a9b8c6a Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 19 Jan 2018 09:55:58 -0800 Subject: [PATCH 024/797] mattermost: 4.4.1 -> 4.6.0 --- pkgs/servers/mattermost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index bf282468844..422309bc654 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -2,18 +2,18 @@ buildGoPackage rec { name = "mattermost-${version}"; - version = "4.4.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "0imda96wgr2nkkxs2jfcqszx1fqgmbbrh7zqmgjh6ks3an1v4m3c"; + sha256 = "158sfbg19sp165iavjwwfxx9s4y116yc5h3plsmvlxpdv674k7v3"; }; webApp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; - sha256 = "1gnzv9xkqawi36z7v9xsy1gk16x71qf0kn8r059qvyarjlyp7888"; + sha256 = "1rbpl6zfmhfgzz2i1q2ym51ll6j54gk5p6ca99v9kjlm4ipcq9mv"; }; goPackagePath = "github.com/mattermost/mattermost-server"; From 5738da94f4b6b2ebcfd464a7634f2a89fac377e7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 18 Jan 2018 11:22:53 -0500 Subject: [PATCH 025/797] python-telegram-bot: init at 9.0.0 --- .../python-telegram-bot/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/python-telegram-bot/default.nix diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix new file mode 100644 index 00000000000..b9e5f2985e9 --- /dev/null +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, certifi, future }: + +buildPythonPackage rec { + pname = "python-telegram-bot"; + version = "9.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a5b4wfc6ms7kblynw2h3ygpww98kyz5n8iibqbdyykwx8xj7hzm"; + }; + + propagatedBuildInputs = [ certifi future ]; + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "This library provides a pure Python interface for the Telegram Bot API."; + homepage = https://python-telegram-bot.org; + license = licenses.lgpl3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f76212bdbb..f311396d6f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22203,6 +22203,8 @@ EOF }; }; + python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; + irc = buildPythonPackage rec { name = "irc-${version}"; version = "14.2.2"; From 9492e5e5594bbe4ca6f676d6912c2f41f866776b Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 4 Jan 2018 18:50:10 +0100 Subject: [PATCH 026/797] go-symbols: init at 2017-02-06 Signed-off-by: Vincent Demeester --- pkgs/development/tools/go-symbols/default.nix | 23 +++++++++++++++++++ pkgs/development/tools/go-symbols/deps.nix | 11 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/go-symbols/default.nix create mode 100644 pkgs/development/tools/go-symbols/deps.nix diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix new file mode 100644 index 00000000000..9a8b592b038 --- /dev/null +++ b/pkgs/development/tools/go-symbols/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "go-symbols-${version}"; + version = "unstable-2017-02-06"; + rev = "5a7f75904fb552189036c640d04cd6afef664836"; + + goPackagePath = "github.com/acroca/go-symbols"; + goDeps = ./deps.nix; + + src = fetchgit { + inherit rev; + url = "https://github.com/acroca/go-symbols"; + sha256 = "0qh2jjhwwk48gi8yii0z031bah11anxfz81nwflsiww7n426a8bb"; + }; + + meta = { + description = "A utility for extracting a JSON representation of the package symbols from a go source tree."; + homepage = https://github.com/acroca/go-symbols; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/go-symbols/deps.nix b/pkgs/development/tools/go-symbols/deps.nix new file mode 100644 index 00000000000..6a333b58bec --- /dev/null +++ b/pkgs/development/tools/go-symbols/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://github.com/golang/tools"; + rev = "96b5a5404f303f074e6117d832a9873c439508f0"; + sha256 = "1h6r9xyp1v3w2x8d108vzghn65l6ia2h895irypmrwymfcp30y42"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a36547af80d..656f5251c70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13221,6 +13221,8 @@ with pkgs; go-protobuf = callPackage ../development/tools/go-protobuf { }; + go-symbols = callPackage ../development/tools/go-symbols { }; + gocode = callPackage ../development/tools/gocode { }; goconvey = callPackage ../development/tools/goconvey { }; From e44038bccab0cae96a93fa517a9acaab9c81a6d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jan 2018 15:08:27 +0100 Subject: [PATCH 027/797] gobjectIntrospection: use absolute path for cairo GIR Cairo does not provide its own GObject bindinds so they are provided by gobject-introspection package. Unfortunately, this means that if we want to use the absolute path, we need gi to depend on cairo, which increases the closure size from 41M to 56M. We will probably want to split the typelib into a separate output. Closes: #34080 --- .../absolute_gir_path.patch | 11 +++++++++++ .../libraries/gobject-introspection/default.nix | 17 ++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch diff --git a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch new file mode 100644 index 00000000000..f7e1bedd3e1 --- /dev/null +++ b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch @@ -0,0 +1,11 @@ +--- a/gir/cairo-1.0.gir.in ++++ b/gir/cairo-1.0.gir.in +@@ -5,7 +5,7 @@ + xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> + + + Date: Sun, 21 Jan 2018 00:04:46 +0800 Subject: [PATCH 028/797] librsvg: 2.40.18 -> 2.42.0 --- pkgs/development/libraries/librsvg/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 09a0f4444b5..da54ac9b5dc 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,16 +1,22 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintlOrEmpty, darwin +, bzip2, libcroco, libintlOrEmpty, darwin, rust , withGTK ? false, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: # no introspection by default, it's too big +let + version = "2.42.0"; + releaseVersion = (lib.concatStringsSep "." (lib.lists.take 2 + (lib.splitString "." version))); + +in stdenv.mkDerivation rec { - name = "librsvg-2.40.19"; + name = "librsvg-${version}"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz"; - sha256 = "0k2nbd4g31qinkdfd8r5c5ih2ixl85fbkgkqqh9747lwr24c9j5z"; + url = "mirror://gnome/sources/librsvg/${releaseVersion}/${name}.tar.xz"; + sha256 = "06j60hb1m96hnrp8phbqn8lfw2j8ai8dcddzc72yvrnrn8lagc4s"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; @@ -22,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); From 7a82c83c63e79b47dc6483d157d59f697874cb32 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 20 Jan 2018 18:03:35 -0500 Subject: [PATCH 029/797] python-telegram-bot: use urllib3 from nixpkgs, disable all tests properly --- .../python-telegram-bot/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index b9e5f2985e9..d5547217910 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k, certifi, future }: +{ stdenv, fetchPypi, buildPythonPackage, certifi, future, urllib3 }: buildPythonPackage rec { pname = "python-telegram-bot"; @@ -9,8 +9,18 @@ buildPythonPackage rec { sha256 = "0a5b4wfc6ms7kblynw2h3ygpww98kyz5n8iibqbdyykwx8xj7hzm"; }; - propagatedBuildInputs = [ certifi future ]; - doCheck = !isPy3k; + prePatch = '' + rm -rf telegram/vendor + substituteInPlace telegram/utils/request.py \ + --replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \ + --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ + --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ + --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" + ''; + + propagatedBuildInputs = [ certifi future urllib3 ]; + + doCheck = false; meta = with stdenv.lib; { description = "This library provides a pure Python interface for the Telegram Bot API."; From b91e84663973452d6ea434b31ada48e830dfef2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 21 Jan 2018 11:01:47 +0100 Subject: [PATCH 030/797] mesa: 17.2.8 -> 17.3.3 TODO: verify that S3TC works without adding libtxc*, and clean all the related code. --- pkgs/development/libraries/mesa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d343bd1112d..8df248e3e46 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -66,7 +66,7 @@ let in let - version = "17.2.8"; + version = "17.3.3"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -81,7 +81,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0pq9kmmyllgd63d936f3x1zsg7sqaswx47khbn0gvbgari2h753f"; + sha256 = "16rpm4rwmzd4kdgipa1gw262jqg3346gih0y3bsc3bgn1vgcbfj1"; }; prePatch = "patchShebangs ."; @@ -134,7 +134,7 @@ stdenv.mkDerivation { "--enable-shared-glapi" "--enable-sysfs" "--enable-llvm-shared-libs" - "--enable-omx" + "--enable-omx-bellagio" "--enable-va" "--disable-opencl" ]; From ba6e0ae33df36306b065c7876d42ec483edac7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 21 Jan 2018 11:59:12 +0100 Subject: [PATCH 031/797] cmake: 3.9.6 -> 3.10.2 Close #33435 (superseded). --- pkgs/development/tools/build-managers/cmake/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index a2f5ee0325b..9357c1a3a85 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -16,8 +16,8 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "3.9"; - minorVersion = "6"; + majorVersion = "3.10"; + minorVersion = "2"; version = "${majorVersion}.${minorVersion}"; in @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - # from https://cmake.org/files/v3.9/cmake-3.9.6-SHA-256.txt - sha256 = "7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218"; + # from https://cmake.org/files/v3.10/cmake-3.10.2-SHA-256.txt + sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b"; }; prePatch = optionalString (!useSharedLibraries) '' From 4b1b6ee6d1a12501e9383748fa07423a0dc1718f Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 1 Jan 2018 17:05:46 +0000 Subject: [PATCH 032/797] patchShebangs: preserve times, resolves #33084 Close #33281. Edits by vcunat: - use Eelco's idea: empty file instead of full copy - use longer name suffix to decrease the likelihood of collision --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 4317a5f4dad..1433d1e1f14 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -54,7 +54,11 @@ patchShebangs() { echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" # escape the escape chars so that sed doesn't interpret them escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g') + # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281 + touch -r "$f" "$f.timestamp" sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" + touch -r "$f.timestamp" "$f" + rm "$f.timestamp" fi fi done From 82c78b86c78bfb3606fe1440ce681119c581c1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 21 Jan 2018 15:48:35 +0100 Subject: [PATCH 033/797] clang: mass-rebuild code cleanup --- pkgs/development/compilers/llvm/4/clang/default.nix | 3 --- pkgs/development/compilers/llvm/5/clang/default.nix | 3 --- 2 files changed, 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index a2ba1fe7f4c..77863ab4f1e 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -37,9 +37,6 @@ let patches = [ ./purity.patch ]; - # XXX: TODO: This should be removed on next rebuild - postBuild = ""; - postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 0ee1404484b..c8eafce4e39 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -37,9 +37,6 @@ let patches = [ ./purity.patch ]; - # XXX: TODO: This should be removed on next rebuild - postBuild = ""; - postPatch = '' sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ From 081b9c9d9626f8d764735b80a77e784845f7b853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 21 Jan 2018 16:09:24 +0100 Subject: [PATCH 034/797] glib: 2.54.2 -> 2.54.3 (maintenance) --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 325a6e5bfa9..c0cf864e79a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -43,7 +43,7 @@ let ''; ver_maj = "2.54"; - ver_min = "2"; + ver_min = "3"; in stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c"; + sha256 = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch From 720f498d7a5568864e2ea3df0d14c1d982eb8179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 21 Jan 2018 16:13:03 +0100 Subject: [PATCH 035/797] gtk2: 2.24.31 -> 2.24.32 (maintenance) --- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 169fd119d51..8a3ce884dfd 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -12,11 +12,11 @@ assert cupsSupport -> cups != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "gtk+-2.24.31"; + name = "gtk+-2.24.32"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658"; + sha256 = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"; }; outputs = [ "out" "dev" "devdoc" ]; From baa23aa2fcb2fc20a0786dde9f71ffd935ff776d Mon Sep 17 00:00:00 2001 From: Dmitry Moskowski Date: Sun, 21 Jan 2018 17:09:47 +0000 Subject: [PATCH 036/797] unbound: 1.6.7 -> 1.6.8 Fixes CVE-2017-15105 --- pkgs/tools/networking/unbound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index b124352fd7b..614447cd5ec 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.7"; + version = "1.6.8"; src = fetchurl { - url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "17qwfmlls0w9kpkya3dlpn44b3kr87wsswzg3gawc13hh8yx8ysf"; + url = "https://unbound.net/downloads/${name}.tar.gz"; + sha256 = "0jfxhh4gc5amhndikskz1s7da27ycn442j3l20bm992n7zijid73"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB From 242ec8cba2437aad9fc760e1f7418767903cbcec Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 18 Jan 2018 11:49:29 -0600 Subject: [PATCH 037/797] boomerang: switch to new active fork, cleanup, maintain --- pkgs/development/tools/boomerang/default.nix | 51 ++++++++++--------- .../tools/boomerang/fix-install.patch | 48 ----------------- .../tools/boomerang/fix-output.patch | 24 --------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 29 insertions(+), 96 deletions(-) delete mode 100644 pkgs/development/tools/boomerang/fix-install.patch delete mode 100644 pkgs/development/tools/boomerang/fix-output.patch diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 6b9dd6393cb..f83353034a8 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -1,38 +1,43 @@ -{ stdenv, fetchgit, cmake, expat, qt5, boost }: +{ stdenv, fetchFromGitHub, cmake, qtbase }: stdenv.mkDerivation rec { name = "boomerang-${version}"; - version = "0.3.99-alpha-2016-11-02"; + version = "0.4.0-alpha-2018-01-18"; - src = fetchgit { - url = "https://github.com/nemerle/boomerang.git"; - rev = "f95d6436845e9036c8cfbd936731449475f79b7a"; - sha256 = "1q3q92lfj24ij5sxdbdhcqyan28r6db1w80yrks4csf9zjij1ixh"; + src = fetchFromGitHub { + owner = "ceeac"; + repo = "boomerang"; + rev = "b4ff8d573407a8ed6365d4bfe53d2d47d983e393"; + sha256 = "0x17vlm6y1paa49fi3pmzz7vzdqms19qkr274hkq32ql342b6i6x"; }; - buildInputs = [ cmake expat qt5.qtbase boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase ]; - patches = [ ./fix-install.patch ./fix-output.patch ]; - - postPatch = '' - substituteInPlace loader/BinaryFileFactory.cpp \ - --replace '"lib"' '"../lib"' - - substituteInPlace ui/DecompilerThread.cpp \ - --replace '"output"' '"./output"' - - substituteInPlace boomerang.cpp \ - --replace 'progPath("./")' "progPath(\"$out/share/boomerang/\")" - - substituteInPlace ui/commandlinedriver.cpp \ - --replace "QFileInfo(args[0]).absolutePath()" "\"$out/share/boomerang/\"" + postPatch = + # Look in installation directory for required files, not relative to working directory + '' + substituteInPlace src/boomerang/core/Settings.cpp \ + --replace "setDataDirectory(\"../share/boomerang\");" \ + "setDataDirectory(\"$out/share/boomerang\");" \ + --replace "setPluginDirectory(\"../lib/boomerang/plugins\");" \ + "setPluginDirectory(\"$out/lib/boomerang/plugins\");" + '' + # Fixup version: + # * don't try to inspect with git + # (even if we kept .git and such it would be "dirty" because of patching) + # * use date so version is monotonically increasing moving forward + + '' + sed -i cmake-scripts/boomerang-version.cmake \ + -e 's/set(\(PROJECT\|BOOMERANG\)_VERSION ".*")/set(\1_VERSION "${version}")/' ''; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://boomerang.sourceforge.net/; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; description = "A general, open source, retargetable decompiler"; + maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/development/tools/boomerang/fix-install.patch b/pkgs/development/tools/boomerang/fix-install.patch deleted file mode 100644 index bc656acfd6a..00000000000 --- a/pkgs/development/tools/boomerang/fix-install.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5851256422a4debc34c956439d8129a4d5f80722 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Thu, 30 Mar 2017 10:06:03 -0500 -Subject: [PATCH] cmake: add install bits - ---- - CMakeLists.txt | 3 +++ - loader/CMakeLists.txt | 2 ++ - ui/CMakeLists.txt | 2 ++ - 3 files changed, 7 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 826fe307..740861db 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -113,3 +113,6 @@ SET_PROPERTY(TARGET boom_base PROPERTY CXX_STANDARD_REQUIRED ON) - - ADD_SUBDIRECTORY(loader) - ADD_SUBDIRECTORY(ui) -+ -+INSTALL(DIRECTORY signatures DESTINATION share/boomerang) -+INSTALL(DIRECTORY frontend/machine DESTINATION share/boomerang/frontend) -diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index b371d366..dcf715fd 100644 ---- a/loader/CMakeLists.txt -+++ b/loader/CMakeLists.txt -@@ -6,6 +6,8 @@ macro(BOOMERANG_ADD_LOADER name) - endif() - qt5_use_modules(${target_name} Core) - set_target_properties(${target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/out/lib") -+ install(TARGETS "${target_name}" -+ LIBRARY DESTINATION lib) - endmacro() - - BOOMERANG_ADD_LOADER(Elf elf/ElfBinaryFile.cpp elf/ElfBinaryFile.h) -diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt -index f6fe3271..8729b522 100644 ---- a/ui/CMakeLists.txt -+++ b/ui/CMakeLists.txt -@@ -26,3 +26,5 @@ boom_base frontend db type boomerang_DSLs codegen util boom_base - ${CMAKE_THREAD_LIBS_INIT} boomerang_passes - ) - qt5_use_modules(boomerang Core Xml Widgets) -+ -+INSTALL(TARGETS boomerang DESTINATION bin) --- -2.11.0 - diff --git a/pkgs/development/tools/boomerang/fix-output.patch b/pkgs/development/tools/boomerang/fix-output.patch deleted file mode 100644 index 18fbe74177b..00000000000 --- a/pkgs/development/tools/boomerang/fix-output.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f3f5f888a1b1fe72ea8fc8cc96ef4ee386011e1c Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Thu, 30 Mar 2017 11:21:38 -0500 -Subject: [PATCH] don't default to writing to program directory - ---- - boomerang.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/boomerang.cpp b/boomerang.cpp -index 5951ed91..b592f482 100644 ---- a/boomerang.cpp -+++ b/boomerang.cpp -@@ -601,7 +601,6 @@ int Boomerang::processCommand(QStringList &args) { - */ - void Boomerang::setProgPath(const QString &p) { - progPath = p + "/"; -- outputPath = progPath + "/output/"; // Default output path (can be overridden with -o below) - } - - /** --- -2.11.0 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a36547af80d..c67716ef30b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -807,7 +807,7 @@ with pkgs; borgbackup = callPackage ../tools/backup/borg { }; - boomerang = callPackage ../development/tools/boomerang { }; + boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; boost-build = callPackage ../development/tools/boost-build { }; From 671c0622c68357d95f28b7177fa2eada7656f32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?= Date: Mon, 22 Jan 2018 01:43:48 +0000 Subject: [PATCH 038/797] hunspell: 1.6.1 -> 1.6.2 --- pkgs/development/libraries/hunspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index dfb45aa598d..ecbfbb7da0b 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.6.2"; name = "hunspell-${version}"; src = fetchurl { url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz"; - sha256 = "0j9c20sj7bgd6f77193g1ihy8w905byk2gdhdc0r9dsh7irr7x9h"; + sha256 = "1i7lsv2cm0713ia3j5wjkcrhpfp3lqpjpwp4d3v18n7ycaqcxn9w"; }; outputs = [ "bin" "dev" "out" "man" ]; From 0fdf29224eae3876aa9d695fb1fe16faeb7cbdb2 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Sun, 21 Jan 2018 17:40:21 -0800 Subject: [PATCH 039/797] init: kubectl at 1.7.9 (alias for kubernetes with only kubectl component) --- pkgs/applications/networking/cluster/helm/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 408019eeb4b..f9548ce87f7 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kubernetes }: +{ stdenv, fetchurl, kubectl }: let arch = if stdenv.isLinux then "linux-amd64" @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ ]; - propagatedBuildInputs = [ kubernetes ]; + propagatedBuildInputs = [ kubectl ]; phases = [ "buildPhase" "installPhase" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a92c95ea9c6..136077fb121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15834,6 +15834,10 @@ with pkgs; kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubectl = (kubernetes.override { components = [ "cmd/kubectl" ]; }).overrideAttrs(oldAttrs: { + name = "kubectl-${oldAttrs.version}"; + }); + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; kupfer = callPackage ../applications/misc/kupfer { }; From 9d82bf2e0ecf9b40d1920d988740f9b3f775bf51 Mon Sep 17 00:00:00 2001 From: Keith Amidon Date: Sun, 21 Jan 2018 17:38:12 -0800 Subject: [PATCH 040/797] libinput: 1.9.3 -> 1.9.4 This rev-bump of libinput resolves issues with out of order key press delivery as described here: https://lists.freedesktop.org/archives/wayland-devel/2017-December/036147.html --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index a0f7807786e..dc88df31fbf 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "09wkc5qqk1k2a68cwfy4x853z8z35wf2qkijh66kacsvc2fjq394"; + sha256 = "142icwzpirwddl7ghfmynxpnsbjg53rjxpzv4arjsaiw9r6bvk8b"; }; outputs = [ "out" "dev" ]; From 8b21391127ca7cc226a1afa97a8b528ad9cd68b7 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 17 Oct 2017 09:49:54 -0400 Subject: [PATCH 041/797] bc: fixes for cross-compilation --- pkgs/tools/misc/bc/cross-bc.patch | 169 ++++++++++++++++++++++++++++++ pkgs/tools/misc/bc/default.nix | 21 +++- 2 files changed, 187 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/misc/bc/cross-bc.patch diff --git a/pkgs/tools/misc/bc/cross-bc.patch b/pkgs/tools/misc/bc/cross-bc.patch new file mode 100644 index 00000000000..ba8857abb58 --- /dev/null +++ b/pkgs/tools/misc/bc/cross-bc.patch @@ -0,0 +1,169 @@ +commit fdda59736ddc048cf38a2c7103f4f5d9eeaf995e +Author: Ben Gamari +Date: Tue Oct 17 10:51:34 2017 -0400 + + Try implementing cross-compilation + +diff --git a/bc/Makefile.am b/bc/Makefile.am +index d9d412e..fdef633 100644 +--- a/bc/Makefile.am ++++ b/bc/Makefile.am +@@ -17,6 +17,7 @@ MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \ + + AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../h + LIBBC = ../lib/libbc.a ++LIBBC_HOST = ../lib/libbc_host.a + LIBL = @LEXLIB@ + LDADD = $(LIBBC) $(LIBL) @READLINELIB@ + +@@ -29,12 +30,20 @@ $(PROGRAMS): libmath.h $(LIBBC) + scan.o: bc.h + global.o: libmath.h ++ ++main_host.c : main.c ++ cp $< $@ + +-fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o ++fbcOBJ = $(addsuffix _host,main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o) ++ ++%.o_host : CC:=$(CC_FOR_BUILD) ++ ++%.o_host : %.c ++ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< + +-libmath.h: libmath.b $(fbcOBJ) $(LIBBC) ++libmath.h: libmath.b $(fbcOBJ) $(LIBBC_HOST) + echo '{0}' > libmath.h +- $(MAKE) global.o +- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS) ++ $(MAKE) global.o_host ++ $(CC_FOR_BUILD) -o fbc $(fbcOBJ) global.o_host $(LIBBC_HOST) $(LIBL) ${READLINELIB} $(LIBS) + ./fbc -c $(srcdir)/libmath.b libmath.h + $(srcdir)/fix-libmath_h + rm -f ./fbc ./global.o +diff --git a/configure.ac b/configure.ac +index fc74573..5cabb73 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,6 +20,7 @@ m4_define([dc_version], 1.4.1) + + AC_INIT([bc],[bc_version]) + AC_CONFIG_SRCDIR(doc/bc.1) ++AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([dist-bzip2]) + AC_CONFIG_HEADERS(config.h) + +@@ -35,6 +36,7 @@ AC_DEFINE([DC_COPYRIGHT], + [Define the dc copyright line.]) + + AC_PROG_CC ++AX_CC_FOR_BUILD + AC_USE_SYSTEM_EXTENSIONS + + AM_PROG_LEX +diff --git a/lib/Makefile.am b/lib/Makefile.am +index ec4bf59..c670f5b 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,5 +1,5 @@ + ## Process this file with automake to produce Makefile.in +-noinst_LIBRARIES = libbc.a ++noinst_LIBRARIES = libbc.a libbc_host.a + + AM_CPPFLAGS = -I. -I.. -I$(srcdir)/../h + +@@ -24,3 +24,11 @@ testmul: testmul.o number.o + + specialnumber: newnumber.o + cp newnumber.o number.o ++ ++%.o_host : CC:=$(CC_FOR_BUILD) ++%.o_host : %.c ++ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< ++ ++libbc_host.a : $(addsuffix _host,$(libbc_a_OBJECTS)) ++ ar cru $@ $+ ++ ranlib $@ +diff --git a/m4/cc_for_build.m4 b/m4/cc_for_build.m4 +new file mode 100644 +index 0000000..c62ffad +--- /dev/null ++++ b/m4/cc_for_build.m4 +@@ -0,0 +1,77 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CC_FOR_BUILD ++# ++# DESCRIPTION ++# ++# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD. ++# ++# LICENSE ++# ++# Copyright (c) 2010 Reuben Thomas ++# Copyright (c) 1999 Richard Henderson ++# ++# This program is free software: you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation, either version 3 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++# Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program. If not, see . ++# ++# As a special exception, the respective Autoconf Macro's copyright owner ++# gives unlimited permission to copy, distribute and modify the configure ++# scripts that are the output of Autoconf when processing the Macro. You ++# need not follow the terms of the GNU General Public License when using ++# or distributing such scripts, even though portions of the text of the ++# Macro appear in them. The GNU General Public License (GPL) does govern ++# all other use of the material that constitutes the Autoconf Macro. ++# ++# This special exception to the GPL applies to versions of the Autoconf ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. ++ ++#serial 3 ++ ++dnl Get a default for CC_FOR_BUILD to put into Makefile. ++AC_DEFUN([AX_CC_FOR_BUILD], ++[# Put a plausible default for CC_FOR_BUILD in Makefile. ++if test -z "$CC_FOR_BUILD"; then ++ if test "x$cross_compiling" = "xno"; then ++ CC_FOR_BUILD='$(CC)' ++ else ++ CC_FOR_BUILD=gcc ++ fi ++fi ++AC_SUBST(CC_FOR_BUILD) ++# Also set EXEEXT_FOR_BUILD. ++if test "x$cross_compiling" = "xno"; then ++ EXEEXT_FOR_BUILD='$(EXEEXT)' ++else ++ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, ++ [rm -f conftest* ++ echo 'int main () { return 0; }' > conftest.c ++ bfd_cv_build_exeext= ++ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 ++ for file in conftest.*; do ++ case $file in ++ *.c | *.o | *.obj | *.ilk | *.pdb) ;; ++ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; ++ esac ++ done ++ rm -f conftest* ++ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) ++ EXEEXT_FOR_BUILD="" ++ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} ++fi ++AC_SUBST(EXEEXT_FOR_BUILD)])dnl diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index 2371e91ae2f..fc60a000e36 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, readline, ed, texinfo}: +{stdenv, autoreconfHook, buildPackages, fetchurl, flex, readline, ed, texinfo}: stdenv.mkDerivation rec { name = "bc-1.07.1"; @@ -9,9 +9,24 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-readline" ]; - buildInputs = [flex readline ed texinfo]; + # As of 1.07 cross-compilation is quite complicated as the build system wants + # to build a code generator, bc/fbc, on the build machine. + patches = [ ./cross-bc.patch ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + # Tools + autoreconfHook ed flex texinfo + # Libraries for build + buildPackages.readline buildPackages.ncurses + ]; + buildInputs = [ readline ]; - doCheck = true; + doCheck = true; # not cross + + # Hack to make sure we never to the relaxation `$PATH` and hooks support for + # compatability. This will be replaced with something clearer in a future + # masss-rebuild. + crossConfig = true; meta = { description = "GNU software calculator"; From e6f9e82ee462c912ec01754d26596f0a5d8a8c23 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 12:03:00 -0400 Subject: [PATCH 042/797] flex: Use native dependencies where applicable Flex needs both a C compiler for the build environment, as well as a native m4. (cherry picked from commit 81827c0084c1a69e41894a4d38b0c0b267eaff34) --- pkgs/development/tools/parsing/flex/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 4ea11a622ea..55fe7db8007 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, m4 +{ stdenv, buildPackages, fetchurl, bison, m4 , fetchpatch, autoreconfHook, help2man }: @@ -19,11 +19,10 @@ stdenv.mkDerivation rec { + "/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch"; sha256 = "1aarhcmz7mfrgh15pkj6f7ikxa2m0mllw1i1vscsf1kw5d05lw6f"; })]; - nativeBuildInputs = [ autoreconfHook help2man ]; + nativeBuildInputs = [ buildPackages.stdenv.cc autoreconfHook help2man ]; buildInputs = [ bison ]; - - propagatedBuildInputs = [ m4 ]; + nativePropagatedBuildInputs = [ m4 ]; postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' From 715fcb4266710ca83991a1613d6cda3843183661 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 13:01:08 -0400 Subject: [PATCH 043/797] flex: Don't disable static while cross-compiling flex linux-pam appears to rely on this while cross-compiling. (cherry picked from commit 4009dd163ac30cd25833bf7eb19b5e26e75c474f) --- pkgs/development/tools/parsing/flex/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 55fe7db8007..0b431296611 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { export ac_cv_func_malloc_0_nonnull=yes export ac_cv_func_realloc_0_nonnull=yes ''; + + # linux-pam derivation relies on static archive + dontDisableStatic = true; }; meta = { From 67be78f1290184ab8ad4a9e54460ae0e2cce6f6f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 7 Jan 2018 16:47:54 -0600 Subject: [PATCH 044/797] flex: patch around attempt to regen manpage, fix cross --- pkgs/development/tools/parsing/flex/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 0b431296611..0b4d8cbfc56 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -29,10 +29,11 @@ stdenv.mkDerivation rec { ''; crossAttrs = { - # disable tests which can't run on build machine postPatch = '' - substituteInPlace Makefile.in --replace "tests" " "; + substituteInPlace Makefile.in --replace "tests" " " + + substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: ' ''; preConfigure = '' From a5a64cfcb186d50d5e19d0ef48b94a55cef6e41a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 18 Oct 2017 08:37:50 -0500 Subject: [PATCH 045/797] lean: fixup nativeBuildInputs vs buildInputs --- pkgs/applications/science/logic/lean/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index b3f0b325927..095aa5a7f8c 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9"; }; - buildInputs = [ gmp cmake ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ gmp ]; enableParallelBuilding = true; preConfigure = '' From e33499bd30c705597c9b8599add086c256e2677c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 11 Jan 2018 11:30:16 -0600 Subject: [PATCH 046/797] python setuptools: fix for cross (nativeBuildInputs) --- pkgs/development/python-modules/setuptools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 5535a80fd4a..b8fd011c4ea 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75"; }; - buildInputs = [ python wrapPython unzip ]; + nativeBuildInputs = [ unzip wrapPython ]; + buildInputs = [ python ]; doCheck = false; # requires pytest installPhase = '' dst=$out/${python.sitePackages} From 4e80b56c3cf26d8150898088a9df9937cffefb41 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 11 Jan 2018 11:27:04 -0600 Subject: [PATCH 047/797] bootstrapped-pip: fix for cross (nativeBuildInputs) --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 88209ad3fd1..37c3ea5d72a 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -46,7 +46,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin ''; - buildInputs = [ python makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ python ]; installPhase = '' From e5f677fed1956fc3a277f206ec992ba22b945855 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 6 Oct 2017 18:15:23 -0500 Subject: [PATCH 048/797] wirelesstools: update (alpine uses this version), fix build, add license --- pkgs/os-specific/linux/wireless-tools/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/os-specific/linux/wireless-tools/default.nix index f5a51a4e096..3585d7ec197 100644 --- a/pkgs/os-specific/linux/wireless-tools/default.nix +++ b/pkgs/os-specific/linux/wireless-tools/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "wireless-tools-29"; +stdenv.mkDerivation rec { + name = "wireless-tools-${version}"; + version = "30.pre2"; src = fetchurl { - url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz; - sha256 = "18g5wa3rih89i776nc2n2s50gcds4611gi723h9ki190zqshkf3g"; + url = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${version}.tar.gz"; + sha256 = "01lgf592nk8fnk7l5afqvar4szkngwpgcv4xh58qsg9wkkjlhnls"; }; preBuild = " @@ -14,5 +15,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } From de54275cfb39dc00242ecee0d26dcbd3720da387 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 6 Oct 2017 18:11:38 -0500 Subject: [PATCH 049/797] wireless-tools: don't assume gcc, don't use ldconfig, fix cross --- pkgs/os-specific/linux/wireless-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/os-specific/linux/wireless-tools/default.nix index 3585d7ec197..f883bf0d226 100644 --- a/pkgs/os-specific/linux/wireless-tools/default.nix +++ b/pkgs/os-specific/linux/wireless-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; preBuild = " - makeFlagsArray=(PREFIX=$out) + makeFlagsArray=(PREFIX=$out CC=$CC LDCONFIG=: AR=$AR RANLIB=$RANLIB) "; meta = { From 0b0e2d68b8cdb7425e0a65e5d40f457538020e53 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Jan 2018 11:47:58 -0600 Subject: [PATCH 050/797] audit: depsBuildBuild for build-native cc --- pkgs/os-specific/linux/audit/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 0558b42dda3..4adc321d930 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchurl, + stdenv, buildPackages, fetchurl, enablePython ? false, python ? null, }: @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = stdenv.lib.optional enablePython python; configureFlags = [ From 60d5e68a259fd1abc017c757ab310b9c638d8a2e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 15 Jan 2018 19:12:03 -0600 Subject: [PATCH 051/797] libedit: disable workaround for non-sandbox, avoid false groff dep --- pkgs/development/libraries/libedit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index c61876713c1..bd230c61028 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. - NROFF = "${groff}/bin/nroff"; + # NROFF = "${groff}/bin/nroff"; patches = [ ./01-cygwin.patch ]; From a5e93fc0d61bf9f043e3c8c844189cf5546d2c16 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 11 Jan 2018 14:15:04 -0600 Subject: [PATCH 052/797] unrar: Fix for cross Just read tool variables from environment, don't try to set them at all. --- pkgs/tools/archivers/unrar/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 9aedda83fd2..15c0837154e 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { }; postPatch = '' - sed 's/^CXX=g++/#CXX/' -i makefile + substituteInPlace makefile \ + --replace "CXX=" "#CXX=" \ + --replace "STRIP=" "#STRIP=" \ + --replace "AR=" "#AR=" ''; buildPhase = '' From 24dd0323b156aa6f0547cec0dacc05b0b88349c5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jan 2018 16:54:08 -0600 Subject: [PATCH 053/797] bind: perl as nativeBuildInput --- pkgs/servers/dns/bind/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index fa00e3edf97..ea4d4f387d8 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; - buildInputs = [ openssl libtool perl libxml2 ] ++ + nativeBuildInputs = [ perl ]; + buildInputs = [ openssl libtool libxml2 ] ++ stdenv.lib.optional enableSeccomp libseccomp; STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase From 7e52676240d2c28a619b804cb97f0a532d414eed Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 15 Jan 2018 15:05:12 -0600 Subject: [PATCH 054/797] llvm-{4,5}: remove perl, groff -- not needed --- pkgs/development/compilers/llvm/4/llvm.nix | 4 +--- pkgs/development/compilers/llvm/5/llvm.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 711024c7d3c..17a25889e64 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -1,8 +1,6 @@ { stdenv , fetch , fetchpatch -, perl -, groff , cmake , python , libffi @@ -41,7 +39,7 @@ in stdenv.mkDerivation (rec { outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; - nativeBuildInputs = [ perl groff cmake python ] + nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libxml2 libffi ] diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 400ffa34117..1f55e6c54e7 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -1,8 +1,6 @@ { stdenv , fetch , fetchpatch -, perl -, groff , cmake , python , libffi @@ -41,7 +39,7 @@ in stdenv.mkDerivation (rec { outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; - nativeBuildInputs = [ perl groff cmake python ] + nativeBuildInputs = [ cmake python ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libxml2 libffi ] From 973d4f5354c6609e39e9736a0d34e2a32896a3c2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 11 Jan 2018 12:24:35 -0600 Subject: [PATCH 055/797] clang-{4,5}: prefer python3, much friendlier for cross --- pkgs/development/compilers/llvm/4/clang/default.nix | 6 +++--- pkgs/development/compilers/llvm/5/clang/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 77863ab4f1e..28eb118e00d 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false }: @@ -16,8 +16,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libedit libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index c8eafce4e39..a0d61e7a3c9 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false }: @@ -16,8 +16,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libedit libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; From e02f427b4a9c0349f4360458867589dfdcdb7b6c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 19:21:09 -0600 Subject: [PATCH 056/797] mktemp: 1.6 -> 1.7 https://www.mktemp.org/release_notes.html --- pkgs/tools/security/mktemp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix index 8b2a60fd765..2a40315932e 100644 --- a/pkgs/tools/security/mktemp/default.nix +++ b/pkgs/tools/security/mktemp/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation { - name = "mktemp-1.6"; + name = "mktemp-1.7"; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; src = fetchurl { - url = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.6.tar.gz; - sha256 = "1nfj89b0dv1c2fyqi1pg54fyzs3462cbp7jv7lskqsxvqy4mh9x1"; + url = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz; + sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f"; }; - + meta = { platforms = stdenv.lib.platforms.unix; }; From 3785e0ac7e2dfa7e9ff4687ab3b4cb0e76b2c7ed Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 19:25:25 -0600 Subject: [PATCH 057/797] mktemp: fix w/cross --- pkgs/tools/security/mktemp/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix index 2a40315932e..a2a4f82f652 100644 --- a/pkgs/tools/security/mktemp/default.nix +++ b/pkgs/tools/security/mktemp/default.nix @@ -6,6 +6,11 @@ stdenv.mkDerivation { # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; + # Don't use "install -s" + postPatch = '' + substituteInPlace Makefile.in --replace " 0555 -s " " 0555 " + ''; + src = fetchurl { url = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz; sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f"; From f57fc787fd334ee1fcb70c9840b78e8545f34362 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 7 Jan 2018 19:49:56 -0600 Subject: [PATCH 058/797] texinfo: fix cross --- pkgs/development/tools/misc/texinfo/5.2.nix | 9 ++++++++- pkgs/development/tools/misc/texinfo/6.5.nix | 11 ++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 571af764fcf..0feb4b943df 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, xz, procps, interactive ? false }: +{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, procps, interactive ? false }: with stdenv.lib; @@ -10,10 +10,17 @@ stdenv.mkDerivation rec { sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal"; }; + # We need a native compiler to build perl XS extensions + # when cross-compiling. + depsBuildBuild = [ buildPackages.stdenv.cc perl ]; + buildInputs = [ perl xz.bin ] ++ optional interactive ncurses ++ optional doCheck procps; # for tests + configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] + ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + preInstall = '' installFlags="TEXMF=$out/texmf-dist"; installTargets="install install-tex"; diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix index 4691df6917b..afa7e9a0a20 100644 --- a/pkgs/development/tools/misc/texinfo/6.5.nix +++ b/pkgs/development/tools/misc/texinfo/6.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }: +{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }: with stdenv.lib; @@ -10,12 +10,17 @@ stdenv.mkDerivation rec { sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"; }; - buildInputs = [ perl xz ] + # We need a native compiler to build perl XS extensions + # when cross-compiling. + depsBuildBuild = [ buildPackages.stdenv.cc perl ]; + + buildInputs = [ xz ] ++ optionals stdenv.isSunOS [ libiconv gawk ] ++ optional interactive ncurses ++ optional doCheck procps; # for tests - configureFlags = stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] + ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; preInstall = '' installFlags="TEXMF=$out/texmf-dist"; From cafe25224fd5f61a74204860348e3f6acf3b2e46 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 22 Jan 2018 18:44:42 -0600 Subject: [PATCH 059/797] flex: review feedback * top-level attributes, not crossAttrs * use depsBuildBuild --- .../tools/parsing/flex/default.nix | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 0b4d8cbfc56..17323a06cc1 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -19,31 +19,27 @@ stdenv.mkDerivation rec { + "/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch"; sha256 = "1aarhcmz7mfrgh15pkj6f7ikxa2m0mllw1i1vscsf1kw5d05lw6f"; })]; + postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace Makefile.in --replace "tests" " " - nativeBuildInputs = [ buildPackages.stdenv.cc autoreconfHook help2man ]; + substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: ' + ''; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoreconfHook help2man ]; buildInputs = [ bison ]; - nativePropagatedBuildInputs = [ m4 ]; + propagatedBuildInputs = [ m4 ]; + + preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_realloc_0_nonnull=yes + ''; postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) '' sed -i Makefile -e 's/-no-undefined//;' ''; - crossAttrs = { - # disable tests which can't run on build machine - postPatch = '' - substituteInPlace Makefile.in --replace "tests" " " - - substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: ' - ''; - - preConfigure = '' - export ac_cv_func_malloc_0_nonnull=yes - export ac_cv_func_realloc_0_nonnull=yes - ''; - - # linux-pam derivation relies on static archive - dontDisableStatic = true; - }; + dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; meta = { homepage = https://github.com/westes/flex; From 2e4124c8c9acaaee44e543d563401f4f5229e423 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Oct 2017 18:23:15 -0400 Subject: [PATCH 060/797] libdaemon: Enable cross-compilation --- pkgs/development/libraries/libdaemon/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 07d5b77efc4..af832a70a73 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx"; }; - configureFlags = [ "--disable-lynx" ]; + configureFlags = [ "--disable-lynx" ] + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + [ # Can't run this test while cross-compiling + "ac_cv_func_setpgrp_void=yes" + ]; meta = { description = "Lightweight C library that eases the writing of UNIX daemons"; From 0235539dfe46ee0c72a620430c41f8fd7d19af53 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 18 Dec 2017 16:59:44 -0500 Subject: [PATCH 061/797] po4a: Docbook dependencies are nativeBuildInputs --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff74410ffbd..656f68cd891 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11263,7 +11263,8 @@ let self = _self // overrides; _self = with self; { url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz"; sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507"; }; - propagatedBuildInputs = [ pkgs.docbook_xml_xslt TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ]; + nativeBuildInputs = [ pkgs.docbook_xml_xslt pkgs.docbook_xsl pkgs.docbook_xsl_ns ]; + propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ]; buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ]; LC_ALL="en_US.UTF-8"; SGML_CATALOG_FILES = "${pkgs.docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"; From 6719bf5a743f3e29e2e9e2520012146a22182a8b Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 27 Oct 2017 17:53:50 -0400 Subject: [PATCH 062/797] libxslt: Explicitly specify libxml prefix Otherwise configure seems not to find xml2-config while cross-compiling. --- pkgs/development/libraries/libxslt/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 2f913093873..62b68ff9ab8 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs ]; # TODO move cryptoSupport as last flag, when upgrading libxslt - configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [ + configureFlags = [] + ++ optional (buildPlatform != hostPlatform) "--with-libxml-prefix=${libxml2.dev}" + ++ optional (!cryptoSupport) "--without-crypto" + ++ [ "--without-debug" "--without-mem-debug" "--without-debugger" From a4179bf45f4e171ea0fa4c633e2f75e17dfa8565 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 17 Dec 2017 00:33:20 -0500 Subject: [PATCH 063/797] zip: Enable cross-compilation --- pkgs/tools/archivers/zip/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 3c841aa621f..cb2d29e239d 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation { ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; + patchPhase = '' + substituteInPlace unix/Makefile --replace 'CC = cc' "" + ''; hardeningDisable = [ "format" ]; From 8f8b836bce23bbdc4fb9b6e4d9bcc0cd793bb6cb Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 18 Oct 2017 00:02:38 -0400 Subject: [PATCH 064/797] libtool2: Enable cross-compilation --- pkgs/development/tools/misc/libtool/libtool2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index bf134c459d9..85821ee2089 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" ]; - nativeBuildInputs = [ perl help2man ]; + nativeBuildInputs = [ perl help2man m4 ]; propagatedBuildInputs = [ m4 ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the From 289365701490fcb3d3d06fa3a24733fec9ea9fa7 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 10 Dec 2017 10:51:05 -0500 Subject: [PATCH 065/797] automake: Enable cross-compilation --- pkgs/development/tools/misc/automake/automake-1.15.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index d6399e128a3..507df5def0c 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg"; }; - buildInputs = [ perl autoconf ]; + nativeBuildInputs = [ autoconf perl ]; + buildInputs = [ autoconf ]; setupHook = ./setup-hook.sh; From c3bf521f188f2b71b0d74b6722ecf922b65033c9 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 29 Oct 2017 13:50:33 -0400 Subject: [PATCH 066/797] procps: Enable cross-compilation --- pkgs/os-specific/linux/procps-ng/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 4023ea5c69f..cc5e3dd5190 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Too red - configureFlags = [ "--disable-modern-top" ]; + configureFlags = [ "--disable-modern-top" ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) + [ "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" ]; meta = { homepage = https://sourceforge.net/projects/procps-ng/; From 2a5bf4cb4039e39d6253e450afd3cab63b0d3387 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sat, 16 Dec 2017 23:06:59 -0500 Subject: [PATCH 067/797] alsa-utils: Enable cross-compilation --- pkgs/os-specific/linux/alsa-utils/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index c9b5b0d2e2d..e2340939fce 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { --replace "which" "type -p" \ --replace "lspci" "${pciutils}/bin/lspci" ''; - buildInputs = [ gettext alsaLib ncurses libsamplerate fftw ]; + nativeBuildInputs = [ gettext ]; + buildInputs = [ alsaLib ncurses libsamplerate fftw ]; configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; From 2b04cddf7e9e485e7ee69390cd76710099bcf768 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 24 Dec 2017 16:16:26 -0500 Subject: [PATCH 068/797] nix-prefetch-scripts: makeWrapper is a nativeBuildInput --- pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 95280bf60b3..a2ff38ab300 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -6,7 +6,7 @@ let mkPrefetchScript = tool: src: deps: stdenv.mkDerivation { name = "nix-prefetch-${tool}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; unpackPhase = ":"; From 16b6e5a45295765071ad0bef3845d7b829a7cbd5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 22 Jan 2018 18:57:13 -0600 Subject: [PATCH 069/797] libxslt: make configureFlags unconditional, re-org to address comment --- pkgs/development/libraries/libxslt/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 62b68ff9ab8..8c72ce2c086 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -40,15 +40,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ findXMLCatalogs ]; - # TODO move cryptoSupport as last flag, when upgrading libxslt - configureFlags = [] - ++ optional (buildPlatform != hostPlatform) "--with-libxml-prefix=${libxml2.dev}" - ++ optional (!cryptoSupport) "--without-crypto" - ++ [ + configureFlags = [ + "--with-libxml-prefix=${libxml2.dev}" "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ optional pythonSupport "--with-python=${python2}"; + ] ++ optional pythonSupport "--with-python=${python2}" + ++ optional (!cryptoSupport) "--without-crypto"; postFixup = '' moveToOutput bin/xslt-config "$dev" From d18af2680d05a161907137af6480229ff619d218 Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Tue, 23 Jan 2018 10:13:07 -0500 Subject: [PATCH 070/797] Revert "clang-{4,5}: prefer python3, much friendlier for cross" --- pkgs/development/compilers/llvm/4/clang/default.nix | 6 +++--- pkgs/development/compilers/llvm/5/clang/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 28eb118e00d..77863ab4f1e 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python3 +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -16,8 +16,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libedit libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index a0d61e7a3c9..c8eafce4e39 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python3 +{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false }: @@ -16,8 +16,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + nativeBuildInputs = [ cmake python ] + ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; buildInputs = [ libedit libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; From 8cdf8f15e661cb5dd1fae38cb24b181b2de61e18 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Tue, 23 Jan 2018 20:41:26 +0100 Subject: [PATCH 071/797] icu: fix include path returned by icu-config --- pkgs/development/libraries/icu/base.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 8a7cf8365a5..1379a9a373d 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -34,6 +34,9 @@ stdenv.mkDerivation { preConfigure = '' sed -i -e "s|/bin/sh|${stdenv.shell}|" configure + + # $(includedir) is different from $(prefix)/include due to multiple outputs + sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in '' + 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 From e12d9adfe3e72e731230d3926cb46286840a9f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 23 Jan 2018 22:42:57 +0100 Subject: [PATCH 072/797] icu: fix the output of icu-config --incfile --- pkgs/development/libraries/icu/base.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 1379a9a373d..6d9a9725cc2 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -48,6 +48,9 @@ stdenv.mkDerivation { # remove dependency on bootstrap-tools in early stdenv build postInstall = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc + '' + '' + substituteInPlace "$dev/bin/icu-config" \ + --replace \''${pkglibdir}/Makefile.inc "$dev/lib/icu/Makefile.inc" ''; postFixup = ''moveToOutput lib/icu "$dev" ''; From 8a77ae81ad4b5d7e398414676fe2d4111c29fc32 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Wed, 24 Jan 2018 13:20:47 +0100 Subject: [PATCH 073/797] openafsClient: rename to openafs --- .../services/network-filesystems/openafs-client/default.nix | 2 +- pkgs/servers/{openafs-client => openafs}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/servers/{openafs-client => openafs}/default.nix (100%) diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 0946e379e79..e5f89a9a0d2 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -17,7 +17,7 @@ let echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo ''; - openafsPkgs = config.boot.kernelPackages.openafsClient; + openafsPkgs = config.boot.kernelPackages.openafs; in { ###### interface diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs/default.nix similarity index 100% rename from pkgs/servers/openafs-client/default.nix rename to pkgs/servers/openafs/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0123190fa08..ff3d87cde0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13022,7 +13022,7 @@ with pkgs; rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; - openafsClient = callPackage ../servers/openafs-client { }; + openafs = callPackage ../servers/openafs { }; facetimehd = callPackage ../os-specific/linux/facetimehd { }; From a6bb22853afad5b7168332a2f2b54989044a2d74 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jan 2018 14:00:02 +0100 Subject: [PATCH 074/797] python.pkgs.backport_functools_lru_cache: set to null conditionally --- .../python-modules/backports_functools_lru_cache/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 2442e132f1b..0def8a2de2a 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -2,9 +2,10 @@ , buildPythonPackage , fetchPypi , setuptools_scm +, pythonOlder }: -buildPythonPackage rec { +if !(pythonOlder "3.3") then null else buildPythonPackage rec { pname = "backports.functools_lru_cache"; version = "1.4"; From e9794d5a381cd9fb9daaf305d4790f6c2d766287 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jan 2018 14:00:25 +0100 Subject: [PATCH 075/797] python.pkgs.backports_ssl_match_hostname: set to null conditionally --- 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 e45418fba46..a22851ec65a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1011,7 +1011,7 @@ in { backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; - backports_ssl_match_hostname_3_4_0_2 = self.buildPythonPackage rec { + backports_ssl_match_hostname_3_4_0_2 = if !(pythonOlder "3.5") then null else self.buildPythonPackage rec { name = "backports.ssl_match_hostname-3.4.0.2"; src = pkgs.fetchurl { @@ -1025,7 +1025,7 @@ in { }; }; - backports_ssl_match_hostname = self.buildPythonPackage rec { + backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else self.buildPythonPackage rec { name = "backports.ssl_match_hostname-${version}"; version = "3.5.0.1"; From 18275c60ff1d68bcf665b809ce6d7371ed33f3d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jan 2018 14:00:42 +0100 Subject: [PATCH 076/797] python.pkgs.tornado: fix optional dependency --- pkgs/development/python-modules/tornado/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index db513d1c614..ec431a6e85b 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -6,6 +6,7 @@ , backports_ssl_match_hostname , certifi , singledispatch +, pythonOlder }: buildPythonPackage rec { @@ -13,7 +14,8 @@ buildPythonPackage rec { version = "4.5.3"; name = "${pname}-${version}"; - propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; + propagatedBuildInputs = [ backports_abc certifi singledispatch ] + ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 From 21ae679db789478f18497289ee1798c94e80b984 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jan 2018 14:00:57 +0100 Subject: [PATCH 077/797] python.pkgs.matplotlib: fix optional dependency --- pkgs/development/python-modules/matplotlib/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 33505b5f618..49bdfa8dc08 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -8,6 +8,7 @@ , enableQt ? false, pyqt4 , libcxx , Cocoa +, pythonOlder }: assert enableGhostscript -> ghostscript != null; @@ -39,8 +40,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype - libpng pkgconfig mock pytz backports_functools_lru_cache - ] + libpng pkgconfig mock pytz ] + ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] From f4348cc5cbb598d9779a3660e2c2f232ed1278b2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jan 2018 14:13:22 +0100 Subject: [PATCH 078/797] python.pkgs.backports_lzma: set to null conditionally --- pkgs/development/python-modules/backports_lzma/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix index 6f7a45a4fe8..a0643e82ae0 100644 --- a/pkgs/development/python-modules/backports_lzma/default.nix +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -4,9 +4,10 @@ , isPy3k , lzma , python +, pythonOlder }: -buildPythonPackage rec { +if !(pythonOlder "3.3") then null else buildPythonPackage rec { pname = "backports.lzma"; version = "0.0.9"; From b62864adf47d06897caff6f9e7b485febc814257 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 10 Dec 2017 01:37:34 -0500 Subject: [PATCH 079/797] e2fsprogs: Enable cross-compilation --- pkgs/tools/filesystems/e2fsprogs/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index e6a83e32632..a27eb5094db 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }: +{ stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { name = "e2fsprogs-1.43.8"; @@ -10,15 +10,9 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkgconfig texinfo buildPackages.stdenv.cc ]; buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; - crossAttrs = { - preConfigure = '' - export CC=$crossConfig-gcc - ''; - }; - configureFlags = if stdenv.isLinux then [ "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks" From 3fe8e610f0fdb73fc533b5156f703a81d8f4b0f7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 23 Jan 2018 11:34:25 -0600 Subject: [PATCH 080/797] e2fsprogs: depsBuildBuild --- pkgs/tools/filesystems/e2fsprogs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index a27eb5094db..6326cda3539 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; - nativeBuildInputs = [ pkgconfig texinfo buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkgconfig texinfo ]; buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; configureFlags = From fffd72cb5668fab958a3dafbb0b6cf8e4384abfe Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 18:51:53 -0600 Subject: [PATCH 081/797] lsof: fix for cross --- pkgs/development/tools/misc/lsof/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 76c83e2dbeb..aa6bd003ed3 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, buildPackages, ncurses }: let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { name = "lsof-${version}"; version = "4.89"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; src = fetchurl { @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { # Stop build scripts from searching global include paths LSOF_INCLUDE = "${stdenv.cc.libc}/include"; - configurePhase = "./Configure -n ${dialect}"; + configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; preBuild = '' sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' for filepath in $(find dialects/${dialect} -type f); do From 10aa7a9611b4ba64c8b229ddc8cb912045e8ad9c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 18:41:04 -0600 Subject: [PATCH 082/797] jwhois: set AR to fix cross build --- pkgs/tools/networking/jwhois/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 1d7932c7ad3..cd0821ef9ef 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { patches = [ ./connect.patch ./service-name.patch ]; + makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = http://www.gnu.org/software/jwhois/; From 11281bb54d0eb8903792364cd4ad3192be81874f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 18:35:11 -0600 Subject: [PATCH 083/797] cron: fix for cross ($CC, no 'install -s') --- pkgs/tools/system/cron/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 4a8babfd630..d6347798053 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { preBuild = '' # do not set sticky bit in /nix/store substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755 --replace 4755 0755 - makeFlags="DESTROOT=$out CC=cc" + # do not strip during install, broken on cross and we'll do ourselves as needed + substituteInPlace Makefile --replace ' -s cron' ' cron' + makeFlags="DESTROOT=$out CC=$CC" # We want to ignore the $glibc/include/paths.h definition of # sendmail path. From 05096950505be8ba62cbf8bceda7c635cb11cf40 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 14 Jan 2018 18:30:28 -0600 Subject: [PATCH 084/797] aspell: perl should be nativeBuildInput build fails otherwise, presumably not also needed as a buildInput for some reason. --- pkgs/development/libraries/aspell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 0f6f5e8dd14..cccd93e5d4d 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patch -p1 < ${./data-dirs-from-nix-profiles.patch} ''; - buildInputs = [ perl ]; + nativeBuildInputs = [ perl ]; doCheck = true; From a0410d92268ef4c10561739b173e7bb91d832dbd Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 10 Dec 2017 01:36:44 -0500 Subject: [PATCH 085/797] rhash: Enable cross-compilation (cherry picked from commit 07f1d9eae440b3533ab53f424b31e541116e5623) --- 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 e33c680b457..68c3edc4cd2 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # * .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 CC=cc PREFIX=$out + make lib-shared lib-static build-shared CC=$CC AR=$AR PREFIX=$out ''; # we don't actually want the static library, so we remove it after it From 3655157d2249795b0f09f77fc82624f668dc36df Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 15 Dec 2017 23:38:45 -0500 Subject: [PATCH 086/797] libomxil-bellagio: Enable cross-compilation --- pkgs/development/libraries/libomxil-bellagio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 5140402eacb..28c8a915c63 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/omxil/omxil/Bellagio%20${version}/${name}.tar.gz"; sha256 = "0k6p6h4npn8p1qlgq6z3jbfld6n1bqswzvxzndki937gr0lhfg2r"; }; - + + configureFlags = + stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" ]; + patches = [ ./fedora-fixes.patch ]; meta = with stdenv.lib; { From 4df330ea6e6a4b5b6882781b1c1b5f87e67d8300 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 17 Oct 2017 16:40:51 -0400 Subject: [PATCH 087/797] libgpg-error: Enable cross-compilation --- pkgs/development/libraries/libgpg-error/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 56bf9b177b5..4771e229d83 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, buildPackages, fetchurl, gettext }: stdenv.mkDerivation rec { name = "libgpg-error-${version}"; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { # If architecture-dependent MO files aren't available, they're generated # during build, so we need gettext for cross-builds. + crossAttrs.nativeBuildInputs = [ gettext buildPackages.stdenv.cc ]; crossAttrs.buildInputs = [ gettext ]; postConfigure = @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { # Thus, re-run it with Bash. "${stdenv.shell} config.status"; - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; meta = with stdenv.lib; { homepage = https://www.gnupg.org/related_software/libgpg-error/index.html; @@ -45,4 +46,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.fuuzetsu maintainers.vrthra ]; }; } - From 162398f907b7950e967b16076bcc12dfd9e76481 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 23 Jan 2018 11:38:46 -0600 Subject: [PATCH 088/797] libgpg-error: fixup --- pkgs/development/libraries/libgpg-error/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 4771e229d83..9faf7a40458 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { # If architecture-dependent MO files aren't available, they're generated # during build, so we need gettext for cross-builds. - crossAttrs.nativeBuildInputs = [ gettext buildPackages.stdenv.cc ]; - crossAttrs.buildInputs = [ gettext ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ gettext ]; postConfigure = stdenv.lib.optionalString stdenv.isSunOS @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Thus, re-run it with Bash. "${stdenv.shell} config.status"; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = true; # not cross meta = with stdenv.lib; { homepage = https://www.gnupg.org/related_software/libgpg-error/index.html; From 2060f547dffed412c6df38b8c4dcb4088fea0024 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 23 Jan 2018 11:47:10 -0600 Subject: [PATCH 089/797] file: fix for cross For whatever reason "selfNativeBuildInput = true" doesn't seeem to do the trick here? (reasons may include "it's not intended to solve this problem" ;)) --- pkgs/tools/misc/file/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 47d67f91ec7..3765f913430 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, file, zlib }: stdenv.mkDerivation rec { name = "file-${version}"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6"; }; + nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ]; doCheck = true; From c68aa532d68df512a657608a02ef7400b7087873 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 17 Oct 2017 15:46:27 -0400 Subject: [PATCH 090/797] glib: Allow cross compilation tweaked to handle non-glibc along with others --- pkgs/development/libraries/glib/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c0cf864e79a..656cdffbb4c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -75,8 +75,13 @@ stdenv.mkDerivation rec { # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ optional stdenv.isDarwin "--disable-compile-warnings" - ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu" - ++ optional stdenv.isSunOS "--disable-dtrace"; + ++ optional (stdenv.hostPlatform.libc != "glibc") "--with-libiconv=gnu" + ++ optional stdenv.isSunOS "--disable-dtrace" + # Can't run this test when cross-compiling + ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) + [ "glib_cv_stack_grows=no" "glib_cv_uscore=no" ] + # GElf only supports elf64 hosts + ++ optional (!stdenv.hostPlatform.is64bit) "--disable-libelf"; NIX_CFLAGS_COMPILE = optional stdenv.isDarwin "-lintl" ++ optional stdenv.isSunOS "-DBSD_COMP"; From f83b6e1130e3193dd9480ca5d60b764870de9d3f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 24 Jan 2018 21:58:57 -0800 Subject: [PATCH 091/797] unpackPhase: Handle sources starting with a hyphen --- pkgs/stdenv/generic/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index dbbe45e45f3..e4a77af199b 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -769,7 +769,7 @@ _defaultUnpack() { # We can't preserve hardlinks because they may have been # introduced by store optimization, which might break things # in the build. - cp -pr --reflink=auto "$fn" "$(stripHash "$fn")" + cp -pr --reflink=auto -- "$fn" "$(stripHash "$fn")" else From 9b85e317f0c1467ece8e7e945db8f183cfb59e70 Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Thu, 25 Jan 2018 08:33:46 +0100 Subject: [PATCH 092/797] terraform-landscape: init at 0.1.17 --- .../cluster/terraform-landscape/Gemfile | 2 + .../cluster/terraform-landscape/Gemfile.lock | 25 ++++++++ .../cluster/terraform-landscape/default.nix | 19 ++++++ .../cluster/terraform-landscape/gemset.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 109 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform-landscape/Gemfile create mode 100644 pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock create mode 100644 pkgs/applications/networking/cluster/terraform-landscape/default.nix create mode 100644 pkgs/applications/networking/cluster/terraform-landscape/gemset.nix diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile new file mode 100644 index 00000000000..c4f9a5511de --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'terraform_landscape' diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock new file mode 100644 index 00000000000..047ddaadad0 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock @@ -0,0 +1,25 @@ +GEM + remote: https://rubygems.org/ + specs: + colorize (0.8.1) + commander (4.4.4) + highline (~> 1.7.2) + diffy (3.2.0) + highline (1.7.10) + polyglot (0.3.5) + terraform_landscape (0.1.17) + colorize (~> 0.7) + commander (~> 4.4) + diffy (~> 3.0) + treetop (~> 1.6) + treetop (1.6.9) + polyglot (~> 0.3) + +PLATFORMS + ruby + +DEPENDENCIES + terraform_landscape + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/applications/networking/cluster/terraform-landscape/default.nix new file mode 100644 index 00000000000..a0dca341ff3 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/default.nix @@ -0,0 +1,19 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "terraform-landscape-${version}"; + + version = (import gemset).terraform_landscape.version; + inherit ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + meta = with lib; { + description = "Improve Terraform's plan output to be easier to read and understand"; + homepage = https://github.com/coinbase/terraform-landscape; + license = with licenses; apsl20; + maintainers = with maintainers; [ mbode ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix new file mode 100644 index 00000000000..38321b9d37a --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix @@ -0,0 +1,61 @@ +{ + colorize = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; + type = "gem"; + }; + version = "0.8.1"; + }; + commander = { + dependencies = ["highline"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "165yr8qzan3gnk241mnwxsvdfwp6p1afg13z0mqdily6lh95acl9"; + type = "gem"; + }; + version = "4.4.4"; + }; + diffy = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941"; + type = "gem"; + }; + version = "3.2.0"; + }; + highline = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + type = "gem"; + }; + version = "1.7.10"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + terraform_landscape = { + dependencies = ["colorize" "commander" "diffy" "treetop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bx8nfqbpxb2hnxnnl1m4sq6jlzf451c85m047jfq04b6w9691fl"; + type = "gem"; + }; + version = "0.1.17"; + }; + treetop = { + dependencies = ["polyglot"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd"; + type = "gem"; + }; + version = "1.6.9"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a48f43fc9ff..0e8bdaeeaa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19999,6 +19999,8 @@ with pkgs; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; + terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; + terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix { From bec047eca3a66cfef43d1afd9f193fbdfc358a03 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 25 Jan 2018 16:31:28 +0900 Subject: [PATCH 093/797] neovim: remove confusing neovim parameter The neovim package refers to itself, hopefully it is shadowed by a function parameter but it is confusing, let's remove it. --- pkgs/applications/editors/neovim/wrapper.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index e2218473d72..187474de5b6 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,6 +1,5 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, lndir +{ stdenv, lib, makeDesktopItem, makeWrapper , vimUtils -, neovim , bundlerEnv, ruby , pythonPackages , python3Packages From 3df98ef5b8ddb8d866952f01f82251bceceeb5d5 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 20 Jan 2018 12:39:56 +0300 Subject: [PATCH 094/797] vkquake: init at 0.97.3 --- pkgs/games/quakespasm/vulkan.nix | 47 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/games/quakespasm/vulkan.nix diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix new file mode 100644 index 00000000000..675c2ab4b4d --- /dev/null +++ b/pkgs/games/quakespasm/vulkan.nix @@ -0,0 +1,47 @@ +{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-loader }: +stdenv.mkDerivation rec { + name = "vkquake-${version}"; + majorVersion = "0.97"; + version = "${majorVersion}.3"; + + src = fetchFromGitHub { + owner = "Novum"; + repo = "vkQuake"; + rev = version; + sha256 = "11z9k5aw9ip7ggmgjdnaq4g45pxqiy0xhd4jqqmgzpmfdbjk4x13"; + }; + + sourceRoot = "source/Quake"; + + buildInputs = [ + makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev + ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + makeFlags = [ "prefix=$(out) bindir=$(out)/bin" ]; + + postFixup = '' + wrapProgram $out/bin/vkquake --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + enableParallelBuilding = true; + + meta = { + description = "Vulkan Quake port based on QuakeSpasm"; + homepage = src.meta.homepage; + longDescription = '' + vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. + It is based on the popular QuakeSpasm port and runs all mods compatible with it + like Arcane Dimensions or In The Shadows. vkQuake also serves as a Vulkan demo + application that shows basic usage of the API. For example it demonstrates render + passes & sub passes, pipeline barriers & synchronization, compute shaders, push & + specialization constants, CPU/GPU parallelism and memory pooling. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a48f43fc9ff..8005f505320 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18494,6 +18494,7 @@ with pkgs; quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { }; quakespasm = callPackage ../games/quakespasm { }; + vkquake = callPackage ../games/quakespasm/vulkan.nix { }; ioquake3 = callPackage ../games/quake3/ioquake { }; From ba12a867f7d57e60466a9715be402fb56e861749 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Thu, 25 Jan 2018 16:46:12 +0100 Subject: [PATCH 095/797] awesome: Remove $LD_LIBRARY_PATH handling I have no idea why gobjectIntrospection even was in here. The only library in there, libgirepository-1.0.so, is not used by awesome. It is only used by lgi.so and that means it should be found via its RPATH. The Pango path is not needed in $LD_LIBRARY_PATH ever since gobjectIntrospection started patching .typelib files with absolute paths. Relevant commits are 36bef2b26731a9 from 2014 ("gobject-introspection: refer to shlibs with absolute paths in typelibs") and c420de6b05710 from 2016 ("gobject-introspection: Fix patching shared objects"). The above patches did not work for cairo, because cairo's typelib is a bit "special". However, this was fixed by e44038bccab0cae some days ago ("gobjectIntrospection: use absolute path for cairo GIR"). Thus, setting $GI_TYPELIB_PATH is enough so that all needed libraries are found. Fixes: https://github.com/NixOS/nixpkgs/issues/14164 Signed-off-by: Uli Schlachter --- pkgs/applications/window-managers/awesome/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index ca596cdfddc..2808c8552ef 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -41,7 +41,6 @@ with luaPackages; stdenv.mkDerivation rec { #cmakeFlags = "-DGENERATE_MANPAGES=ON"; cmakeFlags = "-DOVERRIDE_VERSION=${version}"; - LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; @@ -52,7 +51,6 @@ with luaPackages; stdenv.mkDerivation rec { --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" wrapProgram $out/bin/awesome-client \ From 85ca8f121bdeab205658aa8e4f4b1932a8d4dc4f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 17 Dec 2017 00:25:31 -0800 Subject: [PATCH 096/797] slurm-spank-x11: init at 0.2.5 --- .../services/computing/slurm/slurm.nix | 31 ++++++++++++--- .../computing/slurm-spank-x11/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 pkgs/servers/computing/slurm-spank-x11/default.nix diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index fb91a29a400..45d34f5b76f 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -6,14 +6,20 @@ let cfg = config.services.slurm; # configuration file can be generated by http://slurm.schedmd.com/configurator.html - configFile = pkgs.writeText "slurm.conf" + configFile = pkgs.writeText "slurm.conf" '' ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''} + PlugStackConfig=${plugStackConfig} ${cfg.extraConfig} ''; + + plugStackConfig = pkgs.writeText "plugstack.conf" + '' + ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''} + ''; in { @@ -28,7 +34,7 @@ in enable = mkEnableOption "slurm control daemon"; }; - + client = { enable = mkEnableOption "slurm rlient daemon"; @@ -86,8 +92,19 @@ in ''; }; + enableSrunX11 = mkOption { + default = false; + type = types.bool; + description = '' + If enabled srun will accept the option "--x11" to allow for X11 forwarding + from within an interactive session or a batch job. This activates the + slurm-spank-x11 module. Note that this requires 'services.openssh.forwardX11' + to be enabled on the compute nodes. + ''; + }; + extraConfig = mkOption { - default = ""; + default = ""; type = types.lines; description = '' Extra configuration options that will be added verbatim at @@ -134,7 +151,8 @@ in environment.systemPackages = [ wrappedSlurm ]; systemd.services.slurmd = mkIf (cfg.client.enable) { - path = with pkgs; [ wrappedSlurm coreutils ]; + path = with pkgs; [ wrappedSlurm coreutils ] + ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; wantedBy = [ "multi-user.target" ]; after = [ "systemd-tmpfiles-clean.service" ]; @@ -152,8 +170,9 @@ in }; systemd.services.slurmctld = mkIf (cfg.server.enable) { - path = with pkgs; [ wrappedSlurm munge coreutils ]; - + path = with pkgs; [ wrappedSlurm munge coreutils ] + ++ lib.optional cfg.enableSrunX11 slurm-spank-x11; + wantedBy = [ "multi-user.target" ]; after = [ "network.target" "munged.service" ]; requires = [ "munged.service" ]; diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix new file mode 100644 index 00000000000..13fad7059af --- /dev/null +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, slurm } : +let + version = "0.2.5"; +in +stdenv.mkDerivation { + name = "slurm-spank-x11-${version}"; + version = version; + + src = fetchFromGitHub { + owner = "hautreux"; + repo = "slurm-spank-x11"; + rev = version; + sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry"; + }; + + buildPhase = '' + gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \ + -g -o slurm-spank-x11 slurm-spank-x11.c + gcc -I${slurm.dev}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \ + -g -o x11.so slurm-spank-x11-plug.c + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib + install -m 755 slurm-spank-x11 $out/bin + install -m 755 x11.so $out/lib + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/hautreux/slurm-spank-x11; + description = "Plugin for SLURM to allow for interactive X11 sessions"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ markuskowa ]; + }; +} + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b24c98499c..441a09a7e54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12394,6 +12394,8 @@ with pkgs; slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { }); slurm-llnl-full = slurm-full; # renamed July 2017 + slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; + systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; inherit (callPackages ../servers/http/tomcat { }) From ed5064c6c5501c204a6310ed1be35e19237aefe8 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 25 Jan 2018 23:38:54 +0000 Subject: [PATCH 097/797] otter-browser: init at 0.9.94 --- .../networking/browsers/otter/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/browsers/otter/default.nix diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix new file mode 100644 index 00000000000..80e40da269e --- /dev/null +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -0,0 +1,24 @@ +{ stdenv, qt5, cmake, openssl, gst_all_1, fetchFromGitHub +, version ? "0.9.94" +, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5" +}: +stdenv.mkDerivation { + name = "otter-browser-${version}"; + + src = fetchFromGitHub { + owner = "OtterBrowser"; + repo = "otter-browser"; + rev = "v${version}"; + sha256 = sourceSha; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = with qt5; [ qtbase qtmultimedia qtwebengine ]; + + meta = with stdenv.lib; { + license = licenses.gpl3; + description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5"; + maintainers = with maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a48f43fc9ff..2ec0c0b01c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4780,6 +4780,8 @@ with pkgs; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + otter-browser = callPackage ../applications/networking/browsers/otter {}; + privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; }; From fd7acb9218003df7cb0d8b4c1376e638aa7f09cc Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 26 Jan 2018 11:26:52 +0000 Subject: [PATCH 098/797] duktape: init at 2.2.0 --- .../interpreters/duktape/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/interpreters/duktape/default.nix diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix new file mode 100644 index 00000000000..c54a9d204cb --- /dev/null +++ b/pkgs/development/interpreters/duktape/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "duktape-${version}"; + version = "2.2.0"; + src = fetchurl { + url = "http://duktape.org/duktape-${version}.tar.xz"; + sha256 = "050csp065ll67dck94s0vdad5r5ck4jwsz1fn1y0fcvn88325xv2"; + }; + + buildPhase = '' + make -f Makefile.sharedlibrary + make -f Makefile.cmdline + ''; + installPhase = '' + install -d $out/bin + install -m755 duk $out/bin/ + install -d $out/lib + install -m755 libduktape* $out/lib/ + ''; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "An embeddable Javascript engine, with a focus on portability and compact footprint"; + homepage = "http://duktape.org/"; + downloadPage = "http://duktape.org/download.html"; + license = licenses.mit; + maintainers = [ maintainers.fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ca022a4132..0845a2afb0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6685,6 +6685,8 @@ with pkgs; dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; + duktape = callPackage ../development/interpreters/duktape { }; + beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) From 49d4e6c01875cc1961d57be35fbc8e4349b437f1 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 26 Jan 2018 19:52:34 +0000 Subject: [PATCH 099/797] otter-browser: use qt5.callPackage, fix licence --- pkgs/applications/networking/browsers/otter/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index 80e40da269e..93cf220e499 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,4 +1,5 @@ -{ stdenv, qt5, cmake, openssl, gst_all_1, fetchFromGitHub +{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub +, qtbase, qtmultimedia, qtwebengine , version ? "0.9.94" , sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5" }: @@ -14,10 +15,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - buildInputs = with qt5; [ qtbase qtmultimedia qtwebengine ]; + buildInputs = [ qtbase qtmultimedia qtwebengine ]; meta = with stdenv.lib; { - license = licenses.gpl3; + license = licenses.gpl3Plus; description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5"; maintainers = with maintainers; [ lheckemann ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ec0c0b01c0..a7d08635c4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4780,7 +4780,7 @@ with pkgs; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; - otter-browser = callPackage ../applications/networking/browsers/otter {}; + otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; From d2e83e6357995966f014d45b2b2539a5a48c3bbb Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 16 Dec 2017 22:57:13 -0500 Subject: [PATCH 100/797] buildbot: 0.9.11 -> 0.9.15.post1 --- .../tools/build-managers/buildbot/default.nix | 4 ++-- .../tools/build-managers/buildbot/plugins.nix | 14 +++++++------- .../tools/build-managers/buildbot/worker.nix | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index a2d77f0321a..ba4af7e1d66 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -14,11 +14,11 @@ let package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.11"; + version = "0.9.15.post1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1s3y218wry7502xp4zxccf3z996xm8cnp3dcxl7m5ldmmb055qwv"; + sha256 = "01m5x4lpz90lqf8j0s2c26gqb5yzan6x9d1ffgmrklwf0bljkwni"; }; buildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index ec4bf161562..d0c91e761f1 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -4,11 +4,11 @@ let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.11"; + version = "0.9.15.post1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1gh7wj9z7n7yfs219jbv9pdd2w8dwj6qpa090ffjkfpgd3xana33"; + sha256 = "0gsa5fi1gkwnz8dsrl2s5kzcfawnj3nl8g8h6z1winz627l9n8sh"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -32,7 +32,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "0fk1swdncg4nha744mzkf6jqh1zv1cfhnqvd19669kjcyjx9i68d"; + sha256 = "19cnzp5prima3jrk525xspw7vqc5pjln2nihj4kc3w90dhzllj8x"; }; meta = with stdenv.lib; { @@ -50,7 +50,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "16wxgnh35916c2gw34971ynx319lnm9addhqvii885vid44pqim0"; + sha256 = "1j6aw2j2sl7ix8rb67pbs6nfvv8v3smgkvqzsjsyh5sdfr2663cg"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -70,7 +70,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1hcr8xsc0ajfg2vz2h8g5s8ypsp32kdplgqp21jh8z5y0a6nzqsl"; + sha256 = "0k0wd4rq034bij2flfjv60h8czkfn836bnaa7hwsrl58gxds39m4"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -90,7 +90,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0aw1073xq549q5jkjk31zhqpasp8jiy4gch0fjyw8qy0dax8hc7r"; + sha256 = "08ng56jmy50s3zyn6wxizji1zhgzhi65z7w3wljg02qrbd5688gj"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -110,7 +110,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0x99mdmn1ngcnmkxr40hwqafsq48jybdz45y5kpc0yw68n0bfwmv"; + sha256 = "15fm72yymv873n3vsw9kprypcf6jzln18v4lb062n8lqw9pykwb1"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 4fe728b9ce6..51d6a5b5695 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.11"; + version = "0.9.15.post1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0lb8kwg3m9jgrww929d5nrjs4rj489mb4dnsdxcbdb358jbbym22"; + sha256 = "12zscqb218w88y9fd1jwfn4cr2sw35j998d0jlgd22bch020sy65"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; From 7c609d76b1361dd66be3b7874f7ab64ebeefe78e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 26 Jan 2018 18:54:43 -0500 Subject: [PATCH 101/797] buildbot: make buildbot-pkg a real package, and add it as a build input of buildbot --- .../tools/build-managers/buildbot/default.nix | 3 ++- .../tools/build-managers/buildbot/pkg.nix | 21 ++++++++++++++++ .../tools/build-managers/buildbot/plugins.nix | 25 ++----------------- pkgs/top-level/all-packages.nix | 3 +++ 4 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/tools/build-managers/buildbot/pkg.nix diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index ba4af7e1d66..d62ccd0c9fd 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, openssh, buildbot-worker, pythonPackages, runCommand, makeWrapper }: +{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }: let withPlugins = plugins: runCommand "wrapped-${package.name}" { @@ -36,6 +36,7 @@ let pyflakes openssh buildbot-worker + buildbot-pkg treq ]; diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix new file mode 100644 index 00000000000..356ee574429 --- /dev/null +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "buildbot-pkg"; + version = "0.9.15.post1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gsa5fi1gkwnz8dsrl2s5kzcfawnj3nl8g8h6z1winz627l9n8sh"; + }; + + propagatedBuildInputs = [ setuptools ]; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Buildbot Packaging Helper"; + maintainers = with maintainers; [ nand0p ryansydnor ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index d0c91e761f1..40aaad2efd2 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -1,27 +1,6 @@ -{ stdenv, pythonPackages }: +{ stdenv, pythonPackages, buildbot-pkg }: -let - buildbot-pkg = pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "buildbot-pkg"; - version = "0.9.15.post1"; - - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "0gsa5fi1gkwnz8dsrl2s5kzcfawnj3nl8g8h6z1winz627l9n8sh"; - }; - - propagatedBuildInputs = with pythonPackages; [ setuptools ]; - - meta = with stdenv.lib; { - homepage = http://buildbot.net/; - description = "Buildbot Packaging Helper"; - maintainers = with maintainers; [ nand0p ryansydnor ]; - license = licenses.gpl2; - }; - }; - -in { +{ www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8978d6cd70d..89952c357e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7267,6 +7267,9 @@ with pkgs; buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix { pythonPackages = python2Packages; }; + buildbot-pkg = callPackage ../development/tools/build-managers/buildbot/pkg.nix { + inherit (python2Packages) buildPythonPackage fetchPypi setuptools; + }; buildbot-plugins = callPackages ../development/tools/build-managers/buildbot/plugins.nix { pythonPackages = python2Packages; }; From e013f0d81ac7fb9e0b33de1df8bea33e8679ad17 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 19 Jan 2018 16:16:35 -0800 Subject: [PATCH 102/797] openmpi: 1.10.7->3.0.0, add markuskowa as maintainer * add license * update description * add markuskowa as maintainer --- .../development/libraries/openmpi/default.nix | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index c2f79753bd1..c8cfec3ab2d 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, perl, rdma-core +{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -10,41 +10,47 @@ with stdenv.lib; let - majorVersion = "1.10"; + majorVersion = "3.0"; + minorVersion = "0"; in stdenv.mkDerivation rec { - name = "openmpi-${majorVersion}.7"; + name = "openmpi-${majorVersion}.${minorVersion}"; src = fetchurl { url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; - sha256 = "142s1vny9gllkq336yafxayjgcirj2jv0ddabj879jgya7hyr2d0"; + sha256 = "1mw2d94k6mp4scg1wnkj50vdh734fy5m2ygyrj65s4mh3prbz6gn"; }; - buildInputs = [ gfortran ] - ++ optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core; + postPatch = '' + patchShebangs ./ + ''; + + buildInputs = with stdenv; [ gfortran zlib ] + ++ optional isLinux libnl + ++ optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; configureFlags = [] + ++ optional stdenv.isLinux "--with-libnl=${libnl.dev}" ++ optional enableSGE "--with-sge" ++ optional enablePrefix "--enable-mpirun-prefix-by-default" ; enableParallelBuilding = true; - preBuild = '' - patchShebangs ompi/mpi/fortran/base/gen-mpi-sizeof.pl - ''; - postInstall = '' - rm -f $out/lib/*.la + rm -f $out/lib/*.la ''; + doCheck = true; + meta = { homepage = http://www.open-mpi.org/; - description = "Open source MPI-2 implementation"; - longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; - maintainers = [ ]; + description = "Open source MPI-3 implementation"; + longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; + maintainers = with maintainers; [ markuskowa ]; + license = licenses.bsd3; platforms = platforms.unix; }; } From 58765282f821216795a75c5cc130a75a02120df8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Jan 2018 13:31:45 -0800 Subject: [PATCH 103/797] openmpi: refactor --- pkgs/development/libraries/openmpi/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index c8cfec3ab2d..3f764b1d845 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -7,8 +7,6 @@ , enablePrefix ? false }: -with stdenv.lib; - let majorVersion = "3.0"; minorVersion = "0"; @@ -26,15 +24,15 @@ in stdenv.mkDerivation rec { ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ optional isLinux libnl - ++ optional (isLinux || isFreeBSD) rdma-core; + ++ lib.optional isLinux libnl + ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; - configureFlags = [] - ++ optional stdenv.isLinux "--with-libnl=${libnl.dev}" - ++ optional enableSGE "--with-sge" - ++ optional enablePrefix "--enable-mpirun-prefix-by-default" + configureFlags = with stdenv; [] + ++ lib.optional isLinux "--with-libnl=${libnl.dev}" + ++ lib.optional enableSGE "--with-sge" + ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default" ; enableParallelBuilding = true; @@ -45,7 +43,7 @@ in stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.open-mpi.org/; description = "Open source MPI-3 implementation"; longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; From aa83877cf874f38d998262e25e5cf1e547181e2f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jan 2018 18:26:22 -0800 Subject: [PATCH 104/797] mpi4py/h5py: fix test to run reliably with openmpi-3 --- pkgs/development/python-modules/h5py/default.nix | 8 ++++++-- pkgs/development/python-modules/mpi4py/default.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index e9bae3f8206..bdbdcdcc2e7 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, buildPythonPackage , numpy, hdf5, cython, six, pkgconfig -, mpi4py ? null }: +, mpi4py ? null, openssh }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -24,6 +24,10 @@ in buildPythonPackage rec { postConfigure = '' ${python.executable} setup.py configure ${configure_flags} + + # Needed to run the tests reliably. See: + # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 + ${optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"} ''; preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; @@ -33,7 +37,7 @@ in buildPythonPackage rec { ++ optional mpiSupport mpi ; propagatedBuildInputs = [ numpy six] - ++ optional mpiSupport mpi4py + ++ optionals mpiSupport [ mpi4py openssh ] ; meta = { diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index fcbca62ff9d..9329d386099 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, mpi }: +{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }: buildPythonPackage rec { pname = "mpi4py"; @@ -28,11 +28,15 @@ buildPythonPackage rec { # sometimes packages specify where files should be installed outside the usual # python lib prefix, we override that back so all infrastructure (setup hooks) # work as expected + + # Needed to run the tests reliably. See: + # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 + export OMPI_MCA_rmaps_base_oversubscribe=yes ''; setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - buildInputs = [ mpi ]; + buildInputs = [ mpi openssh ]; meta = { description = From ef60e411455c9d7ef16069df63daf2c9fbd66ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 27 Jan 2018 09:10:36 +0100 Subject: [PATCH 105/797] cmake: bring back 3.9 for Darwin bootstrap Broken by ba6e0ae33df36; see e.g. https://hydra.nixos.org/build/68223628 --- .../tools/build-managers/cmake/default.nix | 20 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 9357c1a3a85..fed88561cf9 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash +, majorVersion ? "3.10" # darwin attributes , ps , isBootstrap ? false @@ -14,10 +15,23 @@ assert useQt4 -> withQt5 == false; with stdenv.lib; +with ( + { + "3.10" = { + minorVersion = "2"; + sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b"; + }; + "3.9" = { + minorVersion = "6"; + sha256 = "7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218"; + }; + + }.${majorVersion} + or (abort ''Unsupported configuration for cmake: majorVersion = "${majorVersion}";'') +); + let os = stdenv.lib.optionalString; - majorVersion = "3.10"; - minorVersion = "2"; version = "${majorVersion}.${minorVersion}"; in @@ -29,7 +43,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; # from https://cmake.org/files/v3.10/cmake-3.10.2-SHA-256.txt - sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b"; + inherit sha256; }; prePatch = optionalString (!useSharedLibraries) '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b24c98499c..1f1aa0acc8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6348,7 +6348,10 @@ with pkgs; llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ inherit (stdenvAdapters) overrideCC; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - cmake = cmake.override { isBootstrap = true; }; + cmake = cmake.override { + isBootstrap = true; + majorVersion = "3.9"; # 3.10.2: 'ApplicationServices/ApplicationServices.h' file not found + }; libxml2 = libxml2.override { pythonSupport = false; }; python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; }); From 54250993414b9db13a89fda2cefcc80862d99b47 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Sat, 27 Jan 2018 19:42:47 +0900 Subject: [PATCH 106/797] node-packages.json-diff: init at 0.5.2 --- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 69 +++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 49380392bab..ad9d79fd88e 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -44,6 +44,7 @@ , "js-beautify" , "jsonlint" , "jsontool" +, "json-diff" , "json-refs" , "json-server" , "js-yaml" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 316693ecec0..90f5fd309d0 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -4135,6 +4135,15 @@ let sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; + "cli-color-0.1.7" = { + name = "cli-color"; + packageName = "cli-color"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz"; + sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; + }; + }; "cli-cursor-1.0.2" = { name = "cli-cursor"; packageName = "cli-cursor"; @@ -6998,6 +7007,15 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; + "difflib-0.2.4" = { + name = "difflib"; + packageName = "difflib"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"; + sha1 = "b5e30361a6db023176d562892db85940a718f47e"; + }; + }; "director-1.2.7" = { name = "director"; packageName = "director"; @@ -7331,6 +7349,15 @@ let sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; }; }; + "dreamopt-0.6.0" = { + name = "dreamopt"; + packageName = "dreamopt"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz"; + sha1 = "d813ccdac8d39d8ad526775514a13dda664d6b4b"; + }; + }; "dtrace-provider-0.6.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -7890,6 +7917,15 @@ let sha512 = "0m7d1yd67hb93gsxv7790h9ayxg3pwf3vgih9v2kxqvsg073wim7jgwf3z57lksdczxnqv2d8gm4mfk4b29f6rc27a7c09vz9w348wc"; }; }; + "es5-ext-0.8.2" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.8.2.tgz"; + sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; + }; + }; "es5class-2.3.1" = { name = "es5class"; packageName = "es5class"; @@ -11005,6 +11041,15 @@ let sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8"; }; }; + "heap-0.2.6" = { + name = "heap"; + packageName = "heap"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/heap/-/heap-0.2.6.tgz"; + sha1 = "087e1f10b046932fc8594dd9e6d378afc9d1e5ac"; + }; + }; "help-me-1.1.0" = { name = "help-me"; packageName = "help-me"; @@ -32651,6 +32696,30 @@ in production = true; bypassCache = false; }; + json-diff = nodeEnv.buildNodePackage { + name = "json-diff"; + packageName = "json-diff"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.2.tgz"; + sha512 = "03nqzpjpb0422fm5k7prlfcyb7wbs7dq7arwzq0za8zq3jy4wvbjjsbm25vr8ar5y6y87k9y1iqyc018zfysh2b675ql3qx6jjimfip"; + }; + dependencies = [ + sources."cli-color-0.1.7" + sources."difflib-0.2.4" + sources."dreamopt-0.6.0" + sources."es5-ext-0.8.2" + sources."heap-0.2.6" + sources."wordwrap-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JSON diff"; + homepage = https://github.com/andreyvit/json-diff; + }; + production = true; + bypassCache = false; + }; json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; From 85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Sat, 27 Jan 2018 12:39:02 -0500 Subject: [PATCH 107/797] gnutls: fix (failing) p11-kit test The p11-kit-trust test looks in /usr/lib for pkcs11 modules. As a result it is unnecessarily skipped on sandboxed builds, and fails on unsandboxed builds with a system p11-kit. Replace hard-coded /usr/lib paths with pkg-config. --- pkgs/development/libraries/gnutls/3.6.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/3.6.nix b/pkgs/development/libraries/gnutls/3.6.nix index 9dc6d5389d9..35344dfde7d 100644 --- a/pkgs/development/libraries/gnutls/3.6.nix +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -11,9 +11,10 @@ callPackage ./generic.nix (args // rec { # Skip two tests introduced in 3.5.11. Probable reasons of failure: # - pkgconfig: building against the result won't work before installing # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox + # Change p11-kit test to use pkg-config to find p11-kit postPatch = '' sed '2iexit 77' -i tests/pkgconfig.sh sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c - # TODO: remove just this line on some rebuild + sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh ''; }) From f968949c75d77bf1344883dec65b5a5323c24d6d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 27 Jan 2018 20:08:35 +0100 Subject: [PATCH 108/797] gzip: remove darwin format patch --- pkgs/tools/compression/gzip/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 49d1b614f3b..cfe41d3dfe7 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "16h8g4acy7fgfxcjacr3wijjsnixwsfd2jhz3zwdi2qrzi262l5f"; }; - patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; - outputs = [ "out" "man" "info" ]; enableParallelBuilding = true; From ec6e7c6eeb9b0da80dead84afe3a935e89d26fa0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 20 Jan 2018 17:24:24 -0800 Subject: [PATCH 109/797] octopus: init at 7.2 --- .../science/chemistry/octopus/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/science/chemistry/octopus/default.nix diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix new file mode 100644 index 00000000000..2ff20fef40e --- /dev/null +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, symlinkJoin, gfortran, perl, procps +, libyaml, libxc, fftw, openblas, gsl +}: + +let + version = "7.2"; + fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; + +in stdenv.mkDerivation { + name = "octopus-${version}"; + + src = fetchurl { + url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; + sha256 = "03zzmq72zdnjkhifbmlxs7ig7x6sf6mv8zv9mxhakm9hzwa9yn7m"; + }; + + nativeBuildInputs = [ perl procps fftw.dev ]; + buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out ]; + + configureFlags = '' + --with-yaml-prefix=${libyaml} + --with-blas=-lopenblas + --with-lapack=-lopenblas + --with-fftw-prefix=${fftwAll} + --with-gsl-prefix=${gsl} + --with-libxc-prefix=${libxc} + ''; + + doCheck = false; + checkTarget = "check-short"; + + postPatch = '' + patchShebangs ./ + ''; + + postConfigure = '' + patchShebangs testsuite/oct-run_testsuite.sh + ''; + + meta = with stdenv.lib; { + description = "Real-space time dependent density-functional theory code"; + homepage = http://octopus-code.org; + maintainers = with maintainers; [ markuskowa ]; + license = licenses.gpl2; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8db63bcd3c7..3291134725e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6827,6 +6827,8 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; + octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; + inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; From 800e74486902fb9d8f98c484ab9c568f36814612 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 20:09:20 +0800 Subject: [PATCH 110/797] p11_kit: 0.23.7 -> 0.23.9 --- pkgs/development/libraries/p11-kit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 34182cd5a84..c5c14ed3b85 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "p11-kit-${version}"; - version = "0.23.7"; + version = "0.23.9"; src = fetchFromGitHub { owner = "p11-glue"; repo = "p11-kit"; rev = version; - sha256 = "1l8sg0g74k2mk0y6vz19hc103dzizxa0h579gdhvxifckglb01hy"; + sha256 = "0lyv6m2jflvs23m0i6l64d470p5a315lz6vs4bflsqv8i1zrrcsh"; }; outputs = [ "out" "dev"]; From ac3b8fe91a1e3749fd7d7bf5dd6f3ce1eb055f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 28 Jan 2018 17:54:51 +0100 Subject: [PATCH 111/797] kwin: fixup build with cmake-3.10 via upstream patch --- pkgs/desktops/plasma-5/kwin/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 289d5a812f7..8b8a5fe72ea 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, fetchpatch, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, @@ -29,7 +29,14 @@ mkDerivation { kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework ]; outputs = [ "bin" "dev" "out" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ [(fetchpatch { + name = "cmake-3.10.diff"; + # included upstream for kwin >= 5.11.95 + url = "https://github.com/KDE/kwin/commit/cd544890ced4192.diff"; + sha256 = "0z5nbcg712v10mskb7r9v0jcx5h8q4ixb7fjbb0kicmzsc266yd5"; + })] + ; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ]; From 413d1844acfa2e72aa54ef181d17a23bdabd72e2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:16:27 +0100 Subject: [PATCH 112/797] libxslt: 1.1.29 -> 1.1.32 --- pkgs/development/libraries/libxslt/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 8c72ce2c086..1bb90ee195d 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -11,22 +11,15 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.29"; + version = "1.1.32"; name = pname + "-" + version; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"; + sha256 = "0q2l6m56iv3ysxgm2walhg4c9wp7q183jb328687i9zlp85csvjj"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-5029"; - url = "https://git.gnome.org/browse/libxslt/" - + "patch/?id=08ab2774b870de1c7b5a48693df75e8154addae5"; - sha256 = "10azfmyffjf9d7b5js4ipxw9f20qi0kw3zq34bpqmbcpq3l338ky"; - }) - ] ++ stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; + patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; # fixes: can't build x86_64-unknown-cygwin shared library unless -no-undefined is specified postPatch = optionalString hostPlatform.isCygwin '' From 92c55ab25df7d8b638dd0cb7c2a328b9dbf8d2dd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:13:48 +0100 Subject: [PATCH 113/797] libseccomp: 2.3.2 -> 2.3.3 --- pkgs/development/libraries/libseccomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 3b365c0e971..023c51c2b14 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "3ddc8c037956c0a5ac19664ece4194743f59e1ccd4adde848f4f0dae7f77bca1"; + sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz"; }; buildInputs = [ getopt makeWrapper ]; From b20284ddd88c812bbce63dd0e1e99d5eb36e2f14 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:16:09 +0100 Subject: [PATCH 114/797] libwebp: 0.6.0 -> 0.6.1 --- pkgs/development/libraries/libwebp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 673cd7abe7d..79a5bef30fc 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; - sha256 = "0h1brwkyxc7lb8lc53aacdks5vc1y9hzngqi41gg7y6l56912a69"; + sha256 = "1ayq2zq0zbgf5yizbm32zh7p1vb8kibw74am6am1n5cz5mw3ql06"; }; configureFlags = [ From 8ebba206e46642754f3f2d42be1f94b75df44c0d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:25:44 +0100 Subject: [PATCH 115/797] libogg: 1.3.2 -> 1.3.3 --- pkgs/development/libraries/libogg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index c5cb85d91ba..8bf62890fac 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libogg-1.3.2"; + name = "libogg-1.3.3"; src = fetchurl { url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z"; + sha256 = "022wjlzn8fx7mfby4pcgyjwx8zir7jr7cizichh3jgaki8bwcgsg"; }; outputs = [ "out" "dev" "doc" ]; From 66d34f852faaeea64b4ec851b24a109d6fa32c60 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 19:31:32 +0100 Subject: [PATCH 116/797] libtiff: 4.0.8 -> 4.0.9 --- pkgs/development/libraries/libtiff/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 0f95b6d34c7..ab1bda9ed29 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }: let - version = "4.0.8"; + version = "4.0.9"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr"; + sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"; }; - prePatch =let + prePatch = let debian = fetchurl { - url = http://snapshot.debian.org/archive/debian-debug/20170928T093547Z/pool/main/t/tiff/tiff_4.0.8-5.debian.tar.xz; - sha256 = "11qkiliw04dmdvdd5z2lv5hh2fiwa29qbhkxvlvmb4yslnmyywha"; + url = http://snapshot.debian.org/archive/debian-debug/20180128T155203Z//pool/main/t/tiff/tiff_4.0.9-3.debian.tar.xz; + sha256 = "0wya42y7kcq093g3h7ca10cm5sns1mgnkjmdd2qdi59v8arga4y4"; }; in '' tar xf '${debian}' From 192f30f06adcdfe58ff0d4191ef457dfcf3d8642 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 24 Jan 2018 13:06:01 -0600 Subject: [PATCH 117/797] nettools: 1.60_p20161110235919 -> 1.60_p20170221182432 Nothing critical, here's the highlights: * ROSE fixes * arp scanf/output fix * linux header compat: https://sourceforge.net/p/net-tools/code/ci/ea3935bd7c0f36c86c40e5785326698fa3336c6a/ Commit log (short): https://sourceforge.net/p/net-tools/code/ci/479bb4a7e11a4084e2935c0a576388f92469225b/log/ --- pkgs/os-specific/linux/net-tools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 9fbf3055715..ce287dc1841 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "net-tools-1.60_p20161110235919"; + name = "net-tools-${version}"; + version = "1.60_p20170221182432"; src = fetchurl { url = "mirror://gentoo/distfiles/${name}.tar.xz"; - sha256 = "1kbgwkys45kb5wqhchi1kf0sfw93c1cl0hgyw7yhacxzdfxjmdfr"; + sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a"; }; preBuild = From 716d1612afadf0cb0c11499261f68d364dd2879f Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Mon, 25 Dec 2017 14:51:40 -0800 Subject: [PATCH 118/797] openssh: Build with Kerberos by default This can be disabled with the `withKerberos` flag if desired. Make the relevant assertions lazy, so that if an overlay is used to set kerberos to null, a later override can explicitly set `withKerberos` to false. Don't build with GSSAPI by default; the patchset is large and a bit hairy, and it is reasonable to follow upstream who has not merged it in not enabling it by default. --- nixos/modules/misc/nixpkgs.nix | 1 - pkgs/tools/networking/openssh/default.nix | 14 +++++--------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 1793c1447d6..6eb42494124 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -69,7 +69,6 @@ in [ (self: super: { openssh = super.openssh.override { hpnSupport = true; - withKerberos = true; kerberos = self.libkrb5; }; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 663e7be7e5f..1c135cd36f4 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false -, withKerberos ? false +, withKerberos ? true , withGssapiPatches ? false , kerberos , linkOpenssl? true }: -assert withKerberos -> kerberos != null; -assert withGssapiPatches -> withKerberos; - let # **please** update this patch when you update to a new openssh release. @@ -23,8 +20,6 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - # Please ensure that openssh_with_kerberos still builds when - # bumping the version here! name = "openssh-${version}"; version = if hpnSupport then "7.5p1" else "7.6p1"; @@ -47,7 +42,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches gssapiPatch; + ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); postPatch = # On Hydra this makes installation fail (sometimes?), @@ -59,7 +54,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos - ++ optional hpnSupport autoreconfHook; + ++ optional hpnSupport autoreconfHook + ; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -78,7 +74,7 @@ stdenv.mkDerivation rec { "--disable-strip" (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withKerberos "--with-kerberos5=${kerberos}" + ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ef49fceab72..7d371881f94 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -142,6 +142,7 @@ mapAliases (rec { rdmd = dtools; # added 2017-08-19 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 + openssh_with_kerberos = openssh; # added 2018-01-28 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd1855b0015..e3f51436b33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3882,15 +3882,12 @@ with pkgs; openssh = callPackage ../tools/networking/openssh { hpnSupport = false; - withKerberos = stdenv.isDarwin; etcDir = "/etc/ssh"; pam = if stdenv.isLinux then pam else null; }; openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); - openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }); - opensp = callPackage ../tools/text/sgml/opensp { }; opentracker = callPackage ../applications/networking/p2p/opentracker { }; From 15a49774091b55172036fe1f8de96e349e9f0674 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 28 Jan 2018 16:32:52 -0500 Subject: [PATCH 119/797] Revert "openssh: Build with Kerberos by default" This reverts commit a232dd66ee0b390dc4d82858af7e15713bd60327. Moving to staging --- nixos/modules/misc/nixpkgs.nix | 1 + pkgs/tools/networking/openssh/default.nix | 14 +++++++++----- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 6eb42494124..1793c1447d6 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -69,6 +69,7 @@ in [ (self: super: { openssh = super.openssh.override { hpnSupport = true; + withKerberos = true; kerberos = self.libkrb5; }; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1c135cd36f4..663e7be7e5f 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false -, withKerberos ? true +, withKerberos ? false , withGssapiPatches ? false , kerberos , linkOpenssl? true }: +assert withKerberos -> kerberos != null; +assert withGssapiPatches -> withKerberos; + let # **please** update this patch when you update to a new openssh release. @@ -20,6 +23,8 @@ let in with stdenv.lib; stdenv.mkDerivation rec { + # Please ensure that openssh_with_kerberos still builds when + # bumping the version here! name = "openssh-${version}"; version = if hpnSupport then "7.5p1" else "7.6p1"; @@ -42,7 +47,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); + ++ optional withGssapiPatches gssapiPatch; postPatch = # On Hydra this makes installation fail (sometimes?), @@ -54,8 +59,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos - ++ optional hpnSupport autoreconfHook - ; + ++ optional hpnSupport autoreconfHook; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { "--disable-strip" (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") + ++ optional withKerberos "--with-kerberos5=${kerberos}" ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7d371881f94..ef49fceab72 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -142,7 +142,6 @@ mapAliases (rec { rdmd = dtools; # added 2017-08-19 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 - openssh_with_kerberos = openssh; # added 2018-01-28 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3f51436b33..bd1855b0015 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3882,12 +3882,15 @@ with pkgs; openssh = callPackage ../tools/networking/openssh { hpnSupport = false; + withKerberos = stdenv.isDarwin; etcDir = "/etc/ssh"; pam = if stdenv.isLinux then pam else null; }; openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); + openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }); + opensp = callPackage ../tools/text/sgml/opensp { }; opentracker = callPackage ../applications/networking/p2p/opentracker { }; From e2a54266c411e71bb5e65d9523766782728a1c3f Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 28 Jan 2018 16:34:04 -0500 Subject: [PATCH 120/797] openssh: Build with Kerberos by default This reverts commit 09696e32c390c232ec7ac506df6457fb93c1f536. which reverted f596aa0f4a35f613422f85a4486e32ea20ca7739 to move it to staging --- nixos/modules/misc/nixpkgs.nix | 1 - pkgs/tools/networking/openssh/default.nix | 14 +++++--------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 1793c1447d6..6eb42494124 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -69,7 +69,6 @@ in [ (self: super: { openssh = super.openssh.override { hpnSupport = true; - withKerberos = true; kerberos = self.libkrb5; }; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 663e7be7e5f..1c135cd36f4 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false -, withKerberos ? false +, withKerberos ? true , withGssapiPatches ? false , kerberos , linkOpenssl? true }: -assert withKerberos -> kerberos != null; -assert withGssapiPatches -> withKerberos; - let # **please** update this patch when you update to a new openssh release. @@ -23,8 +20,6 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - # Please ensure that openssh_with_kerberos still builds when - # bumping the version here! name = "openssh-${version}"; version = if hpnSupport then "7.5p1" else "7.6p1"; @@ -47,7 +42,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches gssapiPatch; + ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); postPatch = # On Hydra this makes installation fail (sometimes?), @@ -59,7 +54,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos - ++ optional hpnSupport autoreconfHook; + ++ optional hpnSupport autoreconfHook + ; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -78,7 +74,7 @@ stdenv.mkDerivation rec { "--disable-strip" (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withKerberos "--with-kerberos5=${kerberos}" + ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ef49fceab72..7d371881f94 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -142,6 +142,7 @@ mapAliases (rec { rdmd = dtools; # added 2017-08-19 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 + openssh_with_kerberos = openssh; # added 2018-01-28 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd1855b0015..e3f51436b33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3882,15 +3882,12 @@ with pkgs; openssh = callPackage ../tools/networking/openssh { hpnSupport = false; - withKerberos = stdenv.isDarwin; etcDir = "/etc/ssh"; pam = if stdenv.isLinux then pam else null; }; openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; }); - openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; }); - opensp = callPackage ../tools/text/sgml/opensp { }; opentracker = callPackage ../applications/networking/p2p/opentracker { }; From 259b9ff6b009807257072d033479aa3690120d73 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 21 Jan 2018 01:03:36 -0500 Subject: [PATCH 121/797] pciutils: enable cross compilation --- pkgs/tools/system/pciutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 1139c49ddf8..3cd00b3394c 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib kmod which ]; - makeFlags = "SHARED=yes PREFIX=\${out}"; + makeFlags = [ "SHARED=yes" "PREFIX=\${out}" "STRIP=" "HOST=${stdenv.hostPlatform.system}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; installTargets = "install install-lib"; From 84f54b898aaffb67254628e89803a49e8836ee03 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 21 Jan 2018 01:34:22 -0500 Subject: [PATCH 122/797] cpupower: enable cross compilation --- pkgs/os-specific/linux/cpupower/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index d6d529627e2..7cde965d215 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, kernel, coreutils, pciutils, gettext }: +{ stdenv, buildPackages, fetchurl, kernel, pciutils, gettext }: stdenv.mkDerivation { name = "cpupower-${kernel.version}"; src = kernel.src; - buildInputs = [ coreutils pciutils gettext ]; + nativeBuildInputs = [ gettext ]; + buildInputs = [ pciutils ]; configurePhase = '' cd tools/power/cpupower - sed -i 's,/bin/true,${coreutils}/bin/true,' Makefile - sed -i 's,/bin/pwd,${coreutils}/bin/pwd,' Makefile - sed -i 's,/usr/bin/install,${coreutils}/bin/install,' Makefile + sed -i 's,/bin/true,${buildPackages.coreutils}/bin/true,' Makefile + sed -i 's,/bin/pwd,${buildPackages.coreutils}/bin/pwd,' Makefile + sed -i 's,/usr/bin/install,${buildPackages.coreutils}/bin/install,' Makefile ''; - buildPhase = '' - make - ''; + makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ]; installPhase = '' make \ From 82ebace595bd3de93b697681180fa13e4fd6b491 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 28 Jan 2018 22:17:04 -0500 Subject: [PATCH 123/797] glibc: Fix Darwin build Fix the failure caused in #34198 by a suggested change of mine. @vcunat reported in [1]. [1]: https://github.com/NixOS/nixpkgs/pull/34198#issuecomment-361075911 --- pkgs/development/libraries/glib/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 656cdffbb4c..f68bd138005 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -75,7 +75,9 @@ stdenv.mkDerivation rec { # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ optional stdenv.isDarwin "--disable-compile-warnings" - ++ optional (stdenv.hostPlatform.libc != "glibc") "--with-libiconv=gnu" + # glibc inclues GNU libiconv, but Darwin's iconv function is good enonugh. + ++ optional (stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isDarwin) + "--with-libiconv=gnu" ++ optional stdenv.isSunOS "--disable-dtrace" # Can't run this test when cross-compiling ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) From 64ba681f4808582bbdef5dfc8716feeaf5e9d77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 29 Jan 2018 06:48:04 +0100 Subject: [PATCH 124/797] glib: fixup build on Darwin after #34198 hopefully --- pkgs/development/libraries/glib/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 656cdffbb4c..2071eb935ae 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -75,7 +75,8 @@ stdenv.mkDerivation rec { # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ optional stdenv.isDarwin "--disable-compile-warnings" - ++ optional (stdenv.hostPlatform.libc != "glibc") "--with-libiconv=gnu" + ++ optional (stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isDarwin) + "--with-libiconv=gnu" ++ optional stdenv.isSunOS "--disable-dtrace" # Can't run this test when cross-compiling ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) From 7b2482ea54a572cd66265f2bf1b54452436ff850 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 29 Jan 2018 15:46:15 +0300 Subject: [PATCH 125/797] modules/nvidia-optimus: fix module blacklisting --- nixos/modules/services/hardware/nvidia-optimus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix index 9fe4021c424..eb1713baa14 100644 --- a/nixos/modules/services/hardware/nvidia-optimus.nix +++ b/nixos/modules/services/hardware/nvidia-optimus.nix @@ -23,7 +23,7 @@ let kernel = config.boot.kernelPackages; in ###### implementation config = lib.mkIf config.hardware.nvidiaOptimus.disable { - boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb"]; + boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb" "nvidia-drm"]; boot.kernelModules = [ "bbswitch" ]; boot.extraModulePackages = [ kernel.bbswitch ]; From 60331e6e9062ff4a9d880c9559bc64f5a32e4757 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 14:14:07 +0100 Subject: [PATCH 126/797] curl: 7.57.0 -> 7.58.0 (security) Fixes: CVE-2018-1000005, CVE-2018-1000007 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index be42c4a1381..16b22e3f255 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -24,11 +24,11 @@ assert brotliSupport -> brotli != null; assert gssSupport -> kerberos != null; stdenv.mkDerivation rec { - name = "curl-7.57.0"; + name = "curl-7.58.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "09j88lzqmi79rvvg2l7bjcs56330bq388f5p468hgblf6hdf6by9"; + sha256 = "0cg7klhf1ksnbw5wvwa802qir877zv4y3dj7swz1xh07g3wq3c0w"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From 300f6c5943e0baeaa75dff05b77a697d61e729b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 29 Jan 2018 21:15:34 +0100 Subject: [PATCH 127/797] lirc: 0.10.0 -> 0.10.1 --- pkgs/development/libraries/lirc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index d6ab09d835c..7f4d8cc19c8 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -2,11 +2,11 @@ , libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { - name = "lirc-0.10.0"; + name = "lirc-0.10.1"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "0lzmqcw0sc28s19yd4bqvl52p4f77razq50w7z92a4xrn7l2sz75"; + sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb"; }; postPatch = '' From 1fbe208cd6e79c4068c100244d98738d39e0e835 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sun, 28 Jan 2018 17:30:37 +0000 Subject: [PATCH 128/797] keepass: from 2.37 to 2.38 Motivation for change: Update to software. --- pkgs/applications/misc/keepass/default.nix | 21 +-------- .../misc/keepass/keepass-plugins-load.patch | 1 - .../misc/keepass/keepass-plugins.patch | 46 ------------------- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 pkgs/applications/misc/keepass/keepass-plugins-load.patch delete mode 100644 pkgs/applications/misc/keepass/keepass-plugins.patch diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 49e4711550d..bee86cb0ed3 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,34 +8,17 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.37"; + version = "2.38"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "1wfbpfjng1blzkbjnxsdnny544297bm9869ianbr6l0hrvcgv3qx"; + sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk"; }; sourceRoot = "."; buildInputs = [ unzip makeWrapper icoutils ]; - pluginLoadPathsPatch = - let outputLc = toString (add 7 (length plugins)); - patchTemplate = readFile ./keepass-plugins.patch; - loadTemplate = readFile ./keepass-plugins-load.patch; - loads = - lib.concatStrings - (map - (p: replaceStrings ["$PATH$"] [ (unsafeDiscardStringContext (toString p)) ] loadTemplate) - plugins); - in replaceStrings ["$OUTPUT_LC$" "$DO_LOADS$"] [outputLc loads] patchTemplate; - - passAsFile = [ "pluginLoadPathsPatch" ]; - postPatch = '' - sed -i 's/\r*$//' KeePass/Forms/MainForm.cs - patch -p1 <$pluginLoadPathsPatchPath - ''; - preConfigure = '' rm -rvf Build/* find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \; diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch deleted file mode 100644 index b7bea38e4c8..00000000000 --- a/pkgs/applications/misc/keepass/keepass-plugins-load.patch +++ /dev/null @@ -1 +0,0 @@ -+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch deleted file mode 100644 index 1793f04a170..00000000000 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- old/KeePass/Forms/MainForm.cs -+++ new/KeePass/Forms/MainForm.cs -@@ -386,42 +386,$OUTPUT_LC$ @@ namespace KeePass.Forms - m_pluginManager.UnloadAllPlugins(); - if(AppPolicy.Current.Plugins) - { -- string[] vExclNames = new string[] { -- AppDefs.FileNames.Program, AppDefs.FileNames.XmlSerializers, -- AppDefs.FileNames.NativeLib32, AppDefs.FileNames.NativeLib64, -- AppDefs.FileNames.ShInstUtil -- }; -- -- string strPlgRoot = UrlUtil.GetFileDirectory( -- WinUtil.GetExecutable(), false, true); -- m_pluginManager.LoadAllPlugins(strPlgRoot, SearchOption.TopDirectoryOnly, -- vExclNames); -- -- if(!NativeLib.IsUnix()) -- { -- string strPlgSub = UrlUtil.EnsureTerminatingSeparator(strPlgRoot, -- false) + AppDefs.PluginsDir; -- m_pluginManager.LoadAllPlugins(strPlgSub, SearchOption.AllDirectories, -- vExclNames); -- } -- else // Unix -- { -- try -- { -- DirectoryInfo diPlgRoot = new DirectoryInfo(strPlgRoot); -- foreach(DirectoryInfo diSub in diPlgRoot.GetDirectories()) -- { -- if(diSub == null) { Debug.Assert(false); continue; } -- -- if(string.Equals(diSub.Name, AppDefs.PluginsDir, -- StrUtil.CaseIgnoreCmp)) -- m_pluginManager.LoadAllPlugins(diSub.FullName, -- SearchOption.AllDirectories, vExclNames); -- } -- } -- catch(Exception) { Debug.Assert(false); } -- } -- } -$DO_LOADS$+ } - - // Delete old files *after* loading plugins (when timestamps - // of loaded plugins have been updated already) From 15c471e444bdba3ec5dc947f927aeadaba7ebc99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 29 Jan 2018 21:25:07 +0100 Subject: [PATCH 129/797] docbook-xsl: apply Debian/Fedora patch to fix issues Our samba now got hit by that bug: https://hydra.nixos.org/build/68373563 --- .../sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index dac9d27f66c..c78dcc0596e 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, findXMLCatalogs, writeScriptBin, ruby, bash }: +{ lib, stdenv, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }: let @@ -10,6 +10,14 @@ let inherit sha256; }; + patches = [(fetchpatch { + name = "potential-infinite-template-recursion.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/docbook-style-xsl.git/" + + "plain/docbook-style-xsl-non-recursive-string-subst.patch?id=bf9e5d16fd"; + sha256 = "1pfb468bsj3j879ip0950waih0r1s6rzfbm2p70glbz0g3903p7h"; + stripLen = "1"; + })]; + propagatedBuildInputs = [ findXMLCatalogs ]; dontBuild = true; From dcdaea355ad5b44dbb0b9929c21d83c247d77ac0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 28 Jan 2018 01:09:22 -0800 Subject: [PATCH 130/797] rdma-core: fix paths in rxe_cfg --- pkgs/os-specific/linux/rdma-core/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 22ce4a10f1c..a7cf884a854 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, ethtool, libnl, libudev, python, perl +, ethtool, nettools, libnl, libudev, python, perl } : let @@ -16,10 +16,13 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libnl ethtool libudev python perl ]; + buildInputs = [ libnl ethtool nettools libudev python perl ]; - postFixup = '' - substituteInPlace $out/bin/rxe_cfg --replace ethtool "${ethtool}/bin/ethtool" + postPatch = '' + substituteInPlace providers/rxe/rxe_cfg.in \ + --replace '@CMAKE_INSTALL_FULL_SHAREDSTATEDIR@' '/run' \ + --replace ethtool "${ethtool}/bin/ethtool" \ + --replace ifconfig "${nettools}/bin/ifconfig" ''; meta = with stdenv.lib; { From 7c554c13ee6073b035124a5070be0454dbaf4f38 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 28 Jan 2018 12:16:12 -0800 Subject: [PATCH 131/797] rdma-core: fix platform flag --- pkgs/os-specific/linux/rdma-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index a7cf884a854..5e697bcbb5f 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -29,6 +29,7 @@ in stdenv.mkDerivation { description = "RDMA Core Userspace Libraries and Daemons"; homepage = https://github.com/linux-rdma/rdma-core; license = licenses.gpl2; + platforms = platforms.linux; maintainers = with maintainers; [ markuskowa ]; }; } From ab02f5400e02fa6e270ca62bbf1398317cbb1a3d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 23 Nov 2017 23:53:28 +0100 Subject: [PATCH 132/797] astral: init at 1.4 --- .../python-modules/astral/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/astral/default.nix diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix new file mode 100644 index 00000000000..76dba87f964 --- /dev/null +++ b/pkgs/development/python-modules/astral/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytz, pytest }: + +buildPythonPackage rec { + pname = "astral"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1zm1ypc6w279gh7lbgsfbzfxk2x4gihlq3rfh59hj70hmhjwiwp7"; + }; + + propagatedBuildInputs = [ pytz ]; + + checkInputs = [ pytest ]; + checkPhase = '' + py.test -k "not test_GoogleLocator" + ''; + + meta = with stdenv.lib; { + description = "Calculations for the position of the sun and the moon"; + homepage = https://github.com/sffjunkie/astral/; + license = licenses.asl20; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 272b57298e5..4a581a04efa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -165,6 +165,8 @@ in { asn1crypto = callPackage ../development/python-modules/asn1crypto { }; + astral = callPackage ../development/python-modules/astral { }; + astropy = callPackage ../development/python-modules/astropy { }; augeas = callPackage ../development/python-modules/augeas { From 9d392684c241b410c995c7a5ee3f7990c1a1973b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 27 Jan 2018 00:47:49 +0100 Subject: [PATCH 133/797] pythonPackages.pytest-aiohttp: init at 0.3.0 --- .../python-modules/pytest-aiohttp/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-aiohttp/default.nix diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix new file mode 100644 index 00000000000..afdc085aa9f --- /dev/null +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }: + +buildPythonPackage rec { + pname = "pytest-aiohttp"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; + }; + + propagatedBuildInputs = [ pytest aiohttp ]; + + meta = with stdenv.lib; { + homepage = https://github.com/aio-libs/pytest-aiohttp/; + description = "Pytest plugin for aiohttp support"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a581a04efa..b266903809e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3217,6 +3217,8 @@ in { pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; + pytestcache = buildPythonPackage rec { name = "pytest-cache-1.0"; src = pkgs.fetchurl { From c68a1651e7b81b47a0d55891b496b71c5281e786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 23 Jan 2018 17:30:09 +0100 Subject: [PATCH 134/797] pythonPackages.aiohttp: remove name attribute --- pkgs/development/python-modules/aiohttp/cors.nix | 2 +- pkgs/development/python-modules/aiohttp/default.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix index ab9595ec2b9..9da239b524a 100644 --- a/pkgs/development/python-modules/aiohttp/cors.nix +++ b/pkgs/development/python-modules/aiohttp/cors.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aiohttp-cors"; version = "0.6.0"; - name = "${pname}-${version}"; + src = fetchPypi { inherit pname version; sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f1eb7a64d79..17737c33986 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -14,7 +14,6 @@ buildPythonPackage rec { pname = "aiohttp"; version = "2.3.9"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -33,4 +32,4 @@ buildPythonPackage rec { license = with lib.licenses; [ asl20 ]; homepage = https://github.com/KeepSafe/aiohttp/; }; -} \ No newline at end of file +} From 6a2ead51ad9167e1a42e9d508920dc148f6d2cec Mon Sep 17 00:00:00 2001 From: Felix Breidenstein Date: Fri, 24 Nov 2017 00:09:00 +0100 Subject: [PATCH 135/797] Add f-breidenstein as maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d579395b20b..08c89301554 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -231,6 +231,7 @@ fadenb = "Tristan Helmich "; falsifian = "James Cook "; fare = "Francois-Rene Rideau "; + f-breidenstein = "Felix Breidenstein "; fgaz = "Francesco Gazzetta "; FireyFly = "Jonas Höglund "; flokli = "Florian Klink "; From 5bf6d94473cff39138f1fe39733507aa988d3727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jan 2018 22:26:52 +0100 Subject: [PATCH 136/797] home-assistant: init at 0.62.1 --- pkgs/servers/home-assistant/default.nix | 72 ++++++++++++++++++++++++ pkgs/servers/home-assistant/frontend.nix | 11 ++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 85 insertions(+) create mode 100644 pkgs/servers/home-assistant/default.nix create mode 100644 pkgs/servers/home-assistant/frontend.nix diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix new file mode 100644 index 00000000000..9ec314e5c73 --- /dev/null +++ b/pkgs/servers/home-assistant/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchFromGitHub, python3 +, extraPackages ? ps: [] +, skipPip ? true }: + +let + + py = python3.override { + packageOverrides = self: super: { + yarl = super.yarl.overridePythonAttrs (oldAttrs: rec { + version = "0.18.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "11j8symkxh0ngvpddqpj85qmk6p70p20jca3alxc181gk3vx785s"; + }; + }); + aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { + version = "2.3.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0fzfpx5ny7559xrxaawnylq20dvrkjiag0ypcd13frwwivrlsagy"; + }; + }); + hass-frontend = super.callPackage ./frontend.nix { }; + }; + }; + + # Ensure that we are using a consistent package set + extraBuildInputs = extraPackages py.pkgs; + +in with py.pkgs; buildPythonApplication rec { + pname = "homeassistant"; + version = "0.62.1"; + + diabled = !isPy3k; + + # PyPI tarball is missing tests/ directory + src = fetchFromGitHub { + owner = "home-assistant"; + repo = "home-assistant"; + rev = version; + sha256 = "0151prwk2ci6bih0mdmc3r328nrvazn9jwk0w26wmd4cpvnb5h26"; + }; + + propagatedBuildInputs = [ + # From setup.py + requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi + # From the components that are part of the default configuration.yaml + sqlalchemy aiohttp-cors hass-frontend user-agents distro mutagen xmltodict netdisco + ] ++ extraBuildInputs; + + checkInputs = [ + pytest requests-mock pydispatcher pytest-aiohttp + ]; + + checkPhase = '' + # The components' dependencies are not included, so they cannot be tested + py.test --ignore tests/components + # Some basic components should be tested however + py.test \ + tests/components/{group,http} \ + tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py + ''; + + makeWrapperArgs = [] ++ stdenv.lib.optional skipPip [ "--add-flags --skip-pip" ]; + + meta = with stdenv.lib; { + homepage = https://home-assistant.io/; + description = "Open-source home automation platform running on Python 3"; + license = licenses.asl20; + maintainers = with maintainers; [ f-breidenstein dotlambda ]; + }; +} diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix new file mode 100644 index 00000000000..6e1a789012f --- /dev/null +++ b/pkgs/servers/home-assistant/frontend.nix @@ -0,0 +1,11 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "home-assistant-frontend"; + version = "20180130.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b9klisl7hh30rml8qlrp9gpz33z9b825pd1vxbck48k0s98z1zi"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc958838f4a..03657bd8b49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11974,6 +11974,8 @@ with pkgs; hiawatha = callPackage ../servers/http/hiawatha {}; + home-assistant = callPackage ../servers/home-assistant { }; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; From f2a45a47d4b4b1293083a2e5882380c7e15a7e2c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 10 Jan 2018 15:19:37 +0100 Subject: [PATCH 137/797] nixos: Add nixpkgs.pkgs option This lets the user set pkgs directly, so that it can be injected externally and be reused among evaluations of NixOS. --- nixos/modules/misc/nixpkgs.nix | 53 ++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 1793c1447d6..351a802a517 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -3,6 +3,8 @@ with lib; let + cfg = config.nixpkgs; + isConfig = x: builtins.isAttrs x || builtins.isFunction x; @@ -42,12 +44,51 @@ let merge = lib.mergeOneOption; }; - _pkgs = import ../../.. config.nixpkgs; + pkgsType = mkOptionType { + name = "nixpkgs"; + description = "An evaluation of Nixpkgs; the top level attribute set of packages"; + check = builtins.isAttrs; + }; in { options.nixpkgs = { + + pkgs = mkOption { + defaultText = literalExample + ''import "''${nixos}/.." { + inherit (config.nixpkgs) config overlays system; + } + ''; + default = import ../../.. { inherit (cfg) config overlays system; }; + type = pkgsType; + example = literalExample ''import {}''; + description = '' + This is the evaluation of Nixpkgs that will be provided to + all NixOS modules. Defining this option has the effect of + ignoring the other options that would otherwise be used to + evaluate Nixpkgs, because those are arguments to the default + value. The default value imports the Nixpkgs source files + relative to the location of this NixOS module, because + NixOS and Nixpkgs are distributed together for consistency, + so the nixos in the default value is in fact a + relative path. The config, overlays + and system come from this option's siblings. + + This option can be used by applications like NixOps to increase + the performance of evaluation, or to create packages that depend + on a container that should be built with the exact same evaluation + of Nixpkgs, for example. Applications like this should set + their default value using lib.mkDefault, so + user-provided configuration can override it without using + lib. + + Note that using a distinct version of Nixpkgs with NixOS may + be an unexpected source of problems. Use this option with care. + ''; + }; + config = mkOption { default = {}; example = literalExample @@ -59,6 +100,8 @@ in The configuration of the Nix Packages collection. (For details, see the Nixpkgs documentation.) It allows you to set package configuration options. + + Ignored when nixpkgs.pkgs is set. ''; }; @@ -83,6 +126,8 @@ in takes as an argument the original Nixpkgs. The first argument should be used for finding dependencies, and the second should be used for overriding recipes. + + Ignored when nixpkgs.pkgs is set. ''; }; @@ -94,14 +139,16 @@ in If unset, it defaults to the platform type of your host system. Specifying this option is useful when doing distributed multi-platform deployment, or when building virtual machines. + + Ignored when nixpkgs.pkgs is set. ''; }; }; config = { _module.args = { - pkgs = _pkgs; - pkgs_i686 = _pkgs.pkgsi686Linux; + pkgs = cfg.pkgs; + pkgs_i686 = cfg.pkgs.pkgsi686Linux; }; }; } From dff396484db868845d5a794e2a96574b7a17ceaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 30 Jan 2018 12:23:47 +0100 Subject: [PATCH 138/797] postfix: Correct license --- lib/licenses.nix | 5 +++++ pkgs/servers/mail/postfix/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 1fdcc15fd72..0086bd63ebd 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -200,6 +200,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Eclipse Public License 1.0"; }; + epl20 = spdx { + spdxId = "EPL-2.0"; + fullName = "Eclipse Public License 2.0"; + }; + epson = { fullName = "Seiko Epson Corporation Software License Agreement for Linux"; url = https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index bf1c16acfeb..f8b36e816e0 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://www.postfix.org/; description = "A fast, easy to administer, and secure mail server"; - license = lib.licenses.bsdOriginal; + license = with lib.licenses; [ ipl10 epl20 ]; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.rickynils ]; }; From ba2008938de62bcaeb04ec0b12d08a04da46ba34 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Tue, 30 Jan 2018 16:28:09 +0100 Subject: [PATCH 139/797] firefox-bin: 58.0 -> 58.0.1 [security] --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 2d707041f87..2221100f21c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0"; + version = "58.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ach/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ach/firefox-58.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "746d50340fff7a198db8430a4fe927a81ebb5fa2527150c78612bd62225133aa06f7dfb657c439d7c2143eb3f3a3d5a0b7edbc019d3fc8337ab268f18c0ae65b"; + sha512 = "7b32498fed47b1e0a58b399436c54ccb784a870ec0e8ab7f789218b17a168d0968666bb01abb456c4d0f6350a7769e05eaf2a3a6a5f3827a42725bf7704ac941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/af/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/af/firefox-58.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "fd09ccaf68d21cd299db1d86ee034db8f6ef81b763bce270126c3d51b9e5039411db8efc40666129d9cfad73804698cc64f0bf7f1eb810a9852d1a7b2c7cd5db"; + sha512 = "12ca5365ea453af0ad4cd4c296c05b3dd99e713e46aa618544573c1023a7e1b6596d91d90fd9bd5a6a332624d985637bb12ffab20548dc808c5dccc0909e3fae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/an/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/an/firefox-58.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "19eeea6f14e4c5457ada42443bb46cfc64019adb0e0d42310357c4fa834c9e0626a18d672276df3a3d8c9b2c3d217514e7cd843f6a71322c8a212bc51379b45a"; + sha512 = "7da1af63fdfa939724aac8c9def9b179bd2fdb37f2034e9758f4578a682c22bcd0803fc2e67412d2339b722eb269cffa96863b819d6e390ac01009152b00c90e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ar/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ar/firefox-58.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a3ac0579f614dbc10b81c5058a1182f68a3a16efeb1140cc13dbfcd171263e21f817922517ffe7715ee8af2cc24a41252e00c3c004ed4442fe641ab93159ca61"; + sha512 = "1e2d9ae0ce968803b6ea6fdf9841328a561c90576a5849e3ef1e89a6f5ea0aa70b2179ca0c04fd89b829ce21f45d3eecdca607a07d64e6c16a8aa06cda8333ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/as/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/as/firefox-58.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "651a08ffeb020ce5d606c49e5d081ca9f97ee51300784d13ba2a12308b1c95074aa3d4e844d88e500db4ad611803c5fe52ac7561e5ad4f7e7bbd2ef4af0058f3"; + sha512 = "c40af34a01fe616e0924993b267cbf498a21962f77139b5aecebd6e1b6d17464685c44f435a18be018a00761e40ff3473a205d55c111be954f379ff6540645c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ast/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ast/firefox-58.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "1d2766f2100e4a95bd8ae5a890f9619213f9ebff7801df5dbe8cbb13caf8c0de67e25d9c99b714fc43dc98816b920911a71837e5ce1025a98bdd7243195de226"; + sha512 = "81898690a8c7bbeddc0c89a2e6c91082e37016d86815a79b2488adc36cbea3c0b669221fa9951e4fe4880f777c5c0be9e9728549d01c77e592c8b1afdb4a629d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/az/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/az/firefox-58.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d7f250df0a62bd5114241e3db96dd961601d0da7c8dc4ceb8cb4d45a147a654a7b1fca9f1dc478cb2dfafffdaa246015ee814b6cbffbd81f57a9b81a7ac76185"; + sha512 = "73ff9c0be45cd7d5f70abcb8e397e9adc777383b793a78c6907396724c78f9fea5794a8a138c9c19f2d0ab46a0133da69f6e5c98a15a8b120567c22bebefcd27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/be/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/be/firefox-58.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "1b835105b9ab4203e269696c1df29ac65aace7a62e9336a4405831f3483b14cec950d303743862119d96a1a9f57a95f19f5ba643c248c2e644720db8ee705a9b"; + sha512 = "19b581888cf07fe9cbabba66832fd62a803920f2a39b195bffd8316b3100edb4b0c628d0563e3d6ab76b097f8e038310079d5d1a2bc2722bb78ee5a51b4bfdcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/bg/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bg/firefox-58.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "7aea83a33f8e343ef52ebcd9e0e7b3b2a44ee2a93523834dc268ce9ffe5b90516d074403ed8c88c1f4b2ddac252b2078df98233c1f5279617bc38b83693119a4"; + sha512 = "bb440c3132a75a7fdb0c3886af57b0650609adf3992b086d9ded68be5525c6dea292de0ff51dbab42968348eb8ce8c918869fa40ab26126cfe775b69a40fc5dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/bn-BD/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bn-BD/firefox-58.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "93b7b7a83e51ac40e11763e947ac8f091eb4a6ad4c7cb3701a1a889a31b725a62daf520e1a1eac5ac1923ad1a11414f386db6b62095bf74bf36a51df2e49e0b3"; + sha512 = "5d7f7a98bcd0f927d1911e4d1a7eb79640912b2944f7c335ba6c81eb6e8310edb26917b9944272205ab2e90aecc28bd9208ffcd4049aa0a491f3e5671f21be8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/bn-IN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bn-IN/firefox-58.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "87852a6d1b84cbe83a490232ef571352c05f5f8eda5f7a26d87081e2814ffd5b41d761110aa75503a21989642a9fe1340ba04d7745d4267d129717d0a882e385"; + sha512 = "96ed7a7c7cef4f88591f6b1f2c4d683d1b39220c8ffdbee9db9b9b470cca1e1902b042b10e62555ec614cb2b0ba560972042c4e65f5b17a2b8bad78d3c456744"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/br/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/br/firefox-58.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "8914a9d5f5bdefc4a681b5766d8333434078e3717dab556f0781b68933fe3fd85b53fe8068cc4796107faed6a7279142e21b8e0a61c90b447d24965704e9f815"; + sha512 = "9537b2f8edc30d76649e7be50f1ef9576ebd8dbde45c6a0c685d846ad2ee8634b80060449f01ea60926040e1bc6b8d8c49346bcc69fc276c4c6d3142e9dd8d06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/bs/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bs/firefox-58.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b6d40c6ae7033eb8b55f3013dd2eff05551ec78009593fa49033adcd8a30362c9aaf7335749ee91899a1203fe5a3ab0cc795a73f80e332c800270d64f34247f4"; + sha512 = "b9cc1e8d570173f283a77b552ed99fd4546fb1f55a1a5e766d6f441e2589e615445c45317c39043d98ae8c4f77a75d80d0fef9bc20944690fa7c75ffd4bc5ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ca/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ca/firefox-58.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "53e774bb1d85ac8229fbc75884b7f781cc7fe0f7ce5235665da115a5a8b2ca4a05a82c1fe51d801daa6a5479e12f8e5531c84891ef922c89bc387699895439d5"; + sha512 = "dc263ccc27c14d7aaa9fb66a9b9398df48d3685b2e2c3493627f279d5509884293121316cc8ffe3aaeb200287d1e0438852dc9e4c02f2aa525c2f16f9a2b510e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/cak/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cak/firefox-58.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "7079bc83b9a64c7ef932c7bbe57153d775dcdebaa938d031e1379678e4c127dd767c3296fde3c9a9b81d5f07e93f38bfa5a6ade9179b7e1dd5d790b560469fd2"; + sha512 = "69026c93cb0e48c3b8790978694642cd6e854203a2d78bba48ac922906cf938781bf1c1dc5316eb887c89b9933132253d378233c3669954a1182d1d7d4145e3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/cs/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cs/firefox-58.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9bc5b068b6f6a38e98cf26d43fb0c304603a69013eb0970a9a8b577f3edb59272ab81258544268213906168dd7bc58224032ca956593fe983b7a82ea82934ff0"; + sha512 = "4dc64d4fa8424b85713a566b0cd7373e352624799055ee7bc0879ebb93008ca6aec9f39f0aa657809f7c7a70f8473e731279ef7b3ffa16ea5132d01c83e5aaed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/cy/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cy/firefox-58.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "95354ec119944578a047f3cb28de6565e3fc2c6fdd93c3cab6bb3b423dcbbd5b3dd7c002a185e800172e197900ddf07ac767e1bdfdad181d243c92ac6ad9ced2"; + sha512 = "85b7c7210429d5ac6120629a033347f1c13de5998b83276f3b735ace1f4a62cd0f201e2312e0be6d7f0607062688402f687e593b93e92439fbda14367efaad66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/da/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/da/firefox-58.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "0e0fcf3a449c4c89d86e180391c4cea86a1ffad00857d7fe26f48d6a3958d0474faad236d3148c029e3671216c6941d3a57d4cab29f9ab3058bef7b24fb4fc60"; + sha512 = "d902f11e93a23dbc4a4e2340926134fadb2a251bb4b00de1d79bbccc9d21de35f99bc2d4469cee812b15d95dbeff6f4388649d27fea020a54b24a59ef3084634"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/de/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/de/firefox-58.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "53ec43f033a987dca6ae5477e58a6bb0a8f2c4299e373f8da674c522057022395c1d1d54e9874eb7e3d0872da12a7121c0edbab42eb404deef8212cac1339c32"; + sha512 = "558502bf31db14744aac18c3efb8e2b0189a118cdf080621910c9cf15a05b1bd28fe1b2f5e2acad678ccbe9769ceabe9dec0b7016f1570ae888f9c3fad7fd6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/dsb/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/dsb/firefox-58.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "eb99b4a6aa2c1f4e75cadc7b22f0aa5967bf2e87a7a3071848cb8f9b8ce85be24aa696462acfed9888e3e8b3cb3e6a6c620c256f29b249c340e664c49b70c383"; + sha512 = "89ad64c3a489a0ef30099581370fffd3743c1857d12fbff65f6387ecf1503e6e394ee91d744847b6db3611800fa195de2e4d1df4a2ec9424436348c36b6731c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/el/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/el/firefox-58.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ba3281351b57e1727535f1b4979388e6bb9187be1f61a145fd7bbafc30ad5a8da79ce3971520255a597f8333bea7ce55ae472ae5e4698de062cd23c85d06430b"; + sha512 = "c7f77728e18d63745cc6385f7923e673483df76b6e8e2ba8f39cf635bb94d8243f9ac1728c4ddb5b94e316ebab026a52871e9fad86276dd885e48481a6dc1edb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-GB/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-GB/firefox-58.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "53dd1af53def127e697a5cccb1d4b4292870868d480231981586257850c7ae7a4108eb6b9b00582eaf28c7d73273838ada0661d44a6346c5c1b08734e59a380b"; + sha512 = "f76ea7e2d15016ca779a5b2f1bcdeb3cf1607ba4b570142cebb60caba5728be65ef05179ee7c5a3029ae8e21e26ea759e7b754b3670a0b6debd0da4528720078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-US/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-US/firefox-58.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "df0f86d1169256f73e68594177388afba5aba4d57260ac6b0b1cc1b61a15725ad7ea5a6210c3a60dbd290f8ad3333792353dcc4d3d23ada6bff8c366f75735f8"; + sha512 = "ad5b2b66a8579ad2f3a9ff97425af7e9c7ab4235cf44a5684ad481879ea953492f0639fc79121be9f808bedba80e3c0205e43433b99a1c8809544fbd1bb3808c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/en-ZA/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-ZA/firefox-58.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "2e158325f50140c085a9886884444f1aa62616e937e32b3ad9c621f62f1b98e642fe9b0d2821bbf8deed627595471a9d139257fc35c478213ca0f487fd7ea884"; + sha512 = "aaca4fc5bb264e0f2c8a5d783b3e1e53786403d01c157d8ca3a87642a3668e839fb0d5e204e96371dc442f21bd66e589ed55b6a76d3f50271dc0345da8059eb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/eo/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/eo/firefox-58.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "af6129508481db96cb8cde0da39f421516115abc2b96b191bd3d5b60b8804e8eef1a1b406c28687c2d4423e721d0fffcd33a6f1c42dc031dd1c3f8624db60b4f"; + sha512 = "f49f89c5c6fbfee70e47a6b632de5b92981a23b54e8e9d7b47ac83ef18bf45d98417c73cfbd06b277b67f94f138c37ebbdea4f1c756e4229d8842f49da6a34c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/es-AR/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-AR/firefox-58.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "3fa95941bf365061cc72cc1d6f1c9ce6ee8044bf28e64821f23b56d63078772acf125746f2ced274a559dd7d0c1b8827fb03fefa9a7d4c325c3a0aa8e9e60c19"; + sha512 = "d04e9a28755ec6de2021b20f72b32ad6aca151cbe8300a54ace876878d8df043923b6afb3b186e5ae3db6345216eeebe9f97978a4e50d9a0a854207e5503a3ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/es-CL/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-CL/firefox-58.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "45b8e8a40522623dcce5df515be89fcaf030b29ec042674a9e21e0929867a51915eff3bb93503a802ca266aa0c6e1237c433c51cb7b38a5588598fa6f2e58ca5"; + sha512 = "0251f56864a79cb38ce5c5cb3908bd1691d2dc15b1198d901a6907f47f1a15385c931538b022d45f75ac3ed0eec7244a081b79c1292bee7a35beb24ccc307dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/es-ES/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-ES/firefox-58.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3dde1cceebde5b8eb599cff69b8c11009cef90d5d2cff5220088b1c25428e27afacaf6058b5e585e795002d3b3a8dad5438602b62b55c48951dce1758c1104fb"; + sha512 = "93a405ef018010d5097ade9f08c228e31b50e76573b75cd2d04205d89f61363d0b8f24585f4e08b93eb8424367d90213dd32fc85ee2f7e28a1ef2742c1c31b3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/es-MX/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-MX/firefox-58.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "80c4e7489be1c319f2d162c75e816d96213c04458f5fdcb4ea171800aef2b39ee5012d9b1b47fda287fe2d7f81526f858927df85cb24fc328ba0b12cc18c4aff"; + sha512 = "4286767ce5866ea0b6f1b41804d92e54361e4defa8fa59b7721abeeba402b07ec3fef051005c083d65f6fb32dd37edd2253cf8ffcd28ea9109963500e4fa3332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/et/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/et/firefox-58.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d08d3b5cbeeb5d5556e961a289fc5af523fa456be29a749d21e258ef3430d5aa61d20071cfab1835dd9febb0d2686ba7f5c457f1e22804899f1bb7d3f23f0515"; + sha512 = "f9a11e6b738a09a9f1eb8834f4932535b828bb1c8dde449b14794ac03ba4a37089ecb45b015daa2dbdde2adc2531ded5d9eec83e70b1ded4eb642e4dbaf118fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/eu/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/eu/firefox-58.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c53d30e012ff1ae6432ed7c73de986210f955092fd702ae852163d359282ea79f4d3b5469fdfc4bc31cce4d300b84f17ee8246a437272b1fe7cd00232360c557"; + sha512 = "c6015ccc4598bb2f0d5bfd12a962d457a3868552853ae6b053c3e40c1668fdf140a2bb791ecb6c2fbe283371f8c1e8789fa315e5a6c05b9b593c413dfaba1351"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/fa/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fa/firefox-58.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "b82f7fcf18f896d4347b3c1830e28a2370f68f06865408bdb39738b78c9f72c99e4818dc4d0579699170d2a38ba3ff9c17230d71814addf5137733f852b016b4"; + sha512 = "4bfa551b23e62ce7a92136afd09e233763abbf36b536340667ba487e3c491a269bbc5e508d196771edbd1745a294a14d3f51ad3d4d79adcda86394ca2e7e5ad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ff/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ff/firefox-58.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "01bafe719ea62f3dca7a527057fac6e0b948de79b926f1c834a4d1f402c2f949f8010fc28e024cb5070b3510320b8d86e173ab74086270f36b4e9159c01799d8"; + sha512 = "e24f247816b7a633c814275a1a858f0580e274285a3875e0509ca65027bf7f39d2f56709af6454187326a7b0a5b20408582b4f16993c3580c5bd67473726d902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/fi/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fi/firefox-58.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "58f4ba6eb6580d41cf558b9157bd8853226885fe82caaf7b7a34c129e8a84e63581f59d6b908d7a27ec86662514c2c049e7bbab058805252eb767f447dc79dce"; + sha512 = "5ff4c6daa231072927b0af6482992859adbfad7645c5c75666c4de69930bb809541c756031b4309fe81b776a434af19badbb285f0f68ebfef4a25a117448e813"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/fr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fr/firefox-58.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3cf320b5f85e354f93f09db84a2a33c685cea1aa3a4558f6c404d208e715a1c9d03f2701f8f81bd6bfac9bbae8a82a84b7e1dc6a87aec41683463fd1d182ed11"; + sha512 = "7ca09555e939136ab336b70343f889832f3dc585aac2f6b3853b628b5db5686f56b97a7c9abba22b5ed7ac0d2eb9bf93ab2fde8ba992d9b9f3d2790130817e43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/fy-NL/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fy-NL/firefox-58.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "75e992be5eb1c3edb4cb4957e97c7feb239d30de56f26ac97ad694e7ec861e4bf044c5a91376c0f8c382149a8bc35faec5dba2435fa59dec075473c749d59909"; + sha512 = "a5d2b78ad7cd9e1677cddb3889d74598383585caad7914ee08333e96c7e66b4b81d5d2ac13432f694dfb3ed5f8515473839317b68f06f4b3708fd02994240da8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ga-IE/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ga-IE/firefox-58.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8da831e7f92fcd6c8fd5fe36be833393fbcf4e7baf6db3b63a911c9a6292cc41095820bf59fdc734e3edfe6a0ea703e791a8f914b7e9105683eb8440f8938ecd"; + sha512 = "e1b28c3f064c190bb723373326f1f023821a2192836d619f23dc6cbb424e10376d307a895bfb1db5062a85037f78c3877b684ea1014da205caa4bd284370803c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/gd/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gd/firefox-58.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "0cc1c318df7a9e7a4620f4e5c8de07a4feed524079b4e8e6a48662b285cbf04fe8b3ad26b92459c481d47268c2a80024f5f57d69c9ed99139887d9ed78e0057c"; + sha512 = "14b98f08cfdbb6ca0c18afef9fbe4d1f283ea2a2635069aa8426ef8075c2e63d4b348c591d556832b3ed8a68dae6e54d9e82dcb9e1dec1b26d6de3189ec6cb9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/gl/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gl/firefox-58.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "4c6ac835dcb079054d958f19eb68584a74af2cacd151a998c840beab39e22a710b205dad8cf3640718aff658b0a4175f51ef6c698208fdcf1a753e23651f8531"; + sha512 = "61473be66b6109a156c6fdf73222167825990dc1b85614ca7ec20c10948ed5a3fe6752361255ed73f31c6f1013265aed5d59a5ae0e184d818edf388cf5a33fb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/gn/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gn/firefox-58.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "bf3e3fb2b4641f7b82c75cd8f822cd95c86be5f533f889b4a15c9e46a73057f1e9be929a4d63f87188a0c2110290c67064346ba7d50a55b636e4ebe0853a92ea"; + sha512 = "b1706bee4fbc84365a26f733ead82f95db6865c2d042fc40f97e9e1e2ecd9cdead2bbc8ee3acbf62cf288f5c907ca4b9be5eeba0ad92dd9c25355491c0849696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/gu-IN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gu-IN/firefox-58.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "a27e909769a20bb94ab1af19f1443a4257e71e1dc2eb4c4e90f38fb73afe4bd9c0c4b754b290abbaa42c9c6ed69644ae65e7a64dda5236dd5820a8939c0cb1eb"; + sha512 = "7a04ad824559b04709431e21197aa9c93a6afae05893ed29922b039b4a4c24ed27e1b091d06e948cd83f1b7f25df0a67477e22b9ce288dfb9ad805b3f43f3cd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/he/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/he/firefox-58.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a577f2d47a31945ec011b9419cc5b8a7c90cfbeccdda4f9ac8e5f204fde458a6cd9b6a5bc53f96414a4d6179368140680370da26d17a24d0da378d382a11aa71"; + sha512 = "3f00ef9afa945f41b8d84c45c314a76abb2bdd219ab228387c3ac1b548948d9ee6037f1df6cb5b0de294a7920e77c3a16d2c687727087e8c422b2f37ec3beaa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/hi-IN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hi-IN/firefox-58.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "667303f7e268f4e8f9b917bc406b22b4ffe4291ab4ff636413e2101c5bba24b6a8dbb7d6fdf66daa95cb948ebaf995ee2fb855a9056fae26284b1ce3513d227c"; + sha512 = "068bbfdf10900f244349c65913772e3565510d73805cdb658ec346c4eab670c91e8c886ad085a469df74bbabbf5a1cce5a9b845c24a9b155f96e2b9749856f15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/hr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hr/firefox-58.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "ca2b5d5d79bcdd86ea74cbfb5c43041b301bae4e20630a905657a642fb34671bc22c3e04e5942fc3ffb66203331c7048b6b9511cd45ff37fe246975b613e570b"; + sha512 = "b965b136811d174ee69ab3424fb15b24f39a59b3261eabe83d988cbc8dd639d4b0ec82285163a33cea1be52a3671e2763e7892eccf176cd286cebc8e9453fbb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/hsb/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hsb/firefox-58.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "94bda6aef07890518c11c2c05690a030487ae02d33f1f8cb64c4175d8131ba2aa7275b55dde306efaef64f7ceb53f9eaeb898d4105d6e8205e107a41e0834eea"; + sha512 = "4b3d92d245f9d93980325080b0394ce9877e0a6e4e2337cf941e5e72becc0125e984166ee30e81b45f95ba9a562b040a26f4cb05114beb5ab18dbbcf968a32eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/hu/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hu/firefox-58.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "c0151e3f36d227ee4d0d86338011bbb7c6c3fa8f5f4f3d8cf278738ec2936d91230223fa474a7825f07a9a3dc43b1bb20e75493a64fbe4d5d84c63d7df3eb1f0"; + sha512 = "42b70cff446c60a2e8388fb16ef3d2829e46f420169b73b4849069ccc75812a10d4a74af7ab19ea78566731e51cd86aae0c047f66fa5c9eaafa169dd520900ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/hy-AM/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hy-AM/firefox-58.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "5567885d44b7c88e5f31298a93387c2faddadfbb6a67409320f8df37cead3f0f957e05eaaa8911301508eae3891bfa37201ee56359ae6df27919fa36907d0ce5"; + sha512 = "84f001a101ea71e8675b4ed7c359a8fcf8b1dea72bb73ff08c6e5a2383abca2e98da32f9d5da31d86291a5ee7f156c04b033259b538656fa17a60b3f66dccfef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/id/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/id/firefox-58.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "eb1fa25f22dfff6074ce87b024c7b353fd628fa61ab6b8f4a2d1267122d362f12b2596240e96747417b728bcd2a37d91913206f3cada58c52a573af9d38168fb"; + sha512 = "5285ae283ea21e24b0ab04c767bfac4d4db9be66a2716934476ca03755634c333c0e96c367889760137e584b2a58c8cb6e9689996038149ee5b568c2e4eb499c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/is/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/is/firefox-58.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "5dd3d4892b6dbd20ba0dab3cd542bb92f3330cedf6e1e94790b0ba065692ec89f58bfc7cea9d644963ad259a8d9c0bede5973b7c6987e2fa37de6f5ab1ed6ffa"; + sha512 = "f1e8eab99c650cf0e4c0d836c5143033b7cb2a9f87f81ba5057c511dfe61ac08778db8762a683b38dbaf2fccbb70a38a0650fc01dfdf8d59ea12d7b31235ca39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/it/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/it/firefox-58.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5192427f9350c2c10161af5772aa16cd7f9db3f156fdf1ae64ace20a250eb2552c14b11f0b96e809a1f70c267fea7ea8057087cdc8bdd3e953a2d14b81f93f27"; + sha512 = "ac877c6b0783c90ce4c44f96144d28d416af43710fe8ad6ac6c56a4847c748c2411dd817b1809801e4d96dddd301466886f45030e74f7ac1f2afefd162e47dc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ja/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ja/firefox-58.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "f9846b5b6f0687e997dcbfbb739cfc7664b41859a95c5b3c52f247c09a35cef738cf0f26f51f0a073363591a32171eeefadefd3eadc7ce9bab888e8c3c531f4e"; + sha512 = "8ee911c05a31230df94d7044de5dcc549b5fdb9779fe0acff0d0095fe45caa13fbbbaf6e8018389222281bfd9ae0a416754836105e1f153467abb1e1db6b8245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ka/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ka/firefox-58.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8bdbf6ef487c0dd9902158bcb202008be69c6871b1702d78b10ed422b774729bed97d70d02d04daecb6cdbcd8ef25421ad186606abf44098ba893074c2fc4253"; + sha512 = "3d5399531290e30c746657286d0a01c03009d08b777b0155ff4a7a5ccb4ed8036d7d6d79de8495e75753aa573c4ab14c1462fc73ca4a0cc93cb5a5095cdc5454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/kab/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kab/firefox-58.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f2b52322a311a68afecd91836995da457ba5afbcd66b87e8d297114280c92e73fd442e9c76340ba4298145e50ecdf69449b0a1acefe3c281e1fd6e22156b368d"; + sha512 = "690cbbbaa4fe9947189623853ef4a1a4d0df2d73ff50118dab40ddbe57ca772d59d85988d8d30216bfba835b827cc33eb96567ff9f2916514497b76a8e4c1c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/kk/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kk/firefox-58.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d1232ce4c4f8c39d90163f4bca6ef73c2a46bcdd53496565678bb448ff538416bb116e1f93bf611d93c2a1d1fa9515975d291638dbf2b4be404d85fe5bc125d0"; + sha512 = "75199857516c970b0ef13808b2a0a13a837643188c3030378bcb010dbfc8c970c4195af4507e32fe17f94b9e1f12b41ddf80f914ba24b1431e6cd0975a334420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/km/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/km/firefox-58.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ed3ca1cea325f223e01073f44ce96036a9e61f097f459a0b32d39dce505995d84e3db51e0511afe90c0285fed8f01b3e59ed7980aeb62758039cc8f4044e24f5"; + sha512 = "3733a9367ebe2a2082e2d7d1a5e09c13a1a587b13e7cb0bff3b4fa1d9c4fec5077e3b9c5156affae4c90ac035a94acaa3ca5666d6dd59ac6d2dfc6a4e9141f28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/kn/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kn/firefox-58.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "a9376c1bb8fde80ce16e1f4f6fe97ed326220a5a8a5c3323a7ec07f1c76b30be582cd4236021e320dfd8f1988b6908a32484e9c18fd965da41e5efafb62617aa"; + sha512 = "767521f281d9a369569c639cf14618f79fcda275cd2f11a6950e91d0d88843a70dfe6845bc9dabce4229597b92e8562a15af2caaaa511e578601cade1a5dd057"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ko/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ko/firefox-58.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "0fce16b8e9f70ad33747523cc825079835a7de27338f4f26ec217662ebda1b85a7db165063c59db28288fee56ffefa35c5cc3cafc6a392af3801bb37cd185dfb"; + sha512 = "113a28ea22d0a2e79f66680471f8d5974abbca440197590cfee0a934f40403d704ed35bca5be9a4164b740e0eba8292f6e0096707a288735d34a2b77604b8d85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/lij/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lij/firefox-58.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d1200b85ef44047dac247406356ec7925cda8fcaa25f89a2c835a25e47841acc7ca0790ccf1b516dde4c0e0f66300557b7028db60f603d66d99fe85807e35809"; + sha512 = "36f284f3605e55ceef29eb4e88205524df8ef1e92f7d1851427c4a4fbf6859721d6918dd4184315743b7a8108a1b85aa40d90189d46f3763c3fdf6d5b73e0279"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/lt/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lt/firefox-58.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "34e7a9034ed9520ebdb2a6661404e9e4371866ede502305949faa0216cb029b90a3fc4da41a6d1e37afb50241c7e9675885038e43fc4801ddfa7064bba6ffe72"; + sha512 = "d56da7e01024210a5ec486c410da70c63728a890c319e4496f6cc33efae41c554aad552c081f3b4777f1fefeec7b6b6d331000608ae4c7b128bcfc726d6be5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/lv/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lv/firefox-58.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "45ca64416bfe0f46b187deb05a23cede11e2b62d879a0389b95d30c10f5e6f8c5a480d900095121d69c37f451eb7d1b9cb5247ca90d99f31794f0e3098f5e1db"; + sha512 = "d5a0f538a1a5860229e1a07d89cd0a7ba6b78ec049d71978bc0791bdb1e3861b8459962e8bdadee996d2abada552abad4f81002e7b042dbe136feee3367fe3e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/mai/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mai/firefox-58.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "949549354bb7bee16ad78e0f090e72048db2df6735c5a1cf56f2b1ee2ef2f1c10d12f2b1310bff919289110d351ddb2e313c9697b3808d40449684d961a979d5"; + sha512 = "2c96217b38ec9fc78d025ea79a934e10d1d1553e39480d1dbbd878ef774aacec5ecbd63baaae1c834c44acae417605aaad5e748ca74f5814af83f862812d1d8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/mk/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mk/firefox-58.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c01b338cec43207691e01b9ab9735531c597afb04e660262514b3cb70b1967258d03b330d7274bd64a5ceca1e4a6a60e555e8267f07fb22a529152db1dceb20e"; + sha512 = "64fd2f8f140dab2786063218f1b6074d8c8f9c5dd506a737676afb9a68edf06d9800e3c9bad3dfad8fceb82c321531ca6fff6a97856c952dced721f0d0915913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ml/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ml/firefox-58.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "07c4b35ed0385ebe5564992527a3eff6d9937ea8fe138997be31ec29cba2f24d067a464d119a46e169c2aa2e74649e44978f2e7a951f5196a44abbdff56a9b37"; + sha512 = "59036ccacdeff45c27a1b737913e54c0e06ddb12a670c1549ba26da4b1d99fd2338a133e1b15b1fbb673df2471b5cd5d5d4061ce56c631e37c429351da2cbceb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/mr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mr/firefox-58.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "4ebe741edf2c02d4e1d9fb89d823e048c39b82a45f3af9cfdafb35c80e645c192017becc05e63e1d3f193b8257baf228147dd9814c3d9e432e4edf943659cc18"; + sha512 = "2fbac808598aa7ce028f2d922fa55b49174507b5ff6e66e1951c3f579cdd051ae4bcd28edfaabd2319dd7286b08d35a0fe33ac2f63c628d217b8f43b89dc23d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ms/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ms/firefox-58.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "9345f2c2daad990cdb61f3e066a5b9b1900af3bc3ab4c268a28b2315f81ec0371daa246b0ecc0caf78a66f61ac06bef57d97196c4186ae450708343031be7071"; + sha512 = "52f6857cdb97b86cd25b0926d509405a1548dfe310fe088c3b27ca77e87fab585faf4893e8562d55fd2ecff43eff5535ede306abcb57bc2ee31a4890530a27af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/my/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/my/firefox-58.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "138a60fe48fe5cef6879c928da51ba6c9ae70fcb4bba5be4b65e775cc2ab89b4fe550341f4c35359d98fffc1aa8f18a55438581fa6d422d07c4a7fc76247cf2f"; + sha512 = "1e89a3a595ff4b6a1f1044788e34266af60bd6b6e0cf94c64af5e50ad074e7a2d405ead7210e1b55622aeeca3255f966f7f500e38e639fc2677502385e4ababb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/nb-NO/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nb-NO/firefox-58.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "610c955b6597d5df47a476df9340342ff5d8d33cb3086dc14e9ec7b6b5519309967b22183c953bab45180f0977f69ffd0e8b103cffbe04712dbc4c183936a2c1"; + sha512 = "b14c55689f787e4a6d4edb504e701d63b36512ae49008249f1fa34cc7961d58ad0b0c7f1aa76933afbcdb76b8830bbc7620580347502acc0712b500dcfa34f70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ne-NP/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ne-NP/firefox-58.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "bb6c63ffd60e6f239868b6ff74d381a6ff59c0f5534e4cf2e55eab54705e83260d527d4e88762f57c7228a04c9ac05fe0088f3a1f39a443018d6b11b7ece8171"; + sha512 = "20426cd45c9c2c5517587eb2c6d04426eb6c2d8f7370d690549dcf44ae2d9bfa823ed359655a75be83916cab2505759f1212abb4d5672a2b70d81ec573d1e5e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/nl/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nl/firefox-58.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d4fa058c64b30a60f79c466b4cf889548acbaead22d5eb086f055cdc1c3039c2adba968d8d7330f4f43637db0a6a1d23308be2826278271d32a1d623914123fa"; + sha512 = "a98a214fd2c4cdffc5a85fcc074b8516d90c5d79e23c80f0ad464931b8288395d953ac46e575f66bcf0b0e5cf862fbe16f07060be73d9c7fd28930983ceea72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/nn-NO/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nn-NO/firefox-58.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5be23c6b02affde65852eb39e787eeb6a4c213f635a57b1e37f52d1588735180343185134522e35584c86c288734117881d2f0093aa77f9df3872f0fc122da29"; + sha512 = "ab5ba866afc67caa89f6794bd93981067ff12684cc307f6fca9f8cb4eb352f96282fd745ef20ff5b2d9911c75f99f78784753d4755623ed3496488a98797db70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/or/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/or/firefox-58.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "4075a64d79757f8bbe50bc1dccaff4229ec8386cded3b60f6dfee4dd4869737f5d8efe1f4c49a36f326dd8fb388f84c7f20006652e5da0306a6ab794cdea7fa3"; + sha512 = "6c32d13fc0ff2cf68e784d4e4a58e6befca6bbf1aa77a6dea64825a1e9d6c3c3705d6a60e31fb0fbc4b87147e954eedeab4cf194e0f2b500d8aa3462b95adb30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/pa-IN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pa-IN/firefox-58.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "84de66a473c3dbdc34e375e6eb48ef4ca00e1b884b6beddcb085b06daecbd1eb7bc921da4e1abd1a295e7e8f455e6d66f08f5a78121610327418ae64ddf145c9"; + sha512 = "483f1b53af7900dcafeba88872ed5b5c5d0d3c703e83d3e080df92ba66467656f43161851474362b8d3a4bfd48ae19a2a21ae244717e55aebbbbed3b55488b96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/pl/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pl/firefox-58.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "a027461729a5284c31da1edaf9168369f5f921c9812b609a0657c9437c881e09454e9b67d9d593299f33d924fdcde2909c9a2249a5fcf1eeef9c91b3387d917e"; + sha512 = "bf580678caf2fd653022ed5120f461b87beb47defb323836e40c0e1755adad1e893930a39afa9bf9137a2bbd197d5918b715871056df3cfa9574e684f80fd56b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/pt-BR/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pt-BR/firefox-58.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "fb7affeefdad0bb12ee5cb6a0e8c54c146079fd09c1670e81040e2887e3d4446d7cfb633c9eaa6d3dd77c4868cb7cacb1f56897889761237abfc1e9456311cb7"; + sha512 = "8036559e9d83540cfefcc5217550f401d988c626117e42db66d4ccd9c31afd8aa4224bbadd7293c44b3973df7646d36ade1728d24fde3f5e7cbab19e3e83832b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/pt-PT/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pt-PT/firefox-58.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a8fa801d18901f9a316c45f66b903f750bbba70ecb7d134a09ede0cf02f2bb2939d7c6b831c1ef77b27425139e3437dbc58e11fcaa80594efe62c767e4e1e186"; + sha512 = "afa6bdcffd36065c94bb1984ac9734d1091c14bf065e68c2a650e28fb49a5f7d52f19aa83078973dafb7446c2a01aa9fde7ef43e26a7f26963863329b868841f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/rm/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/rm/firefox-58.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "0a1fcb869512557000dd0ce03ff75941e268d59a5843b0873e1c299c9aa307f0a28e4838663c66ca3f85dc7c4ba564d6ddebab3cfc4fae978191fc54e3fec7dc"; + sha512 = "26b71c4b734bb2bcd7141247894721b2d35e521c5e9da2cd9fa455646f234fec97b55467e80f8d6b36bae62c807c79e7e12a395e65e4c59d464f7b4c3115f3e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ro/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ro/firefox-58.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "891368634e22dba613191c19eb29634a87c49d32dc991bee9044e5f37d51489fd284e45888a8178bb25cf866da6e742e263e361cf0db23cdf100ce8ef3358671"; + sha512 = "e0a3358a71ae65166bca792a8e60c6319f9a4c277c8369a2563a084dd9fe8b68952df87d1f9ce5270420090d5ac7a6dbb207cd7063b488dae4d0efc8006e46a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ru/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ru/firefox-58.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "94b7b44ce9c724af069314b33512a5535429c56e9f69373c50308f093ba3a7cd28e9aad13d3ad43cce909a1f350976268f2e3c206045693b4c53a851f595db33"; + sha512 = "adfe22866b6123b537ddaf1dd81d397478e7894c021ad74327c922d85bee8ec132f410509a147bd7f1300df778922ab940c36385db2659c8a356914b908ce9ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/si/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/si/firefox-58.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "c6971203252b25d1c956e327aecc9c6e395b39be2691b53b421c96aa8dc49a1c2dbb16a03140a9d1020225068179e08fb784721137032b4f0d3020a83f89fb28"; + sha512 = "94892e878fc9feeb9e208aff8096496423e40e42bc22ede273cc5e3e549564861ec31ef9935f1e29d68b51abe79b17a9c6b1e5763917111fe94c95f27c3826b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/sk/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sk/firefox-58.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "73b9b3dec958550e015688261375dccf94e7c9e0886f40bb1fdc8bc6fcb75ed5da1416b5ef136811a7bff2f9c8b7b88836d9e92b29876a2748ae01fc300ccab0"; + sha512 = "26985d29d4cef9fa987d83b873da188b7a776929533aecfd1f1639bc0b7c4393bd9e04cfeb3f7f9f2cfb7b43b5ee14a421791a6024b2eea3707b7c3699594e83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/sl/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sl/firefox-58.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "316915484eb9371a656d75ab05fc2616f514a97087126ccf2f2a75d9821641cc4157f019ebf9f946a07d0b1e7b92c464dfe3970dfae0ca375bda282819b7d53e"; + sha512 = "c8796f686d147774ed4205a04521fb1375d1189575e855b6eeb0db7c35da96aba70803cd477656118f6137658f71d53c188d10653d67f121942d95d81a6a05a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/son/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/son/firefox-58.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "38975465d0b416b3d86c677bcadfc49995d78a943f08704218df29d008ee4dee93ec4b99a6cc0f0c22b0faafffbc96b5dd3dd16891881a342951682f5e9f4018"; + sha512 = "56f8b81bc5619b88234feef3e17c1a80ce06effc78880b4c9da083530c7f9c037015b6a940914bada62e98711065d6a0c556d90b60125af357ade797403885cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/sq/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sq/firefox-58.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "168372d4876ded273268cfc94860548777bc03b471e4da5f28735234e669f23cbb5ba9121a147971af26f78e84d22b2e7fa097b60c33ed7b784ef0dcd1a8e3dc"; + sha512 = "1bd75656650f34ddcffd38eae46ba84eb18fecd79b9cd7972f96d0906862d37013c48046355530baf5f253985b65922d386ffcaa25339e964db16fca6bf85505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/sr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sr/firefox-58.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "7a8b38f4143b827287e6f629caa0bd5d85b4b28825b620330004be14e4506b7466a8daf80871914179a8001d8351bab30128fac5f5392cdf22b33fd8c2d8256e"; + sha512 = "abbfc2f50567f4506dabcf8500ca56b369fe6e6502147ced5a52cb2d506c6b28248adeb6564a6a092ae96632ed2fd43356507cc53c6c4a53756df2ae2f6dc735"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/sv-SE/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sv-SE/firefox-58.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4f3d3b150bc3173a7eff5037fbc10af0d3db734405fde659ddea5981b3f7aeeb7474658e965e3ac4a6f06ea9fa03fabeea0572dd622bbea7dc18458b69939e85"; + sha512 = "5f19b531d37c8774142a86cf83c678e0ab889c5f22aa792c6bfa881ad9441c02aced2324077137c8ec75c18a1e7a93243b9b87604036b5d29ae4e93871540ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ta/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ta/firefox-58.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "5dcd6d2b0a170f359fcdaad2ed9d0ae7696d821ea417c2584b2acb3db8d49f0a2c2951dbc5033507529687eeee54e40da5afadbc909758e04a76e5558c4563b0"; + sha512 = "f503d38e25cd403f8dca12992258265cd3abd50219655eb51867ee455790e1864dea2a26cb0d72bc311c3685e79836df9c0c1794b499d13fb54689ab9408d484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/te/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/te/firefox-58.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "179f3f7b4249febb51f1649ade20da83c494eca5f84bc94fc31ba92cf421edcd28bfa10e4f2d0b183a2e64767e6005dff5284f7a68bfcd5ea4781e8ade80ba26"; + sha512 = "3f68679d85cc1c844fcffccb371424c38406df074c8e21a200e04bcc5fbbfb1199d2202487c660c95ff1941b433d22ef3474580a0de0909dc251092e139b4bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/th/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/th/firefox-58.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "257cc1d4d6d25ba3ed8a4194e1bf83bd442b46560b41268828297a95b5009e809b7a0a1a436095a5b15a8d2e2537fa2ae0187a282fe5ec4c158bc6bd4e185953"; + sha512 = "b3ea54ed6c65b68f39eedad3d4500030de3f53c6b603a15f63a82b2766e023f552869d5d0e05cc5a4ec4eeafeb3dc124ff6ed09a5adc53e44068034247ac0bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/tr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/tr/firefox-58.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "65b0feb6e1c0e9fa97b5f829060c83e9b1ec3a66e317400673891a2fea2cac3ba46924cd04e87ee0bd98fa6746482ec10d43f6acab541de4224d736ec3f5fbd3"; + sha512 = "644ffebe355085ccaffe266c2ff50440200adf95a46aa1822f21a160dc982bbdbc8157d9231e1b96c11c573409c620bcff113865d55eba3c3b7f3cea7faf29a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/uk/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/uk/firefox-58.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "a7c9966a5d90e83555315593d8ea76e8fb3077d1142ae42dd21a04664b071c3989b2ccb516b062acd9d54b9b9ded54224e3453052f0421cb1da2a05e853e70f9"; + sha512 = "20579b4afeb36f5fb07a3a93e4c5837919df959f9ae98e25c39597e2f1446347952fedaa776d40bd606264cf935ff343cf69431e8c8f978dc8fcc60020f669a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/ur/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ur/firefox-58.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "8792ca10de7e917f5f24f432832fae305b695673083b74d369e6a08da80345262612ed884d4506c06ddb16194ce98f12179af40ec6bed86ff582ce09ec306c8b"; + sha512 = "4466d3f53a1d68df8e7bf6074c2639d84e5a7bcbee32db522f8d3a771266454c1d0c9bad1baf52b27c91a6fbb779c41fbea50a84675e9530ce33b1bafe722c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/uz/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/uz/firefox-58.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "3bdeb9dbeb58e19222fdcc41360431ee5376b9d8a2e623a028ba3ae734bf8944117b705afdd56b922022587b3cd8976b3790e8db8b1b1fbf9025f9c1ac9162a5"; + sha512 = "4234f1c10daec449867a4357a123be7d04ed3456b98a2d2e82a3ec3d85f7da167e5dab95ed6c4f4f1f44b9481608a80cb1ff1713bd0abe06606a15bce7df6d6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/vi/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/vi/firefox-58.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fedbac3c77ba7b2d264cf8f84d16c7e9ac8703e5181a05300168e7e1ab59a192c416e24f61f0de59076019f3fd9c5ebf70ba7fbc8986a922edfc9297c0df2ded"; + sha512 = "fa5b72aec8b5a845ffe37588424059037ed1121f35047b123d39e7b6b11f0ff54731a974b7ceb3406adaa1705e14477a7ef189ce53305add2712cc7d433daf82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/xh/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/xh/firefox-58.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "9ef362061f74d4a989611f491fd030473f76696f3642fcf5d8f0d6110e7ae7d4b3dadc5ec630ce9016c1117bfc94d234131b709093d793910f036d2344f3fecf"; + sha512 = "17db5a14e2e9e4a022a6d1048f72e734f41de485f72ce45a6848b69db1a96bbafef25809b79a3f85fa70c6e7f43c9f1fb6f16472c294f13f1b77fcbb45d84dfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/zh-CN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/zh-CN/firefox-58.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "39c4dd67bda38bdcbc8dce7fc9c416ddbb004c03b2b57f8d5500b2686dde12e3e1661caaf12e800f9276bcb4ed01bf33d509543fb41ca4fd2963e22f4bf1e0c4"; + sha512 = "e8570e0c589e298e84653302c85ccc46ef7b9362b5449a09a43eaaccaf2d3ba1b55475c5fb190067d596f85d9ac3cc037e5ad400454a2d49c8e9ad878bd8e04a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-x86_64/zh-TW/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/zh-TW/firefox-58.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8875690a4f6ba74108887f17fc64d87038a364ce2f603ae184aab36b6b2c11418ea2cbadb9244c8a8cc5e59d831657302f40dd7c94b855473a9bb4a6f7f49abe"; + sha512 = "51243e1c7a330f0043988904759fa8d7fb67e287ed47a6b6a18a12ade989346f4939874dbc6b15670217436f8132126b29fb641d60e8f338bb8985ee5411498e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ach/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ach/firefox-58.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "96da329d9ee86ba7ee01a99b57997d84b6084eee3c8b3ec9f852c07670798d17ff9b630d385b5b5c363cc45d95497cd36f742446f899c8edad2ccc00c12cb151"; + sha512 = "a36499123874af16bf33d80ccf2a84dbd21f641155ded9d58e0c064a8cc5d9f034fb64d154f0ab46cebff191e9c9cc46c820026c53408329810a318556be6210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/af/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/af/firefox-58.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "280be62bbf765bc5123c3148d09597201a84ec40ae7a1643a4eb594f022242c1e9cb0af6f7f9f6b822925e871b800e1b83e7930a4848ef44d7822b944254a982"; + sha512 = "4c42737bcd7af2f9f0b6ae3415a56d82d360998f8bd0ab01b6b0cd5f72bbc84fff4045b3553a1a87f0c3258f46b526f9e9eb0c3dc8c8c66a2a22d5430fc38499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/an/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/an/firefox-58.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "c941e17fe3f8caadfc0de7d7254ca75ff7505a1a892bcad0a5a215ed2943cd0390637bb317717a2ed6d1958b22f6baf7ea8eced4649733a40514a75e82cf3524"; + sha512 = "e821fd76b262744b740ee1a42092b954df2a6a552cfe305ab88e6ca8b2538045654f64f4e1a0e1446906f91896486f204518836148eebf19d306b4af0c2b4d6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ar/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ar/firefox-58.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "15b5362e71032df26df6a8903527a4b39dbc7e84e5c62964f0db08f4918cab97d451290ff92482c9bd99b488d17c06545f1463b98018015776710436358dfb27"; + sha512 = "de178b0791074179c76a9e0334b5c5f2bb3599e67ccf4c8ab1d9964952b17c2ec0c509e8e37d83332d1cef7b74ee3081eb4092001023c3a2f14d906a8c0e48e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/as/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/as/firefox-58.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "2811aee59e85ab535f0a57c3f286dc6dfbe38c2dc07a9cb103e9f9258bd8514db37db012c48e6afa0935aa573a676f40b0e802e70d81f13931e7a531d4b0134f"; + sha512 = "a6f3ff8f5f31b5bea725175a27fac0872765f584a91877adc01dd42811b059b61706c53f64e4d1a0b7782c26998bbb2f73e865bed4f4e992762b5f90993265b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ast/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ast/firefox-58.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "efe1404351c824142a49b58adc280b2490752e98a9e87bb3b7d7f1473d8bc2e93564b8b7ef3f8cd99ddb2d0afdf4a5370c97f908858a55f9e76b953fbbd5089d"; + sha512 = "dcc47a42af28f1814541f71650e24c653b5f99958b495aac3d0408ddd27aeb8d689d6244633c5a397d5f304dad3e8d2778e5a3573497e47c895a9f46365c40ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/az/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/az/firefox-58.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a70621c70092c9d375cdb8f94f0176341d732989645c2492232f8e664e01484d4c5e18ee45ead3a1c732ad01fb2bd3468e4a723d2a8e3afdfabff82efe9447dd"; + sha512 = "41212665cbd529e935af5dcb8582b152e84bac8c7055b02f2a43dc6fe53e33bb882908feb71faaa8f34a026a64117a286e59422ba110bff8c04e18229bc418aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/be/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/be/firefox-58.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "bf8089e6df9af11dff0b5cc19b15f0df5aec4b7451fa195fc3ef52f3447dac43c90119779596a4ff2aa61290af4c78f3af1dc10d89a501479b12c90e432fa93a"; + sha512 = "681e9c68187d9b53880494ab08300bc28b8536f5aae320dc9da6abfc8642c8aea2e2613b48d32c25309589f737743c733b361c543525106ed9373ecd3b40b891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/bg/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bg/firefox-58.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "ae1580a6e882d7d4085f30ff35cbe94f97c4ec3aeff6c386fbc002bddab1894a3834ae2c8647c87de00f85e685e0cf06522fde87e20c13643269120246fb4506"; + sha512 = "742cebc1e646a2d9f5d9d6c406ca1903f81faf21c4a38df0ce6edad8f7b96ee8b22d7ada34fbc24461f5e7644417d37b4dcac6a5a10f8b0ce11fdbfda9c01508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/bn-BD/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bn-BD/firefox-58.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "b1f479d2bddd2f240ef150465854e9a49a3e8ef9b9e23dd8254e8fbe902f7b602a05f1f9fc156f1a94aef5edff4c65f59eedb49e268cfa755d7bcd9c88ec13eb"; + sha512 = "0562b8bc93c1c768ca49e94a6285206e3402b45d9217c6679eec7f30395cfa500c35da7ab0e560a5fff3db5eb60e6085845a6a7b2ba7b695ebdf09990bdce5e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/bn-IN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bn-IN/firefox-58.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "614e224b18b2c9d698a210a21b21202c98e5bdd8725755edfb5533456fc9a5a74c9e6353db979b07fe5596ff97cdbc7110da88eec8b01701879b5992fe935ff2"; + sha512 = "d459a21206cf140acff54ccf6d7557090ffb3eb752f62b91ea56a4c4138858ed9146d3edb6ee3252ebdd548f3435cb973c284cd0008207d46dfe5b8b12a6bf55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/br/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/br/firefox-58.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "e99b5b609de56dc21af10f20eed110ddde1c7abd21a0ef79ece2d8e933a39d0dacf20f2ab8296acb885f1432ad5b58ae0cbe291056ac70576b098263c83f8558"; + sha512 = "c23ee525c1c989264fbd1e00834cd0a1da1c470a54bebb5caf18502499f16917697f3b6de55ecdb9270ae11741420dd1def626603f2f945f2fea8ec6279f4b8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/bs/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bs/firefox-58.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "f7967e7b9fdab113cd8546c7325276f4d35e760a1bf78ef3c56398bb06d8a98fca82d0fe5d9bf80045bed12edc6c6e8656f5b088e2de4cbd0f1e69cc142695f2"; + sha512 = "dc254689e74cf7038fefe2b6b911cb75b96fbee105a44713828f8f7c9f1a9fd8624f5ce62205f26b4d287f73004edfde73d4fcc4431d2e4464d36e822f4667ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ca/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ca/firefox-58.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2680323d28ec219662173d4f3556d9c9780b2c6a4efd7a4adbe92fd99cbe616c86ea154c2a3f3b38314a62663416a630f4efb93bc0845597ed69afd5afefae57"; + sha512 = "3f358d601c182bdca9e82221e9e6061ee5d610cd42caf722e1597c6e3e47ea005949ce52d0e38d160a02e4f02f210328d631fc095b0a49af71e92919aeddbb37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/cak/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cak/firefox-58.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "35900e03a398f5ffc48652589789164173366a4f07de1eff90b288b3793146173629baa9b66d587d69e0a26bc57687e61a08879ab66dcbe8436a5f393e968fb0"; + sha512 = "274ebb0800585fd06dee02bb4a2a88cb4a64d39198e23fe481061b0cd96c281c2bc9983516614eea980c118fb98db01be2c0a387a8cc595da7a2144215f27230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/cs/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cs/firefox-58.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d9aef028c0430dbf5320e4bd12659652dba741f37ab94c48176c6dc380b005f177c6e5c38ade7a78931fe22e9f5840b6aef6f09bffa952966273937f3efd2bfd"; + sha512 = "dc688379b955cb619e1780c66368ebf5a09415a3b31c8d116c1182051281bec251a06ff15b54816e5f0f11f1c0246f33d2db42009035a7254702bd73d13ca83a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/cy/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cy/firefox-58.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "405e3b56b1a583066d04e3fd35f9c0ae9094c3e3bf241ed77728ceb41aa3e880c09a89f747ad22a5a0c33db052038053ae4b2b0904d5c40dfbbcc2eb43178093"; + sha512 = "f20ad279750ec9281ee9a800971a4538e43dc3587df35afe676e7980e965522dba2b6a9deb2d0b9acac31308de3a8a167ec8dcb05934503602483a6eeadf00f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/da/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/da/firefox-58.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "b9402927aa684722cf772b6ce95158776414d5f1555a596f00a957d00123005fb804594001443393572eafcb2cc1c37aa278fe29eebb0931b7eca24751186d81"; + sha512 = "b9fea0a664a02698423099a963787f8b5aa89f3aae8ce6be9962d9d8316e01547d2d3fe54f05116ad1fc6d7a68d6f72d65adcbe63de98bd4b16c8689190510c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/de/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/de/firefox-58.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "f5d480ac6e2dee9784b34391a289a53d85c5f132baba94a1573179c1183a4a216eab0e2d19067342b4eeeb6248f38f1fa0b8269b1aba2add7d5728d505f70019"; + sha512 = "13407206fe0fdd88793406c349e4f7a66132f2edbc32af12b7d30026d22cf721970c8e8494228fc80602cd57feb3dcdf17f0490580b2e33806f0b3bf03fc7ff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/dsb/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/dsb/firefox-58.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "07b8f40225b583186cc680e3269a12e123335f4fd2041f0db67daeb53e72642fc0f91a29074fc11182bbfb50e326d53ce8ceee543f4f93762c664c362e32cb9c"; + sha512 = "6d6661cc82de4eb37b0326f8cdbc55feaaf85cc44137af1bc217d609f42d97216402927021dbacf81cfe704ec8c1e42c3dd18f39bc1f7e6665984ccf3bd678ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/el/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/el/firefox-58.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "6dbaab9a026c060bbfa286ee2cd7b1ac34d7a50dd33af81f9696148ec11353ce1519005959aface7c6de723dca7bf03055ccaa8fc70177419179116b30a04140"; + sha512 = "2e8d1ad194159f6d7e56a461d594b1cf998f073da332a1f1bfba46ccd76e0e5733a691608a16ee08207f45d16ca59766e774534024239b8d5b3be9156942b31b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/en-GB/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-GB/firefox-58.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d3890fa00dc159a3a9494a9ae2dac84761ef6bca74c442504428809507196612cd1e362bfb837a93b9bc15ac4b58da10e05c4d8235dfba625e9349cd04c9f37b"; + sha512 = "f45ccaa1b6684558a1c9b5e43907fb59be0ca466260950d701091e6bc1c6a9d18d1a8dd2b2dec77381450f61f99b632cb0f3c0269ff309321750e16577df697c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/en-US/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-US/firefox-58.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c291f87696212c59624a87530a02b881243b5c7645b3a75aabea574161c488ffe71392d00d18827ab9e4533f272eb44e57d062cfa88a5d14e0eaaad4011b344f"; + sha512 = "e3d289363aa63cb459e1a1f4f18e893617bfc6f972a49308aacf126698d2dde0baffb3dacaeffae9471a8111eb332c753f376ebbe31aebfbce52c5ea84122a16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/en-ZA/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-ZA/firefox-58.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "2935c69302dc079266463058513b816d0631a5477aa535b876b15eb2406bf6c0c4adbd60a83823acec1a6fbeaafc951a9d2a4ad80d2b623d1f2194a79b0099a9"; + sha512 = "a4c56c45280faf3dc65bba6de159f65b121972da5831664a70369b446aeda44f7614d01dde6a070df058a4bc2d42f32772e1003f64d277cc5bf8361f76fa2816"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/eo/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/eo/firefox-58.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "92e893b038ee0611f85a55b262565982c9941570911c36b5e5fe41d7833596f23f703aad5b606ed266c33a5e1156dacc641f126d8e04ba22db7848c0cf1d0c03"; + sha512 = "d79405fa9fa01f13a4a98797b3192f1feda51b26568e89746f6b25fed6b73c1f45f3e6bd69427547da19c7eb70508fdea0ff6db21e8d15211faf8da03b088e85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/es-AR/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-AR/firefox-58.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "fa000f580bd0c1be1f3e89ce901723d7e11b5d7cc69ad16f7dd31f6b4c07a7c04505165983833c008f4be23b5720211ec8eb9921993e7e6b330347e9f0bc0d7b"; + sha512 = "f5751dc82ceeff378d78717ee5850edb4f160f3ae26c0efd70557014c96c765fe789fec2a8650f65c9fad67cf1253c00f4bdb75387162db1c914ed45dfb7164d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/es-CL/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-CL/firefox-58.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5d9f4abfc8d66fc3ef0dc08f7dcf84fc430806ca629598edc0e0cdb8c173efb56d1b5c4ed5ba8fcf90878163032a645ce282d6934980b636e8a8c199efe8cf9a"; + sha512 = "592c5f9a70e28521f75e16b79fa0852815f34b9570ecbab610a96892d9b13fae609a9050a4dd0867bee7b811cac67188c9a756bccc2d6d99821f9ce9db48a509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/es-ES/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-ES/firefox-58.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "d03218163b91ea0f6c478bc33c05676c98de8bfe1a42646f07f2d6daa37439e756031a22e4ff980a34912adeb18ecaf20283a71edb51fe8926bcb4aec22f4ed1"; + sha512 = "e3fd1f13087eac51a830acc760b83ff9459cf6a1a14136c43c8ab7395b22b01cb2627b077c5f50968023c47f31484818ccf18245d109610dd04e3e5627fdb65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/es-MX/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-MX/firefox-58.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a55b1c6b88518f0749a349cd527542fadf510e1948b4bd50f141a3abd68e60b8e595503380e7dca6dbd1d80466d206da8e9e418c7ff12bda1e5a41df913978ae"; + sha512 = "35ea8599e66c29f7fdf1f2ab5a400a0ccae4d0ded4bb3d509d0caf7a6449bb7944c794fe080b1364be055eedc8bac017b8281bd9a76b1d76def573d3191cd011"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/et/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/et/firefox-58.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "43e3eb5c94bcd5c0678b2999d165d65d2996417e0edc3b88fc4c132747049309b6beb8d20d4b51302b7474167b6d03d74e4a76d9b9df505ca305f22468f0b7ed"; + sha512 = "29e6013843c56fde01478cc871fe15c2f1485d41e87af30daf97e5c0f4e80ae14368601a2df43bbe3618fc878e7503007708b760d1f2a571b4993a99c2411f17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/eu/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/eu/firefox-58.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "fd25b5548cd5de401332c63bd85aa493a60334fd95cf3069d832eb9ac0dcea33d4440594117e396066f827e8ec1737a9afb554904dc3fcd570d805287f2de87f"; + sha512 = "3f6ef7db13d1b8c8eaded290430a8462aab2172c4e813c9bf2f11f0e417485d88872a66628130987a37286ba474e8bddb9ef01e120dc2c6baf49bf9b5c5e67ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/fa/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fa/firefox-58.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "3b0fc55a09e4e3bdbcb957116fc301311bebe56a1ef627578bee9972a5e24d7406ebb62899a7e896aaa67cc2d35a6269392846deb306790a25661038c0e12d26"; + sha512 = "14dc9bfa351de740e46a8a3d59c99d0de7ec5d890783f03a8b260217a02d1cf03a94c6a0d7411698f789e9b77c2e1def24b74d9754be821b1104964308a6322e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ff/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ff/firefox-58.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3ae6196faf8adcc409abb61eda980652b98a9b4b1eb750626dcc879520019b17486210dc50732eb4beae6910df9876edadd16a7ed001f2442fa0c5fa67d0b3c8"; + sha512 = "273b3a3c6d32f63de9a8b47cc6eedb7239e42cbf5b8e48191b2d9f9d88731a5da6957ad9bbadfc6bc52e591328a2a89540c4ff880cefda455ce1e5beb35492fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/fi/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fi/firefox-58.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "6ca46b0e0234984cad7401ee4770b7d121783d5ec6a5aab6cfcdc0c560da23ece1c3c581afe5d2c33d0baea3966d4bca41085b142196dacc96f24bf07bc7c71b"; + sha512 = "1d71f85cb661c87bbf1c64c2711b45ce912aca629638d2b7953d0ee3256e7e50c920f400c2bcf92ce171be44134a66b28a34a3b38580da3ce2436dae1b0dd44a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/fr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fr/firefox-58.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "46de1b2996a40bc5401b9e1717465fe8420d4eed26a4c2aab4a20933a3b7ff9bfaa81b1913b587dd0e48c827626eea9ab5ad459d08c1b0f3b6f0c90abf710537"; + sha512 = "ef15d841348c23f35c2fd6cf93d86657d6e3308bc03935505b99ba1119a02846c2ca2c5c55cc0cde992d4e8af50bc612e086be34cfa61711858f11e6e256f7d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/fy-NL/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fy-NL/firefox-58.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "f5ed577816da80549fa9c8bc4755c4bab8aa2c9da7174f37606cff62512b0307c54572b87501b440eed66c5727b23d679e749254049c91860e10389794ca2ed7"; + sha512 = "f42e5dbb7d16828aa2d5fb45faf44ef92b8ef29e5c49dc8a75540959cf6c153f7d423255c4eda765a9db69dbbc18e7b8a04bd3ec1329314c1d69bfa41ea32f93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ga-IE/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ga-IE/firefox-58.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "282d7bc4c2ab46aa7fb2157d21e24295a82e9f28f833b756e96adb640667f611ad460f6102fb58e9e38087ab3c8dff439c942e1fd9536cd2782470622ae8301b"; + sha512 = "4fea194d08121ce95dc6891b18cbbb031e64f402f31c83b92c9044c8d9337f2b50d76017f4ecfa616f51e8188e6705e8e940fc2fed95b7d21d4c8385b656ece3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/gd/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gd/firefox-58.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f11a73f1b2ee2371eef7dd85ce66b7d0fb25b020103003ea326480ebc16c55922967245fd76791cb25a7ab99b96f842394f0fd290c3214174d0bc218a4327bca"; + sha512 = "614811dae0bd10f809ae048d47543fbdf0459320a8f9926280bdd8467b2859646b7201355777081638b46b77d3def96f8052b55c243ff524a22d2db4e20db864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/gl/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gl/firefox-58.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "4f562d3b74ec69ee495d901cc91b2af12b68bad92f7ad66d45a94777fb34559e35aa103effabcd311ecf952acc9939ba16c3a17905684532d7e0f7b2b7c784e3"; + sha512 = "a20e1f54fd12acd5480bff14d24993c2d58a33618170813980a8a1f0b810140a99c7157d8c8eed3d56f8daaf2fbbd525c1df98e1a90cd0f6f89ec253e4b5b73e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/gn/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gn/firefox-58.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "fe08fc07cd11c00f932c042aefea193c7d6ffdc000b210117bf39e8f1c01689ed5abb5f26dbc55ee971d53abea2fe209f7359be990263229d43b49ed73cef5be"; + sha512 = "ccd057d636e8f3884db25ed91186a5c995b02eca0c3c7e07616364ce7d95e42dc1f3d1c6e9eb844c6bab4088127232bdd85e3f33898f681f837c3887ab0415e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/gu-IN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gu-IN/firefox-58.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "06eb8635eb7ee46f3e9e4bd2444d8beef4da5db534530d4d1572122a617558f27d7e8bee1efbe43e916c58406ad0728f294c2208048331cbe3c54da42a43ffe6"; + sha512 = "fadc9a802e9322e2ab0f6b66bf8d938a5e3bfc67a1ac901c0d41d5ea82bd87be0165f50b2c5ce7a75c68f8db45eec8b0e7ea3de237f6c6f79d72cdf386cf3e00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/he/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/he/firefox-58.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b45d06a32d3d6fea1c2093ad21168329137ea4cc1e2aa8133822b4355a67be081b7c5d9afaf01122e474ff43ecf2f802c881cb6da5bafcf1e3765204ae33d011"; + sha512 = "9fd2d1f4087b247814282e2edab633fd865ebe94fc73906bad065e0af927f298f46306dbe7f36c98875b57bbb66aa5e51f37f5a5308f024eaa9a62f968916c0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/hi-IN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hi-IN/firefox-58.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "30cfa4d45da6cb519396ca143e929695b7a2cacae1df4c88ca4ab85acd4ff74afc880f13d23f11f6bdbd99843cdfe88b3becbac15c0add4635ce8c2009996304"; + sha512 = "7a07dc67e58c295309768e84b2489413b6d8ff71a786d249b977a7bbba245f74c6d88e33beb934444a34de88a205233953f0b7be3a3628950b0c851c35c593d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/hr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hr/firefox-58.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "64c6ae787603cd3b1855bdc01a458b3034b7ab959e15312e261c170f5e6435bd47cec560667dd0a1aecb48824df73534540f9e6a91f690f5e50c7b5a3b2fddf2"; + sha512 = "5db4c7e305856d96899270e20b41c6db2c130abf25bd5eb47cbd2683e8097fb41d37bbd3c577253601c99d2bcedf42472bfce74cc4155a01de3998160b3a139c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/hsb/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hsb/firefox-58.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "30da250712f6cf80749350e4c2a0ca069b4b0079d0bce9cbe16657232c1ce76212f962f5891f9cde86f9c88811996e922c2acf7b99a651bf6733fcc3b83613cd"; + sha512 = "5729719fa57723f4c87c5f63f9c08b552e374d9ed9cc9f39aec49223be7b85d550074f680511c79c5b47cc0219dff687c7ac288781822a5bd10f4365cea88825"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/hu/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hu/firefox-58.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b60242512dcff653d758a9984b66ef77a718836da5b726233f2ba44f09cc6fbcd3f4502446c4c4c1d4c6112cf213ddba40d0078f9f7c7ed4e9cd6305b64d8c71"; + sha512 = "b0334bd7fdfe6737ca5fa1166c37204a6f0205f6756af31b8aa34da6df759f487a3c1aa88bc9cf2dcab4be8724a203e3d35509af4fcf03581c8c59023db532a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/hy-AM/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hy-AM/firefox-58.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "36afb61bcab97ee12a30c2ac50f366c8b35337ef91d9fca7a935bdc0dbdc4c150c6cba62ddb532ec194df93b4f9df96800d048857790b5c634a9f0bf7faa2570"; + sha512 = "33ac9a2a7a554c4662a9285124fb8050894c921ec72d7d3655197923e2fe3fadee007afb54a25bafb9ab8c9a0d898af52102bf629a604563d10f462001f08853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/id/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/id/firefox-58.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "d7e36fad6b94e3a3887b346b863c13c5c3f0bf8c0ad85354cae62724e6f320af2b8afb988b390c7c620f763fe90e9719bbc8033b1b65f516157e569de076662f"; + sha512 = "7bc77cb0cecd1cb993b158670e448fd22bf982ecec84213c8c32634df32ba538fbee8eb834719dd99ef1087b6f8955effbe1776a3e150bf5fd2ccc90606bc215"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/is/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/is/firefox-58.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "d9e7caad2e362ec7e764d29b4c1052d9dcdf0d329762b8c74fcf54d3542fbd9d9920ec693be45a26eff9d09a713bb2867ad39a9e30196e92716bb21aa09281bc"; + sha512 = "8a3fd3e89f503fe4c74b85e8ef87e1e332646cd150c95ff8685071bcc456bdeb09de46e256d13a53f5f8f4cd3172a12ec6c8096dbe54a9cf018be857b4997e94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/it/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/it/firefox-58.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "309bc35eebcfbef93b26eefe1a0fcd0aeb16648636857ea2d65dbf89ecfa03dc071ce1e26b2ebcbf64b58f7b5a8aca110fd6f20ab3af306acc7a32195920c0ab"; + sha512 = "8babf797e0b804e4e8b98a6261dfed27c93832966a66de71ba6794ffd3bf7d3b41ceff7ac4308ec9f978fab310baba5a87dec82f710014cc9dd6f27a520ceaff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ja/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ja/firefox-58.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "61b26b1c808798dcee28d59179f53117981d655b4b50215d53889f029e75eb32dea5e5b291ec6301c77b1578febfafacf0de0e1924153b5c56d2b67287d05924"; + sha512 = "f3fd18b97b2880b3627e100ae20527eb998c7b9d11b2c38b628fd1372f7811cd40662cb5d199f12982fa35f8fb9e6923e2c8b1ecaf5634b6989e8b89480ff252"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ka/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ka/firefox-58.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "1394a91c94ea06abaae35b82a041667699b4a55977dd7aff2f5dbf39e21d18488db00dd52fe39fdb01af02a753e2f2e5810d456eab3e2c7524cff12f744eaa1e"; + sha512 = "4f69cc6927a6aea8496283c1c47961a38ed621b4a4563346506e4c138714824cd5bcba2f0c4d1226c643412ac071838693c0b3a2acd6fc9602a6f12060955f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/kab/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kab/firefox-58.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "663043b3f1cf1c47be7fa40f8bcb807611df665545041fcd5cce9b93a605abbc52cea6663dfd696ee48a3b462f412d2825d0ffe03e5a35166772090475e167cb"; + sha512 = "93fb1351b4c6271cbbf04e8bc8750569f5e3a4375559512055f4bdc68b7ef1c7f78c9354d5168e54d49bb0a529a380eacfb25a109e7f7ef2fdddb1bcd7bb9fcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/kk/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kk/firefox-58.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7fd70d200ab915f01f7239d8d84351dcf2f5aff159112f6f60e9ca4eb204b087461d8af00cebf282b4ee05dfd5571ceaa4dc1076c31353635c7eed7dfc8fa464"; + sha512 = "e4d849284c358bd297b07f557ae304cf9ae681733ee2acd232eda28abb9bfc38ad97916b00f257f56a9a514bfaff9b440ced15194dc3abf56b0af209221a7272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/km/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/km/firefox-58.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c8057c8108e588a26737dda5c6244f738f3d9f86334e18f2373072830b99a02cbcef7a5e4961e6adf5bd48e6605064ce0569ab10923b8c7fb649be2ef1fbab28"; + sha512 = "0fa3bcf4b054c8033ca4ace9446b6062114889a9b3affa730ebf3ee23fdff470676919cc7086b5a13a215ef87b73aae306e667d0b1c18437b6265d5622972a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/kn/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kn/firefox-58.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "958c4cd905f2b7fcedf75b819e6136a98577cf8a87b0d20d643d74068332b33003a6a92ca7348f9336cdc5e88333cce2efdfe522817a8450672c8e103212df6f"; + sha512 = "7ff42d342f103c2b6f4f4050c7c79dd0687f87105e31dd80efedec34dea27dc5c9eeda16b79ea676d43f78a85e55a1e47c400e0faff9006bfefa55f183efb82b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ko/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ko/firefox-58.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1a50dc600063481468769e8f9ea4f150068e9636b1ee84ef86c7f55e515ffb6124db686b3d2b52a29c12538342f13d9838d7499d89afaf49481d89eb2995fd8c"; + sha512 = "9fff35314fcb6031923b51db50e779564b7e5aea3068165bec73c6d8833b18579f87e676291a6570827aed29a1074ba54f08255c6125333da2f040c9ac404bb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/lij/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lij/firefox-58.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "429681a147f3575ac693dd6002579751ca24ddbaa51a9926e303369e2c1273a2f3199889c9ae9db82533f7cce73e177dcbadaffb1be0f189db98327a71260b69"; + sha512 = "d574c03667da40589736295bad53fe22cc67d3f6dbc5281feba5d76138ecbace6daf7d39145d11ea794730c3606f6586fa58d3058fa7eb3f0d1336acf7958cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/lt/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lt/firefox-58.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "a5c7c999210b05c88c354e0c88cc25e5128da8fb6f399dc05ce512ed0bfafdcc109ea17259772304d99027fb73ad667f091ad312d32cda5b4de0f387c39c3b9c"; + sha512 = "4c38dd3f72be96b2a7bec60a55e7ac0a75c13036c3b62d4805ac3f32efb6422b2a74807cefb87a3ad10f25d41c14d00055cdf09092ad9068bcddd5a46dded650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/lv/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lv/firefox-58.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "d1f95c065173cfe5256e5733d3c4d551623355745cb7de570b5dc4ff2d7dd7da0a31ce2637d96c22556e41b92a637bba07278efa710d4be096ecab1e4476aa80"; + sha512 = "fca51f322300f18b3e5c988f883fb352593c40988e5f0203008b71c725a162da0a15e67434a91af0e8dc63ad869280f6ead6714e2da1b4b6b83284fc56790688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/mai/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mai/firefox-58.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "1a7fab6cd71d67c46022dc8ea0484aae0915b1458e83dd3c5f1bde5daa77ad730da046ab1d1ad7f2cc3d34d418cd7ddfb95747bbf219841ea304bbb615697fcf"; + sha512 = "650b729a0dc938c2a0375e967e89a2d6e95595bd9c0f8f0e9940dbb51be4ee80257ab7c7006eb933b4d21fb4cad053a4e55e2dee673c8f976a1f038e3ba5c1d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/mk/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mk/firefox-58.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ffd6a31976e3dc795e52c6431a2447ca64e4bf39b6bdbaf88e7f9c975678473f36952a33db9f17d80d3086fe0e8a8272bd9a8b1926b3291cb4abbb2d0adc1b2b"; + sha512 = "3c15491a97cf61676c6dd1705a281b2f85b4e2e4446645b20d7fd46b5968248591d11ec344544b42c00643a9a21bc3cc57665b7effcd03f9a8105d6a89fd876f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ml/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ml/firefox-58.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "21a2c8450e7057a882d2ff901eedd08b21d3ba7c421f8591a0bf2cce8424757298ad608560eada9f3300d387f071fb7b3e199e0878d413d66ba1be5fdc0d01fc"; + sha512 = "d76726b4d18d114ef391fa65e3396bef3e5d7896b90264e89e82673d0ee8be69633d831220908da30852994f1d5f782e6d6f221b0a93b028f543aa9899d2234d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/mr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mr/firefox-58.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3836a86acfe8e7c2e812ac447be62158e6bc2e00e73345d40f288214b703a9399d12f43f909c48aa7ffc32bd8b1b1e592af3595a2fb4369a68ccd801f3085a29"; + sha512 = "b789f8e68a2020902bddcb95daf854cc784cc2a3319c2a145a5cb877755780699010b4162ffb124d0f5945e722ee6d7b0f0a1baedf277bd8d3c429b9d7870b42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ms/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ms/firefox-58.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ecfc28fa91aee525e54bde80b0d2d76da9a88b595f6b48dfe93632776228ca79b95f2116eccd585460cd8af6dd90d81352db6f21d86b51582b806721207df31f"; + sha512 = "76fe657a616e786926740bd10bb8332cc520e08aa6944ecefe98824e5f0d059c6c93cf0e5968c11b153e55bc445a79939ef0b2a765daa69d6c72b8e25010f4ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/my/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/my/firefox-58.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "2d57e9bdcee5a3b1ca91567dd97f98c554d62ae54544ec4b789b5bb75648cc7aaed617aa508897f8e4143c9bec6f79926396b7cabd6a4a9fe86f38f714af5211"; + sha512 = "618224cff81d80523150cae7c020e8a29569fc7310fa031076ace7006bd8f8efcc4773b450de4ae4965445b277770603a7793287cb85714f0aa057584e636116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/nb-NO/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nb-NO/firefox-58.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "9f2b0f925054107eabc00a28f08604aa482694abf70d60d3e7d5f5808485f4e7fbd36289fb87dc8aed090a7cddf1172db6cbe768052aafe3d8d775277808aed2"; + sha512 = "7f33f1f49e6ac31a022d1ba856e23d1b10a23aa2501550d5ffbdeed05c752c27b3345704bb9d15d8eead5115085b0ed00d5b5d53de9cf2290e753f04a4f3fc1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ne-NP/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ne-NP/firefox-58.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "7e85227c6e3fe28382ae17fca3e2e91a06fe1d6971c9abb8e06c8b4c1b4b9e0d26a1fff88d747c07a9da942f91f95354402f6c12cb992a555af210f01d5e13d1"; + sha512 = "892223856ff20d4cf7c601066ba6f3620b39fbf4e56fd89207f3d18b10b39bebc236d5eddabde57585f0e0c906dc035ed030d49b53bc346ce630581b9288654f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/nl/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nl/firefox-58.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9febb386608d0d7b34c2d00637f85971c00c5395b229b44dd29d2d18bd0007e5f105bacb24f6a9f39c0e2eeb882478bc279b3a18a45cdacee6f697607b411511"; + sha512 = "f139e9420300a0276f9ff7b70fb1839ae9e2aaf089ccaddca782b8dd1797df80873cb8ebc91d37399c39772d5b381b30ddda8c41395065d2424defb709eae21d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/nn-NO/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nn-NO/firefox-58.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "8e5bbbbbbc1cc8d195e0503d982d50b92d3ed832e6a8b9662e7a7fc0cce21a0a5b0ad8769026f8d78d8b59a1f5605164fb07059600e7c92bfaf2eb2f2e4d2eaa"; + sha512 = "50cd63ddb3f83f7c62916299d910d940930f046da612e3cce890310d271822acd87f971b5aee56aebc4011b1c414574c7c96cced936ba6f89a21bb93ea9bd356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/or/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/or/firefox-58.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "9e7089f9e53d2136805f58d449c697e811b4c81af00e0bb321d2ec96ddf58838dd04b7c357530fde6fd69864c797ce3d4f0db105eb0534a1ea95588b779dea2e"; + sha512 = "ef73a14c8210d1b82e0ed33109027099a8d5dc3961476eedc31a92bd855a529e2be6411b196d0c4df97124c5be69ec4b6a245a936de1c0e8c609a0d17d51d8d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/pa-IN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pa-IN/firefox-58.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "5e1ce5092040a3c0ab7e5431dcd6731e16757b49c1dcd48e4520dd3caf728bcfd1dfe7ec75013e2359d9759526a9dfc2e8c87df88dd85708ee023b3a51a51603"; + sha512 = "53fc6c822192bf96db817d32ea46f0570a83e296b1e4cdfa585503b02b961346b21751e22d50c056a6411ace168844df019e6dcb96346e02bc9deada71c5e237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/pl/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pl/firefox-58.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "dd42a424f88c169dc26c0fa4876285440f019e2de936c6737ecc4255953bb44728ee63577d15a3bdb55b9540be5b8560984df936c2dbaa9b6b393efd1af0651f"; + sha512 = "a009db74e155f4a089501ab96d7c72c2baa2e2ad0e555ffe0ee0baf6b259b5bfbf422ed6bca4b012f7b1799db02dd0d13323b39e6f73c7e5877e8ea080f62335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/pt-BR/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pt-BR/firefox-58.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "83256d6c42257eb57b6926c04a1e7adc0a7ae120207477a7e79fe71b342802391ff5844cd1f6b15464a6cba12ea0d3e62dbf2e43ef0e4e275d16bf60c8e3bc5d"; + sha512 = "c77a8c87942045b959058319fcccc35ff8d054842fc8d7332171f110e82595886746597614ec4884915ba8397c63ebce597dbab648d2f823a1fd803f8c662382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/pt-PT/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pt-PT/firefox-58.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "80133f87098b9d2d5855fa87f16b441fa3845d19464dc3a156bab55adb8fb32e2b2055c22883963f37aef9e2051a9e859f02f4ccdf829e02cdd3ac326ea246bb"; + sha512 = "6c09645104219be720c843f3065617184ac5731f354d4217347c662d2cc7cf66060b7805e16b032914f20e75ebddc72de06c3f7b520656bf7d5afd9c4ca517d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/rm/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/rm/firefox-58.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c01b84a6e5c087ecc28eec795275a065d7f370ed965ee0c876371dd7e442110bfe4c8c9356d9ae6ca0cd09448e4688901281973536ac0c72092a3ce5550605f3"; + sha512 = "a232ea477b7b0841eb5dce7efb722b81da8136ec974bbdd7739d0700b163953f0b07e9509b973afa3c09af75b0b08523fe94dee21aec919f40f57e2ffd9dd6f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ro/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ro/firefox-58.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "a00d1c473e0ead438c04c44a7169884d93e488bee068898abc2082570340c747bda7f77a597eef4353488fd94b811e955f1b44ea51e96a49b02b2a51299230d6"; + sha512 = "887a70aa19415abe5bb2bb10f4e66e293177713612186567e9691b715e8b7b7ec3487509a111e8d9053241bc74d1bc9bcbf930931a14050b7c8b513076ed385d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ru/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ru/firefox-58.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "3e2df508529125004f9e21fa100ab941c5cef0a849dd413fef3a22db67e8c7d3445f26cbbab26e76e716379af2156ab06c9be2b8b6996cbcca55f7966aad8b04"; + sha512 = "efb8f8746d07a387d094e23c10f8a2ae3697e854b26a9ec78013f4fb2284a359bfa6cac686779fb8e1d72114c59e191f86240f02b61f4c748909dfcea45368a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/si/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/si/firefox-58.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "9e3c4e1f46e528343d9a12555427706b387fa666fad133c1ecd051dd0ae0766f81ac21e90b80ed492dba0f37638211319cbbe6119955dd9daec01b1dd65730e7"; + sha512 = "9b469c23762a85e1f536928d78df87da8cf2661f78e5a558d8caeaf504ef7ae54c54eb2c3b6ea00381fc2e83348e9f403bd1c106cb518148ebccd113b5e5f442"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/sk/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sk/firefox-58.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "bf82820a071ff046d51f3b8e0867f3776976ee9084b0753bb15bab5407d3fde1d8c7ce3ebb57832f3395aa4c228471cd1c6da1d9e5c03610ec1845c4a07db6aa"; + sha512 = "1ff839d7c631fba2510534032345fcf6397f694d035daff179382270a7889b6c2046b4b2bd6d7666c6e298146ef47cc9fac2b7c525d7c8f563b58b7fe11a5dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/sl/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sl/firefox-58.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "51a54b0ab14636b8a002280589c8dfea6dd3dbc25236432dd774156cba0de2ca814dd4845118934a719e2b0240da0c6a7a38588e2fa2f54301f8625a14cd8a37"; + sha512 = "766e06e574d0f4933f8bf3e50521b5025915797f25712a29f0961759410272fda59aeb869d4d84cad961b277f5fc8ec78b8c333ee0e60e52e07fbb99822973b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/son/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/son/firefox-58.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0709b04b9c2d9b316132a5643c951f05cad0adaca9ec8aea9374e3e80019a990fa12419bee06185712e7c100b038d4eee648a12b8fde186f1a7caab472c40cde"; + sha512 = "60df99153af07b88fd888b232b570eeeb4cafe01ed1c85cd536774b03e121523689d6de3fa3d6335fe7e0c9534273ce571d7a3fa00034e1681b78f4012a8fe7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/sq/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sq/firefox-58.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f5de9ad3600867e039a801642256ce8c0fd2feae4c2072561a7bb3cf2e4af7774fc68d388b884fefdb4a4e9e44bab288da489f9edce2f663926ac4755332fe42"; + sha512 = "97263478fbeeada0ff397723bd8c4e0935c88c25cfc259bb2906e8d0a2ecce8101f4cb5ea9457b8b0b3276de475e0a8fbe995faa1edb33ced17b98404ac1021b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/sr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sr/firefox-58.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "816c6d2e5de45d069506ac6a54c6292c18442ff310397f4f8f8a5bc38e87d9cb9fc02293dc71f94010b01f965de625bd437f245342ee12615966fed3b1e9e3f5"; + sha512 = "b822f5077378b3c41951aafed6f6b3ab174d9240058d69a05905803c2b8ab74791abfc1ce59550585f0eca9fd97e3c0325c9bfeef47d14b8eca039959ebbbd1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/sv-SE/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sv-SE/firefox-58.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "0b31a68d604c6d8c46c875054bdf60e05afbce7b074c63e2c2dd715a03e77540aab12de27305a9a6215ec138b76b5375e5103ace750bbf78269d838905efa43b"; + sha512 = "20555a59e733f49b3714cd4517aa952a0e9306681f5ea1f33d9464ee50705187ad0e745ebfa00a64e4cd0aac4d7c3c3257cf04681e74e18037684e675b05df7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ta/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ta/firefox-58.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "69b591bf072db73e8c083f6052b239d4331dc2688ea35b99055ee1938009b198f19de56b12059132c3b4b66cf5fa0e7a171a8c01eb998e0aeb8f1db921246593"; + sha512 = "2d5721bc3519b766dc70163b8f91988b49512e4709d998239691c382a006bb06fd82b793fce843f976a55cffa8a0ff06711917e35233629945539c1f27453d02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/te/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/te/firefox-58.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "985e78c31ef1c3604d5fd3ffc5cc8871c897522dfff37675a6da6d72bb15c9538caa9cf346ade4304207ccf1dc790f7b353f4a7f76dc8b1ee7df91d0ef912644"; + sha512 = "28ff1470be8a12212ef2467daa9a363ef929fe8f6741678b5d17ccfa149b122bc2dd74478bb96e721725c87d6a3000878dd7b51d1e38e6242e6e286c3621b25f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/th/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/th/firefox-58.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9474d8ea5bb99dc0d6cc84f13c70df13f3958b23057a8a4c20180b57e5803ae108add8e8e385c5c6b5a76442adefb20cfa328987d9651e200e9cab5cfe96f8b3"; + sha512 = "935a7354cca219695f58592b1d6668ee3d305559ad9c30cfc274b63952bb133429528e38bda10d5cdeddb428133712da74ba621e2c831ae14329c22530f9ff91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/tr/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/tr/firefox-58.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6be02174476b94a899227d93c3ade402f48ac7126e13f896ada068f34ba32f718f6ee28de7eb2475a0190cde1a10f1e08fcd8a95e0216c827457b0d6b5be13d8"; + sha512 = "9f30bcd90b0c5ae5b55dc74a1e4adf8b029d8b87ba4f2961a4eb47ff4c61decff4abfac4f4664f1e99653f05a1749a17c775ba323ac322ec1fe3e104a4c57cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/uk/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/uk/firefox-58.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c6e21ada75939a968eebcc57598844b60a24e155bb540f295d727315b3b91f5533207372ee5826e85d740c77ef134e8dfa779828f8308627b96b57ed58589a21"; + sha512 = "eca33af02a5f2d7363688aa2636d407822dfe9b70fa003d085ca6b9c3089adb49d080204c5e94d89178ff952dc5ca6a9402446610eb3e4460e55cdb066b965e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/ur/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ur/firefox-58.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c3e10cb76ec9851a1cd2853e44a57437450d67ff130c6be2c0367c0bef2d2c22bd67966667b71feea2d308ac05a652f72dace7f0436678d2be46ad1361524515"; + sha512 = "6dc7bb3693fa86305bb50be09c7945f199450c286867f56e66721944a27894e3de7a6452801ef4d04b0339403900b46effb7d2282a81c0b042ccf4c49f758a47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/uz/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/uz/firefox-58.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "01852bd4d2404270180070b81446679e7467904cb476fbd245ecd086c3f914f01fd61706d7a2d75d903540ac5ca254aeb12470d708fc86e3f475147591eaf479"; + sha512 = "1ab8b3aefedc0c50c76169c0890cc5e3c381b7f743bb901c5573103761ae67985deae20ac2ef5b5d0f85f848a82a8d60bc87336205e462ddd2f040ba3586f258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/vi/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/vi/firefox-58.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "3980ad79b0a6b9dd72d882dca046be9c43406e3ac84663af3dd46bf03fded2be303adbbc4669077df7c803546aaabd0ec0d2aac34b6f8a6f03f86955e34f4c83"; + sha512 = "cca1d12e5f34b78f930d7b7b53afce55567be0e9e6894b2af1d20a5c2c11df0531d06945d812bec956904fbd3ecb4921c282f8a9a520661c4988d2147d370dd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/xh/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/xh/firefox-58.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "3e1664e57115d4d9f817363cbc1c5a68039a7baa3e5b430dcf6b1be4252857daef1806f606f6eddd2bf7cc48542f382aa937915fa6f3dddcd2faf27bb8217943"; + sha512 = "8ed571a58fe104ef53aa785d10481371adcdf4a38f449bdbc65f6ab532797d9c4d301f6f75868645aca291cdc10ae3b5b8d2fd1f8f116f9ef21b9d91e4264f24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/zh-CN/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/zh-CN/firefox-58.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "e159a96858204f27d76cfecfcff32f400b2cdd8bfd847fb98dddd085f77565d5cd0e280b0f8a5552b397a08578144bda8307563454282de3fc70cb555ccd1554"; + sha512 = "ca63b214cdd67857d69ba86263e3efeadddbfc0f35a6c13ba9308959bc158d481cd6930246f3b59b7c335399ccfcfe5fbbff5fd1cd62aa1316c1da96403dfae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0/linux-i686/zh-TW/firefox-58.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/zh-TW/firefox-58.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "66f5978aac39e4be86745570cdc2fe6cbaae233b19b6d2ea710584862580027ac1a6033a2238601e6ca6968b39cf1313b088348c788dce9dbb3bdef9d97d8784"; + sha512 = "35bcec66fb184dddc9aab83fd91c561c396b6ae48bb9e027e4a64aa7aa60fd264ce4da917255370736ffb08fc42362bba61844ee0295c6b7adf721fb70d93136"; } ]; } From e851d53ceaf2cd48d0757c385626dd2040db0f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 30 Jan 2018 19:49:44 +0100 Subject: [PATCH 140/797] docbook-xsl-ns: "revert" after parent commit I didn't realize I was redefining two derivations at once. --- .../stylesheets/xslt/docbook-xsl/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index c78dcc0596e..e965882a9c3 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -2,7 +2,7 @@ let - common = { pname, sha256 }: let self = stdenv.mkDerivation rec { + common = { pname, sha256, patches ? [] }: let self = stdenv.mkDerivation rec { name = "${pname}-1.79.1"; src = fetchurl { @@ -10,13 +10,7 @@ let inherit sha256; }; - patches = [(fetchpatch { - name = "potential-infinite-template-recursion.patch"; - url = "https://src.fedoraproject.org/cgit/rpms/docbook-style-xsl.git/" - + "plain/docbook-style-xsl-non-recursive-string-subst.patch?id=bf9e5d16fd"; - sha256 = "1pfb468bsj3j879ip0950waih0r1s6rzfbm2p70glbz0g3903p7h"; - stripLen = "1"; - })]; + inherit patches; propagatedBuildInputs = [ findXMLCatalogs ]; @@ -52,6 +46,15 @@ in { docbook_xsl = common { pname = "docbook-xsl"; sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj"; + + patches = [(fetchpatch { + name = "potential-infinite-template-recursion.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/docbook-style-xsl.git/" + + "plain/docbook-style-xsl-non-recursive-string-subst.patch?id=bf9e5d16fd"; + sha256 = "1pfb468bsj3j879ip0950waih0r1s6rzfbm2p70glbz0g3903p7h"; + stripLen = "1"; + })]; + }; docbook_xsl_ns = common { From 787d371c2857121a6dabaee7ec1318d44898e8ac Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 30 Jan 2018 22:03:43 +0100 Subject: [PATCH 141/797] json-glib: fixup darwin install_name Couldn't figure out how to fix it durning the build. --- pkgs/development/libraries/json-glib/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 73fa1f311bf..bf32f4f8e8b 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }: +{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext +, gobjectIntrospection, dbus, libintlOrEmpty +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { name = "json-glib-${minVer}.2"; @@ -11,7 +14,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; - buildInputs = libintlOrEmpty; + buildInputs = libintlOrEmpty + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; From c208456d3aaf9b290a477c6ba415ef38556f3443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Jan 2018 23:01:25 +0000 Subject: [PATCH 142/797] rdma-core: set correct RUNDIR and SHAREDSTATEDIR --- pkgs/os-specific/linux/rdma-core/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 5e697bcbb5f..77f94e544a0 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -18,9 +18,13 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libnl ethtool nettools libudev python perl ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_RUNDIR=/run" + "-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib" + ]; + postPatch = '' substituteInPlace providers/rxe/rxe_cfg.in \ - --replace '@CMAKE_INSTALL_FULL_SHAREDSTATEDIR@' '/run' \ --replace ethtool "${ethtool}/bin/ethtool" \ --replace ifconfig "${nettools}/bin/ifconfig" ''; From e5245495367e437c82cb163c7c4d8f8a1721efa2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 31 Jan 2018 01:51:28 +0100 Subject: [PATCH 143/797] nss: 3.33 -> 3.34.1 --- 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 47f5c1ef5cf..8d799e2c13a 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.33"; + version = "3.34.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_33_RTM/src/${name}.tar.gz"; - sha256 = "1r44qa4j7sri50mxxbnrpm6fxprwrhv76whi7bfq73j06syxmw4q"; + url = "mirror://mozilla/security/nss/releases/NSS_3_34_1_RTM/src/${name}.tar.gz"; + sha256 = "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3"; }; buildInputs = [ perl zlib sqlite ]; From dc52fc6dda00c4f3e275e56a5f4f0386260e4063 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 31 Jan 2018 09:40:15 +0800 Subject: [PATCH 144/797] aria2 (nixos): actually load the module Fixes #33991 --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/aria2.nix | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 51f9917b192..1942cca23d6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -425,6 +425,7 @@ ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix ./services/networking/amuled.nix + ./services/networking/aria2.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix index ad4ac9bf45e..df9c92db2e5 100644 --- a/nixos/modules/services/networking/aria2.nix +++ b/nixos/modules/services/networking/aria2.nix @@ -10,9 +10,9 @@ let settingsDir = "${homeDir}"; sessionFile = "${homeDir}/aria2.session"; downloadDir = "${homeDir}/Downloads"; - + rangesToStringList = map (x: builtins.toString x.from +"-"+ builtins.toString x.to); - + settingsFile = pkgs.writeText "aria2.conf" '' dir=${cfg.downloadDir} @@ -110,12 +110,12 @@ in mkdir -m 0770 -p "${homeDir}" chown aria2:aria2 "${homeDir}" if [[ ! -d "${config.services.aria2.downloadDir}" ]] - then + then mkdir -m 0770 -p "${config.services.aria2.downloadDir}" chown aria2:aria2 "${config.services.aria2.downloadDir}" fi if [[ ! -e "${sessionFile}" ]] - then + then touch "${sessionFile}" chown aria2:aria2 "${sessionFile}" fi @@ -132,4 +132,4 @@ in }; }; }; -} \ No newline at end of file +} From ad78ba1efaecc55d1ca8db6975c9b6d939aa28dc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 29 Jan 2018 17:50:13 -0500 Subject: [PATCH 145/797] lib: Better use the module type system in platform parsing I need some module system types here so I can next fix meta-checks for derivations. I'd like to use a "proper" record type here, but submodule types seem overkill so holding off with ad-hoc stuff for now. In practice, all I need for the next step are the `.check` functions so this is good, especially as the submodule check function is shallow, saving full inductive type-checking for a later step. --- lib/systems/parse.nix | 152 +++++++++++++++++++++++++++++++++--------- 1 file changed, 122 insertions(+), 30 deletions(-) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index f59549ec2f3..37a8c848c5d 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -4,6 +4,16 @@ # http://llvm.org/docs/doxygen/html/Triple_8cpp_source.html especially # Triple::normalize. Parsing should essentially act as a more conservative # version of that last function. +# +# Most of the types below come in "open" and "closed" pairs. The open ones +# specify what information we need to know about systems in general, and the +# closed ones are sub-types representing the whitelist of systems we support in +# practice. +# +# Code in the remainder of nixpkgs shouldn't rely on the closed ones in +# e.g. exhaustive cases. Its more a sanity check to make sure nobody defines +# systems that overlap with existing ones and won't notice something amiss. +# { lib }: with lib.lists; with lib.types; @@ -11,29 +21,52 @@ with lib.attrsets; with (import ./inspect.nix { inherit lib; }).predicates; let - setTypesAssert = type: pred: + inherit (lib.options) mergeOneOption; + + setTypes = type: mapAttrs (name: value: - assert pred value; - setType type ({ inherit name; } // value)); - setTypes = type: setTypesAssert type (_: true); + assert type.check value; + setType type.name ({ inherit name; } // value)); in rec { - isSignificantByte = isType "significant-byte"; - significantBytes = setTypes "significant-byte" { + ################################################################################ + + types.openSignifiantByte = mkOptionType { + name = "significant-byte"; + description = "Endianness"; + merge = mergeOneOption; + }; + + types.significantByte = enum (attrValues significantBytes); + + significantBytes = setTypes types.openSignifiantByte { bigEndian = {}; littleEndian = {}; }; - isCpuType = isType "cpu-type"; - cpuTypes = with significantBytes; setTypesAssert "cpu-type" - (x: elem x.bits [8 16 32 64 128] - && (if 8 < x.bits - then isSignificantByte x.significantByte - else !(x ? significantByte))) - { + ################################################################################ + + # Reasonable power of 2 + types.bitWidth = enum [ 8 16 32 64 128 ]; + + ################################################################################ + + types.openCpuType = mkOptionType { + name = "cpu-type"; + description = "instruction set architecture name and information"; + merge = mergeOneOption; + check = x: types.bitWidth.check x.bits + && (if 8 < x.bits + then types.significantByte.check x.significantByte + else !(x ? significantByte)); + }; + + types.cpuType = enum (attrValues cpuTypes); + + cpuTypes = with significantBytes; setTypes types.openCpuType { arm = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; @@ -50,16 +83,34 @@ rec { wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; }; }; - isVendor = isType "vendor"; - vendors = setTypes "vendor" { + ################################################################################ + + types.openVendor = mkOptionType { + name = "vendor"; + description = "vendor for the platform"; + merge = mergeOneOption; + }; + + types.vendor = enum (attrValues vendors); + + vendors = setTypes types.openVendor { apple = {}; pc = {}; unknown = {}; }; - isExecFormat = isType "exec-format"; - execFormats = setTypes "exec-format" { + ################################################################################ + + types.openExecFormat = mkOptionType { + name = "exec-format"; + description = "executable container used by the kernel"; + merge = mergeOneOption; + }; + + types.execFormat = enum (attrValues execFormats); + + execFormats = setTypes types.openExecFormat { aout = {}; # a.out elf = {}; macho = {}; @@ -68,15 +119,33 @@ rec { unknown = {}; }; - isKernelFamily = isType "kernel-family"; - kernelFamilies = setTypes "kernel-family" { + ################################################################################ + + types.openKernelFamily = mkOptionType { + name = "exec-format"; + description = "executable container used by the kernel"; + merge = mergeOneOption; + }; + + types.kernelFamily = enum (attrValues kernelFamilies); + + kernelFamilies = setTypes types.openKernelFamily { bsd = {}; }; - isKernel = x: isType "kernel" x; - kernels = with execFormats; with kernelFamilies; setTypesAssert "kernel" - (x: isExecFormat x.execFormat && all isKernelFamily (attrValues x.families)) - { + ################################################################################ + + types.openKernel = mkOptionType { + name = "kernel"; + description = "kernel name and information"; + merge = mergeOneOption; + check = x: types.execFormat.check x.execFormat + && all types.kernelFamily.check (attrValues x.families); + }; + + types.kernel = enum (attrValues kernels); + + kernels = with execFormats; with kernelFamilies; setTypes types.openKernel { darwin = { execFormat = macho; families = { }; }; freebsd = { execFormat = elf; families = { inherit bsd; }; }; hurd = { execFormat = elf; families = { }; }; @@ -93,8 +162,17 @@ rec { win32 = kernels.windows; }; - isAbi = isType "abi"; - abis = setTypes "abi" { + ################################################################################ + + types.openAbi = mkOptionType { + name = "abi"; + description = "binary interface for compiled code and syscalls"; + merge = mergeOneOption; + }; + + types.abi = enum (attrValues abis); + + abis = setTypes types.openAbi { cygnus = {}; gnu = {}; msvc = {}; @@ -106,12 +184,24 @@ rec { unknown = {}; }; + ################################################################################ + + types.system = mkOptionType { + name = "system"; + description = "fully parsed representation of llvm- or nix-style platform tuple"; + merge = mergeOneOption; + check = { cpu, vendor, kernel, abi }: + types.cpuType.check cpu + && types.vendor.check vendor + && types.kernel.check kernel + && types.abi.check abi; + }; + isSystem = isType "system"; - mkSystem = { cpu, vendor, kernel, abi }: - assert isCpuType cpu && isVendor vendor && isKernel kernel && isAbi abi; - setType "system" { - inherit cpu vendor kernel abi; - }; + + mkSystem = components: + assert types.system.check components; + setType "system" components; mkSkeletonFromList = l: { "2" = # We only do 2-part hacks for things Nix already supports @@ -174,4 +264,6 @@ rec { optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}"; in "${cpu.name}-${vendor.name}-${kernel.name}${optAbi}"; + ################################################################################ + } From 2e4aded366914d625a2f31208e8ac8548cb43a7e Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 31 Jan 2018 04:39:21 +0100 Subject: [PATCH 146/797] beets-alternatives: Fix tests against beets 1.4.6 Since the bump of beets to version 1.4.6 in e5fab33efdea1d0e1357bc084605 the tests no longer run successfully because beets 1.4.6 introduces a breaking API change for the Item.move() method which now instead of just passing copy=True the operation is now passed using a different "operation" keyword argument. Unfortunately the original repository of beets-alternatives is unmaintained since 3 years and thus there is no upstream fix available at the moment. However, there is a fork maintained by @wisp3rwind, which addresses this problem (wisp3rwind/beets-alternatives@33c6525ed4f799a2a4991c9fc9d55524) and a bunch of other fixes. The reason why I'm not using the patch from @wisp3rwind is that it simply doesn't apply against beets-alternatives 0.8.2, but my patch here essentially does the same. Signed-off-by: aszlig Upstream issue: geigerzaehler/beets-alternatives#13 Cc: @Profpatsch --- .../beets/alternatives-beets-1.4.6.patch | 30 +++++++++++++++++++ .../tools/audio/beets/alternatives-plugin.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/audio/beets/alternatives-beets-1.4.6.patch diff --git a/pkgs/tools/audio/beets/alternatives-beets-1.4.6.patch b/pkgs/tools/audio/beets/alternatives-beets-1.4.6.patch new file mode 100644 index 00000000000..652e0e4a94b --- /dev/null +++ b/pkgs/tools/audio/beets/alternatives-beets-1.4.6.patch @@ -0,0 +1,30 @@ +diff --git a/test/helper.py b/test/helper.py +index c216226..d409c09 100644 +--- a/test/helper.py ++++ b/test/helper.py +@@ -11,6 +11,7 @@ import beets + from beets import plugins + from beets import ui + from beets.library import Item ++from beets.util import MoveOperation + + from beetsplug import alternatives + from beetsplug import convert +@@ -183,7 +184,7 @@ class TestHelper(Assertions): + item = Item.from_path(os.path.join(self.fixture_dir, 'min.' + ext)) + item.add(self.lib) + item.update(values) +- item.move(copy=True) ++ item.move(operation=MoveOperation.COPY) + item.write() + album = self.lib.add_album([item]) + album.albumartist = item.artist +@@ -201,7 +202,7 @@ class TestHelper(Assertions): + item = Item.from_path(os.path.join(self.fixture_dir, 'min.mp3')) + item.add(self.lib) + item.update(values) +- item.move(copy=True) ++ item.move(operation=MoveOperation.COPY) + item.write() + return item + diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 27be81733d3..f808e90281e 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec { sha256 = "10za6h59pxa13y8i4amqhc6392csml0dl771lssv6b6a98kamsy7"; }; + patches = [ ./alternatives-beets-1.4.6.patch ]; + postPatch = '' sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py sed -i -e '/test_suite/d' setup.py From 46c158a32f1b920fe0280c7aea3f42670ece7473 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 31 Jan 2018 05:51:09 +0100 Subject: [PATCH 147/797] nixos/networking-interfaces: set default value for virtualType --- .../tasks/network-interfaces-scripted.nix | 4 +--- .../tasks/network-interfaces-systemd.nix | 24 ++++++++----------- nixos/modules/tasks/network-interfaces.nix | 10 ++++---- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 1f424f84c6e..63d07832d10 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -230,9 +230,7 @@ let RemainAfterExit = true; }; script = '' - ip tuntap add dev "${i.name}" \ - ${optionalString (i.virtualType != null) "mode ${i.virtualType}"} \ - user "${i.virtualOwner}" + ip tuntap add dev "${i.name}" mode "${i.virtualType}" user "${i.virtualOwner}" ''; postStop = '' ip link del ${i.name} || true diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index a365a01bfb1..5d72ad0f1bd 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -74,21 +74,17 @@ in networks."99-main" = genericNetwork mkDefault; } (mkMerge (flip map interfaces (i: { - netdevs = mkIf i.virtual ( - let - devType = if i.virtualType != null then i.virtualType - else (if hasPrefix "tun" i.name then "tun" else "tap"); - in { - "40-${i.name}" = { - netdevConfig = { - Name = i.name; - Kind = devType; - }; - "${devType}Config" = optionalAttrs (i.virtualOwner != null) { - User = i.virtualOwner; - }; + netdevs = mkIf i.virtual ({ + "40-${i.name}" = { + netdevConfig = { + Name = i.name; + Kind = i.virtualType; }; - }); + "${i.virtualType}Config" = optionalAttrs (i.virtualOwner != null) { + User = i.virtualOwner; + }; + }; + }); networks."40-${i.name}" = mkMerge [ (genericNetwork mkDefault) { name = mkDefault i.name; DHCP = mkForce (dhcpStr diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index b7e85e402aa..2a17ae934f8 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -273,11 +273,13 @@ let }; virtualType = mkOption { - default = null; - type = with types; nullOr (enum [ "tun" "tap" ]); + default = if hasPrefix "tun" name then "tun" else "tap"; + defaultText = ''if hasPrefix "tun" name then "tun" else "tap"''; + type = with types; enum [ "tun" "tap" ]; description = '' - The explicit type of interface to create. Accepts tun or tap strings. - Also accepts null to implicitly detect the type of device. + The type of interface to create. + The default is TUN for an interface name starting + with "tun", otherwise TAP. ''; }; From f1cacaf97c4057997a2b4c62be1696650f53203d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 31 Jan 2018 05:52:22 +0100 Subject: [PATCH 148/797] nixos/tests: add test for virtual interfaces --- nixos/tests/networking.nix | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 7708775f73f..182328b3296 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -433,6 +433,49 @@ let $client2->succeed("ip addr show dev vlan >&2"); ''; }; + virtual = { + name = "Virtual"; + machine = { + networking.interfaces."tap0" = { + ip4 = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + ip6 = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ]; + virtual = true; + }; + networking.interfaces."tun0" = { + ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ]; + ip6 = [ { address = "2001:1470:fffd:2097::"; prefixLength = 64; } ]; + virtual = true; + }; + }; + + testScript = '' + my $targetList = <<'END'; + tap0: tap UNKNOWN_FLAGS:800 user 0 + tun0: tun UNKNOWN_FLAGS:800 user 0 + END + + # Wait for networking to come up + $machine->start; + $machine->waitForUnit("network.target"); + + # Test interfaces set up + my $list = $machine->succeed("ip tuntap list | sort"); + "$list" eq "$targetList" or die( + "The list of virtual interfaces does not match the expected one:\n", + "Result:\n", "$list\n", + "Expected:\n", "$targetList\n" + ); + + # Test interfaces clean up + $machine->succeed("systemctl stop network-addresses-tap0"); + $machine->succeed("systemctl stop network-addresses-tun0"); + my $residue = $machine->succeed("ip tuntap list"); + $residue eq "" or die( + "Some virtual interface has not been properly cleaned:\n", + "$residue\n" + ); + ''; + }; }; in mapAttrs (const (attrs: makeTest (attrs // { From 729cf93ffb5f2c419f2ba3b8b0131775020e0256 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Wed, 31 Jan 2018 04:55:45 +0000 Subject: [PATCH 149/797] supervise: 1.1.0 -> 1.2.0 --- pkgs/tools/system/supervise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index b6e0700e47f..c264b73b502 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "supervise-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchzip { url = "https://github.com/catern/supervise/releases/download/v${version}/supervise-${version}.tar.gz"; - sha256 = "0i20znchvydk8ww31ka4b0wjkaizz38racwgvqj32idwhqgar5x2"; + sha256 = "07v3197nf3jbx2w6jxzyk9b8p5qjj9irpr4jvv5lkfbi7s6rav3k"; }; meta = with stdenv.lib; { From afb87a66b39df4ed1f71f4d42f96f5482ece32f3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 30 Jan 2018 22:10:34 -0500 Subject: [PATCH 150/797] lib: Avoid double import --- lib/systems/doubles.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 0cae8ec56fd..f39bfff13de 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -1,8 +1,8 @@ { lib }: let inherit (lib) lists; - parse = import ./parse.nix { inherit lib; }; - inherit (import ./inspect.nix { inherit lib; }) predicates; + inherit (lib.systems) parse; + inherit (lib.systems.inspect) predicates; inherit (lib.attrsets) matchAttrs; all = [ From fefa9ef756298e6863ece2e93bd057124b78452f Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Sat, 27 Jan 2018 10:11:26 -0500 Subject: [PATCH 151/797] top-level: Duplicate overlaying unless stdenvOverrides comes last The stdenvOverrides overlay is used to bring packages forward during bootstrapping via stdenv.overrides. These packages have already had the overlays applied to them in the previous boostrapping stage. If stdenvOverrides is not last in the overlays stack, all remaining overlays will windup being applied again to these packages. closes #34086 --- pkgs/top-level/stage.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 7cddc664570..de676c5a421 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -116,7 +116,9 @@ let lib.optionalAttrs allowCustomOverrides ((config.packageOverrides or (super: {})) super); - # The complete chain of package set builders, applied from top to bottom + # The complete chain of package set builders, applied from top to bottom. + # stdenvOverlays must be last as it brings package forward from the + # previous bootstrapping phases which have already been overlayed. toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([ stdenvBootstappingAndPlatforms platformCompat @@ -125,9 +127,9 @@ let splice allPackages aliases - stdenvOverrides configOverrides - ] ++ overlays); + ] ++ overlays ++ [ + stdenvOverrides ]); in # Return the complete set of packages. From 1c04923d6482785238b6bd8f656ac2c0fdd8461f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 31 Jan 2018 06:50:20 +0000 Subject: [PATCH 152/797] mpd_clientlib: fix dynamic library on darwin --- pkgs/servers/mpd/clientlib.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 269b20dbebb..dab63a5bad8 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { version = "2.13"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1g1n6rk8kn87mbjqxxj0vi7haj8xx21xmqlzbrx2fvyp5357zvsq"; }; - nativeBuildInputs = [ meson ninja ]; + nativeBuildInputs = [ meson ninja ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; meta = with stdenv.lib; { description = "Client library for MPD (music player daemon)"; From dccd8a2685ba73b443ea20a6101e24fc6fc9b000 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 31 Jan 2018 07:35:08 +0000 Subject: [PATCH 153/797] ncmpc: fix build on darwin --- pkgs/applications/audio/ncmpc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 1b865642178..93e909fc604 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses mpd_clientlib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = https://www.musicpd.org/clients/ncmpc/; From 81b9ca062dfabf4094b2760a0cdbae6474946cbb Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 31 Jan 2018 08:57:15 +0100 Subject: [PATCH 154/797] skopeo: remove the patch by setting a variable at build time --- pkgs/development/tools/skopeo/default.nix | 34 +++++++++++------------ pkgs/development/tools/skopeo/path.patch | 25 ----------------- 2 files changed, 16 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/tools/skopeo/path.patch diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 0f720f1f7e3..75732c71a23 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,11 +1,23 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, runCommand }: with stdenv.lib; +let + version = "0.1.27"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "projectatomic"; + repo = "skopeo"; + sha256 = "1xwwzxjczz8qdk1rf0h78qd3vk9mxxb8yi6f8kfqvcdcsvkajd5g"; + }; + + defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; + +in buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.27"; - rev = "v${version}"; + inherit src; goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; @@ -13,27 +25,13 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree ]; - src = fetchFromGitHub { - inherit rev; - owner = "projectatomic"; - repo = "skopeo"; - sha256 = "1xwwzxjczz8qdk1rf0h78qd3vk9mxxb8yi6f8kfqvcdcsvkajd5g"; - }; - - patches = [ - ./path.patch - ]; + buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}"; preBuild = '' export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" ''; - postInstall = '' - mkdir $bin/etc - cp -v ./go/src/github.com/projectatomic/skopeo/default-policy.json $bin/etc/default-policy.json - ''; - meta = { description = "A command line utility for various operations on container images and image repositories"; homepage = https://github.com/projectatomic/skopeo; diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch deleted file mode 100644 index fe456b58e54..00000000000 --- a/pkgs/development/tools/skopeo/path.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go -index 50e29b2..7108df5 100644 ---- a/cmd/skopeo/main.go -+++ b/cmd/skopeo/main.go -@@ -3,6 +3,7 @@ package main - import ( - "fmt" - "os" -+ "path/filepath" - - "github.com/Sirupsen/logrus" - "github.com/containers/image/signature" -@@ -88,6 +89,11 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) { - policyPath := c.GlobalString("policy") - var policy *signature.Policy // This could be cached across calls, if we had an application context. - var err error -+ var dir string -+ if policyPath == "" { -+ dir, err = filepath.Abs(filepath.Dir(os.Args[0])) -+ policyPath = dir + "/../etc/default-policy.json" -+ } - if c.GlobalBool("insecure-policy") { - policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}} - } else if policyPath == "" { - From bacbc48cfe7d615a43c4c9df78d4c07982200cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 23 Jan 2018 10:51:13 +0100 Subject: [PATCH 155/797] home-assistant: add NixOS module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/misc/home-assistant.nix | 90 +++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 nixos/modules/services/misc/home-assistant.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 415be580e97..28ed10a5ece 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -302,6 +302,7 @@ kodi = 283; restya-board = 284; mighttpd2 = 285; + hass = 286; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -572,6 +573,7 @@ kodi = 283; restya-board = 284; mighttpd2 = 285; + hass = 286; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e512881765e..257236bd999 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -314,6 +314,7 @@ ./services/misc/gogs.nix ./services/misc/gollum.nix ./services/misc/gpsd.nix + ./services/misc/home-assistant.nix ./services/misc/ihaskell.nix ./services/misc/irkerd.nix ./services/misc/jackett.nix diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix new file mode 100644 index 00000000000..bc463d3e670 --- /dev/null +++ b/nixos/modules/services/misc/home-assistant.nix @@ -0,0 +1,90 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.home-assistant; + + configFile = pkgs.writeText "configuration.yaml" (builtins.toJSON cfg.config); +in { + meta.maintainers = with maintainers; [ dotlambda ]; + + options.services.home-assistant = { + enable = mkEnableOption "Home Assistant"; + + configDir = mkOption { + default = "/var/lib/hass"; + type = types.path; + description = "The config directory, where your configuration.yaml is located."; + }; + + config = mkOption { + default = null; + type = with types; nullOr attrs; + example = literalExample '' + { + homeassistant = { + name = "Home"; + time_zone = "UTC"; + }; + frontend = { }; + http = { }; + } + ''; + description = '' + Your configuration.yaml as a Nix attribute set. + Beware that setting this option will delete your previous configuration.yaml. + ''; + }; + + package = mkOption { + default = pkgs.home-assistant; + defaultText = "pkgs.home-assistant"; + type = types.package; + example = literalExample '' + pkgs.home-assistant.override { + extraPackages = ps: with ps; [ colorlog ]; + } + ''; + description = '' + Home Assistant package to use. + Most Home Assistant components require additional dependencies, + which are best specified by overriding pkgs.home-assistant. + You can find the dependencies by searching for failed imports in your log or by looking at this list: + + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.home-assistant = { + description = "Home Assistant"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + preStart = lib.optionalString (cfg.config != null) '' + rm -f ${cfg.configDir}/configuration.yaml + ln -s ${configFile} ${cfg.configDir}/configuration.yaml + ''; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/hass --config "${cfg.configDir}" + ''; + User = "hass"; + Group = "hass"; + Restart = "on-failure"; + ProtectSystem = "strict"; + ReadWritePaths = "${cfg.configDir}"; + PrivateTmp = true; + }; + }; + + users.extraUsers.hass = { + home = cfg.configDir; + createHome = true; + group = "hass"; + uid = config.ids.uids.hass; + }; + + users.extraGroups.hass.gid = config.ids.gids.hass; + }; +} From 0604c078a8a61faaf179908551dc6ffe82f75b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Jan 2018 01:41:36 +0100 Subject: [PATCH 156/797] home-assistant: add NixOS test --- nixos/release.nix | 1 + nixos/tests/home-assistant.nix | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 nixos/tests/home-assistant.nix diff --git a/nixos/release.nix b/nixos/release.nix index 972c89c1a41..a396eaac9a3 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -267,6 +267,7 @@ in rec { tests.graphite = callTest tests/graphite.nix {}; tests.hardened = callTest tests/hardened.nix { }; tests.hibernate = callTest tests/hibernate.nix {}; + tests.home-assistant = callTest tests/home-assistant.nix { }; tests.hound = callTest tests/hound.nix {}; tests.i3wm = callTest tests/i3wm.nix {}; tests.initrd-network-ssh = callTest tests/initrd-network-ssh {}; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix new file mode 100644 index 00000000000..0e2fee8e808 --- /dev/null +++ b/nixos/tests/home-assistant.nix @@ -0,0 +1,41 @@ +import ./make-test.nix ({ pkgs, ... }: + +let + configDir = "/var/lib/foobar"; + +in { + name = "home-assistant"; + + nodes = { + hass = + { config, pkgs, ... }: + { + services.home-assistant = { + inherit configDir; + enable = true; + config = { + homeassistant = { + name = "Home"; + time_zone = "UTC"; + }; + frontend = { }; + http = { }; + }; + }; + }; + }; + + testScript = '' + startAll; + $hass->waitForUnit("home-assistant.service"); + + # Since config is specified using a Nix attribute set, + # configuration.yaml is a link to the Nix store + $hass->succeed("test -L ${configDir}/configuration.yaml"); + + # Check that Home Assistant's web interface and API can be reached + $hass->waitForOpenPort(8123); + $hass->succeed("curl --fail http://localhost:8123/states"); + $hass->succeed("curl --fail http://localhost:8123/api/ | grep 'API running'"); + ''; +}) From 0b0afe9a8e91f55b939668092001aac8cdcd01bf Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Wed, 31 Jan 2018 13:32:16 +0000 Subject: [PATCH 157/797] dovecot_pigeonhole: 0.4.21 -> 0.5.0.1 (#34449) --- pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 67094228a5e..92b404d0f65 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.4.21"; + version = "0.5.0.1"; src = fetchurl { - url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; - sha256 = "0snxrx9lk3j0rrcd4jlhwlqk4v31n1qfx2asgwb4scy5i2vrrq2a"; + url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; + sha256 = "1lpsdqh9pwqx917z5v23bahhhbrcb3y5ps3l413sli8cn4a6sdan"; }; buildInputs = [ dovecot openssl ]; From 495e2b0343e2d6cca8ca86888b38d4a36aa1c2cc Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 31 Jan 2018 01:52:10 +0100 Subject: [PATCH 158/797] firefox: 57.0.4 -> 58.0.1 --- .../networking/browsers/firefox/common.nix | 19 ++++++++++++------- .../networking/browsers/firefox/packages.nix | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 3e90d54f39d..0d72b8e55ee 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -88,8 +88,18 @@ stdenv.mkDerivation (rec { rm -f js/src/configure rm -f .mozconfig* + '' + lib.optionalString (stdenv.lib.versionAtLeast version "58.0.0") '' + cat >.mozconfig < $TMPDIR/ga + '' + '' # this will run autoconf213 - make -f client.mk configure-files + ${if (stdenv.lib.versionAtLeast version "58.0.0") then "./mach configure" else "make -f client.mk configure-files"} configureScript="$(realpath ./configure)" @@ -99,11 +109,6 @@ stdenv.mkDerivation (rec { test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml cd obj-* - '' + lib.optionalString googleAPISupport '' - # Google API key used by Chromium and Firefox. - # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, - # please get your own set of keys. - echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga ''; configureFlags = [ @@ -166,7 +171,7 @@ stdenv.mkDerivation (rec { ++ flag gssSupport "negotiateauth" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ flag webrtcSupport "webrtc" - ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga" + ++ lib.optional googleAPISupport "--with-google-api-keyfile=$TMPDIR/ga" ++ flag crashreporterSupport "crashreporter" ++ lib.optional drmSupport "--enable-eme=widevine" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f7614dcf64a..930f0877412 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "57.0.4"; + version = "58.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "58846037aebbf14b85e6b3a46dbe617c780c6916e437ea4ee32a2502a6b55e3689921a0be28b920dedf2f966195df04ac8e45411caeb2601a168ec08b4827cf0"; + sha512 = "08xgv1qm2xx5wjczqg1ldf0yqm939zsghhr4acbkwnymv5apfak3vx0kcr9iwqkmdqjdjmggxz439kjn510f92fik33zjfsjn7sd9k5"; }; patches = From 27f5262cf24cc3b3bd8bc3ff411d1e249ef54978 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 31 Jan 2018 09:05:54 -0500 Subject: [PATCH 159/797] linux: 4.14.15 -> 4.14.16 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 26c74df2354..0a3ad3ef84f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,15 +3,13 @@ with stdenv.lib; import ./generic.nix (args // rec { - version = "4.14.15"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed + version = "4.14.16"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0hk15qslkq15x53zkp70gnhdmjg5j9xigyykmig3g03gqsh97hzz"; + sha256 = "095c2cjmjfsgnmml4f3lzc0pbhjy8nv8w07rywgpp5s5494dn2q7"; }; } // (args.argsOverride or {})) From 26e06c9a92c88a2cb973fbe324401dc1f699ba19 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 31 Jan 2018 09:06:17 -0500 Subject: [PATCH 160/797] linux: 4.4.113 -> 4.4.114 --- 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 13bdb3f51c9..ec6141c3d20 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.113"; + version = "4.4.114"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0gbpmx09jq2cryqnnv3z4d7971gkrvn7nndxz1diny9ain4x4wmp"; + sha256 = "1nag129dv3krn9b3f958fv2ns56x1nlgf8fy3mx74pkzqm6hnh4m"; }; } // (args.argsOverride or {})) From 6aa13b6b1dc7859aeb4e0304511279fbbaadcb58 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 31 Jan 2018 09:06:30 -0500 Subject: [PATCH 161/797] linux: 4.9.78 -> 4.9.79 --- 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 7ff53e36d48..314ba6827c3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.78"; + version = "4.9.79"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1wy02y9nkwsi3bbcg5w4jzxp3f7aalylh1gh79bzi4knysz4zlfj"; + sha256 = "0kf2zh7gf8jsm11vmp2hx2bji54ndsaj74ma405rj0qyxdchd45i"; }; } // (args.argsOverride or {})) From fe6510369d69975c322337fa844e22bfde1f906a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Jan 2018 15:33:03 +0100 Subject: [PATCH 162/797] titaniumenv: add parameter that specifies than an IPA build is a store build --- pkgs/development/mobile/titaniumenv/build-app.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 660f1bbccab..4079adaef51 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -2,7 +2,7 @@ { name, src, preBuild ? "", target, androidPlatformVersions ? [ "25" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.2" -, enableWirelessDistribution ? false, installURL ? null +, enableWirelessDistribution ? false, iosBuildStore ? false, installURL ? null }: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; @@ -145,7 +145,7 @@ stdenv.mkDerivation { security default-keychain -s $keychainName # Do the actual build - titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out + titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out # Remove our generated keychain ${deleteKeychain} From b063a023204908ad8a11750fb8474f5a45c1380b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Jan 2018 12:14:15 +0100 Subject: [PATCH 163/797] LTS Haskell 10.4 --- .../configuration-hackage2nix.yaml | 307 +++++++++--------- 1 file changed, 156 insertions(+), 151 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0c4e82a3e48..ecb22c15dfa 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 10.3 + # LTS Haskell 10.4 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -49,17 +49,17 @@ default-package-overrides: - accelerate-examples ==1.1.0.0 - accelerate-fft ==1.1.0.0 - accelerate-fftw ==1.0 - - accelerate-fourier ==1.0.0.2 + - accelerate-fourier ==1.0.0.3 - accelerate-io ==1.0.0.1 - accelerate-llvm ==1.1.0.0 - accelerate-llvm-native ==1.1.0.1 - - accelerate-llvm-ptx ==1.1.0.0 + - accelerate-llvm-ptx ==1.1.0.1 - accelerate-utility ==1.0 - accuerr ==0.2.0.2 - ace ==0.6 - action-permutations ==0.0.0.1 - active ==0.2.0.13 - - ad ==4.3.4 + - ad ==4.3.5 - adjunctions ==4.3 - adler32 ==0.1.1.0 - aern2-mp ==0.1.2.0 @@ -183,7 +183,7 @@ default-package-overrides: - annotated-wl-pprint ==0.7.0 - ansigraph ==0.3.0.5 - ansi-terminal ==0.7.1.1 - - ansi-wl-pprint ==0.6.8.1 + - ansi-wl-pprint ==0.6.8.2 - apecs ==0.2.4.7 - api-field-json-th ==0.1.0.2 - appar ==0.1.4 @@ -214,7 +214,7 @@ default-package-overrides: - atom-conduit ==0.5.0.1 - atomic-primops ==0.8.1.1 - atomic-write ==0.2.0.5 - - attoparsec ==0.13.2.0 + - attoparsec ==0.13.2.2 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - attoparsec-ip ==0.0.1 @@ -251,7 +251,7 @@ default-package-overrides: - basic-prelude ==0.7.0 - bbdb ==0.8 - bcrypt ==0.0.11 - - bench ==1.0.7 + - bench ==1.0.8 - benchpress ==0.2.2.10 - bencode ==0.6.0.0 - bento ==0.1.0 @@ -293,7 +293,7 @@ default-package-overrides: - bit-stream ==0.1.0.2 - bitx-bitcoin ==0.11.0.1 - blake2 ==0.2.0 - - blank-canvas ==0.6.1 + - blank-canvas ==0.6.2 - blas-carray ==0.0 - blas-ffi ==0.0 - blas-hs ==0.1.1.0 @@ -302,10 +302,10 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.0.2 - blaze-html ==0.9.0.1 - - blaze-markup ==0.8.0.0 + - blaze-markup ==0.8.2.0 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - - bloodhound ==0.15.0.0 + - bloodhound ==0.15.0.1 - bloomfilter ==2.0.1.0 - blosum ==0.1.1.4 - bmp ==1.2.6.3 @@ -348,7 +348,7 @@ default-package-overrides: - bzlib-conduit ==0.2.1.5 - c2hs ==0.28.3 - Cabal ==2.0.1.1 - - cabal-doctest ==1.0.4 + - cabal-doctest ==1.0.5 - cabal-file-th ==0.2.4 - cabal-rpm ==0.12 - cabal-toolkit ==0.0.4 @@ -366,8 +366,8 @@ default-package-overrides: - cassava-conduit ==0.4.0.1 - cassette ==0.1.0 - cast ==0.1.0.2 - - cayley-client ==0.4.1 - - cereal ==0.5.4.0 + - cayley-client ==0.4.2 + - cereal ==0.5.5.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 - cereal-time ==0.1.0.0 @@ -380,14 +380,15 @@ default-package-overrides: - Chart-diagrams ==1.8.2 - chart-unit ==0.5.5.0 - chaselev-deque ==0.5.0.5 - - chatwork ==0.1.2.0 + - ChasingBottoms ==1.3.1.3 + - chatwork ==0.1.3.0 - cheapskate ==0.1.1 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - checkers ==0.4.9.5 - choice ==0.2.2 - - chunked-data ==0.3.0 + - chunked-data ==0.3.1 - cipher-aes ==0.2.11 - cipher-aes128 ==0.7.0.3 - cipher-blowfish ==0.0.3 @@ -415,7 +416,7 @@ default-package-overrides: - cmark-gfm ==0.1.3 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.19 + - cmdargs ==0.10.20 - code-builder ==0.1.3 - codec ==0.2.1 - code-page ==0.1.3 @@ -441,12 +442,12 @@ default-package-overrides: - concise ==0.1.0.0 - concurrency ==1.2.3.0 - concurrent-extra ==0.7.0.11 - - concurrent-output ==1.10.1 + - concurrent-output ==1.10.2 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.2.12.1 - - conduit-algorithms ==0.0.6.1 + - conduit ==1.2.13 + - conduit-algorithms ==0.0.7.1 - conduit-combinators ==1.1.2 - conduit-connection ==0.1.0.3 - conduit-extra ==1.2.3.2 @@ -454,7 +455,7 @@ default-package-overrides: - conduit-parse ==0.1.2.2 - conduit-throttle ==0.3.1.0 - ConfigFile ==1.1.4 - - config-ini ==0.2.1.1 + - config-ini ==0.2.2.0 - configuration-tools ==0.3.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 @@ -464,7 +465,7 @@ default-package-overrides: - constraints ==0.9.1 - consul-haskell ==0.4.2 - containers-unicode-symbols ==0.3.1.1 - - contravariant ==1.4 + - contravariant ==1.4.1 - contravariant-extras ==0.3.3.1 - control-bool ==0.2.1 - control-monad-free ==0.6.1 @@ -511,7 +512,7 @@ default-package-overrides: - csv ==0.1.2 - csv-conduit ==0.6.7 - ctrie ==0.2 - - cubicbezier ==0.6.0.4 + - cubicbezier ==0.6.0.5 - cubicspline ==0.1.2 - cublas ==0.4.0.0 - cuda ==0.9.0.0 @@ -534,12 +535,13 @@ default-package-overrides: - data-clist ==0.1.2.0 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 + - data-default-instances-base ==0.1.0.1 - data-default-instances-containers ==0.0.1 - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==2.0.1.0 - data-diverse-lens ==1.0.0.1 - - data-dword ==0.3.1.1 + - data-dword ==0.3.1.2 - data-endian ==0.1.1 - data-fix ==0.2.0 - data-has ==0.3.0.0 @@ -547,7 +549,8 @@ default-package-overrides: - data-inttrie ==0.1.2 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 - - data-msgpack ==0.0.10 + - data-msgpack ==0.0.11 + - data-msgpack-types ==0.0.1 - data-or ==1.0.0.5 - data-ordlist ==0.4.7.0 - data-ref ==0.0.1.1 @@ -560,7 +563,7 @@ default-package-overrides: - DAV ==1.3.1 - dawg-ord ==0.5.1.0 - dbcleaner ==0.1.3 - - dbus ==0.10.14 + - dbus ==0.10.15 - debian-build ==0.10.1.0 - debug ==0.0.2 - Decimal ==0.4.2 @@ -580,7 +583,7 @@ default-package-overrides: - dhall-nix ==1.0.9 - dhall-text ==1.0.4 - diagrams ==1.4 - - diagrams-builder ==0.8.0.1 + - diagrams-builder ==0.8.0.2 - diagrams-cairo ==1.4 - diagrams-canvas ==1.4 - diagrams-contrib ==1.4.1 @@ -590,7 +593,7 @@ default-package-overrides: - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.1.1 - dice ==0.1 - - dictionaries ==0.2.0.3 + - dictionaries ==0.2.0.4 - Diff ==0.3.4 - diff3 ==0.3.0 - digest ==0.0.1.2 @@ -614,10 +617,10 @@ default-package-overrides: - diversity ==0.8.1.0 - djinn-ghc ==0.0.2.3 - djinn-lib ==0.0.1.2 - - dlist ==0.8.0.3 + - dlist ==0.8.0.4 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - - dns ==3.0.0 + - dns ==3.0.1 - docker ==0.4.1.1 - docker-build-cacher ==1.8.2 - dockerfile ==0.1.0.1 @@ -628,7 +631,7 @@ default-package-overrides: - doctest-driver-gen ==0.1.0.1 - do-list ==1.0.1 - dom-parser ==3.0.0 - - dotenv ==0.5.2.1 + - dotenv ==0.5.2.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.6 @@ -669,7 +672,7 @@ default-package-overrides: - elm-export ==0.6.0.1 - elm-export-persistent ==0.1.2 - emailaddress ==0.2.0.0 - - email-validate ==2.3.2 + - email-validate ==2.3.2.1 - enclosed-exceptions ==1.0.2 - EntrezHTTP ==1.0.4 - entropy ==0.3.8 @@ -686,7 +689,7 @@ default-package-overrides: - errors ==2.2.2 - errors-ext ==0.4.1 - error-util ==0.0.1.2 - - ersatz ==0.4.1 + - ersatz ==0.4.2 - esqueleto ==2.5.3 - etcd ==1.0.5 - ether ==0.5.1.0 @@ -717,12 +720,12 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - exp-pairs ==0.1.5.2 - - extensible ==0.4.7 + - extensible ==0.4.7.1 - extensible-effects ==2.1.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.2 + - extra ==1.6.3 - extractable-singleton ==0.0.1 - - extrapolate ==0.3.0 + - extrapolate ==0.3.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fasta ==0.10.4.2 @@ -764,7 +767,7 @@ default-package-overrides: - FloatingHex ==0.4 - floatshow ==0.2.4 - flow ==1.0.10 - - fmlist ==0.9.1 + - fmlist ==0.9.2 - fmt ==0.5.0.0 - fn ==0.3.0.2 - focus ==0.1.5.2 @@ -799,7 +802,7 @@ default-package-overrides: - funcmp ==1.8 - functor-classes-compat ==1 - fuzzcheck ==0.1.1 - - fuzzyset ==0.1.0.3 + - fuzzyset ==0.1.0.4 - gauge ==0.1.3 - gd ==3000.7.3 - gdax ==0.6.0.0 @@ -807,16 +810,16 @@ default-package-overrides: - general-games ==1.0.5 - generic-aeson ==0.2.0.9 - generic-arbitrary ==0.1.0 - - generic-deriving ==1.12 + - generic-deriving ==1.12.1 - generic-lens ==0.5.1.0 - GenericPretty ==1.2.1 - generic-random ==1.0.0.0 - generics-eot ==0.2.1.1 - - generics-sop ==0.3.1.0 + - generics-sop ==0.3.2.0 - generics-sop-lens ==0.1.2.1 - generic-xmlpickler ==0.1.0.5 - geniplate-mirror ==0.7.5 - - genvalidity ==0.4.0.2 + - genvalidity ==0.4.0.4 - genvalidity-aeson ==0.1.0.0 - genvalidity-bytestring ==0.1.0.0 - genvalidity-containers ==0.3.0.0 @@ -829,7 +832,7 @@ default-package-overrides: - genvalidity-property ==0.1.0.0 - genvalidity-scientific ==0.1.0.0 - genvalidity-text ==0.4.0.0 - - genvalidity-time ==0.1.0.0 + - genvalidity-time ==0.1.0.1 - genvalidity-unordered-containers ==0.1.0.0 - genvalidity-uuid ==0.0.0.0 - genvalidity-vector ==0.1.0.0 @@ -838,7 +841,7 @@ default-package-overrides: - ghc-core ==0.5.6 - ghc-events ==0.7.0 - ghc-exactprint ==0.5.5.0 - - ghcid ==0.6.8 + - ghcid ==0.6.9 - ghcjs-base-stub ==0.1.0.4 - ghcjs-codemirror ==0.0.0.1 - ghcjs-dom ==0.9.2.0 @@ -887,7 +890,7 @@ default-package-overrides: - GLURaw ==2.0.0.3 - GLUT ==2.7.0.12 - gluturtle ==0.0.58.1 - - gnuplot ==0.5.4.2 + - gnuplot ==0.5.5 - goggles ==0.1.0.3 - gogol ==0.3.0 - gogol-adexchange-buyer ==0.3.0 @@ -1020,7 +1023,7 @@ default-package-overrides: - hailgun-simple ==0.1.0.0 - hakyll ==4.10.0.0 - half ==0.2.2.3 - - hamilton ==0.1.0.1 + - hamilton ==0.1.0.2 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 @@ -1053,18 +1056,18 @@ default-package-overrides: - haskell-src ==1.0.2.0 - haskell-src-exts ==1.19.1 - haskell-src-exts-simple ==1.19.0.0 - - haskell-src-exts-util ==0.2.1.2 - - haskell-src-meta ==0.8.0.1 - - haskell-tools-ast ==1.0.0.3 - - haskell-tools-backend-ghc ==1.0.0.3 - - haskell-tools-builtin-refactorings ==1.0.0.3 - - haskell-tools-cli ==1.0.0.3 - - haskell-tools-daemon ==1.0.0.3 - - haskell-tools-debug ==1.0.0.3 - - haskell-tools-demo ==1.0.0.3 - - haskell-tools-prettyprint ==1.0.0.3 - - haskell-tools-refactor ==1.0.0.3 - - haskell-tools-rewrite ==1.0.0.3 + - haskell-src-exts-util ==0.2.2 + - haskell-src-meta ==0.8.0.2 + - haskell-tools-ast ==1.0.0.4 + - haskell-tools-backend-ghc ==1.0.0.4 + - haskell-tools-builtin-refactorings ==1.0.0.4 + - haskell-tools-cli ==1.0.0.4 + - haskell-tools-daemon ==1.0.0.4 + - haskell-tools-debug ==1.0.0.4 + - haskell-tools-demo ==1.0.0.4 + - haskell-tools-prettyprint ==1.0.0.4 + - haskell-tools-refactor ==1.0.0.4 + - haskell-tools-rewrite ==1.0.0.4 - haskintex ==0.8.0.0 - hasmin ==1.0.1 - hasql ==1.1.1 @@ -1088,7 +1091,7 @@ default-package-overrides: - HDBC-session ==0.1.1.1 - hdevtools ==0.1.6.1 - heap ==1.0.3 - - heaps ==0.3.5 + - heaps ==0.3.6 - heatshrink ==0.1.0.0 - hebrew-time ==0.1.1 - hedgehog ==0.5.1 @@ -1120,20 +1123,20 @@ default-package-overrides: - hit ==0.6.3 - hjsmin ==0.2.0.2 - hjsonpointer ==1.3.0 - - hjsonschema ==1.7.1 + - hjsonschema ==1.7.2 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.6.1 - - hmatrix ==0.18.1.0 + - hmatrix ==0.18.2.0 - hmatrix-gsl ==0.18.0.1 - hmatrix-gsl-stats ==0.4.1.7 - hmatrix-morpheus ==0.1.1.1 - hmatrix-repa ==0.1.2.2 - hmatrix-special ==0.4.0.1 - - hmpfr ==0.4.3 + - hmpfr ==0.4.4 - hnix ==0.3.4 - hoauth2 ==1.5.1 - hocilib ==0.2.0 - - Hoed ==0.4.0 + - Hoed ==0.4.1 - holy-project ==0.2.0.1 - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.5 @@ -1147,7 +1150,7 @@ default-package-overrides: - hpack ==0.21.2 - hpc-coveralls ==1.0.10 - HPDF ==1.4.10 - - hpio ==0.9.0.2 + - hpio ==0.9.0.3 - hpp ==0.5.1 - hpqtypes ==1.5.1.1 - hprotoc ==2.4.6 @@ -1163,8 +1166,8 @@ default-package-overrides: - hsebaysdk ==0.4.0.0 - hse-cpp ==0.2 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.5 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1175,7 +1178,7 @@ default-package-overrides: - hslua-module-text ==0.1.2.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.4.11 + - HsOpenSSL ==0.11.4.12 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - hspec ==2.4.4 @@ -1189,7 +1192,7 @@ default-package-overrides: - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.4.0.0 - hspec-megaparsec ==1.0.0 - - hspec-meta ==2.4.4 + - hspec-meta ==2.4.6 - hspec-pg-transact ==0.1.0.2 - hspec-smallcheck ==0.4.2 - hspec-wai ==0.9.0 @@ -1214,7 +1217,7 @@ default-package-overrides: - HTTP ==4000.3.9 - http2 ==1.6.3 - http-api-data ==0.3.7.1 - - http-client ==0.5.7.1 + - http-client ==0.5.9 - http-client-openssl ==0.2.1.1 - http-client-tls ==0.3.5.1 - http-common ==0.8.2.0 @@ -1259,12 +1262,13 @@ default-package-overrides: - hxt-regex-xmlschema ==9.2.0.3 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - - hybrid-vectors ==0.2.1 + - hybrid-vectors ==0.2.2 - hyperloglog ==0.4.2 - - hyphenation ==0.7 + - hyphenation ==0.7.1 - ical ==0.0.1 - iconv ==0.4.1.3 - identicon ==0.2.2 + - idris ==1.2.0 - ieee754 ==0.8.0 - if ==0.1.0.0 - IfElse ==0.85 @@ -1277,17 +1281,17 @@ default-package-overrides: - immortal ==0.2.2.1 - importify ==1.0.1 - include-file ==0.1.0.3 - - incremental-parser ==0.2.5.2 + - incremental-parser ==0.2.5.3 - indentation-core ==0.0.0.1 - indentation-parsec ==0.0.0.1 - indents ==0.4.0.1 - - inflections ==0.4.0.0 + - inflections ==0.4.0.1 - influxdb ==1.2.2.2 - ini ==0.3.5 - inline-c ==0.6.0.5 - inline-c-cpp ==0.2.1.0 - inline-java ==0.7.2 - - inline-r ==0.9.0.2 + - inline-r ==0.9.1 - insert-ordered-containers ==0.2.1.0 - inspection-testing ==0.1.2 - instance-control ==0.1.2.0 @@ -1296,13 +1300,13 @@ default-package-overrides: - intern ==0.9.1.4 - interpolate ==0.1.1 - interpolatedstring-perl6 ==1.0.0 - - Interpolation ==0.3.0 - interpolation ==0.1.0.2 + - Interpolation ==0.3.0 - IntervalMap ==0.5.3.1 - intervals ==0.8.1 - - intro ==0.3.0.1 + - intro ==0.3.1.0 - invariant ==0.5 - - invertible ==0.2.0.2 + - invertible ==0.2.0.3 - io-choice ==0.0.6 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 @@ -1311,14 +1315,14 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.0.1 - io-streams-haproxy ==1.0.0.2 - - ip ==1.1.1 + - ip ==1.1.2 - ip6addr ==0.5.3 - iproute ==1.7.1 - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.3 + - IPv6DB ==0.2.4 - ipython-kernel ==0.9.0.1 - irc ==0.6.1.0 - - irc-client ==1.0.0.1 + - irc-client ==1.0.1.0 - irc-conduit ==0.2.2.4 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 @@ -1397,7 +1401,7 @@ default-package-overrides: - leapseconds-announced ==2017.1.0.1 - lens ==4.15.4 - lens-accelerate ==0.1.0.0 - - lens-action ==0.2.2 + - lens-action ==0.2.3 - lens-aeson ==1.0.2 - lens-datetime ==0.3 - lens-family ==1.2.2 @@ -1418,8 +1422,8 @@ default-package-overrides: - libsystemd-journal ==1.4.2 - libxml-sax ==0.7.5 - LibZip ==1.0.1 - - licensor ==0.2.1 - - lifted-async ==0.9.3.2 + - licensor ==0.2.2 + - lifted-async ==0.9.3.3 - lifted-base ==0.2.3.11 - lift-generics ==0.1.2 - line ==4.0.1 @@ -1455,7 +1459,7 @@ default-package-overrides: - log-warper ==1.8.3 - loop ==0.3.0 - lrucache ==1.2.0.0 - - lrucaching ==0.3.2 + - lrucaching ==0.3.3 - lucid ==2.9.9 - lxd-client ==0.1.0.5 - lxd-client-config ==0.1.0.1 @@ -1503,13 +1507,13 @@ default-package-overrides: - MFlow ==0.4.6.0 - mfsolve ==0.3.2.0 - microformats2-parser ==1.0.1.7 - - microlens ==0.4.8.1 + - microlens ==0.4.8.3 - microlens-aeson ==2.2.0.2 - microlens-contra ==0.1.0.1 - microlens-ghc ==0.4.8.0 - - microlens-mtl ==0.1.11.0 + - microlens-mtl ==0.1.11.1 - microlens-platform ==0.3.9.0 - - microlens-th ==0.4.1.1 + - microlens-th ==0.4.1.3 - microsoft-translator ==0.1.1 - microspec ==0.1.0.0 - microstache ==1.0.1.1 @@ -1550,7 +1554,7 @@ default-package-overrides: - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadloc ==0.7.1 - - monad-logger ==0.3.26 + - monad-logger ==0.3.28.1 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.4.0 @@ -1579,9 +1583,9 @@ default-package-overrides: - monoid-extras ==0.4.2 - monoid-subclasses ==0.4.4 - monoid-transformer ==0.0.3 - - mono-traversable ==1.0.7.0 + - mono-traversable ==1.0.8.1 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.13 + - morte ==1.6.14 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.1 @@ -1608,7 +1612,7 @@ default-package-overrides: - nakadi-client ==0.3.0.0 - names-th ==0.2.0.3 - nano-erl ==0.1.0.1 - - nanospec ==0.2.1 + - nanospec ==0.2.2 - naqsha ==0.2.0.1 - nats ==1.1.1 - natural-sort ==0.1.2 @@ -1622,7 +1626,7 @@ default-package-overrides: - netwire ==5.0.2 - netwire-input ==0.0.6 - netwire-input-glfw ==0.0.7 - - network ==2.6.3.2 + - network ==2.6.3.3 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 @@ -1631,7 +1635,7 @@ default-package-overrides: - network-house ==0.1.0.2 - network-info ==0.2.0.9 - network-ip ==0.3.0.2 - - network-msgpack-rpc ==0.0.3 + - network-msgpack-rpc ==0.0.4 - network-multicast ==0.2.0 - Network-NineP ==0.4.1 - network-simple ==0.4.0.5 @@ -1711,7 +1715,7 @@ default-package-overrides: - palette ==0.1.0.5 - pandoc ==2.0.6 - pandoc-citeproc ==0.12.2.5 - - pandoc-types ==1.17.3 + - pandoc-types ==1.17.3.1 - pango ==0.13.4.0 - papillon ==0.1.0.5 - parallel ==3.2.1.1 @@ -1753,7 +1757,7 @@ default-package-overrides: - persistent-mongoDB ==2.6.0 - persistent-mysql ==2.6.2.1 - persistent-mysql-haskell ==0.3.6 - - persistent-postgresql ==2.6.2.2 + - persistent-postgresql ==2.6.3 - persistent-refs ==0.4 - persistent-sqlite ==2.6.4 - persistent-template ==2.5.3 @@ -1764,7 +1768,7 @@ default-package-overrides: - picoparsec ==0.1.2.3 - picosat ==0.1.4 - pid1 ==0.1.2.0 - - pinboard ==0.9.12.6 + - pinboard ==0.9.12.8 - pinch ==0.3.2.0 - pipes ==4.3.7 - pipes-aeson ==0.4.1.8 @@ -1790,7 +1794,7 @@ default-package-overrides: - placeholders ==0.1 - plan-b ==0.2.1 - plot ==0.2.3.9 - - pointed ==5 + - pointed ==5.0.1 - pointedlist ==0.6.1 - pointful ==1.0.9 - pointless-fun ==1.1.0.6 @@ -1798,11 +1802,12 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 + - pomaps ==0.0.0.3 - pooled-io ==0.0.2.1 - PortMidi ==0.1.6.1 - posix-paths ==0.2.1.3 - postgresql-binary ==0.12.1 - - postgresql-libpq ==0.9.3.1 + - postgresql-libpq ==0.9.4.0 - postgresql-query ==3.3.0 - postgresql-schema ==0.1.14 - postgresql-simple ==0.5.3.0 @@ -1829,23 +1834,23 @@ default-package-overrides: - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - - pretty-show ==1.6.15 - - pretty-simple ==2.0.1.0 + - pretty-show ==1.6.16 + - pretty-simple ==2.0.2.0 - pretty-types ==0.2.3.1 - prim-array ==0.2.1 - primes ==0.2.1.0 - - primitive ==0.6.2.0 + - primitive ==0.6.3.0 - printcess ==0.1.0.3 - probability ==0.2.5.1 - - process-extras ==0.7.2 + - process-extras ==0.7.3 - product-isomorphic ==0.0.3.1 - product-profunctors ==0.8.0.3 - profiterole ==0.1 - profiteur ==0.4.4.0 - profunctor-extras ==4.0 - - profunctors ==5.2.1 + - profunctors ==5.2.2 - projectroot ==0.2.0.1 - - project-template ==0.2.0 + - project-template ==0.2.0.1 - prometheus-client ==0.3.0 - prometheus-metrics-ghc ==0.3.0 - promises ==0.3 @@ -1861,11 +1866,11 @@ default-package-overrides: - proto-lens-optparse ==0.1.0.4 - proto-lens-protobuf-types ==0.2.2.0 - proto-lens-protoc ==0.2.2.3 - - protolude ==0.2 + - protolude ==0.2.1 - proxied ==0.3 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - - psqueues ==0.2.4.0 + - psqueues ==0.2.5.0 - pthread ==0.2.0 - publicsuffix ==0.20170802 - pure-io ==0.2.1 @@ -1882,19 +1887,19 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.3.1 - quickcheck-combinators ==0.0.2 - - quickcheck-instances ==0.3.16 + - quickcheck-instances ==0.3.16.1 - quickcheck-io ==0.2.0 - quickcheck-properties ==0.1 - quickcheck-simple ==0.1.0.2 - quickcheck-special ==0.1.0.6 - - quickcheck-state-machine ==0.3.0 + - quickcheck-state-machine ==0.3.1 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.1.0 - quickcheck-with-counterexamples ==1.0 - raaz ==0.2.0 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 - - rakuten ==0.1.0.4 + - rakuten ==0.1.0.5 - ramus ==0.1.2 - random ==1.1 - random-fu ==0.2.7.0 @@ -1907,7 +1912,7 @@ default-package-overrides: - rank-product ==0.2.0.1 - Rasterific ==0.7.2.1 - rasterific-svg ==0.3.3 - - ratel ==0.3.8 + - ratel ==0.3.10 - ratel-wai ==0.3.2 - ratio-int ==0.1.2 - rattletrap ==3.1.2 @@ -1929,7 +1934,7 @@ default-package-overrides: - references ==0.3.3.1 - ref-fd ==0.4.0.1 - refined ==0.1.2.1 - - reflection ==2.1.2 + - reflection ==2.1.3 - reform ==0.2.7.1 - reform-blaze ==0.2.4.3 - reform-hamlet ==0.0.5.3 @@ -1963,7 +1968,7 @@ default-package-overrides: - req-conduit ==1.0.0 - reroute ==0.4.1.0 - resource-pool ==0.2.3.2 - - resourcet ==1.1.10 + - resourcet ==1.1.11 - rest-client ==0.5.1.1 - rest-core ==0.39 - rest-gen ==0.20.0.1 @@ -1992,7 +1997,7 @@ default-package-overrides: - safecopy ==0.9.3.3 - safe-exceptions ==0.1.6.0 - safe-exceptions-checked ==0.1.0 - - safeio ==0.0.4.0 + - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 @@ -2000,7 +2005,7 @@ default-package-overrides: - sandi ==0.4.1 - sandman ==0.2.0.1 - say ==0.1.0.0 - - sbp ==2.3.2 + - sbp ==2.3.6 - sbv ==7.4 - SCalendar ==1.1.0 - scalendar ==1.2.0 @@ -2019,8 +2024,8 @@ default-package-overrides: - search-algorithms ==0.3.0 - securemem ==0.1.9 - SegmentTree ==0.3 - - selda ==0.1.11.2 - - selda-postgresql ==0.1.7.0 + - selda ==0.1.12 + - selda-postgresql ==0.1.7.1 - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 - semigroupoids ==5.2.1 @@ -2040,18 +2045,18 @@ default-package-overrides: - servant-client ==0.11 - servant-docs ==0.11 - servant-elm ==0.4.0.1 - - servant-exceptions ==0.1.0 + - servant-exceptions ==0.1.1 - servant-foreign ==0.10.1 - servant-generic ==0.1.0.1 - servant-js ==0.9.3.1 - servant-JuicyPixels ==0.3.0.3 - - servant-kotlin ==0.1.0.2 + - servant-kotlin ==0.1.0.3 - servant-lucid ==0.7.1 - servant-mock ==0.8.3 - servant-pandoc ==0.4.1.4 - servant-purescript ==0.9.0.2 - servant-rawm ==0.2.0.2 - - servant-ruby ==0.5.0.0 + - servant-ruby ==0.5.1.0 - servant-server ==0.11.0.1 - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.1 @@ -2061,7 +2066,7 @@ default-package-overrides: - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - serversession-backend-persistent ==1.0.4 - - serversession-backend-redis ==1.0.2 + - serversession-backend-redis ==1.0.3 - serversession-frontend-wai ==1.0 - serversession-frontend-yesod ==1.0 - servius ==1.2.0.3 @@ -2077,8 +2082,8 @@ default-package-overrides: - shakespeare ==2.0.14.1 - shell-conduit ==4.6.1 - shell-escape ==0.2.0 - - shelly ==1.7.0 - - shikensu ==0.3.7 + - shelly ==1.7.0.1 + - shikensu ==0.3.8 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - show-prettyprint ==0.2 @@ -2091,12 +2096,12 @@ default-package-overrides: - simple-session ==0.10.1.1 - simple-templates ==0.8.0.1 - singleton-bool ==0.1.2.0 - - singleton-nats ==0.4.0.3 + - singleton-nats ==0.4.0.4 - singletons ==2.3.1 - siphash ==1.0.3 - skein ==1.0.9.4 - skeletons ==0.4.0 - - skylighting ==0.5.0.1 + - skylighting ==0.5.1 - slack-web ==0.2.0.1 - slave-thread ==1.0.2 - slug ==0.1.7 @@ -2128,7 +2133,7 @@ default-package-overrides: - sphinx ==0.6.0.2 - Spintax ==0.3.2 - splice ==0.6.1.1 - - split ==0.2.3.2 + - split ==0.2.3.3 - splitmix ==0 - Spock ==0.12.0.0 - Spock-api ==0.12.0.0 @@ -2149,7 +2154,7 @@ default-package-overrides: - stateref ==0.3 - statestack ==0.2.0.5 - StateVar ==1.1.0.4 - - stateWriter ==0.2.9 + - stateWriter ==0.2.10 - statistics ==0.14.0.2 - stm ==2.4.4.1 - stm-chans ==3.0.0.4 @@ -2206,7 +2211,7 @@ default-package-overrides: - svg-tree ==0.6.2.1 - swagger ==0.3.0 - swagger2 ==2.2 - - swagger-petstore ==0.0.1.6 + - swagger-petstore ==0.0.1.7 - swish ==0.9.1.10 - syb ==0.7 - syb-with-class ==0.6.1.8 @@ -2215,20 +2220,20 @@ default-package-overrides: - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - system-fileio ==0.3.16.3 - - system-filepath ==0.4.13.4 + - system-filepath ==0.4.14 - system-posix-redirect ==1.1.0.1 - tabular ==0.2.2.7 - tagchup ==0.4.1 - tagged ==0.8.5 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.2 - - tagsoup ==0.14.2 + - tagsoup ==0.14.3 - tagstream-conduit ==0.5.5.3 - tar ==0.5.0.3 - tar-conduit ==0.1.1 - tardis ==0.4.1.0 - tasty ==0.11.3 - - tasty-ant-xml ==1.1.1 + - tasty-ant-xml ==1.1.2 - tasty-auto ==0.2.0.0 - tasty-dejafu ==0.7.1.1 - tasty-discover ==4.1.3 @@ -2236,13 +2241,13 @@ default-package-overrides: - tasty-fail-fast ==0.0.3 - tasty-golden ==2.3.1.2 - tasty-hedgehog ==0.1.0.1 - - tasty-hspec ==1.1.3.2 + - tasty-hspec ==1.1.3.3 - tasty-html ==0.4.1.1 - tasty-hunit ==0.9.2 - tasty-kat ==0.0.3 - tasty-program ==1.0.5 - tasty-quickcheck ==0.9.1 - - tasty-rerun ==1.1.8 + - tasty-rerun ==1.1.9 - tasty-silver ==3.1.11 - tasty-smallcheck ==0.8.1 - tasty-stats ==0.2.0.3 @@ -2268,7 +2273,7 @@ default-package-overrides: - test-framework-quickcheck2 ==0.3.0.4 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - - texmath ==0.10.1 + - texmath ==0.10.1.1 - text ==1.2.2.2 - text-all ==0.4.1.1 - text-binary ==0.2.1.1 @@ -2298,7 +2303,7 @@ default-package-overrides: - th-extras ==0.0.0.4 - th-lift ==0.7.7 - th-lift-instances ==0.1.11 - - th-orphans ==0.13.4 + - th-orphans ==0.13.5 - thread-hierarchy ==0.3.0.0 - thread-local-storage ==0.1.2 - threads ==0.5.1.5 @@ -2335,7 +2340,7 @@ default-package-overrides: - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 - titlecase ==1.0.1 - - tldr ==0.2.4 + - tldr ==0.2.5 - tls ==1.4.0 - tls-debug ==0.4.5 - tls-session-manager ==0.0.0.2 @@ -2352,7 +2357,7 @@ default-package-overrides: - transient ==0.5.9.2 - transient-universe ==0.4.6.1 - traverse-with-class ==1.0.0.0 - - tree-diff ==0.0.0.1 + - tree-diff ==0.0.1 - tree-fun ==0.8.1.0 - tries ==0.0.4.2 - trifecta ==1.7.1.1 @@ -2380,7 +2385,7 @@ default-package-overrides: - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - typelits-witnesses ==0.2.3.0 - - type-of-html ==1.3.2.0 + - type-of-html ==1.3.2.1 - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 @@ -2394,7 +2399,7 @@ default-package-overrides: - unboxed-ref ==0.4.0.0 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 - - unfoldable ==0.9.4 + - unfoldable ==0.9.5 - unfoldable-restricted ==0.0.3 - unicode ==0.0 - unicode-show ==0.1.0.2 @@ -2404,8 +2409,8 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - Unique ==0.4.7.1 - unique ==0 + - Unique ==0.4.7.2 - unit-constraint ==0.0.0 - units-parser ==0.1.1.2 - universe ==1.0 @@ -2418,7 +2423,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.0.1 - unix-time ==0.3.7 - - unliftio ==0.2.2.0 + - unliftio ==0.2.4.0 - unliftio-core ==0.1.1.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.8.0 @@ -2444,7 +2449,7 @@ default-package-overrides: - validate-input ==0.4.0.0 - validation ==0.6.2 - validationt ==0.2.0.0 - - validity ==0.4.0.2 + - validity ==0.4.0.3 - validity-aeson ==0.1.0.0 - validity-bytestring ==0.2.0.0 - validity-containers ==0.2.0.0 @@ -2475,20 +2480,20 @@ default-package-overrides: - versions ==3.3.1 - vhd ==0.2.2 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.12 + - viewprof ==0.0.0.13 - vinyl ==0.7.0 - vivid ==0.3.0.2 - vivid-osc ==0.3.0.0 - vivid-supercollider ==0.3.0.0 - void ==0.7.2 - - vty ==5.19.1 + - vty ==5.19.2 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 - wai-cli ==0.1.1 - wai-conduit ==3.0.0.3 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.21.0 + - wai-extra ==3.0.22.0 - wai-handler-launch ==3.0.2.3 - wai-logger ==2.3.1 - wai-middleware-auth ==0.1.2.1 @@ -2499,7 +2504,7 @@ default-package-overrides: - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.3.0 - - wai-middleware-rollbar ==0.8.1 + - wai-middleware-rollbar ==0.8.2 - wai-middleware-static ==0.8.1 - wai-middleware-throttle ==0.2.2.0 - wai-predicates ==0.10.0 @@ -2525,11 +2530,11 @@ default-package-overrides: - web-routes-th ==0.22.6.2 - web-routes-wai ==0.24.3 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.3.0 + - websockets ==0.12.3.1 - websockets-rpc ==0.6.0 - websockets-simple ==0.0.6.3 - websockets-snap ==0.10.2.4 - - weeder ==0.1.11 + - weeder ==0.1.13 - weigh ==0.0.7 - wide-word ==0.1.0.5 - wikicfp-scraper ==0.1.0.9 @@ -2555,9 +2560,9 @@ default-package-overrides: - word-wrap ==0.4.1 - Workflow ==0.8.3 - wrap ==0.0.0 - - wrecker ==1.2.3.0 + - wrecker ==1.2.4.0 - wreq ==0.5.2.0 - - wreq-stringless ==0.5.2.0 + - wreq-stringless ==0.5.9.1 - writer-cps-full ==0.1.0.0 - writer-cps-lens ==0.1.0.1 - writer-cps-morph ==0.1.0.2 @@ -2581,7 +2586,7 @@ default-package-overrides: - xlsx-tabular ==0.2.2 - xml ==1.3.14 - xml-basic ==0.1.2 - - xml-conduit ==1.7.0.1 + - xml-conduit ==1.7.1.2 - xml-conduit-parse ==0.3.1.2 - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.1 @@ -2602,7 +2607,7 @@ default-package-overrides: - xturtle ==0.2.0.0 - xxhash ==0.0.2 - xxhash-ffi ==0.2.0.0 - - yaml ==0.8.25.1 + - yaml ==0.8.28 - Yampa ==0.10.7 - YampaSynth ==0.2 - yeshql ==3.0.1.3 @@ -2613,7 +2618,7 @@ default-package-overrides: - yesod-auth-fb ==1.8.1 - yesod-auth-hashdb ==1.6.2 - yesod-bin ==1.5.3 - - yesod-core ==1.4.37.2 + - yesod-core ==1.4.37.3 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.4.1 - yesod-fb ==0.4.0 @@ -2653,8 +2658,8 @@ default-package-overrides: - zeromq4-haskell ==0.7.0 - zim-parser ==0.2.1.0 - zip ==0.2.0 - - zip-archive ==0.3.1.1 - - zippers ==0.2.4 + - zip-archive ==0.3.2.2 + - zippers ==0.2.5 - ziptastic-client ==0.3.0.3 - ziptastic-core ==0.2.0.3 - zlib ==0.6.1.2 From 94b6357dc5906910a4da0ab64c415ae5b73b590a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jan 2018 13:03:07 +0100 Subject: [PATCH 164/797] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.8-20-g7c22fdf from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d0f20cf2586210625888ec7fa8bd96c8bdd9eddb. --- .../haskell-modules/hackage-packages.nix | 5003 ++++++----------- 1 file changed, 1681 insertions(+), 3322 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3250a4f301a..d2e3281bbba 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2692,6 +2692,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ChannelT_0_0_0_7" = callPackage + ({ mkDerivation, base, free, mmorph, mtl, transformers-base }: + mkDerivation { + pname = "ChannelT"; + version = "0.0.0.7"; + sha256 = "183pghm74vk1vdcn0mdn6g5q284sncpl1cc49lpczz1wbr15s89y"; + libraryHaskellDepends = [ base free mmorph mtl transformers-base ]; + homepage = "https://github.com/pthariensflame/ChannelT"; + description = "Generalized stream processors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector @@ -8583,6 +8596,8 @@ self: { pname = "HStringTemplate"; version = "0.8.6"; sha256 = "1kam09fhnz1485swp5z1k8whjiwz9fcscp6zibxkq8hw3sfcn8kh"; + revision = "1"; + editedCabalFile = "05j23rsll9xxj92gk1qvaksd9z985fpdmbp8mv73ywwjl29kfwyb"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty syb template-haskell text @@ -9402,15 +9417,16 @@ self: { }) {}; "Hastodon" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types - , MissingH, text + ({ mkDerivation, aeson, base, bytestring, http-client, http-conduit + , http-types, mime-types, MissingH, text }: mkDerivation { pname = "Hastodon"; - version = "0.2.0"; - sha256 = "1ybchvkcv9n4wp8r4xassmgw1z0kdscmkccg3rbhz72lwp3m13zz"; + version = "0.3.1"; + sha256 = "0z8ph9frrad5nn23hi3qr2gj7lh7p2qpcmx4rdyv8vlqal38zdv1"; libraryHaskellDepends = [ - aeson base bytestring http-conduit http-types MissingH text + aeson base bytestring http-client http-conduit http-types + mime-types MissingH text ]; homepage = "https://github.com/syucream/hastodon"; description = "mastodon client module for Haskell"; @@ -9698,24 +9714,6 @@ self: { }) {}; "Hoed" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, filepath, libgraph, mtl, process, regex-posix, time - }: - mkDerivation { - pname = "Hoed"; - version = "0.4.0"; - sha256 = "0l01viv04dkxinysd7wbzn7k5rm8c21ix8k5a4p940hml879m9f1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base bytestring cereal containers directory filepath libgraph - mtl process regex-posix time - ]; - homepage = "https://wiki.haskell.org/Hoed"; - description = "Lightweight algorithmic debugging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Hoed_0_4_1" = callPackage ({ mkDerivation, array, base, bytestring, cereal, clock, containers , deepseq, directory, libgraph, process, QuickCheck, regex-tdfa , semigroups, strict, template-haskell, terminal-size, uniplate @@ -9734,6 +9732,31 @@ self: { homepage = "https://github.com/MaartenFaddegon/Hoed"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "Hoed_0_5_0" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, cereal-text + , cereal-vector, clock, containers, deepseq, directory, hashable + , hashtables, libgraph, open-browser, primitive, process + , QuickCheck, regex-tdfa, regex-tdfa-text, semigroups, strict + , template-haskell, terminal-size, text, transformers, uniplate + , vector, vector-th-unbox + }: + mkDerivation { + pname = "Hoed"; + version = "0.5.0"; + sha256 = "1pj2scisdissbhlf6gn5bxqp09zvi5v7h8n7l3y1rirkqwwf74a8"; + libraryHaskellDepends = [ + array base bytestring cereal cereal-text cereal-vector clock + containers deepseq directory hashable hashtables libgraph + open-browser primitive process QuickCheck regex-tdfa + regex-tdfa-text semigroups strict template-haskell terminal-size + text transformers uniplate vector vector-th-unbox + ]; + testHaskellDepends = [ base process QuickCheck ]; + homepage = "https://github.com/MaartenFaddegon/Hoed"; + description = "Lightweight algorithmic debugging"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -10000,25 +10023,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network - , openssl, time - }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.4.11"; - sha256 = "0dgywjkvzxwpr33l642cw8v2gqn3s8kclg97xs1w8a5pqcg647pp"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - base bytestring integer-gmp network time - ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - homepage = "https://github.com/vshabanov/HsOpenSSL"; - description = "Partial OpenSSL binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_4_12" = callPackage ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network , openssl, time }: @@ -10035,7 +10039,6 @@ self: { homepage = "https://github.com/vshabanov/HsOpenSSL"; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -10352,8 +10355,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.2.3"; - sha256 = "0j51v7y475wdrhjwrqrmlh6574l032vh7zsdhxqx723f7iswjimf"; + version = "0.2.4"; + sha256 = "1axppdhckdch3kjcmw8dga76v865xccdwsksxfnahg32k613g8zd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10782,6 +10785,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels_3_2_9_4" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl + , primitive, transformers, vector, zlib + }: + mkDerivation { + pname = "JuicyPixels"; + version = "3.2.9.4"; + sha256 = "1mlj3zcr3c49mjv0sddsfdzvzv3m0cbv56fbrkarygs5dxyh8dgz"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq mtl primitive + transformers vector zlib + ]; + homepage = "https://github.com/Twinside/Juicy.Pixels"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-canvas" = callPackage ({ mkDerivation, base, containers, JuicyPixels }: mkDerivation { @@ -12221,6 +12242,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MemoTrie_0_6_9" = callPackage + ({ mkDerivation, base, newtype-generics }: + mkDerivation { + pname = "MemoTrie"; + version = "0.6.9"; + sha256 = "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base newtype-generics ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/conal/MemoTrie"; + description = "Trie-based memo functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MetaHDBC" = callPackage ({ mkDerivation, base, convertible, hashtables, HDBC, HDBC-odbc , mtl, template-haskell @@ -18418,22 +18455,6 @@ self: { }) {}; "Unique" = callPackage - ({ mkDerivation, base, containers, extra, hashable, hspec - , QuickCheck, unordered-containers - }: - mkDerivation { - pname = "Unique"; - version = "0.4.7.1"; - sha256 = "1a912180fk2xhz6md50n21xz0z89n9ylansyqxq034jgsfkz8b7s"; - libraryHaskellDepends = [ - base containers extra hashable unordered-containers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - description = "It provides the functionality like unix \"uniq\" utility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Unique_0_4_7_2" = callPackage ({ mkDerivation, base, containers, extra, hashable, hspec , QuickCheck, unordered-containers }: @@ -18447,7 +18468,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Unixutils" = callPackage @@ -20392,33 +20412,6 @@ self: { }) {}; "accelerate-fourier" = callPackage - ({ mkDerivation, accelerate, accelerate-arithmetic - , accelerate-llvm-native, accelerate-utility, base, containers - , criterion, QuickCheck, transformers, utility-ht - }: - mkDerivation { - pname = "accelerate-fourier"; - version = "1.0.0.2"; - sha256 = "1rcbxrhh55jrp8f8g7pb8a4mq0cmhrhfx6q8z8n1hlyazswfdw1d"; - libraryHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-utility base containers - QuickCheck transformers utility-ht - ]; - testHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-utility base QuickCheck - utility-ht - ]; - benchmarkHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-llvm-native - accelerate-utility base criterion utility-ht - ]; - homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; - description = "Fast Fourier transform and convolution using the Accelerate framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "accelerate-fourier_1_0_0_3" = callPackage ({ mkDerivation, accelerate, accelerate-arithmetic , accelerate-llvm-native, accelerate-utility, base, containers , criterion, QuickCheck, transformers, utility-ht @@ -20529,29 +20522,6 @@ self: { }) {}; "accelerate-llvm-ptx" = callPackage - ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring - , containers, cuda, deepseq, directory, dlist, fclabels, file-embed - , filepath, hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty - , process, template-haskell, time, unordered-containers - }: - mkDerivation { - pname = "accelerate-llvm-ptx"; - version = "1.1.0.0"; - sha256 = "1av0s4wgq7l2jhkmg7cmr1fivwqankqgyjikpwg1q569dapfrasw"; - revision = "1"; - editedCabalFile = "1zap2f9xalxqgc3pkzmq7ykpiini1q4d02kyxibnwbh9cyk1kkvp"; - libraryHaskellDepends = [ - accelerate accelerate-llvm base bytestring containers cuda deepseq - directory dlist fclabels file-embed filepath hashable llvm-hs - llvm-hs-pure mtl nvvm pretty process template-haskell time - unordered-containers - ]; - description = "Accelerate backend for NVIDIA GPUs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "accelerate-llvm-ptx_1_1_0_1" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , containers, cuda, deepseq, directory, dlist, fclabels, file-embed , filepath, hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty @@ -21328,8 +21298,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "2"; - editedCabalFile = "1ml42hbvfhqzpdi1y5q6dqp4wq6zqb30f15r34n9ip9iv44qjwwf"; + revision = "3"; + editedCabalFile = "0jm8kkqa5k9nppis3jdx11nmds6w0x62rmnv5bn5q3b75llhnlc1"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -21412,29 +21382,6 @@ self: { }) {}; "ad" = callPackage - ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad - , containers, criterion, data-reify, directory, doctest, erf - , filepath, free, nats, reflection, transformers - }: - mkDerivation { - pname = "ad"; - version = "4.3.4"; - sha256 = "0r3qixsj624q5c88xlr444fn7z5c36m32ciyxz732lngg06pvwdz"; - revision = "1"; - editedCabalFile = "0rfxjifhaxvq8nv1n1l8wf49gh13ailcnyachffk7y55nqr0zqdf"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base comonad containers data-reify erf free nats reflection - transformers - ]; - testHaskellDepends = [ base directory doctest filepath ]; - benchmarkHaskellDepends = [ base criterion erf ]; - homepage = "http://github.com/ekmett/ad"; - description = "Automatic Differentiation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ad_4_3_5" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad , containers, criterion, data-reify, directory, doctest, erf , filepath, free, nats, reflection, semigroups, transformers @@ -21443,6 +21390,8 @@ self: { pname = "ad"; version = "4.3.5"; sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw"; + revision = "1"; + editedCabalFile = "10azjkyjx9gxz8pp6aapx2jkniyayns5qqdapb5vi7i7ykx6j92n"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -21453,7 +21402,6 @@ self: { homepage = "http://github.com/ekmett/ad"; description = "Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "adaptive-containers" = callPackage @@ -21594,6 +21542,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "adjunctions_4_4" = callPackage + ({ mkDerivation, array, base, comonad, containers, contravariant + , distributive, free, generic-deriving, hspec, hspec-discover, mtl + , profunctors, semigroupoids, semigroups, tagged, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "adjunctions"; + version = "4.4"; + sha256 = "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h"; + libraryHaskellDepends = [ + array base comonad containers contravariant distributive free mtl + profunctors semigroupoids semigroups tagged transformers + transformers-compat void + ]; + testHaskellDepends = [ base distributive generic-deriving hspec ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/ekmett/adjunctions/"; + description = "Adjunctions and representable functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "adler32" = callPackage ({ mkDerivation, base, bytestring, hspec, zlib }: mkDerivation { @@ -22390,6 +22361,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-typescript" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, interpolate, mtl, process, tasty, tasty-ant-xml + , tasty-hspec, template-haskell, temporary, text, th-abstraction + , unordered-containers + }: + mkDerivation { + pname = "aeson-typescript"; + version = "0.1.0.3"; + sha256 = "0f5s26fhkpcciqy5wcdsq123nzgcxf2dx9g2v0n9i6h3jkp5800b"; + libraryHaskellDepends = [ + aeson base containers interpolate mtl template-haskell text + th-abstraction unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + interpolate mtl process tasty tasty-ant-xml tasty-hspec + template-haskell temporary text th-abstraction unordered-containers + ]; + homepage = "https://github.com/codedownio/aeson-typescript#readme"; + description = "Generate TypeScript definition files from your ADTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -23875,6 +23870,8 @@ self: { pname = "amazonka"; version = "1.5.0"; sha256 = "0g5fb1kwydhhi4pvp4skc0l26gy0kdpbrl3pixmnml5d2fxa86pw"; + revision = "1"; + editedCabalFile = "0v4wfwrm0zjzm1g2gw9qi521hlvzg26dm79x03zy8i2aqg8rqgri"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-conduit ini mmorph monad-control mtl resourcet @@ -24403,6 +24400,8 @@ self: { pname = "amazonka-core"; version = "1.5.0"; sha256 = "173mdmk3p9jqnskjf5g9r1kr568plrmshb6p17cq11n1wnngkxnk"; + revision = "1"; + editedCabalFile = "0w04b2cpshrv1r8nkw70y0n70wshzmnl0lp1khpj8qzzj1zxl1i2"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -26292,8 +26291,8 @@ self: { }: mkDerivation { pname = "animate"; - version = "0.3.0"; - sha256 = "040csdyzncfbdf46jy8mkgn2n4hd80na0jm4p3q954zhaqk2bvck"; + version = "0.4.0"; + sha256 = "1mzjvnr1q8lj380ijhqpnqpbqfz34bcv4frg1phsr478j55x17v4"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; @@ -26484,23 +26483,6 @@ self: { }) {}; "ansi-wl-pprint" = callPackage - ({ mkDerivation, ansi-terminal, base }: - mkDerivation { - pname = "ansi-wl-pprint"; - version = "0.6.8.1"; - sha256 = "0qxk0iibbyqk7fmrq5cbkr1269bd6vqbdmj2n8s5bvds0836mnnm"; - revision = "1"; - editedCabalFile = "0miriy5zkssjwg8zk1wzg7wx3l5ljzvrhga33m2iz7j4y0sb4fx7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ ansi-terminal base ]; - executableHaskellDepends = [ ansi-terminal base ]; - homepage = "http://github.com/ekmett/ansi-wl-pprint"; - description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ansi-wl-pprint_0_6_8_2" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; @@ -26512,7 +26494,6 @@ self: { homepage = "http://github.com/ekmett/ansi-wl-pprint"; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansigraph" = callPackage @@ -28479,8 +28460,8 @@ self: { }: mkDerivation { pname = "ascii-table"; - version = "0.3.0.0"; - sha256 = "13lr4ylrwxyv08qmrb20f5i2gazda18gcx804c8qhxywzjm4irf9"; + version = "0.3.0.1"; + sha256 = "01m7rdvjrn0mrqc100d81ji17f1h8lyqyyp5ydv2xzns8cmrcdzp"; libraryHaskellDepends = [ aeson base containers dlist hashable text unordered-containers vector wl-pprint-extras @@ -29488,21 +29469,23 @@ self: { }) {}; "ats-pkg" = callPackage - ({ mkDerivation, base, bytestring, composition-prelude, dhall - , directory, filemanip, http-client, http-client-tls, lens - , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-ext, tar, temporary, text, unix, zlib + ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal, cli-setup + , composition-prelude, dhall, directory, filemanip, http-client + , http-client-tls, lens, optparse-applicative, parallel-io, process + , shake, shake-ats, shake-ext, tar, temporary, text, unix, zlib }: mkDerivation { pname = "ats-pkg"; - version = "1.2.1.3"; - sha256 = "0fwk49swprc1n9s08cy6m3ydy2b48pnmbb9z8al6sxk2xfxbn3x1"; + version = "1.4.0.6"; + sha256 = "0lh6blxawz9crx7sgb2ih9ls7ca9z0lid15viczrzws44d6s3s2g"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - base bytestring composition-prelude dhall directory filemanip - http-client http-client-tls lens optparse-applicative parallel-io - process shake shake-ats shake-ext tar temporary text unix zlib + ansi-wl-pprint base bytestring composition-prelude dhall directory + filemanip http-client http-client-tls lens optparse-applicative + parallel-io process shake shake-ats shake-ext tar temporary text + unix zlib ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/ats-pkg#readme"; @@ -29510,6 +29493,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ats-setup" = callPackage + ({ mkDerivation, base, Cabal, directory, http-client + , http-client-tls, parallel-io, tar, zlib + }: + mkDerivation { + pname = "ats-setup"; + version = "0.1.0.2"; + sha256 = "0si95yvwmjxy79z1ifqqxmps289l8xfqdzm9y430s341638ajivj"; + libraryHaskellDepends = [ + base Cabal directory http-client http-client-tls parallel-io tar + zlib + ]; + description = "ATS scripts for Cabal builds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attempt" = callPackage ({ mkDerivation, base, failure }: mkDerivation { @@ -29588,35 +29587,6 @@ self: { }) {}; "attoparsec" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, criterion, deepseq, directory, filepath, ghc-prim - , http-types, parsec, QuickCheck, quickcheck-unicode, scientific - , tasty, tasty-quickcheck, text, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.2.0"; - sha256 = "1wrwj359r0kgrcc2kw1yl9cpvkihhq0qm3i12kw39707s6m2x0pd"; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers - ]; - testHaskellDepends = [ - array base bytestring deepseq QuickCheck quickcheck-unicode - scientific tasty tasty-quickcheck text transformers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion deepseq - directory filepath ghc-prim http-types parsec scientific text - transformers unordered-containers vector - ]; - homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "attoparsec_0_13_2_2" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, criterion, deepseq, directory, filepath, ghc-prim , http-types, parsec, QuickCheck, quickcheck-unicode, scientific @@ -29643,7 +29613,6 @@ self: { homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-arff" = callPackage @@ -32270,6 +32239,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "batch" = callPackage + ({ mkDerivation, async, base, hspec, lifted-async, lifted-base + , monad-control, mtl, stm, timespan, transformers-base + }: + mkDerivation { + pname = "batch"; + version = "0.1.0.0"; + sha256 = "18jphm2dpn5gz4514gk525rhhgwflzb6f913rwf08dqaqlshr39r"; + libraryHaskellDepends = [ + async base lifted-async lifted-base monad-control mtl stm timespan + transformers-base + ]; + testHaskellDepends = [ base hspec stm timespan ]; + homepage = "https://github.com/agrafix/batch#readme"; + description = "Simplify queuing up data and processing it in batch"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "batch-rename" = callPackage ({ mkDerivation, base, directory, filepath, Glob }: mkDerivation { @@ -32790,24 +32777,6 @@ self: { }) {}; "bench" = callPackage - ({ mkDerivation, base, criterion, optparse-applicative, process - , silently, text, turtle - }: - mkDerivation { - pname = "bench"; - version = "1.0.7"; - sha256 = "1mn9lsix5ng9a6k0c26mw6fbqx4gap2c3cqzm30ariisdkh2bdaf"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base criterion optparse-applicative process silently text turtle - ]; - homepage = "http://github.com/Gabriel439/bench"; - description = "Command-line benchmark tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bench_1_0_8" = callPackage ({ mkDerivation, base, criterion, optparse-applicative, process , silently, text, turtle }: @@ -32823,7 +32792,6 @@ self: { homepage = "http://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "benchmark-function" = callPackage @@ -33105,6 +33073,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bhoogle" = callPackage + ({ mkDerivation, base, brick, bytestring, containers, directory + , filepath, hoogle, lens, process, protolude, text, time, vector + , vty + }: + mkDerivation { + pname = "bhoogle"; + version = "0.1.2.4"; + sha256 = "0r19z0ywxnzymd23kr9skl287w1d0g4420rxwdpq087gw77a67wl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick bytestring containers directory filepath hoogle lens + process protolude text time vector vty + ]; + homepage = "https://github.com/githubuser/bhoogle#readme"; + description = "Simple terminal GUI for local hoogle"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bibdb" = callPackage ({ mkDerivation, alex, array, async, base, bibtex, bytestring , containers, curl, download-curl, filepath, happy, microlens @@ -33644,6 +33632,8 @@ self: { pname = "binary-orphans"; version = "0.1.8.0"; sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi"; + revision = "1"; + editedCabalFile = "1zgp08sikp71k9llcplkdrfhh2gn43gk7hx81nslixl5s91a1j9q"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -34937,15 +34927,15 @@ self: { }: mkDerivation { pname = "biohazard"; - version = "0.6.16"; - sha256 = "05w44blv6bawkiw2vyb32swnv6wg92033xz9p03fhrc2yhl33pps"; + version = "1.0.0"; + sha256 = "0cc855d3h1fh52ldvqzwf3f834g8singavvpk1ir157fgg8qjz3g"; libraryHaskellDepends = [ async attoparsec base base-prelude binary bytestring containers directory exceptions filepath hashable primitive random scientific stm text transformers unix unordered-containers vector vector-algorithms vector-th-unbox zlib ]; - homepage = "http://github.com/udo-stenzel/biohazard"; + homepage = "https://bitbucket.org/ustenzel/biohazard"; description = "bioinformatics support library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -35114,8 +35104,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.1"; - sha256 = "1yfp8rb0m1c2iph07221q45ma9hxnslpj49w7fsp2ddcrr3vzk12"; + version = "0.0.0.2"; + sha256 = "18smrav39awp25j43c7k9r1laxwf7iix61qb2yi5h2b6djbgxq9h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -35132,7 +35122,7 @@ self: { array base Cabal containers data-default extra filepath HUnit hxt mtl polyparse QuickCheck random toolshed ]; - homepage = "http://functionalley.eu"; + homepage = "https://functionalley.eu/BishBosh/bishbosh.html"; description = "Plays chess"; license = "GPL"; }) {}; @@ -35998,34 +35988,6 @@ self: { }) {}; "blank-canvas" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, colour, containers, data-default-class, directory - , http-types, kansas-comet, mime-types, process, scotty, shake, stm - , text, text-show, time, transformers, unix, vector, wai, wai-extra - , warp - }: - mkDerivation { - pname = "blank-canvas"; - version = "0.6.1"; - sha256 = "06jsbqbd67hyb1k2yv0iqn11rhqhycl1c9afrnmwh05bic9wsdf6"; - revision = "2"; - editedCabalFile = "1lb4q70s3xgwzkirgci6b5flq8y9lfj8qspx52hl20zrwvhi6h1n"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring colour - containers data-default-class http-types kansas-comet mime-types - scotty stm text text-show transformers vector wai wai-extra warp - ]; - testHaskellDepends = [ - base containers directory process shake stm text time unix vector - ]; - homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; - description = "HTML5 Canvas Graphics Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "blank-canvas_0_6_2" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, colour, containers, data-default-class, directory , http-types, kansas-comet, mime-types, process, scotty, semigroups @@ -36036,6 +35998,8 @@ self: { pname = "blank-canvas"; version = "0.6.2"; sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; + revision = "1"; + editedCabalFile = "0zc84pjrmb2xpsvavvf950vrwyd6nlfj3x2hi930wq1kjm7pr4ps"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour @@ -36346,25 +36310,6 @@ self: { }) {}; "blaze-markup" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.8.0.0"; - sha256 = "03sl7xs6vk4zxbjszgyjpsppi1cknswg7z7rswz2f0rq62wwpq8r"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-markup_0_8_2_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: @@ -36380,7 +36325,6 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-shields" = callPackage @@ -36656,8 +36600,8 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.15.0.0"; - sha256 = "05q2zxmrxxqmi4vr98dvgfly8gir5h4iaimb3lwiflk0pw8nfn6n"; + version = "0.15.0.1"; + sha256 = "0g85fp2vppx6p1zbx506jnsfcik8q7nmc98fwrhcckgvkbdpi2v8"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers data-default-class exceptions hashable http-client http-types mtl mtl-compat @@ -36675,7 +36619,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bloodhound_0_15_0_1" = callPackage + "bloodhound_0_15_0_2" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, errors, exceptions, generics-sop, hashable , hspec, http-client, http-types, mtl, mtl-compat, network-uri @@ -36685,8 +36629,8 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.15.0.1"; - sha256 = "0g85fp2vppx6p1zbx506jnsfcik8q7nmc98fwrhcckgvkbdpi2v8"; + version = "0.15.0.2"; + sha256 = "17xw085k72dmw1q4cbqjs07gvvwwfsijcs9lsb3smxxhri1s229i"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers data-default-class exceptions hashable http-client http-types mtl mtl-compat @@ -39741,14 +39685,27 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.4"; - sha256 = "03sawamkp95jycq9sah72iw525pdndb3x4h489zf4s3ir9avds3d"; + version = "1.0.5"; + sha256 = "0x3m97q3xjmvf601vzkx4a8sl77x1y8jf0lwbq67181s37jp9asm"; libraryHaskellDepends = [ base Cabal directory filepath ]; homepage = "https://github.com/phadej/cabal-doctest"; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-doctest_1_0_6" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1.0.6"; + sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + homepage = "https://github.com/phadej/cabal-doctest"; + description = "A Setup.hs helper for doctests running"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-file-th" = callPackage ({ mkDerivation, base, Cabal, directory, pretty, template-haskell }: @@ -40427,6 +40384,8 @@ self: { pname = "cabal2nix"; version = "2.8.1"; sha256 = "1ahdqyiw76fixk90bi1b87ym5ii09fskpk0q9f9csbdmjif945x7"; + revision = "1"; + editedCabalFile = "0pq2cns1q7hbxd7gpyy643vaz8pcc7l96vlw23y30hpdgcnn23d3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42371,27 +42330,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.4.1"; - sha256 = "11q92jbc4sgvif6akd5vvsdj3ncx0xhwk0mimyc55m4m7srjdplq"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -42708,26 +42646,6 @@ self: { }) {}; "cereal" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; - version = "0.5.4.0"; - sha256 = "1rzyr8r9pjlgas5pc8n776r22i0ficanq05ypqrs477jxxd6rjns"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - homepage = "https://github.com/GaloisInc/cereal"; - description = "A binary serialization library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cereal_0_5_5_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2 }: @@ -42745,7 +42663,6 @@ self: { homepage = "https://github.com/GaloisInc/cereal"; description = "A binary serialization library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-conduit" = callPackage @@ -43200,8 +43117,8 @@ self: { ({ mkDerivation, async, base, stm }: mkDerivation { pname = "chan"; - version = "0.0.2"; - sha256 = "1qig63k7iarmmfjnm3zl32b9268ix9bjmhh2gf99hknr0c5h7dmc"; + version = "0.0.3"; + sha256 = "0ci20y0wd232qnh1mql3vjqml13mkrpm9dgv005wcgym7w18isgr"; libraryHaskellDepends = [ async base stm ]; testHaskellDepends = [ async base stm ]; homepage = "https://github.com/athanclark/chan#readme"; @@ -43443,36 +43360,6 @@ self: { }) {}; "chatwork" = callPackage - ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection - , data-default-class, hspec, http-api-data, http-client - , http-client-tls, http-types, req, retry, servant-server, text - , warp - }: - mkDerivation { - pname = "chatwork"; - version = "0.1.2.0"; - sha256 = "1qgb5b8y99rh243x1mz0n12lv59l73vnhczxzq8s2h5lzcay3bps"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req retry text - ]; - executableHaskellDepends = [ - aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req retry text - ]; - testHaskellDepends = [ - aeson aeson-casing base bytestring connection data-default-class - hspec http-api-data http-client http-client-tls http-types req - retry servant-server text warp - ]; - homepage = "https://github.com/matsubara0507/chatwork#readme"; - description = "The ChatWork API in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "chatwork_0_1_3_0" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection , data-default-class, hspec, http-api-data, http-client , http-client-tls, http-types, req, servant-server, text, warp @@ -43499,7 +43386,6 @@ self: { homepage = "https://github.com/matsubara0507/chatwork#readme"; description = "The ChatWork API in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate" = callPackage @@ -44104,22 +43990,6 @@ self: { }) {}; "chunked-data" = callPackage - ({ mkDerivation, base, bytestring, containers, semigroups, text - , transformers, vector - }: - mkDerivation { - pname = "chunked-data"; - version = "0.3.0"; - sha256 = "0bszq6fijnr4pmadzz89smj7kfmzx0ca3wd9ga8gv0in9jk9vgp1"; - libraryHaskellDepends = [ - base bytestring containers semigroups text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Typeclasses for dealing with various chunked data representations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "chunked-data_0_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, semigroups, text , transformers, vector }: @@ -44133,7 +44003,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Typeclasses for dealing with various chunked data representations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chunks" = callPackage @@ -46392,27 +46261,6 @@ self: { }) {}; "cmdargs" = callPackage - ({ mkDerivation, base, filepath, process, template-haskell - , transformers - }: - mkDerivation { - pname = "cmdargs"; - version = "0.10.19"; - sha256 = "1m1a2zl5ijjkjfrl5zqdqbbdf883y81zlq8qaiy2pww52cai3snf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base filepath process template-haskell transformers - ]; - executableHaskellDepends = [ - base filepath process template-haskell transformers - ]; - homepage = "https://github.com/ndmitchell/cmdargs#readme"; - description = "Command line argument processing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmdargs_0_10_20" = callPackage ({ mkDerivation, base, filepath, process, template-haskell , transformers }: @@ -46431,7 +46279,6 @@ self: { homepage = "https://github.com/ndmitchell/cmdargs#readme"; description = "Command line argument processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmdargs-browser" = callPackage @@ -46557,8 +46404,8 @@ self: { }: mkDerivation { pname = "cmv"; - version = "1.0.7"; - sha256 = "16gq4y8ixdppkkmwg2xafqgshpqplybv5dyqjkpqpbmwmv46mydv"; + version = "1.0.8"; + sha256 = "1l113yawclfpvhb5p3j6mhi3nqh8d1ix64k7d2q9slnvs3vdvphb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48938,8 +48785,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.3.1"; - sha256 = "0n04gnnv323fk1h9mp8krqbl2v6ljjv1vzw5df38cxvj2xd64y94"; + version = "0.3.1.1"; + sha256 = "109c202sqhsx6fr8m0zkwgzsy7pnnaps2nhyykp7cd6rw0ak6i28"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -48954,22 +48801,6 @@ self: { }) {}; "concurrent-output" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.10.1"; - sha256 = "17h081vj2sksv9ldpp9jlir2avnzbx92ay321lha8cjm9cpv4996"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "concurrent-output_1_10_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix }: @@ -48983,7 +48814,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-rpc" = callPackage @@ -49189,33 +49019,6 @@ self: { }) {}; "conduit" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, exceptions - , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, split - , transformers, transformers-base, transformers-compat, vector - }: - mkDerivation { - pname = "conduit"; - version = "1.2.12.1"; - sha256 = "0zl6gflh7y36y2vypjhqx13nhkk5y3h12c1zj7kjfclrmwnvnwh0"; - libraryHaskellDepends = [ - base exceptions lifted-base mmorph monad-control mtl primitive - resourcet transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck resourcet safe - split transformers - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq hspec kan-extensions mwc-random - transformers vector - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_2_13" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, exceptions , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl , mwc-random, primitive, QuickCheck, resourcet, safe, split @@ -49240,36 +49043,9 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-algorithms" = callPackage - ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit - , conduit-combinators, conduit-extra, containers, deepseq - , directory, HUnit, mtl, resourcet, stm, stm-conduit - , test-framework, test-framework-hunit, test-framework-th - , transformers - }: - mkDerivation { - pname = "conduit-algorithms"; - version = "0.0.6.1"; - sha256 = "0zs7klxlkirch0j7gasxqalfw9nc4pfslgrg93jwn5vhpxdxhgwk"; - libraryHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq mtl resourcet stm stm-conduit - transformers - ]; - testHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory HUnit mtl resourcet stm - stm-conduit test-framework test-framework-hunit test-framework-th - transformers - ]; - description = "Conduit-based algorithms"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-algorithms_0_0_7_1" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq , directory, HUnit, lzma-conduit, mtl, resourcet, stm, stm-conduit @@ -49294,7 +49070,6 @@ self: { homepage = "https://github.com/luispedro/conduit-algorithms#readme"; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-audio" = callPackage @@ -49668,27 +49443,6 @@ self: { }) {}; "config-ini" = callPackage - ({ mkDerivation, base, containers, directory, doctest, hedgehog - , ini, megaparsec, microlens, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "config-ini"; - version = "0.2.1.1"; - sha256 = "0rhjqbg6f37jmcddad0yiqvn9i4i8k7rcivnqz92swd2bikyrp3n"; - libraryHaskellDepends = [ - base containers megaparsec text transformers unordered-containers - ]; - testHaskellDepends = [ - base containers directory doctest hedgehog ini microlens text - unordered-containers - ]; - homepage = "https://github.com/aisamanra/config-ini"; - description = "A library for simple INI-based configuration files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "config-ini_0_2_2_0" = callPackage ({ mkDerivation, base, containers, directory, doctest, hedgehog , ini, megaparsec, microlens, text, transformers , unordered-containers @@ -49707,7 +49461,6 @@ self: { homepage = "https://github.com/aisamanra/config-ini"; description = "A library for simple INI-based configuration files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "config-manager" = callPackage @@ -49754,6 +49507,8 @@ self: { pname = "config-schema"; version = "0.5.0.0"; sha256 = "108gjzafzc5hv1vilnxagf65bh2xia2rfwxcjw6axzzhw5lszgli"; + revision = "1"; + editedCabalFile = "03py056v8wvabykx95h5z52g0a5sxglmvvk67wvr94ig8161gbjc"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -50639,22 +50394,6 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, semigroups, StateVar, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "contravariant"; - version = "1.4"; - sha256 = "117fff8kkrvlmr8cb2jpj71z7lf2pdiyks6ilyx89mry6zqnsrp1"; - libraryHaskellDepends = [ - base semigroups StateVar transformers transformers-compat void - ]; - homepage = "http://github.com/ekmett/contravariant/"; - description = "Contravariant functors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "contravariant_1_4_1" = callPackage ({ mkDerivation, base, StateVar, transformers, transformers-compat }: mkDerivation { @@ -50667,7 +50406,6 @@ self: { homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "contravariant-extras" = callPackage @@ -52349,8 +52087,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "6.1"; - sha256 = "0mh71svz7d0xpsh0da292sfzyhbd8cja3r0xyddb947k3kd08q3g"; + version = "6.2"; + sha256 = "0d88s8wj3679v4hjgh2jzhsp3iscbh8ph8vkc2rv528abkxfrqfv"; libraryHaskellDepends = [ base binary bytestring containers mtl network-info safe stm time ]; @@ -54011,24 +53749,6 @@ self: { }) {}; "cubicbezier" = callPackage - ({ mkDerivation, base, containers, fast-math, integration, matrices - , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty - , tasty-hunit, vector, vector-space - }: - mkDerivation { - pname = "cubicbezier"; - version = "0.6.0.4"; - sha256 = "1bdrl26fm09vmmwdlg09ihq3b42qbz7dphzq03b983zlzrj1064f"; - libraryHaskellDepends = [ - base containers fast-math integration matrices microlens - microlens-mtl microlens-th mtl vector vector-space - ]; - testHaskellDepends = [ base parsec tasty tasty-hunit ]; - description = "Efficient manipulating of 2D cubic bezier curves"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cubicbezier_0_6_0_5" = callPackage ({ mkDerivation, base, containers, fast-math, integration, matrices , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty , tasty-hunit, vector, vector-space @@ -54044,7 +53764,6 @@ self: { testHaskellDepends = [ base parsec tasty tasty-hunit ]; description = "Efficient manipulating of 2D cubic bezier curves"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cubicspline" = callPackage @@ -55762,23 +55481,6 @@ self: { }) {}; "data-dword" = callPackage - ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty - , tasty-quickcheck, template-haskell - }: - mkDerivation { - pname = "data-dword"; - version = "0.3.1.1"; - sha256 = "0dgs30yvs7cpikf6f2x4r7rb1f4fv3xi2rgr579af8nhrb2d6z7p"; - libraryHaskellDepends = [ - base data-bword ghc-prim hashable template-haskell - ]; - testHaskellDepends = [ base tasty tasty-quickcheck ]; - homepage = "https://github.com/mvv/data-dword"; - description = "Stick two binary words together to get a bigger one"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-dword_0_3_1_2" = callPackage ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty , tasty-quickcheck, template-haskell }: @@ -55793,7 +55495,6 @@ self: { homepage = "https://github.com/mvv/data-dword"; description = "Stick two binary words together to get a bigger one"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-easy" = callPackage @@ -56338,34 +56039,6 @@ self: { }) {}; "data-msgpack" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck - , text, unordered-containers, vector, void - }: - mkDerivation { - pname = "data-msgpack"; - version = "0.0.10"; - sha256 = "0vpv4l6phsa9b3l0wxk798w9kzkc454v2kk554rcmz94wq3k6n61"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 deepseq - hashable QuickCheck text unordered-containers vector void - ]; - executableHaskellDepends = [ base bytestring groom ]; - testHaskellDepends = [ - base bytestring containers hashable hspec QuickCheck text - unordered-containers vector void - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq QuickCheck - ]; - homepage = "http://msgpack.org/"; - description = "A Haskell implementation of MessagePack"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-msgpack_0_0_11" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable , hspec, QuickCheck, text, unordered-containers, vector, void @@ -56390,7 +56063,6 @@ self: { homepage = "http://msgpack.org/"; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-msgpack-types" = callPackage @@ -57406,33 +57078,6 @@ self: { }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, criterion - , deepseq, directory, extra, filepath, libxml-sax, network, parsec - , process, QuickCheck, random, resourcet, tasty, tasty-hunit - , tasty-quickcheck, text, transformers, unix, vector, xml-types - }: - mkDerivation { - pname = "dbus"; - version = "0.10.14"; - sha256 = "13x1b3qzgsrksaqmrrlpvn5ivq4s4yzhwa8nl833pcvybzzxjb9n"; - libraryHaskellDepends = [ - base bytestring cereal containers deepseq libxml-sax network parsec - random text transformers unix vector xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath - libxml-sax network parsec process QuickCheck random resourcet tasty - tasty-hunit tasty-quickcheck text transformers unix vector - xml-types - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - homepage = "https://github.com/rblaze/haskell-dbus#readme"; - description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "dbus_0_10_15" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, criterion , deepseq, directory, extra, filepath, libxml-sax, network, parsec , process, QuickCheck, random, resourcet, tasty, tasty-hunit @@ -57457,7 +57102,6 @@ self: { homepage = "https://github.com/rblaze/haskell-dbus#readme"; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -59206,8 +58850,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "0.0.4"; - sha256 = "0xdz9hfh9wyh5pyn82kapbjiq6hgrdr23krb2940q0hr0rf39ssb"; + version = "1.0.0"; + sha256 = "0ylfaj73yv9bzp1sygbhcipji2g9jws2r4alvhns1y7wzl74fgbz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -59450,6 +59094,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall_1_9_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring + , bytestring, case-insensitive, charset, containers, contravariant + , cryptohash, deepseq, exceptions, http-client, http-client-tls + , lens, optparse-generic, parsers, prettyprinter, system-fileio + , system-filepath, tasty, tasty-hunit, text, text-format + , transformers, trifecta, unordered-containers, vector + }: + mkDerivation { + pname = "dhall"; + version = "1.9.0"; + sha256 = "1i59rvjjkqikz964kzrnbxfwjhwvnwqwvaw9m03yq540qi4kmiaz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base base16-bytestring bytestring case-insensitive + charset containers contravariant cryptohash exceptions http-client + http-client-tls lens parsers prettyprinter system-fileio + system-filepath text text-format transformers trifecta + unordered-containers vector + ]; + executableHaskellDepends = [ + base optparse-generic prettyprinter system-filepath text trifecta + ]; + testHaskellDepends = [ + base containers deepseq prettyprinter tasty tasty-hunit text vector + ]; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text @@ -59472,6 +59148,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-bash_1_0_7" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall + , neat-interpolation, optparse-generic, shell-escape, text + , text-format, trifecta, vector + }: + mkDerivation { + pname = "dhall-bash"; + version = "1.0.7"; + sha256 = "1mwxzrr5dmlm1892a4akgs52jl0bwiyf2qpl2mnr91y7fnmn00qs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dhall neat-interpolation shell-escape + text text-format vector + ]; + executableHaskellDepends = [ + base bytestring dhall optparse-generic text trifecta + ]; + description = "Compile Dhall to Bash"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-check" = callPackage ({ mkDerivation, base, containers, dhall, directory, filepath , fsnotify, text, trifecta @@ -59510,6 +59209,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-json_1_0_10" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall + , optparse-generic, text, trifecta, vector, yaml + }: + mkDerivation { + pname = "dhall-json"; + version = "1.0.10"; + sha256 = "0zqb5hh3520l75walfnyr1i9dqphjxcawchvm12shjz2vqpi6wpq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base dhall text vector ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring dhall optparse-generic text + trifecta yaml + ]; + description = "Compile Dhall to JSON or YAML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , neat-interpolation, optparse-generic, text, text-format, trifecta @@ -59532,6 +59251,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-nix_1_0_10" = callPackage + ({ mkDerivation, base, containers, data-fix, dhall, hnix + , neat-interpolation, optparse-generic, text, text-format, trifecta + , vector + }: + mkDerivation { + pname = "dhall-nix"; + version = "1.0.10"; + sha256 = "09iy1a0nc2mwbsly58na9lw4jh7wv7zq0lspdcynhsxj3xv2q23n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-fix dhall hnix neat-interpolation text + text-format vector + ]; + executableHaskellDepends = [ + base dhall hnix optparse-generic text trifecta + ]; + description = "Dhall to Nix compiler"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-text" = callPackage ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { @@ -59545,6 +59287,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-text_1_0_5" = callPackage + ({ mkDerivation, base, dhall, optparse-generic, text }: + mkDerivation { + pname = "dhall-text"; + version = "1.0.5"; + sha256 = "195nfflpk787m8jjmspw2x4rb2s7vd0z5wz5s0bzfwdl6c7xgg27"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base dhall optparse-generic text ]; + description = "Template text using Dhall"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -59644,38 +59400,6 @@ self: { }) {}; "diagrams-builder" = callPackage - ({ mkDerivation, base, base-orphans, bytestring, cmdargs - , diagrams-cairo, diagrams-lib, diagrams-postscript - , diagrams-rasterific, diagrams-svg, directory, exceptions - , filepath, hashable, haskell-src-exts, haskell-src-exts-simple - , hint, JuicyPixels, lens, mtl, split, svg-builder, transformers - }: - mkDerivation { - pname = "diagrams-builder"; - version = "0.8.0.1"; - sha256 = "072vzskwp20qb768rv87876ngn6gnj959m91vpzri9ls9jx0x6vf"; - revision = "3"; - editedCabalFile = "00lpy8ch7zjc2z3ifwg8j1jfsrf4sg1fk9pngykl8bqb79hm5h3i"; - configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-orphans cmdargs diagrams-lib directory exceptions - filepath hashable haskell-src-exts haskell-src-exts-simple hint - lens mtl split transformers - ]; - executableHaskellDepends = [ - base bytestring cmdargs diagrams-cairo diagrams-lib - diagrams-postscript diagrams-rasterific diagrams-svg directory - filepath JuicyPixels lens svg-builder - ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "hint-based build service for the diagrams graphics EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "diagrams-builder_0_8_0_2" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -59762,6 +59486,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.1"; sha256 = "1apbgicaq7qaij42hwh5aiy67si2fjd0m4lah1hw4vz0cqfxxs2v"; + revision = "1"; + editedCabalFile = "0143vrfnb5qp3m23nvh5h67b2wvkq8y27yn6jjq601cs95f3b41c"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -59820,6 +59546,8 @@ self: { pname = "diagrams-gtk"; version = "1.4"; sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn"; + revision = "1"; + editedCabalFile = "0afpcbgkc897gp0hpqi5frwbzln1qapf36p93v9zxl05my6nj04i"; libraryHaskellDepends = [ base cairo diagrams-cairo diagrams-lib gtk ]; @@ -59913,6 +59641,8 @@ self: { pname = "diagrams-lib"; version = "1.4.2"; sha256 = "1rdg8b46hc1ybk1y9dw7w725rag58rkr7hs7z3gvk4isxm11gm79"; + revision = "1"; + editedCabalFile = "0vz16br2gn4agi35k92qw84cja2dqj63g7q3ak64jhc8r99bd4a1"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -60268,34 +59998,6 @@ self: { }) {}; "dictionaries" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , criterion, data-default, deepseq, directory, exceptions, filepath - , hspec, QuickCheck, random, random-shuffle, tagged, text, time - , transformers, zlib - }: - mkDerivation { - pname = "dictionaries"; - version = "0.2.0.3"; - sha256 = "0a8d20vfd5gcxrfhsa0530fnzb9fqh47qsjbyhf7pnh0f0p0qbi6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base binary bytestring containers data-default deepseq - directory exceptions filepath tagged text time transformers zlib - ]; - executableHaskellDepends = [ - base bytestring containers criterion deepseq directory exceptions - filepath random random-shuffle tagged text transformers - ]; - testHaskellDepends = [ - base bytestring containers directory filepath hspec QuickCheck - random tagged text time - ]; - description = "Tools to handle StarDict dictionaries"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dictionaries_0_2_0_4" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , criterion, data-default, deepseq, directory, exceptions, filepath , hspec, QuickCheck, random, random-shuffle, tagged, text, time @@ -60321,7 +60023,6 @@ self: { ]; description = "Tools to handle StarDict dictionaries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dictionary-sharing" = callPackage @@ -62335,23 +62036,6 @@ self: { }) {}; "dlist" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck - , quickcheck-instances - }: - mkDerivation { - pname = "dlist"; - version = "0.8.0.3"; - sha256 = "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ - base Cabal QuickCheck quickcheck-instances - ]; - homepage = "https://github.com/spl/dlist"; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dlist_0_8_0_4" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; @@ -62362,7 +62046,6 @@ self: { homepage = "https://github.com/spl/dlist"; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dlist-instances" = callPackage @@ -62490,29 +62173,6 @@ self: { }) {}; "dns" = callPackage - ({ mkDerivation, async, attoparsec, auto-update, base - , base64-bytestring, binary, bytestring, conduit, conduit-extra - , containers, cryptonite, doctest, hspec, iproute, mtl, network - , psqueues, QuickCheck, safe, time, word8 - }: - mkDerivation { - pname = "dns"; - version = "3.0.0"; - sha256 = "1i2mdrzvyxclfrpik2rm36ljm3c3z1a73vjy7vivzy6wcmfzyb56"; - libraryHaskellDepends = [ - async attoparsec auto-update base base64-bytestring binary - bytestring conduit conduit-extra containers cryptonite iproute mtl - network psqueues safe time - ]; - testHaskellDepends = [ - base bytestring doctest hspec iproute QuickCheck word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_3_0_1" = callPackage ({ mkDerivation, async, attoparsec, auto-update, base , base64-bytestring, binary, bytestring, conduit, conduit-extra , containers, cryptonite, doctest, hspec, iproute, mtl, network @@ -62533,7 +62193,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -62679,6 +62338,8 @@ self: { pname = "docker"; version = "0.4.1.1"; sha256 = "103j8hcabfwrzjmjzxw3ks7b90nnanznck941v956q1h3240npka"; + revision = "1"; + editedCabalFile = "1zbi904jaq2mvbxhmw2l181xz0p6q8mia843g5arsz3akckq2z72"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -62698,7 +62359,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "docker_0_5_0_0" = callPackage + "docker_0_5_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , conduit-combinators, conduit-extra, connection, containers , data-default-class, directory, exceptions, filemanip, filepath @@ -62711,8 +62372,10 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.5.0.0"; - sha256 = "1zaypbnk0dk5bwr8zxq5bmq5aqzgcgl0sqvxqq115ia863m0d1wv"; + version = "0.5.0.1"; + sha256 = "0357d9hnrr990ysp87c17a8brnkp1w2w666m5jxhkap53n2dji4v"; + revision = "1"; + editedCabalFile = "1rrhgk3g33ppzxp3yqwdsj7l9nrmxl2xssb97slm7l81vypvs5z5"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -62750,6 +62413,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "docker-build-cacher_1_9_1" = callPackage + ({ mkDerivation, base, containers, foldl, language-docker + , system-filepath, text, turtle + }: + mkDerivation { + pname = "docker-build-cacher"; + version = "1.9.1"; + sha256 = "1d8v9900j9ygx060gahwk208i5f36sdpnlpdaa1qqhcnywvmfzi4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers foldl language-docker system-filepath text turtle + ]; + homepage = "https://github.com/seatgeek/docker-build-cacher#readme"; + description = "Builds a services with docker and caches all of its intermediate stages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dockercook" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base16-bytestring, bytestring, conduit, conduit-combinators @@ -63191,36 +62873,6 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, directory, exceptions, hspec - , hspec-megaparsec, megaparsec, optparse-applicative, process, text - , transformers, yaml - }: - mkDerivation { - pname = "dotenv"; - version = "0.5.2.1"; - sha256 = "0nd4d12sj93gs0n7pgdhailrwd56h33xy894n5m6zfi4ay43s62r"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat directory exceptions megaparsec process text - transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat directory exceptions hspec hspec-megaparsec - megaparsec process text transformers yaml - ]; - homepage = "https://github.com/stackbuilders/dotenv-hs"; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "dotenv_0_5_2_3" = callPackage ({ mkDerivation, base, base-compat, directory, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text , transformers, yaml @@ -66681,23 +66333,6 @@ self: { }) {}; "email-validate" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; - version = "2.3.2"; - sha256 = "1h15z89qsp7b08nnjgs2rcwavfhfrkanvh7j8jp0rrx7xh0rz6lv"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - homepage = "https://github.com/Porges/email-validate-hs"; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "email-validate_2_3_2_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec , QuickCheck, template-haskell }: @@ -66712,7 +66347,6 @@ self: { homepage = "https://github.com/Porges/email-validate-hs"; description = "Email address validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validate-json" = callPackage @@ -67983,34 +67617,6 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, data-default, directory, doctest - , filepath, lens, mtl, parsec, process, temporary, transformers - , unordered-containers - }: - mkDerivation { - pname = "ersatz"; - version = "0.4.1"; - sha256 = "0na9i2jc5assjis12pfpi08ykf90b79ydsvv1lqsbgsbij9w2w91"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers data-default lens mtl - process temporary transformers unordered-containers - ]; - executableHaskellDepends = [ - array base containers lens mtl parsec - ]; - testHaskellDepends = [ array base directory doctest filepath mtl ]; - homepage = "http://github.com/ekmett/ersatz"; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ersatz_0_4_2" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, data-default, directory, doctest , filepath, lens, mtl, parsec, process, semigroups, temporary @@ -69083,7 +68689,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore_1_0_0" = callPackage + "eventstore_1_1_0" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan , ekg-core, exceptions, fast-logger, hashable, http-client @@ -69095,8 +68701,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.0.0"; - sha256 = "1mhgvh1mm6fkibjd9p8k2wjhi064b22knwkjdk4i396zya6210f0"; + version = "1.1.0"; + sha256 = "0r91vgnq291aq4smbap07agm6bry1xflawihm31d0krzv0j69rx1"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -69224,6 +68830,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "exact-pi_0_4_1_3" = callPackage + ({ mkDerivation, base, numtype-dk, semigroups }: + mkDerivation { + pname = "exact-pi"; + version = "0.4.1.3"; + sha256 = "1r1cjyz6aqbq8ydn3gq4107n3hnd6zbygj7pw299nqdaag38g7jf"; + libraryHaskellDepends = [ base numtype-dk semigroups ]; + homepage = "https://github.com/dmcclean/exact-pi/"; + description = "Exact rational multiples of pi (and integer powers of pi)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exact-real" = callPackage ({ mkDerivation, base, checkers, criterion, directory, doctest , filepath, groups, integer-gmp, memoize, QuickCheck, random, tasty @@ -70057,27 +69676,6 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim - , hashable, lens, monad-skeleton, mtl, primitive, profunctors - , QuickCheck, semigroups, StateVar, tagged, template-haskell - , transformers, vector - }: - mkDerivation { - pname = "extensible"; - version = "0.4.7"; - sha256 = "0a0xmixyhfxlkrqr0nk1nvi8177i4432xamg91y5971mgail7kgv"; - libraryHaskellDepends = [ - base comonad constraints deepseq ghc-prim hashable monad-skeleton - mtl primitive profunctors QuickCheck semigroups StateVar tagged - template-haskell transformers vector - ]; - testHaskellDepends = [ base lens QuickCheck template-haskell ]; - homepage = "https://github.com/fumieval/extensible"; - description = "Extensible, efficient, optics-friendly data types and effects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extensible_0_4_7_1" = callPackage ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim , hashable, lens, monad-skeleton, mtl, primitive, profunctors , QuickCheck, semigroups, StateVar, tagged, template-haskell @@ -70096,7 +69694,6 @@ self: { homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, optics-friendly data types and effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible-data" = callPackage @@ -70203,8 +69800,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.2"; - sha256 = "1l8l8724g3kd3f01pq429y7czr1bnhbrq2y0lii1hi767sjxgnz4"; + version = "1.6.3"; + sha256 = "06ds0jlx6sljwdf63l154qbzia9mnsri79i9qm3xikky3nj9ia1m"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -70286,21 +69883,6 @@ self: { }) {}; "extrapolate" = callPackage - ({ mkDerivation, base, leancheck, speculate, template-haskell }: - mkDerivation { - pname = "extrapolate"; - version = "0.3.0"; - sha256 = "1mqhn515mq730frzcadw4m0zsizk1vkhcygazy6y03533mai0z2g"; - libraryHaskellDepends = [ - base leancheck speculate template-haskell - ]; - testHaskellDepends = [ base leancheck speculate ]; - homepage = "https://github.com/rudymatela/extrapolate#readme"; - description = "generalize counter-examples of test properties"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extrapolate_0_3_1" = callPackage ({ mkDerivation, base, leancheck, speculate, template-haskell }: mkDerivation { pname = "extrapolate"; @@ -70313,7 +69895,6 @@ self: { homepage = "https://github.com/rudymatela/extrapolate#readme"; description = "generalize counter-examples of test properties"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ez-couch" = callPackage @@ -70635,19 +70216,15 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, base, Cabal, combinat - , composition-prelude, criterion, directory, hspec, http-client - , http-client-tls, parallel-io, QuickCheck, recursion-schemes, tar - , zlib + ({ mkDerivation, arithmoi, ats-setup, base, Cabal, combinat + , composition-prelude, criterion, hspec, QuickCheck + , recursion-schemes }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.2.0"; - sha256 = "1bj3qcbyfr9fg5j4dmrkbja3dv40whxz6kyakjwd8m3rw250ncck"; - setupHaskellDepends = [ - base Cabal directory http-client http-client-tls parallel-io tar - zlib - ]; + version = "0.3.2.4"; + sha256 = "0dvrwlcpfsrrw8la5brvhjc78k48s2kaz08cg6xqx82vkrzipm63"; + setupHaskellDepends = [ ats-setup base Cabal ]; libraryHaskellDepends = [ base composition-prelude recursion-schemes ]; @@ -73177,6 +72754,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "fixer" = callPackage + ({ mkDerivation, aeson, base, containers, directory, genvalidity + , genvalidity-containers, genvalidity-hspec + , genvalidity-hspec-aeson, genvalidity-text, genvalidity-time + , hspec, http-api-data, http-client, mtl, QuickCheck, servant + , servant-client, stm, text, time, validity, validity-containers + , validity-time, yaml + }: + mkDerivation { + pname = "fixer"; + version = "0.0.0.0"; + sha256 = "044l199r91gsxplahilsh6ims8bxlqdi6srprdvdygqhxzhpvanf"; + libraryHaskellDepends = [ + aeson base containers directory http-api-data http-client mtl + servant servant-client stm text time validity validity-containers + validity-time yaml + ]; + testHaskellDepends = [ + aeson base containers directory genvalidity genvalidity-containers + genvalidity-hspec genvalidity-hspec-aeson genvalidity-text + genvalidity-time hspec http-api-data http-client mtl QuickCheck + servant servant-client stm text time validity validity-containers + validity-time yaml + ]; + homepage = "https://github.com/NorfairKing/fixer#readme"; + description = "A Haskell client for http://fixer.io/"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fixfile" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, exceptions, filepath, hashable, hashtables, lens, mtl @@ -74160,18 +73766,6 @@ self: { }) {}; "fmlist" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "fmlist"; - version = "0.9.1"; - sha256 = "0v83rxr4889c6m5djfp3vx450kzsj1wi5d0qmd7myvh7i0r4afqv"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/sjoerdvisscher/fmlist"; - description = "FoldMap lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fmlist_0_9_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "fmlist"; @@ -74181,7 +73775,6 @@ self: { homepage = "https://github.com/sjoerdvisscher/fmlist"; description = "FoldMap lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fmt" = callPackage @@ -74640,8 +74233,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "1"; - editedCabalFile = "1ydj5ng7wsi9jg6xw9bg8c7wrsg2jpnvjkjvzxaf6n8sjs0gxhvw"; + revision = "2"; + editedCabalFile = "1dj785ih5bla68yzxkpsilwj1p1xv6a8rh76rz799aap5injda0z"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -75510,6 +75103,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5" = callPackage + ({ mkDerivation, base, bifunctors, comonad, containers + , distributive, exceptions, mtl, profunctors, semigroupoids + , semigroups, template-haskell, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "free"; + version = "5"; + sha256 = "1s4avwm4lnscmxv3fy0zws3vbg61sczgxm1m3cdnqxp95bd6p4c7"; + libraryHaskellDepends = [ + base bifunctors comonad containers distributive exceptions mtl + profunctors semigroupoids semigroups template-haskell transformers + transformers-base transformers-compat + ]; + homepage = "http://github.com/ekmett/free/"; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-concurrent" = callPackage ({ mkDerivation, base, type-aligned }: mkDerivation { @@ -75884,6 +75498,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freer-simple_1_0_1_0" = callPackage + ({ mkDerivation, base, criterion, extensible-effects, free, mtl + , natural-transformation, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers-base + }: + mkDerivation { + pname = "freer-simple"; + version = "1.0.1.0"; + sha256 = "0vh14z39pk1ni16hcq9yw0x8ckhcbyi8hgndpv7gmqzhvcdd0saf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base natural-transformation transformers-base + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion extensible-effects free mtl + ]; + homepage = "https://github.com/lexi-lambda/freer-simple#readme"; + description = "Implementation of a friendly effect system for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel , pretty, random, syb @@ -76695,14 +76336,31 @@ self: { pname = "funcmp"; version = "1.8"; sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k"; + revision = "1"; + editedCabalFile = "1fkjmx4mmfmf2y08w7mgw1rp6q6w9zxdj95zfydgxgkmvk9b37c4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath process ]; - homepage = "http://savannah.nongnu.org/projects/funcmp/"; + homepage = "https://github.com/peti/funcmp"; description = "Functional MetaPost"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "funcmp_1_9" = callPackage + ({ mkDerivation, base, filepath, pretty, process }: + mkDerivation { + pname = "funcmp"; + version = "1.9"; + sha256 = "1d5appkjhajb9ndv2gwnfz8lw2w53v8baajzmrhg26ihzj1bkch8"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base filepath pretty process ]; + homepage = "https://github.com/peti/funcmp"; + description = "Functional MetaPost is a Haskell frontend to the MetaPost language"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "funcons-tools" = callPackage ({ mkDerivation, base, bv, containers, directory, mtl, multiset , parsec, split, text, vector @@ -77094,8 +76752,8 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.3"; - sha256 = "11sbdqmcvmqzb9xhvs4bgjj8wb1i2ls5gm1pgiy757h4clcyl4k1"; + version = "0.1.0.4"; + sha256 = "1nk3qrjcg5q4mnv2lzbw08ikgibix0ns6910z9xixcfq5kgij6my"; libraryHaskellDepends = [ base base-unicode-symbols data-default lens text text-metrics unordered-containers vector @@ -77109,14 +76767,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fuzzyset_0_1_0_4" = callPackage + "fuzzyset_0_1_0_5" = callPackage ({ mkDerivation, base, base-unicode-symbols, data-default, hspec , ieee754, lens, text, text-metrics, unordered-containers, vector }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.4"; - sha256 = "1nk3qrjcg5q4mnv2lzbw08ikgibix0ns6910z9xixcfq5kgij6my"; + version = "0.1.0.5"; + sha256 = "12cl135ph7qjnfm0x36yw3mvjilsw4pm509yvh7i5whsafs3kakq"; libraryHaskellDepends = [ base base-unicode-symbols data-default lens text text-metrics unordered-containers vector @@ -77203,8 +76861,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fx"; - version = "0.10"; - sha256 = "0nki5nb55qahjf3f2dqrfvrx77i3kba6aqiv1pwwkinnlv3k7n7i"; + version = "0.10.1"; + sha256 = "1awscv2y8ywcyyn08hdmlh3qdjs33akr7grfdfls59rmhidg4fhd"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/fx"; description = "Horizontally composable effects"; @@ -78176,23 +77834,6 @@ self: { }) {}; "generic-deriving" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec - , template-haskell - }: - mkDerivation { - pname = "generic-deriving"; - version = "1.12"; - sha256 = "09nl2c2b54ngqv4rgv3avvallyvfnv5jfld0wk2v90srl3x6p5vk"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ base hspec template-haskell ]; - homepage = "https://github.com/dreixel/generic-deriving"; - description = "Generic programming library for generalised deriving"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "generic-deriving_1_12_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell }: @@ -78210,7 +77851,6 @@ self: { homepage = "https://github.com/dreixel/generic-deriving"; description = "Generic programming library for generalised deriving"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-enum" = callPackage @@ -78452,18 +78092,6 @@ self: { }) {}; "generics-sop" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: - mkDerivation { - pname = "generics-sop"; - version = "0.3.1.0"; - sha256 = "1bazlhgmxcwv7vd44jhdx74cnhmaz6yy47jxfycapjj4mjrnp0x7"; - libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; - testHaskellDepends = [ base ]; - description = "Generic Programming using True Sums of Products"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "generics-sop_0_3_2_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; @@ -78473,7 +78101,6 @@ self: { testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generics-sop-lens" = callPackage @@ -78482,8 +78109,8 @@ self: { pname = "generics-sop-lens"; version = "0.1.2.1"; sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf"; - revision = "2"; - editedCabalFile = "1zavix9vzj6qnr6izfmq1ggsdzsqzz41dlmh228lpvfm2mddx6w2"; + revision = "3"; + editedCabalFile = "1phq0hjpgxfvb8ay9v4ix6axk07mbd266javss9nmqmqmn3vnb51"; libraryHaskellDepends = [ base generics-sop lens ]; homepage = "https://github.com/phadej/generics-sop-lens#readme"; description = "Lenses for types in generics-sop"; @@ -78729,19 +78356,6 @@ self: { }) {}; "genvalidity" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, validity }: - mkDerivation { - pname = "genvalidity"; - version = "0.4.0.2"; - sha256 = "1kmbjx57212v7v1b7b7585m0i9sd5qh32ln83pc63m6jdpw161a1"; - libraryHaskellDepends = [ base QuickCheck validity ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity_0_4_0_4" = callPackage ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; @@ -78752,7 +78366,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -78996,24 +78609,6 @@ self: { }) {}; "genvalidity-time" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec - , QuickCheck, time, validity-time - }: - mkDerivation { - pname = "genvalidity-time"; - version = "0.1.0.0"; - sha256 = "0jgfrrspyawvymp2p55ba56pxggqkg352c1n2bmyyi9hs99fp0jf"; - libraryHaskellDepends = [ - base genvalidity QuickCheck time validity-time - ]; - testHaskellDepends = [ base genvalidity-hspec hspec time ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "GenValidity support for time"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "genvalidity-time_0_1_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time }: @@ -79690,6 +79285,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-exactprint_0_5_6_0" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.5.6.0"; + sha256 = "0fbq7p2kykqq2pzf0mld0brj3pdrgxb1zvpa05pqxsfs66czlbsg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb + ]; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -80432,12 +80051,12 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.6.8"; - sha256 = "1ca8962sh41jkz82lx1snx8fzp8s2v5dsq0mczgzc7aqjgclb35g"; + version = "0.6.9"; + sha256 = "0bkhbzjjp4n97dsf8q4ggphsfh0rxwgdn4kmg8l87zbrih41gdpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base cmdargs directory extra filepath process time unix + base cmdargs directory extra filepath process time ]; executableHaskellDepends = [ ansi-terminal base cmdargs containers directory extra filepath @@ -82284,8 +81903,8 @@ self: { pname = "github"; version = "0.18"; sha256 = "0i4cs6d95ik5c8zs2508nmhjh2v30a0qjyxfqyxhjsz48p9h5p1i"; - revision = "1"; - editedCabalFile = "1krz0plxhm1q1k7bb0wzl969zd5fqkgqcgfr6rmqw60njpwrdsrp"; + revision = "2"; + editedCabalFile = "1rywfb78acwh81mdnxb4q35n374k1wbxg0562biis0i0jjxfp211"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -82394,6 +82013,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-release_1_1_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers, uri-templater + }: + mkDerivation { + pname = "github-release"; + version = "1.1.3"; + sha256 = "040yd8npjv54xfh4fv4i1p9x6qsa5qj1m5wblr7xjf0w090sblf0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types + mime-types optparse-generic text unordered-containers uri-templater + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/tfausak/github-release#readme"; + description = "Upload files to GitHub releases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, github , groom, html, http-client, http-client-tls, monad-parallel @@ -83172,10 +82813,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.24"; - sha256 = "1fhpwr7v2ad49j9699f5za1ww2m1ln39cvnm82z57cngjghpnngs"; - revision = "2"; - editedCabalFile = "0fz8vr8kiny3jhh2jr3c5pv2283zm6nkfi93pj34v7xs62zcpg59"; + version = "2.25"; + sha256 = "1hh6zqkk1cm50n7d17i2490q2xh7hzy63krpj58rwhgpmn3ps5sb"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -83767,8 +83406,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.28"; - sha256 = "1r754m2yfg7mmrg0m4lx0dpwp9d2fypyllgipmqxcfirgqyhln09"; + version = "0.3.30"; + sha256 = "1cjfhpza7mhfywx09rf2qzglqwyss3ndk9sqn0vwvpv4c2wvglaq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83812,27 +83451,6 @@ self: { }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage - ({ mkDerivation, array, base, containers, data-accessor - , data-accessor-transformers, deepseq, filepath, process, temporary - , time, transformers, utility-ht - }: - mkDerivation { - pname = "gnuplot"; - version = "0.5.4.2"; - sha256 = "0s7z8a7cqnmfrs551wyqaj557hslhkw401z35nfb7shx6wrdvpq5"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base containers data-accessor data-accessor-transformers - deepseq filepath process temporary time transformers utility-ht - ]; - homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; - description = "2D and 3D plots using gnuplot"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gnuplot_0_5_5" = callPackage ({ mkDerivation, array, base, containers, data-accessor , data-accessor-transformers, deepseq, filepath, process, temporary , time, transformers, utility-ht @@ -83851,7 +83469,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; description = "2D and 3D plots using gnuplot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gnutls" = callPackage @@ -87361,6 +86978,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "groupBy" = callPackage + ({ mkDerivation, base, code-page, criterion, doctest + , optparse-applicative, QuickCheck, random, utility-ht + }: + mkDerivation { + pname = "groupBy"; + version = "0.1.0.0"; + sha256 = "1w8spv6fhwhfdr6azlfgnjs8dqcyk8sn27hnk2wyi7gpy9zzhxw0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck ]; + benchmarkHaskellDepends = [ + base code-page criterion optparse-applicative random utility-ht + ]; + homepage = "https://github.com/oisdk/groupBy#readme"; + description = "Replacement definition of Data.List.GroupBy"; + license = stdenv.lib.licenses.mit; + }) {}; + "grouped-list" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, pointed , QuickCheck, tasty, tasty-quickcheck @@ -90028,8 +89663,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.2.6"; - sha256 = "09ajj0x9cw1nyrxlki8kldal1h0mfsyr8rsz8c1y23qf8d2h69f8"; + version = "1.3.0"; + sha256 = "13z78q36x28h7yn282k03568hj0lvava678d7hhhp5hrbk6ni8xv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91070,30 +90705,6 @@ self: { }) {}; "hamilton" = callPackage - ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers - , free, hmatrix, hmatrix-gsl, optparse-applicative - , typelits-witnesses, vector, vector-sized, vty - }: - mkDerivation { - pname = "hamilton"; - version = "0.1.0.1"; - sha256 = "12wp6z2dhcpyijvf1bqcx1bamw19crm23wvzgbpbjw3azyi72sn3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ad base comonad free hmatrix hmatrix-gsl typelits-witnesses - vector-sized - ]; - executableHaskellDepends = [ - ansi-wl-pprint base containers hmatrix optparse-applicative vector - vector-sized vty - ]; - homepage = "https://github.com/mstksg/hamilton"; - description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hamilton_0_1_0_2" = callPackage ({ mkDerivation, ad, ansi-wl-pprint, base, comonad, containers , free, hmatrix, hmatrix-gsl, optparse-applicative , typelits-witnesses, vector, vector-sized, vty @@ -91115,7 +90726,6 @@ self: { homepage = "https://github.com/mstksg/hamilton"; description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hamlet" = callPackage @@ -92081,6 +91691,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "happstack-server-tls_7_1_6_5" = callPackage + ({ mkDerivation, base, bytestring, extensible-exceptions + , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile + , time, unix + }: + mkDerivation { + pname = "happstack-server-tls"; + version = "7.1.6.5"; + sha256 = "0hp13wxaghs6ldqpbpyf8agph7b1y488fc516z1n6bvbpzcbhbvq"; + libraryHaskellDepends = [ + base bytestring extensible-exceptions happstack-server hslogger + HsOpenSSL network sendfile time unix + ]; + librarySystemDepends = [ openssl ]; + homepage = "http://www.happstack.com/"; + description = "extend happstack-server with https:// support (TLS/SSL)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "happstack-server-tls-cryptonite" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , extensible-exceptions, happstack-server, hslogger, network @@ -92957,6 +92587,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashrename" = callPackage + ({ mkDerivation, base, bytestring, cryptohash, directory, filepath + }: + mkDerivation { + pname = "hashrename"; + version = "0.1.1.0"; + sha256 = "19w35cdwxzmyw65l4zwhj67w5s741ayca7dm250wz6w2xlc37f5v"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptohash directory filepath + ]; + homepage = "https://gist.github.com/rnhmjoj/20ea1b366d45b1c4c0e8"; + description = "Rename every file in a directory with his SHA1 hash"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hashring" = callPackage ({ mkDerivation, base, containers, hashable, QuickCheck , test-framework, test-framework-quickcheck2 @@ -94016,6 +93663,25 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "haskell-ml" = callPackage + ({ mkDerivation, attoparsec, base, binary, hmatrix, MonadRandom + , random-shuffle, singletons, text, vector + }: + mkDerivation { + pname = "haskell-ml"; + version = "0.4.2"; + sha256 = "0843akac5j1nhq6nknshblx33mg8b5h1lykpmgp627zzlbvzc3d3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary hmatrix MonadRandom singletons text vector + ]; + executableHaskellDepends = [ base hmatrix random-shuffle ]; + testHaskellDepends = [ base MonadRandom ]; + description = "Machine learning in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-modbus" = callPackage ({ mkDerivation, array, base, bytestring, cereal, hspec }: mkDerivation { @@ -94483,22 +94149,6 @@ self: { }) {}; "haskell-src-exts-util" = callPackage - ({ mkDerivation, base, containers, data-default, haskell-src-exts - , transformers, uniplate - }: - mkDerivation { - pname = "haskell-src-exts-util"; - version = "0.2.1.2"; - sha256 = "1a5y6fvzpjdi6az580rb1aq3gjxlcm6gn5dfd9mixyn5dv32aysv"; - libraryHaskellDepends = [ - base containers data-default haskell-src-exts transformers uniplate - ]; - homepage = "https://github.com/pepeiborra/haskell-src-exts-util"; - description = "Helper functions for working with haskell-src-exts trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-exts-util_0_2_2" = callPackage ({ mkDerivation, base, containers, data-default, haskell-src-exts , semigroups, transformers, uniplate }: @@ -94513,30 +94163,9 @@ self: { homepage = "https://github.com/pepeiborra/haskell-src-exts-util"; description = "Helper functions for working with haskell-src-exts trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta" = callPackage - ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb - , template-haskell, test-framework, test-framework-hunit - , th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; - version = "0.8.0.1"; - sha256 = "1i5f21mx061k50nl3pvvffjqsbvvldl50y8d4b9b31g63l0jg5q9"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - testHaskellDepends = [ - base haskell-src-exts HUnit pretty template-haskell test-framework - test-framework-hunit - ]; - description = "Parse source to template-haskell abstract syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-meta_0_8_0_2" = callPackage ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb , template-haskell, test-framework, test-framework-hunit , th-orphans @@ -94554,7 +94183,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -94613,22 +94241,6 @@ self: { }) {}; "haskell-tools-ast" = callPackage - ({ mkDerivation, base, ghc, mtl, references, template-haskell - , uniplate - }: - mkDerivation { - pname = "haskell-tools-ast"; - version = "1.0.0.3"; - sha256 = "1zfcwm6na7ivl4xy6yfdbgncklxp70g5llzl7i754sqvacbp7ygv"; - libraryHaskellDepends = [ - base ghc mtl references template-haskell uniplate - ]; - homepage = "https://github.com/nboldi/haskell-tools"; - description = "Haskell AST for efficient tooling"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-ast_1_0_0_4" = callPackage ({ mkDerivation, base, ghc, mtl, references, template-haskell , uniplate }: @@ -94642,7 +94254,6 @@ self: { homepage = "https://github.com/nboldi/haskell-tools"; description = "Haskell AST for efficient tooling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-ast-fromghc" = callPackage @@ -94700,24 +94311,6 @@ self: { }) {}; "haskell-tools-backend-ghc" = callPackage - ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th - , haskell-tools-ast, mtl, references, safe, split, template-haskell - , transformers, uniplate - }: - mkDerivation { - pname = "haskell-tools-backend-ghc"; - version = "1.0.0.3"; - sha256 = "1k8ykgasq621dndazb99834l6c0gz3qp40r81ja5mjwfqnihy2wk"; - libraryHaskellDepends = [ - base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl - references safe split template-haskell transformers uniplate - ]; - homepage = "https://github.com/nboldi/haskell-tools"; - description = "Creating the Haskell-Tools AST from GHC's representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-backend-ghc_1_0_0_4" = callPackage ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th , haskell-tools-ast, mtl, references, safe, split, template-haskell , transformers, uniplate @@ -94733,42 +94326,9 @@ self: { homepage = "https://github.com/nboldi/haskell-tools"; description = "Creating the Haskell-Tools AST from GHC's representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-builtin-refactorings" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, either - , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-refactor, haskell-tools-rewrite, mtl, old-time - , polyparse, references, split, tasty, tasty-hunit - , template-haskell, time, transformers, uniplate - }: - mkDerivation { - pname = "haskell-tools-builtin-refactorings"; - version = "1.0.0.3"; - sha256 = "0m6wwx3z5gbh9pak7r6lirk66clyb6yzryhbzcqhnwlnaawrpnh4"; - libraryHaskellDepends = [ - base Cabal containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-refactor - haskell-tools-rewrite mtl references split template-haskell - transformers uniplate - ]; - testHaskellDepends = [ - base Cabal containers directory either filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-refactor - haskell-tools-rewrite mtl old-time polyparse references split tasty - tasty-hunit template-haskell time transformers uniplate - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Refactoring Tool for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-builtin-refactorings_1_0_0_4" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint @@ -94801,43 +94361,6 @@ self: { }) {}; "haskell-tools-cli" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , directory, filepath, ghc, ghc-paths, Glob - , haskell-tools-builtin-refactorings, haskell-tools-daemon - , haskell-tools-refactor, knob, mtl, optparse-applicative, process - , references, split, strict, tasty, tasty-hunit, time - }: - mkDerivation { - pname = "haskell-tools-cli"; - version = "1.0.0.3"; - sha256 = "1cbp5n2b4q3kjacj4adnblb5znwi9waqx0pg14khk6nhdpqbp4l7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filepath ghc ghc-paths - haskell-tools-builtin-refactorings haskell-tools-daemon - haskell-tools-refactor mtl references split strict - ]; - executableHaskellDepends = [ - base directory filepath Glob haskell-tools-builtin-refactorings - haskell-tools-daemon mtl optparse-applicative process split - ]; - testHaskellDepends = [ - base bytestring directory filepath - haskell-tools-builtin-refactorings knob tasty tasty-hunit - ]; - benchmarkHaskellDepends = [ - aeson base bytestring criterion directory filepath - haskell-tools-builtin-refactorings haskell-tools-daemon knob split - time - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Command-line frontend for Haskell-tools Refact"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-cli_1_0_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, Glob , haskell-tools-builtin-refactorings, haskell-tools-daemon @@ -94875,41 +94398,6 @@ self: { }) {}; "haskell-tools-daemon" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob - , haskell-tools-builtin-refactorings, haskell-tools-prettyprint - , haskell-tools-refactor, HUnit, mtl, network, optparse-applicative - , pretty, process, references, split, strict, tasty, tasty-hunit - , template-haskell - }: - mkDerivation { - pname = "haskell-tools-daemon"; - version = "1.0.0.3"; - sha256 = "1g25i9ilsrk0201cnnm2r5xbcnlmknpvw3h99vl087i3d913wln7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers deepseq Diff directory - filepath fswatch ghc ghc-paths haskell-tools-builtin-refactorings - haskell-tools-prettyprint haskell-tools-refactor mtl network - optparse-applicative pretty process references split strict - template-haskell - ]; - executableHaskellDepends = [ - base directory filepath haskell-tools-builtin-refactorings - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath ghc Glob - haskell-tools-builtin-refactorings HUnit network process tasty - tasty-hunit - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Background process for Haskell-tools that editors can connect to"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-daemon_1_0_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob , haskell-tools-builtin-refactorings, haskell-tools-prettyprint @@ -94945,31 +94433,6 @@ self: { }) {}; "haskell-tools-debug" = callPackage - ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings - , haskell-tools-prettyprint, haskell-tools-refactor, references - , split, template-haskell - }: - mkDerivation { - pname = "haskell-tools-debug"; - version = "1.0.0.3"; - sha256 = "1f2m1ggjjbdwl23v558dlyqzcl00dg2almhppf8m3xg5vzgjzlpj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base filepath ghc ghc-paths haskell-tools-ast - haskell-tools-backend-ghc haskell-tools-builtin-refactorings - haskell-tools-prettyprint haskell-tools-refactor references split - template-haskell - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Debugging Tools for Haskell-tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-debug_1_0_0_4" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings , haskell-tools-prettyprint, haskell-tools-refactor, references @@ -94995,38 +94458,6 @@ self: { }) {}; "haskell-tools-demo" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings - , haskell-tools-prettyprint, haskell-tools-refactor, http-types - , HUnit, mtl, network, references, tasty, tasty-hunit, transformers - , wai, wai-websockets, warp, websockets - }: - mkDerivation { - pname = "haskell-tools-demo"; - version = "1.0.0.3"; - sha256 = "17cqnchan6qm9hhrrzk8m9v3qqzr3rfb1q8iyf8daa50qj9s836p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-builtin-refactorings haskell-tools-prettyprint - haskell-tools-refactor http-types mtl references transformers wai - wai-websockets warp websockets - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson base bytestring directory filepath HUnit network tasty - tasty-hunit websockets - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "A web-based demo for Haskell-tools Refactor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-tools-demo_1_0_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings @@ -95090,23 +94521,6 @@ self: { }) {}; "haskell-tools-prettyprint" = callPackage - ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl - , references, split, text, uniplate - }: - mkDerivation { - pname = "haskell-tools-prettyprint"; - version = "1.0.0.3"; - sha256 = "0gm48sikbm3dzv687wy7qn7j6159jf6j2gq0yhrhvxqhss4r03md"; - libraryHaskellDepends = [ - base containers ghc haskell-tools-ast mtl references split text - uniplate - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Pretty printing of Haskell-Tools AST"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-prettyprint_1_0_0_4" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, text, uniplate }: @@ -95121,31 +94535,9 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Pretty printing of Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-refactor" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc - , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc - , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references - , split, template-haskell, transformers, uniplate - }: - mkDerivation { - pname = "haskell-tools-refactor"; - version = "1.0.0.3"; - sha256 = "1gfy04fj3rg900ii32msyqrhzzwfcj6sl9z3ldjfm0c0jpdx4bm3"; - libraryHaskellDepends = [ - base Cabal containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-rewrite mtl references - split template-haskell transformers uniplate - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Refactoring Tool for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-refactor_1_0_0_4" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references @@ -95164,32 +94556,9 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-rewrite" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc - , haskell-tools-ast, haskell-tools-prettyprint, mtl, references - , tasty, tasty-hunit - }: - mkDerivation { - pname = "haskell-tools-rewrite"; - version = "1.0.0.3"; - sha256 = "15i25crjz50i9kxj2r2dsvmckfq8c0hkwypqrivy7c39cmqhv504"; - libraryHaskellDepends = [ - base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl - references - ]; - testHaskellDepends = [ - base directory filepath haskell-tools-ast haskell-tools-prettyprint - tasty tasty-hunit - ]; - homepage = "https://github.com/haskell-tools/haskell-tools"; - description = "Facilities for generating new parts of the Haskell-Tools AST"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-tools-rewrite_1_0_0_4" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references , tasty, tasty-hunit @@ -95209,7 +94578,6 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Facilities for generating new parts of the Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tor" = callPackage @@ -95858,8 +95226,8 @@ self: { }: mkDerivation { pname = "haskey"; - version = "0.2.0.0"; - sha256 = "1c0snqs740gqwfzlpyhr8zggaplmba6mzj8cnl8r47sgn006q95i"; + version = "0.2.0.1"; + sha256 = "07q7kp07ipq20v3ag49j3ca116p48yn3pn5im5p101l8372hj58n"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions filepath focus haskey-btree list-t lz4 mtl semigroups stm stm-containers @@ -98426,24 +97794,6 @@ self: { }) {}; "heaps" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest - , filepath - }: - mkDerivation { - pname = "heaps"; - version = "0.3.5"; - sha256 = "1p1nsglsf8hric63cn3n1iw1nlbiv3lgk3n5gq0znajj7j7s64qv"; - revision = "1"; - editedCabalFile = "05avm1b16gj3rlm9sjqkxb0flq055r6gqhnacp7yzw4j1bghm5j7"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base directory doctest filepath ]; - homepage = "http://github.com/ekmett/heaps/"; - description = "Asymptotically optimal Brodal/Okasaki heaps"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "heaps_0_3_6" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest , filepath }: @@ -98457,7 +97807,6 @@ self: { homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heapsort" = callPackage @@ -102021,33 +101370,6 @@ self: { }) {}; "hjsonschema" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , directory, file-embed, filepath, hashable, hjsonpointer, hspec - , http-client, http-types, pcre-heavy, profunctors, protolude - , QuickCheck, scientific, semigroups, text, unordered-containers - , vector, wai-app-static, warp - }: - mkDerivation { - pname = "hjsonschema"; - version = "1.7.1"; - sha256 = "0x9w33scdnbfdmadxpx2c4fgkmpvny9ipsl2y7fq56zr6fa0ybfz"; - libraryHaskellDepends = [ - aeson base bytestring containers file-embed filepath hashable - hjsonpointer http-client http-types pcre-heavy profunctors - protolude QuickCheck scientific semigroups text - unordered-containers vector - ]; - testHaskellDepends = [ - aeson async base bytestring directory filepath hjsonpointer hspec - profunctors protolude QuickCheck semigroups text - unordered-containers vector wai-app-static warp - ]; - homepage = "https://github.com/seagreen/hjsonschema"; - description = "JSON Schema library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hjsonschema_1_7_2" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-types, pcre-heavy, profunctors, protolude @@ -102072,7 +101394,6 @@ self: { homepage = "https://github.com/seagreen/hjsonschema"; description = "JSON Schema library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hjugement" = callPackage @@ -102742,26 +102063,6 @@ self: { }) {}; "hmatrix" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, split, storable-complex, vector - }: - mkDerivation { - pname = "hmatrix"; - version = "0.18.1.0"; - sha256 = "07zkwvg872hfk6jyn4s54ws8mvclynazaxf7fsbqi16dmf9dn61c"; - configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; - libraryHaskellDepends = [ - array base binary bytestring deepseq random split storable-complex - vector - ]; - librarySystemDepends = [ openblasCompat ]; - preConfigure = "sed -i hmatrix.cabal -e '/\\/usr\\//D'"; - homepage = "https://github.com/albertoruiz/hmatrix"; - description = "Numeric Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openblasCompat;}; - - "hmatrix_0_18_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , openblasCompat, random, semigroups, split, storable-complex , vector @@ -102779,7 +102080,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "hmatrix-banded" = callPackage @@ -103203,20 +102503,6 @@ self: { }) {inherit (pkgs) ncurses;}; "hmpfr" = callPackage - ({ mkDerivation, base, integer-gmp, mpfr }: - mkDerivation { - pname = "hmpfr"; - version = "0.4.3"; - sha256 = "09q4gmj2gr3krh7vpkc8xwiy874d7mr6v57hv2i3n481yhky0yir"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base integer-gmp ]; - librarySystemDepends = [ mpfr ]; - homepage = "https://github.com/michalkonecny/hmpfr"; - description = "Haskell binding to the MPFR library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) mpfr;}; - - "hmpfr_0_4_4" = callPackage ({ mkDerivation, base, integer-gmp, mpfr }: mkDerivation { pname = "hmpfr"; @@ -103228,7 +102514,6 @@ self: { homepage = "https://github.com/michalkonecny/hmpfr"; description = "Haskell binding to the MPFR library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mpfr;}; "hmt" = callPackage @@ -103516,15 +102801,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_6_1" = callPackage + "hoauth2_1_6_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , http-conduit, http-types, microlens, text, unordered-containers , uri-bytestring, uri-bytestring-aeson, wai, warp }: mkDerivation { pname = "hoauth2"; - version = "1.6.1"; - sha256 = "0rmb3f4ci75fpzzqcq4qrjnqpnpmpr6i9j69z7cf8m2ji1vnvlw7"; + version = "1.6.2"; + sha256 = "185yia9mdjhmhian83rrd0hm3wjpja7hawnyvzq25rnhh2g4l2ay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104359,8 +103644,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.17"; - sha256 = "0igs4c08sjwckk71ck358d4c90mgb3mhlyl2ag569wzyqyj77mlp"; + version = "5.0.17.1"; + sha256 = "0678kdssjmb8k08jmazg1w9lglz27ni2p3b5031likk2dp9gvf2h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104419,8 +103704,8 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.1.1.0"; - sha256 = "11gbk92wqcakmqqrvggjypxxpgdccacqbrrzicwy8113hd6kiw75"; + version = "0.2"; + sha256 = "17sj62b78a22alq9hpsrjcri5yxz7yzxdar521yd6x7jv3xxpix2"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system network socks ]; @@ -104547,6 +103832,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hopenpgp-tools_0_20" = callPackage + ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec + , base, base16-bytestring, binary, binary-conduit, bytestring + , conduit, conduit-extra, containers, crypto-pubkey, cryptohash + , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client + , http-client-tls, http-types, ixset-typed, lens, monad-loops + , openpgp-asciiarmor, optparse-applicative, resourcet, text, time + , time-locale-compat, transformers, unordered-containers + , wl-pprint-extras, wl-pprint-terminfo, yaml + }: + mkDerivation { + pname = "hopenpgp-tools"; + version = "0.20"; + sha256 = "1qhx58l6qxs7b5zp76dsy3y0whqnkp919c98lz9n1clla0hfhdgb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson ansi-wl-pprint array attoparsec base base16-bytestring binary + binary-conduit bytestring conduit conduit-extra containers + crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP + http-client http-client-tls http-types ixset-typed lens monad-loops + openpgp-asciiarmor optparse-applicative resourcet text time + time-locale-compat transformers unordered-containers + wl-pprint-extras wl-pprint-terminfo yaml + ]; + executableToolDepends = [ alex happy ]; + homepage = "https://salsa.debian.org/clint/hOpenPGP"; + description = "hOpenPGP-based command-line tools"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hopenssl" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest , HUnit, openssl @@ -104641,8 +103958,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.3.2"; - sha256 = "04ah438igxykyspzlhpa5y50z1accrb9sxhv2sn8riqfhdz2sych"; + version = "0.4.0"; + sha256 = "186pb32mqwvb5n1a9v2p0cs3g01lrdw5j3p3ddjqdkss7mq6sacz"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -104658,8 +103975,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.3.4"; - sha256 = "09vc23id1f30270c6q3wadckzvbqj4hvaxzy3wfbmhsqbrmmrfwh"; + version = "0.4.0"; + sha256 = "0dk5xhxiw697pb1df544yixsfhiivpp8irllvvjbij7hfbivi409"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; @@ -104673,8 +103990,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "hoppy-runtime"; - version = "0.3.2"; - sha256 = "0ax4aqbnxc80dbj8f7hykgj5agn59nwv4icfwmb4knxj2qw35kg3"; + version = "0.4.0"; + sha256 = "0vi1i2wa64gdxsc3705vpmimkajf3dz6dakxils1alyxp5ih8f4z"; libraryHaskellDepends = [ base Cabal containers directory filepath ]; @@ -104688,8 +104005,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.3.0"; - sha256 = "0rgvqkslhj6d9craiwb5g75217jh7s34980rpcbjbjba8pscpxjb"; + version = "0.4.0"; + sha256 = "0kb9myfnradifyihigjw08navl5fwcfqznqrp9xjmkwkp8k2h0p5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -105119,39 +104436,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hpack_0_20_0" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal - , containers, cryptonite, deepseq, directory, filepath, Glob, hspec - , HUnit, interpolate, mockery, pretty, QuickCheck, temporary, text - , unordered-containers, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.20.0"; - sha256 = "0n8dhxk0h45lhc436xmdbmf0pva26dyg6p9vcksfl3dfp0nvf2mi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring Cabal containers cryptonite - deepseq directory filepath Glob pretty text unordered-containers - yaml - ]; - executableHaskellDepends = [ - aeson base base-compat bytestring Cabal containers cryptonite - deepseq directory filepath Glob pretty text unordered-containers - yaml - ]; - testHaskellDepends = [ - aeson base base-compat bytestring Cabal containers cryptonite - deepseq directory filepath Glob hspec HUnit interpolate mockery - pretty QuickCheck temporary text unordered-containers yaml - ]; - homepage = "https://github.com/sol/hpack#readme"; - description = "An alternative format for Haskell packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec @@ -105185,7 +104469,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hpack_0_22_0" = callPackage + "hpack_0_23_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , http-client, http-client-tls, http-types, interpolate, mockery @@ -105194,8 +104478,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.22.0"; - sha256 = "1abkbnnmrw2hdvvpf55m4dxh7vdxyk6ayc21ah91sgv8nnmavm67"; + version = "0.23.0"; + sha256 = "1604lr20745kkzbhl2ski74p6swjgvarsbaxcpj5wldhk65add6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105514,8 +104798,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.9.0.2"; - sha256 = "0jxmmch6y897rk02rql4rs82qmdj3r3xpbsrv75sgc2mb09cx2zy"; + version = "0.9.0.3"; + sha256 = "0cz7dxxxxfr142gr3hrq1k1x8axdgvyw7bsjsd1v9spka2i03rcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105537,16 +104821,16 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hpio_0_9_0_3" = callPackage + "hpio_0_9_0_4" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory - , doctest, exceptions, filepath, hlint, hspec, monad-control - , monad-logger, mtl, optparse-applicative, protolude, QuickCheck - , text, transformers, transformers-base, unix, unix-bytestring + , doctest, exceptions, filepath, hspec, monad-control, monad-logger + , mtl, optparse-applicative, protolude, QuickCheck, text + , transformers, transformers-base, unix, unix-bytestring }: mkDerivation { pname = "hpio"; - version = "0.9.0.3"; - sha256 = "0cz7dxxxxfr142gr3hrq1k1x8axdgvyw7bsjsd1v9spka2i03rcd"; + version = "0.9.0.4"; + sha256 = "18j60xiwh18s01bbapi95h8g6ixr9brqh375qlhg600cgf0yzirx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105559,7 +104843,7 @@ self: { transformers ]; testHaskellDepends = [ - base containers directory doctest exceptions filepath hlint hspec + base containers directory doctest exceptions filepath hspec protolude QuickCheck ]; homepage = "https://github.com/quixoftic/hpio#readme"; @@ -107557,8 +106841,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.0.3"; - sha256 = "03silw148f3wr62j5zdyy1qq6jmsmfhijmghcv0bf7sgv0lgaycv"; + version = "0.3.1.0"; + sha256 = "04k2yq4a5q87yj8z9h2qzmw32p0c8snc5ccaqyyk24kxa9p26av8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107634,6 +106918,23 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; + "hsdns_1_7_1" = callPackage + ({ mkDerivation, adns, base, containers, network }: + mkDerivation { + pname = "hsdns"; + version = "1.7.1"; + sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers network ]; + librarySystemDepends = [ adns ]; + homepage = "http://github.com/peti/hsdns"; + description = "Asynchronous DNS Resolver"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {inherit (pkgs) adns;}; + "hsdns-cache" = callPackage ({ mkDerivation, base, hsdns, network, SafeSemaphore, text, time , unordered-containers @@ -108944,32 +108245,6 @@ self: { }) {}; "hspec-meta" = callPackage - ({ mkDerivation, ansi-terminal, array, async, base, call-stack - , deepseq, directory, filepath, hspec-expectations, HUnit - , QuickCheck, quickcheck-io, random, setenv, time, transformers - }: - mkDerivation { - pname = "hspec-meta"; - version = "2.4.4"; - sha256 = "117n4j56wfh48xj02mv0wkp10bkr2xkyvwg7n7r2ynp03wrf9ykm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv time transformers - ]; - executableHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv time transformers - ]; - homepage = "http://hspec.github.io/"; - description = "A version of Hspec which is used to test Hspec itself"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-meta_2_4_6" = callPackage ({ mkDerivation, ansi-terminal, array, async, base, call-stack , deepseq, directory, filepath, hspec-expectations, HUnit , QuickCheck, quickcheck-io, random, setenv, time, transformers @@ -108993,7 +108268,6 @@ self: { homepage = "http://hspec.github.io/"; description = "A version of Hspec which is used to test Hspec itself"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-monad-control" = callPackage @@ -110110,6 +109384,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsx2hs_0_14_1_2" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-exts + , haskell-src-meta, mtl, template-haskell, utf8-string + }: + mkDerivation { + pname = "hsx2hs"; + version = "0.14.1.2"; + sha256 = "06j2nc2yg8a8pp3c2ayxrm76fj2w2w5d2ilq91hvwwb1ikrklg5b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string + ]; + homepage = "https://github.com/seereason/hsx2hs"; + description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsyscall" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -110752,6 +110046,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_3_7_2" = callPackage + ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring + , Cabal, cabal-doctest, containers, directory, doctest, filepath + , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck + , quickcheck-instances, text, time, time-locale-compat + , unordered-containers, uri-bytestring, uuid, uuid-types + }: + mkDerivation { + pname = "http-api-data"; + version = "0.3.7.2"; + sha256 = "10kcpxl9m1q2dl4z2ig6ysrhrdmdg35skfh8kwx0h7f0n7d6wlb8"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base bytestring containers hashable + http-types text time time-locale-compat unordered-containers + uri-bytestring uuid-types + ]; + testHaskellDepends = [ + base bytestring directory doctest filepath hspec HUnit QuickCheck + quickcheck-instances text time unordered-containers uuid + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/fizruk/http-api-data"; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, http-types }: mkDerivation { @@ -110766,35 +110088,6 @@ self: { }) {}; "http-client" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , http-types, mime-types, monad-control, network, network-uri - , random, streaming-commons, text, time, transformers, zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.5.7.1"; - sha256 = "19cvnnfcjj2m3pgs6ivyjs21rw9wx5ynarh6hvb27a76cscai2fy"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie deepseq exceptions filepath - ghc-prim http-types mime-types network network-uri random - streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_5_9" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -110821,7 +110114,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -111665,14 +110957,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-types_0_11" = callPackage + "http-types_0_12" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, doctest , hspec, QuickCheck, quickcheck-instances, text }: mkDerivation { pname = "http-types"; - version = "0.11"; - sha256 = "08w30rf1i7kbh2j1iajqmj6yhhmglnb8kjggc8kdni3xahhrgcss"; + version = "0.12"; + sha256 = "1fb7hn8d4zkf1q0kyj7p02js15n4mw48bbr43bym9v5v8xj3lyk3"; libraryHaskellDepends = [ array base bytestring case-insensitive text ]; @@ -112593,6 +111885,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-fingertree" = callPackage + ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree"; + version = "0.1.0.0"; + sha256 = "0hh1f9m92s53254a2bk3h4i77girf8nni8rmyrd0ljramn4hiz55"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "Generic finger-tree structure, with example instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-fingertree-strict" = callPackage + ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree-strict"; + version = "0.1.0.0"; + sha256 = "02bgqcjjhxpzd5nql50abbbjlg5pan2wy1dhdwc2br87n3jhx90x"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/githubuser/hw-fingertree-strict#readme"; + description = "Generic strict finger-tree structure"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, vector }: mkDerivation { @@ -113591,20 +112919,6 @@ self: { }) {}; "hybrid-vectors" = callPackage - ({ mkDerivation, base, deepseq, primitive, vector }: - mkDerivation { - pname = "hybrid-vectors"; - version = "0.2.1"; - sha256 = "18nc6qw7f9rxi0h6qk28yq6i0x19gwjzq2v9mi2ajxnwzvydip1f"; - revision = "1"; - editedCabalFile = "1i73cfi226l8nivqw9dxnxajkdsgxkh89h00mgsrplf60kdh4wzh"; - libraryHaskellDepends = [ base deepseq primitive vector ]; - homepage = "http://github.com/ekmett/hybrid-vectors"; - description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hybrid-vectors_0_2_2" = callPackage ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: mkDerivation { pname = "hybrid-vectors"; @@ -113616,7 +112930,6 @@ self: { homepage = "http://github.com/ekmett/hybrid-vectors"; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hydra-hs" = callPackage @@ -114129,29 +113442,6 @@ self: { }) {}; "hyphenation" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers - , doctest, unordered-containers, zlib - }: - mkDerivation { - pname = "hyphenation"; - version = "0.7"; - sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s"; - revision = "2"; - editedCabalFile = "0bf147dfnp8lw4kmscgkmd4pnawzv0yc63hhjr7sjvk5xyyvb5mq"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring containers unordered-containers zlib - ]; - testHaskellDepends = [ - base containers doctest unordered-containers - ]; - homepage = "http://github.com/ekmett/hyphenation"; - description = "Configurable Knuth-Liang hyphenation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hyphenation_0_7_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers , doctest, unordered-containers, zlib }: @@ -114170,7 +113460,6 @@ self: { homepage = "http://github.com/ekmett/hyphenation"; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hypher" = callPackage @@ -116090,26 +115379,6 @@ self: { }) {}; "incremental-parser" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "incremental-parser"; - version = "0.2.5.2"; - sha256 = "0qlawnlghp8cz96sc6kjzhp0dlinmnyh38gjcp6i1wfn2qy8qy7d"; - libraryHaskellDepends = [ base monoid-subclasses ]; - testHaskellDepends = [ - base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq monoid-subclasses text - ]; - homepage = "https://github.com/blamario/incremental-parser"; - description = "Generic parser library capable of providing partial results from partial input"; - license = "GPL"; - }) {}; - - "incremental-parser_0_2_5_3" = callPackage ({ mkDerivation, base, bytestring, checkers, criterion, deepseq , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text }: @@ -116127,7 +115396,6 @@ self: { homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -116476,26 +115744,6 @@ self: { }) {}; "inflections" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec - , hspec-megaparsec, megaparsec, QuickCheck, text - , unordered-containers - }: - mkDerivation { - pname = "inflections"; - version = "0.4.0.0"; - sha256 = "1m42sigx621yzd6sznaas6917skyw8lf5ynfcjd87jybhv2r9g2k"; - libraryHaskellDepends = [ - base exceptions megaparsec text unordered-containers - ]; - testHaskellDepends = [ - base containers hspec hspec-megaparsec megaparsec QuickCheck text - ]; - homepage = "https://github.com/stackbuilders/inflections-hs"; - description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inflections_0_4_0_1" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , hspec-megaparsec, megaparsec, QuickCheck, text , unordered-containers @@ -116513,7 +115761,6 @@ self: { homepage = "https://github.com/stackbuilders/inflections-hs"; description = "Inflections library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inflist" = callPackage @@ -116561,6 +115808,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_2_2_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clock + , containers, foldl, http-client, http-types, HUnit, lens, mtl + , mwc-random, network, optional-args, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.2.2.3"; + sha256 = "14454644vlkyd27ywhsvkczxdxdwqkl917zcb51ay68gdnrrwm1i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific text time + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers foldl http-client lens mwc-random + network optional-args text time vector + ]; + testHaskellDepends = [ + base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck + tasty-th text vector + ]; + homepage = "https://github.com/maoe/influxdb-haskell"; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -116790,9 +116069,9 @@ self: { }) {}; "inline-r" = callPackage - ({ mkDerivation, aeson, base, bytestring, c2hs, containers - , criterion, data-default-class, deepseq, directory, exceptions - , filepath, ieee754, mtl, pretty, primitive, process + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , data-default-class, deepseq, directory, exceptions, filepath + , ieee754, inline-c, mtl, pretty, primitive, process , quickcheck-assertions, R, reflection, setenv, silently , singletons, strict, tasty, tasty-expected-failure, tasty-golden , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text @@ -116800,16 +116079,15 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.9.0.2"; - sha256 = "1swxdilr1l7h3pk313fyjgpg58g20v6560j9g4cxz0gakqqhb3jc"; + version = "0.9.1"; + sha256 = "1wpvyagc56yjkxvaw7a64gl2i4qfn4cgb47nx53pc6wcph7cyras"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq - exceptions mtl pretty primitive process reflection setenv + exceptions inline-c mtl pretty primitive process reflection setenv singletons template-haskell text th-lift th-orphans transformers unix vector ]; libraryPkgconfigDepends = [ R ]; - libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring directory filepath ieee754 mtl process quickcheck-assertions silently singletons strict tasty @@ -116870,8 +116148,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.1.0"; sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "3"; - editedCabalFile = "0ik4n32rvamxvlp80ixjrbhskivynli7b89s4hk6401bcy3ykp3g"; + revision = "4"; + editedCabalFile = "0ls5rm5hg2lqp2m6bfssa30y72x8xyyl7izvwr3w804dpa9fvwrm"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -116882,7 +116160,7 @@ self: { unordered-containers ]; homepage = "https://github.com/phadej/insert-ordered-containers#readme"; - description = "Associative containers retating insertion order for traversals"; + description = "Associative containers retaining insertion order for traversals"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -117576,13 +116854,13 @@ self: { }: mkDerivation { pname = "intrinsic-superclasses"; - version = "0.2.0.0"; - sha256 = "0bx8igqwpyhs1q8rhyxhc5389nx49ynfq08bis30x9gdq209dqih"; + version = "0.3.0.0"; + sha256 = "18xvpdip1zdgylqcngvk8hz6dsnl3bp681pc31nb562vg2crqzz6"; libraryHaskellDepends = [ base containers haskell-src-meta mtl template-haskell ]; homepage = "https://github.com/daig/intrinsic-superclasses#readme"; - description = "A quasiquoter implementation of the Intrinsic Superclasses Proposal"; + description = "A quasiquoter for better instance deriving and default methods"; license = stdenv.lib.licenses.mit; }) {}; @@ -117593,8 +116871,8 @@ self: { }: mkDerivation { pname = "intro"; - version = "0.3.0.1"; - sha256 = "0yc163r255w7df0hjly30bh5dqgx38f1z5lk3x3i7jh93j97cpn0"; + version = "0.3.1.0"; + sha256 = "14kl6nx62qkm19fjn593m62iy4myjwg94yyr38kkbna438n5wpns"; libraryHaskellDepends = [ base binary bytestring containers deepseq dlist extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -117715,26 +116993,6 @@ self: { }) {}; "invertible" = callPackage - ({ mkDerivation, base, haskell-src-meta, invariant, lens - , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell - , transformers, TypeCompose - }: - mkDerivation { - pname = "invertible"; - version = "0.2.0.2"; - sha256 = "1a45hgsz46rqx2bfi0cgnf443pr28ik2rqi2f745q2qr41pvdqgf"; - revision = "1"; - editedCabalFile = "1jbk0mcn66j2931yka1923j7k45jgv6174q8rr3plidyn8fgm2hg"; - libraryHaskellDepends = [ - base haskell-src-meta invariant lens partial-isomorphisms - semigroupoids template-haskell transformers TypeCompose - ]; - testHaskellDepends = [ base QuickCheck transformers ]; - description = "bidirectional arrows, bijective functions, and invariant functors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "invertible_0_2_0_3" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell , transformers, TypeCompose @@ -117750,7 +117008,6 @@ self: { testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -118084,33 +117341,6 @@ self: { }) {}; "ip" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , doctest, hashable, HUnit, primitive, QuickCheck - , quickcheck-classes, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, vector - }: - mkDerivation { - pname = "ip"; - version = "1.1.1"; - sha256 = "150gbl7589w1a1imqn8qh5g9ar68bkkx0ifiab5zf0gvxgkiz4jd"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector - ]; - testHaskellDepends = [ - attoparsec base bytestring doctest HUnit QuickCheck - quickcheck-classes test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring criterion text - ]; - homepage = "https://github.com/andrewthad/haskell-ip#readme"; - description = "Library for IP and MAC addresses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ip_1_1_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , doctest, hashable, HUnit, primitive, QuickCheck , quickcheck-classes, test-framework, test-framework-hunit @@ -118381,27 +117611,6 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, containers - , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-conduit - , text, time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "1.0.0.1"; - sha256 = "0qg4bvl82wwm7jlrxsmc4aw51rfdygq8qzm6x7j4121av5wbk095"; - libraryHaskellDepends = [ - base bytestring conduit connection containers contravariant - exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-conduit text time tls transformers x509 - x509-store x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-client"; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-conduit @@ -118420,7 +117629,6 @@ self: { homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -118600,8 +117808,8 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.5.1"; - sha256 = "1cam9f7ppxj7yh1am0qjkh8b19haggrqdmkd26xik1ymn7nq9iyd"; + version = "0.6.5.2"; + sha256 = "06is6hbk1992brbjrrjsqbv221h9c3syq0v1bah953sczg3a99jk"; libraryHaskellDepends = [ base bytestring containers directory filepath irc mtl network parsec random SafeSemaphore stm time unix @@ -119423,6 +118631,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "iwlib" = callPackage + ({ mkDerivation, base, wirelesstools }: + mkDerivation { + pname = "iwlib"; + version = "0.1.0"; + sha256 = "0khmfwql4vwj55idsxmhjhrbqzfir3g9wm5lmpvnf77mm95cfpdz"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ wirelesstools ]; + homepage = "https://github.com/jaor/iwlib"; + description = "Bindings for the iw C library"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) wirelesstools;}; + "ix-shapable" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -120181,6 +119402,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jml-web-service" = callPackage + ({ mkDerivation, base, bytestring, clock, data-default, http-types + , monad-logger, optparse-applicative, prometheus-client + , prometheus-metrics-ghc, protolude, tasty, text, wai, wai-extra + , warp + }: + mkDerivation { + pname = "jml-web-service"; + version = "0.1.0"; + sha256 = "1gs3qmcx87wh7372a4sa3g5f4w1lbyvd8iwr1w5pay21f0kcgnxk"; + libraryHaskellDepends = [ + base bytestring clock data-default http-types monad-logger + optparse-applicative prometheus-client prometheus-metrics-ghc + protolude text wai wai-extra warp + ]; + testHaskellDepends = [ base protolude tasty ]; + homepage = "https://github.com/jml/jml-web-service#readme"; + description = "Common utilities for running a web service"; + license = stdenv.lib.licenses.asl20; + }) {}; + "jni" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, containers , cpphs, deepseq, inline-c, jdk, singletons @@ -120864,8 +120106,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "0.0.6"; - sha256 = "1mmxwhdrvxx5y0s8d7lxggjd396g3ga69zj6c2s020kdakhplnam"; + version = "1.0.0"; + sha256 = "06h9qji4cnzqw4nmxs6dka7ywhz8jr56v5pcb3dlvganjg3s0gdx"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -121059,8 +120301,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "2"; - editedCabalFile = "0d070nv5kyplqpch98cfbcd5nxa24q3hrfjzpwkkvngqn6j0g6pi"; + revision = "3"; + editedCabalFile = "0hi2im3k7hpz3rasap90fvik3x5ibb7dd38sr1zsy7wsjkhk7zs4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122014,6 +121256,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kan-extensions_5_1" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, fail, free, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.1"; + sha256 = "019jyrilk97i5bj8v044ig03m66h02q4b073m1fksrk7y9c8wgqr"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive fail free mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/kan-extensions/"; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -122273,6 +121535,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip-elasticsearch_0_4_0_4" = callPackage + ({ mkDerivation, aeson, async, base, bloodhound, bytestring + , containers, criterion, deepseq, enclosed-exceptions, exceptions + , http-client, http-types, katip, lens, lens-aeson + , quickcheck-instances, random, retry, scientific, stm, stm-chans + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "katip-elasticsearch"; + version = "0.4.0.4"; + sha256 = "0zg0f5czqff9zd0rnkj68bmxmizrl01q4wbvz43hj5j8mj0jzybj"; + libraryHaskellDepends = [ + aeson async base bloodhound bytestring enclosed-exceptions + exceptions http-client http-types katip retry scientific stm + stm-chans text time transformers unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base bloodhound bytestring containers http-client http-types + katip lens lens-aeson quickcheck-instances scientific stm tagged + tasty tasty-hunit tasty-quickcheck text time transformers + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson base bloodhound criterion deepseq random text + unordered-containers uuid + ]; + homepage = "https://github.com/Soostone/katip"; + description = "ElasticSearch scribe for the Katip logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-syslog" = callPackage ({ mkDerivation, aeson, base, bytestring, hsyslog, katip , string-conv, text @@ -123015,6 +122310,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keys_3_12" = callPackage + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, tagged, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "keys"; + version = "3.12"; + sha256 = "0may9nrlfji2mmypl9q47lcpg4r793hmm4i22x7j4l6zz67sggyl"; + revision = "1"; + editedCabalFile = "1lbl62y3alhpgkf2knh4q5pcby54kblb68cbx2i77fbdwz8jbka7"; + libraryHaskellDepends = [ + array base comonad containers free hashable semigroupoids + semigroups tagged transformers transformers-compat + unordered-containers + ]; + homepage = "http://github.com/ekmett/keys/"; + description = "Keyed functors and containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "keysafe" = callPackage ({ mkDerivation, aeson, argon2, async, base, bloomfilter , bytestring, containers, deepseq, directory, disk-free-space @@ -123802,6 +123119,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_1_0_0" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "1.0.0"; + sha256 = "0spgcfg2py1ff1zak211xsgmccpg56c9bbv14xsgjdig9k6cfyz0"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + homepage = "https://github.com/tfausak/lackey#readme"; + description = "Generate Ruby clients from Servant APIs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lagrangian" = callPackage ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -124662,8 +123993,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "0.1.1.5"; - sha256 = "1lgfrighhqm56s7i0kdpz4fhkmav4p474xiw2xns07g65dr223a8"; + version = "0.1.1.6"; + sha256 = "1463z1xpjdm6cziib10w7x7n5ch77mjgy73h7rik3ybawj8njswd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base composition-prelude deepseq @@ -126000,6 +125331,8 @@ self: { pname = "lattices"; version = "1.7"; sha256 = "1p5bqr3a8haib4wsdzy08z61jv8cq91n7rzj7wanh1nwp3r2n1nc"; + revision = "1"; + editedCabalFile = "1nsc77nnh8cvfw8f58g0w5mjamy4iivkadyyaj3yzawfr8jbxi53"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -126014,6 +125347,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lattices_1_7_1" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty + , tasty-quickcheck, transformers, universe-base + , universe-instances-base, universe-reverse-instances + , unordered-containers + }: + mkDerivation { + pname = "lattices"; + version = "1.7.1"; + sha256 = "0bcv28dazaz0n166jbd579vim0hr4c20rmg0s34284fdr6p50m3x"; + libraryHaskellDepends = [ + base base-compat containers deepseq hashable semigroupoids tagged + universe-base universe-reverse-instances unordered-containers + ]; + testHaskellDepends = [ + base base-compat containers QuickCheck quickcheck-instances tasty + tasty-quickcheck transformers universe-instances-base + unordered-containers + ]; + homepage = "http://github.com/phadej/lattices/"; + description = "Fine-grained library for constructing and manipulating lattices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "launchpad-control" = callPackage ({ mkDerivation, array, base, containers, hmidi, mtl, transformers }: @@ -126826,6 +126185,50 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "lens_4_16" = callPackage + ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring + , Cabal, cabal-doctest, call-stack, comonad, containers + , contravariant, criterion, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors + , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect + , tagged, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, text + , th-abstraction, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.16"; + sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z"; + revision = "1"; + editedCabalFile = "0pgjpixph8idgf2wp8z25cbq6jf2bddigfs7r7nbln2a1v8yli1y"; + setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; + libraryHaskellDepends = [ + array base base-orphans bifunctors bytestring call-stack comonad + containers contravariant distributive exceptions filepath free + ghc-prim hashable kan-extensions mtl parallel profunctors + reflection semigroupoids semigroups tagged template-haskell text + th-abstraction transformers transformers-compat + unordered-containers vector void + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving HUnit mtl nats parallel QuickCheck semigroups + simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-accelerate" = callPackage ({ mkDerivation, accelerate, base, lens }: mkDerivation { @@ -126841,26 +126244,6 @@ self: { }) {}; "lens-action" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant - , directory, doctest, filepath, lens, mtl, profunctors - , semigroupoids, semigroups, transformers - }: - mkDerivation { - pname = "lens-action"; - version = "0.2.2"; - sha256 = "1skhczbl774sb0202b8allm96b67wqsl5fd7jdr9i6a20hyx1gqr"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base comonad contravariant lens mtl profunctors semigroupoids - semigroups transformers - ]; - testHaskellDepends = [ base directory doctest filepath ]; - homepage = "http://github.com/ekmett/lens-action/"; - description = "Monadic Getters and Folds"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-action_0_2_3" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant , directory, doctest, filepath, lens, mtl, profunctors , semigroupoids, semigroups, transformers @@ -126878,7 +126261,6 @@ self: { homepage = "http://github.com/ekmett/lens-action/"; description = "Monadic Getters and Folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-aeson" = callPackage @@ -127191,6 +126573,34 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "lentil_1_0_10_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip + , filepath, hspec, natural-sort, optparse-applicative, parsec + , pipes, regex-tdfa, semigroups, terminal-progress-bar, text + , transformers + }: + mkDerivation { + pname = "lentil"; + version = "1.0.10.0"; + sha256 = "0s7qxd65bjw0h709q9igb5q4jls80wc9jzh5s8ic7ww11f0m5hm7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath natural-sort + optparse-applicative parsec pipes regex-tdfa semigroups + terminal-progress-bar text transformers + ]; + testHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath hspec + natural-sort optparse-applicative parsec pipes regex-tdfa + semigroups terminal-progress-bar text transformers + ]; + homepage = "http://www.ariis.it/static/articles/lentil/page.html"; + description = "frugal issue tracker"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lenz" = callPackage ({ mkDerivation, base, base-unicode-symbols, hs-functors , transformers @@ -128205,6 +127615,9 @@ self: { pname = "libxml"; version = "0.1.1"; sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi"; + configureFlags = [ + "--extra-include-dir=${libxml2.dev}/include/libxml2" + ]; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ libxml2 ]; description = "Binding to libxml2"; @@ -128273,27 +127686,6 @@ self: { }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers - , directory, http-conduit, process - }: - mkDerivation { - pname = "licensor"; - version = "0.2.1"; - sha256 = "1is281xsrfdh2vsank07j1gw634iadz0sp8ssabpfqgnb3a98rvz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers directory http-conduit process - ]; - executableHaskellDepends = [ - base Cabal cmdargs containers directory - ]; - homepage = "https://github.com/jpvillaisaza/licensor"; - description = "A license compatibility helper"; - license = stdenv.lib.licenses.mit; - }) {}; - - "licensor_0_2_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers , directory, http-conduit, process }: @@ -128312,7 +127704,6 @@ self: { homepage = "https://github.com/jpvillaisaza/licensor"; description = "A license compatibility helper"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "life" = callPackage @@ -128350,28 +127741,6 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, criterion, deepseq - , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit - , tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; - version = "0.9.3.2"; - sha256 = "0c8y6m1kpkviq2zi1d2889hbzh7k46rly4mvmfkrzam45fqggrcj"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty tasty-hunit - tasty-th - ]; - benchmarkHaskellDepends = [ async base criterion deepseq ]; - homepage = "https://github.com/maoe/lifted-async"; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lifted-async_0_9_3_3" = callPackage ({ mkDerivation, async, base, constraints, criterion, deepseq , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit , tasty-th, transformers-base @@ -128391,7 +127760,6 @@ self: { homepage = "https://github.com/maoe/lifted-async"; description = "Run lifted IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -130558,8 +129926,8 @@ self: { ({ mkDerivation, base, containers, hslogger, PSQueue, stm }: mkDerivation { pname = "load-balancing"; - version = "1.0.1.0"; - sha256 = "17xrgq7ww56dx1jy1ksqgx0c0zgzapc7ikdy2cwv65cigd1pqaik"; + version = "1.0.1.1"; + sha256 = "1vszir1b79fdn545k3k86mgqhivyg8s5vv5v24y4cp4cc47aiwmi"; libraryHaskellDepends = [ base containers hslogger PSQueue stm ]; homepage = "https://github.com/SumAll/haskell-load-balancing"; description = "Client-side load balancing utilities"; @@ -131005,7 +130373,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "log-warper_1_8_5" = callPackage + "log-warper_1_8_6" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers , data-default, deepseq, directory, filepath, fmt, hspec , hspec-discover, HUnit, markdown-unlit, microlens, microlens-mtl @@ -131015,8 +130383,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.8.5"; - sha256 = "11yai7siw1jkyk5v1kprkv7j13npwkp16za366ihqf5lg6hhw63l"; + version = "1.8.6"; + sha256 = "11lh26fkmyx5hzpjhjm1198g6gy1qpsix2srp1w7laim3kxbl4rb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131132,8 +130500,8 @@ self: { }: mkDerivation { pname = "logging"; - version = "3.0.4"; - sha256 = "0qkv19bmkh7gak6rzzcy0mgdz835gpc59iq1l10wjj7gb8vv0kd0"; + version = "3.0.5"; + sha256 = "0cd00pjxjdq69n6hxa01x31s2vdfd39kkvj0d0ssqj3n6ahssbxi"; libraryHaskellDepends = [ base binary bytestring fast-logger lifted-base monad-control old-locale regex-compat text time time-locale-compat transformers @@ -131166,6 +130534,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_2" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.2"; + sha256 = "1p0czcwph777dncidsrn0nbrmhhv7f8c5ic86mnrkxj7hzym0dfw"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, wl-pprint-text @@ -131956,25 +131348,6 @@ self: { }) {}; "lrucaching" = callPackage - ({ mkDerivation, base, base-compat, containers, deepseq, hashable - , hspec, psqueues, QuickCheck, transformers, vector - }: - mkDerivation { - pname = "lrucaching"; - version = "0.3.2"; - sha256 = "1vg6ip77vlqixj2ghvwm036yb4qhkif175k8gfd27nmr4w5rv2ns"; - libraryHaskellDepends = [ - base base-compat deepseq hashable psqueues vector - ]; - testHaskellDepends = [ - base containers deepseq hashable hspec QuickCheck transformers - ]; - homepage = "https://github.com/cocreature/lrucaching#readme"; - description = "LRU cache"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lrucaching_0_3_3" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , hspec, psqueues, QuickCheck, transformers, vector }: @@ -131991,7 +131364,6 @@ self: { homepage = "https://github.com/cocreature/lrucaching#readme"; description = "LRU cache"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ls-usb" = callPackage @@ -135165,6 +134537,8 @@ self: { pname = "mbox"; version = "0.3.4"; sha256 = "1pkiagxb013an71d3si3kldgn7rl9l5zi2s3s6hjhfg0pcwbbr6w"; + revision = "1"; + editedCabalFile = "11jikczq21fnhsvr6n33qbb5q6ixbhab4s0js8n39zwgmglighz5"; libraryHaskellDepends = [ base safe text time time-locale-compat ]; description = "Read and write standard mailbox files"; license = stdenv.lib.licenses.bsd3; @@ -136728,18 +136102,6 @@ self: { }) {}; "microlens" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "microlens"; - version = "0.4.8.1"; - sha256 = "0iqagqc3c6b6ihydhc6s7dlibwwf7pr1k9gixls3jikj6hfxzf0p"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/aelve/microlens"; - description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens_0_4_8_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microlens"; @@ -136749,7 +136111,6 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-aeson" = callPackage @@ -136816,22 +136177,6 @@ self: { }) {}; "microlens-mtl" = callPackage - ({ mkDerivation, base, microlens, mtl, transformers - , transformers-compat - }: - mkDerivation { - pname = "microlens-mtl"; - version = "0.1.11.0"; - sha256 = "1885kc8sgcrv05q2sya4q562gph7hgp1hd66mgy7r1vnnz43zfjf"; - libraryHaskellDepends = [ - base microlens mtl transformers transformers-compat - ]; - homepage = "http://github.com/aelve/microlens"; - description = "microlens support for Reader/Writer/State from mtl"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-mtl_0_1_11_1" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: @@ -136845,7 +136190,6 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "microlens support for Reader/Writer/State from mtl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-platform" = callPackage @@ -136866,20 +136210,6 @@ self: { }) {}; "microlens-th" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.1.1"; - sha256 = "0yvaabxs80fbmbg0yc1q7c147ks15bpn6fdq1zc0ay2pp06l06jv"; - libraryHaskellDepends = [ - base containers microlens template-haskell - ]; - homepage = "http://github.com/aelve/microlens"; - description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-th_0_4_1_3" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { pname = "microlens-th"; @@ -136891,7 +136221,6 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "Automatic generation of record lenses for microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "micrologger" = callPackage @@ -137328,6 +136657,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "milena_0_5_2_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, digest, lens + , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck + , random, resource-pool, semigroups, tasty, tasty-hspec + , tasty-quickcheck, transformers, zlib + }: + mkDerivation { + pname = "milena"; + version = "0.5.2.1"; + sha256 = "1mylkqp8vha9gq7li5cir5h3i27zb573alxgxnvr1y938z2nimf2"; + libraryHaskellDepends = [ + base bytestring cereal containers digest lens lifted-base + monad-control mtl murmur-hash network random resource-pool + semigroups transformers zlib + ]; + testHaskellDepends = [ + base bytestring lens mtl network QuickCheck semigroups tasty + tasty-hspec tasty-quickcheck + ]; + homepage = "https://github.com/adamflott/milena.git#readme"; + description = "A Kafka client for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mime" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -138093,7 +137447,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_5_2" = callPackage + "mmark_0_0_5_3" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid @@ -138103,8 +137457,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.5.2"; - sha256 = "1ap0m90dcnxixr8nxvq8i2nj51gmf293cw8bya6i63zw69ip18z4"; + version = "0.0.5.3"; + sha256 = "0i5x3rpsq9diqb1nagnswzcgi0sj8jwp73xi46hfwjnc656r955k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -138125,19 +137479,18 @@ self: { "mmark-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid - , megaparsec, mmark, mmark-ext, optparse-applicative, skylighting - , stache, text, unordered-containers + , megaparsec, mmark, mmark-ext, optparse-applicative, stache, text + , unordered-containers }: mkDerivation { pname = "mmark-cli"; - version = "0.0.2.0"; - sha256 = "108vrkpb61b1fpyqwqqxx9d3c8jsn0igk3rfm56pxyps2rdpx7px"; + version = "0.0.3.0"; + sha256 = "0nb17k23bs21qi7a888qp81w682ax2qvih9fbvdkdh6c2n6yklrp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring directory gitrev lucid megaparsec mmark - mmark-ext optparse-applicative skylighting stache text - unordered-containers + mmark-ext optparse-applicative stache text unordered-containers ]; homepage = "https://github.com/mmark-md/mmark-cli"; description = "Command line interface to MMark markdown processor"; @@ -138165,18 +137518,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark-ext_0_1_1_0" = callPackage - ({ mkDerivation, base, blaze-html, foldl, hspec, lucid, microlens - , mmark, modern-uri, skylighting, text + "mmark-ext_0_2_0_0" = callPackage + ({ mkDerivation, base, foldl, hspec, lucid, microlens, mmark + , modern-uri, skylighting, text }: mkDerivation { pname = "mmark-ext"; - version = "0.1.1.0"; - sha256 = "0vgsdiagr8bp02dpi8hn4libn0np2z74ksj2vm2x0a76haqlv8kc"; + version = "0.2.0.0"; + sha256 = "1ccfdjsn8z80x2m5p9q17r2hf14zj63nkxkrg9s7knwr1j08gj1k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base blaze-html foldl lucid microlens mmark modern-uri skylighting - text + base foldl lucid microlens mmark modern-uri skylighting text ]; testHaskellDepends = [ base hspec lucid mmark text ]; homepage = "https://github.com/mmark-md/mmark-ext"; @@ -139093,28 +138445,6 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, conduit - , conduit-extra, exceptions, fast-logger, lifted-base - , monad-control, monad-loops, mtl, resourcet, stm, stm-chans - , template-haskell, text, transformers, transformers-base - , transformers-compat, unliftio-core - }: - mkDerivation { - pname = "monad-logger"; - version = "0.3.26"; - sha256 = "0p7mdiv0n4wizcam2lw143szs584yzs0bq9lfrn90pgvz0q7k1ia"; - libraryHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra exceptions - fast-logger lifted-base monad-control monad-loops mtl resourcet stm - stm-chans template-haskell text transformers transformers-base - transformers-compat unliftio-core - ]; - homepage = "https://github.com/kazu-yamamoto/logger"; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_28_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans @@ -139134,7 +138464,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -140157,6 +139486,38 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "mongoDB_2_3_0_2" = callPackage + ({ mkDerivation, array, base, base16-bytestring, base64-bytestring + , binary, bson, bytestring, conduit, conduit-extra, containers + , criterion, cryptohash, data-default-class, hashtables, hspec + , lifted-base, monad-control, mtl, network, nonce, old-locale + , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text + , time, tls, transformers, transformers-base + }: + mkDerivation { + pname = "mongoDB"; + version = "2.3.0.2"; + sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd"; + libraryHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring conduit conduit-extra containers cryptohash + data-default-class hashtables lifted-base monad-control mtl network + nonce parsec pureMD5 random random-shuffle resourcet tagged text + time tls transformers transformers-base + ]; + testHaskellDepends = [ base hspec mtl old-locale text time ]; + benchmarkHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring containers criterion cryptohash hashtables lifted-base + monad-control mtl network nonce parsec random random-shuffle text + transformers-base + ]; + homepage = "https://github.com/mongodb-haskell/mongodb"; + description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mongodb-queue" = callPackage ({ mkDerivation, base, data-default, hspec, lifted-base , monad-control, mongoDB, network, text, transformers @@ -140248,30 +139609,6 @@ self: { }) {}; "mono-traversable" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, foldl - , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split - , text, transformers, unordered-containers, vector - , vector-algorithms - }: - mkDerivation { - pname = "mono-traversable"; - version = "1.0.7.0"; - sha256 = "0jfcw8xfizsva1w4h7546fryzqc1gnl1w3ki42nl41s1fdqfxibq"; - libraryHaskellDepends = [ - base bytestring containers hashable split text transformers - unordered-containers vector vector-algorithms - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec HUnit QuickCheck semigroups - text transformers unordered-containers vector - ]; - benchmarkHaskellDepends = [ base criterion mwc-random vector ]; - homepage = "https://github.com/snoyberg/mono-traversable#readme"; - description = "Type classes for mapping, folding, and traversing monomorphic containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mono-traversable_1_0_8_1" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, gauge , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split , text, transformers, unordered-containers, vector @@ -140293,7 +139630,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable#readme"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mono-traversable-instances" = callPackage @@ -140707,38 +140043,6 @@ self: { }) {}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, code-page, containers - , criterion, deepseq, Earley, http-client, http-client-tls - , microlens, microlens-mtl, mtl, optparse-applicative, pipes - , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit - , tasty-quickcheck, text, text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.13"; - sha256 = "03vjkp3ngbdhv5ib7jwdwx23bklm32m3gmvq63r2cxagydl1267m"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - base code-page optparse-applicative text text-format - ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - benchmarkHaskellDepends = [ base criterion system-filepath text ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_14" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, http-client, http-client-tls , microlens, microlens-mtl, mtl, optparse-applicative, pipes @@ -140768,7 +140072,6 @@ self: { benchmarkHaskellDepends = [ base criterion system-filepath text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -142744,6 +142047,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability_2_0_2" = callPackage + ({ mkDerivation, base, mwc-random, primitive, transformers }: + mkDerivation { + pname = "mwc-probability"; + version = "2.0.2"; + sha256 = "1v2k0vpz33xmf58dhidwnjjvhkczfqizlcgwalf1vk19sw1ls3x5"; + libraryHaskellDepends = [ base mwc-random primitive transformers ]; + homepage = "http://github.com/jtobin/mwc-probability"; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-random" = callPackage ({ mkDerivation, base, HUnit, math-functions, primitive, QuickCheck , statistics, test-framework, test-framework-hunit @@ -143314,7 +142630,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "nakadi-client_0_4_0_0" = callPackage + "nakadi-client_0_4_1_0" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, bytestring , classy-prelude, conduit, conduit-combinators, conduit-extra , containers, hashable, http-client, http-client-tls, http-conduit @@ -143325,8 +142641,8 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.4.0.0"; - sha256 = "0aixamqvlm7as8cfgp8b36smh139kwp5qny51dgzsczg6sr7gdk0"; + version = "0.4.1.0"; + sha256 = "08f2gp9fvc6dlsqb6z50rpfb8rjnlwv2001q5aixlkslhhh0jhr7"; libraryHaskellDepends = [ aeson aeson-casing base bytestring conduit conduit-combinators conduit-extra containers hashable http-client http-client-tls @@ -143594,18 +142910,6 @@ self: { }) {}; "nanospec" = callPackage - ({ mkDerivation, base, hspec, silently }: - mkDerivation { - pname = "nanospec"; - version = "0.2.1"; - sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec silently ]; - description = "A lightweight implementation of a subset of Hspec's API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "nanospec_0_2_2" = callPackage ({ mkDerivation, base, hspec, silently }: mkDerivation { pname = "nanospec"; @@ -143616,7 +142920,6 @@ self: { homepage = "https://github.com/hspec/nanospec#readme"; description = "A lightweight implementation of a subset of Hspec's API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nanovg" = callPackage @@ -144155,8 +143458,8 @@ self: { }: mkDerivation { pname = "nemesis"; - version = "2016.3.19"; - sha256 = "0dc62gnpf0brcl8dxxnhmmagd95xf61mq5bij5vgr8jwiisq69d7"; + version = "2018.1.27"; + sha256 = "197ajy30wxhfccn0h0crwkgbl7zhlb3w37h4zxplyxz2az1s1bvr"; libraryHaskellDepends = [ base containers directory dlist Glob lens mtl process time ]; @@ -144803,25 +144106,6 @@ self: { }) {}; "network" = callPackage - ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework - , test-framework-hunit, unix - }: - mkDerivation { - pname = "network"; - version = "2.6.3.2"; - sha256 = "1dn092zfqmxfbzln6d0khka4gizzjivf2yja9w9hwb5g9q3pfi1m"; - revision = "1"; - editedCabalFile = "17234sy0vqic8g9wg8gmfmc0by50scjwbdk8bkcl9kjf3fvs4nyx"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring doctest HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/haskell/network"; - description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network_2_6_3_3" = callPackage ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework , test-framework-hunit, unix }: @@ -144838,7 +144122,6 @@ self: { homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-address" = callPackage @@ -145305,26 +144588,6 @@ self: { }) {}; "network-msgpack-rpc" = callPackage - ({ mkDerivation, async, base, binary, binary-conduit, bytestring - , conduit, conduit-extra, data-default-class, data-msgpack - , exceptions, hspec, MissingH, monad-control, mtl, network, tagged - }: - mkDerivation { - pname = "network-msgpack-rpc"; - version = "0.0.3"; - sha256 = "02r0qciia05sv3rkdfh4akl10m5w2ay2rc7hxfh2cvhj5789rgvl"; - libraryHaskellDepends = [ - base binary binary-conduit bytestring conduit conduit-extra - data-default-class data-msgpack exceptions MissingH monad-control - mtl network tagged - ]; - testHaskellDepends = [ async base bytestring hspec mtl network ]; - homepage = "http://msgpack.org/"; - description = "A MessagePack-RPC Implementation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-msgpack-rpc_0_0_4" = callPackage ({ mkDerivation, async, base, binary, binary-conduit, bytestring , conduit, conduit-extra, data-default-class , data-default-instances-base, data-msgpack, data-msgpack-types @@ -145345,7 +144608,6 @@ self: { homepage = "http://msgpack.org/"; description = "A MessagePack-RPC Implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-multicast" = callPackage @@ -148253,6 +147515,8 @@ self: { pname = "objective"; version = "1.1.2"; sha256 = "0i36r3ygwpzb57ga0jjkp9rzikpsp15l777dclp7yi1zvqz2ikrg"; + revision = "1"; + editedCabalFile = "039j3xac9ish0yk4w04bmip6g9p6ndfd9ngh46ya125ms4nhmyj4"; libraryHaskellDepends = [ base containers exceptions free hashable monad-skeleton mtl profunctors template-haskell transformers transformers-compat @@ -148417,6 +147681,17 @@ self: { }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; inherit (pkgs) mesa; ovr = null; systemd = null;}; + "odbc" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "odbc"; + version = "0.0.0"; + sha256 = "1yyp21j0kmq7mc80z3vpmra16kbqb35pzblir1gppiz0wh1wmgpb"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers @@ -148435,13 +147710,12 @@ self: { }) {}; "odpic-raw" = callPackage - ({ mkDerivation, base, bytestring, c2hs, hspec, odpic, QuickCheck - }: + ({ mkDerivation, base, c2hs, hspec, odpic, QuickCheck, text }: mkDerivation { pname = "odpic-raw"; - version = "0.1.2"; - sha256 = "1v6ww4ix4l0vi27x4x2ar3ldx6h8lhm701iis4164indq9dp2yy7"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.1.7"; + sha256 = "0hwb43si56adsgzjlqlncw3hiq901w2g5d41hjv5b8gyhbhzzkmz"; + libraryHaskellDepends = [ base text ]; librarySystemDepends = [ odpic ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base hspec QuickCheck ]; @@ -148912,6 +148186,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "online_0_2_1_0" = callPackage + ({ mkDerivation, base, doctest, foldl, formatting, numhask + , optparse-generic, perf, protolude, scientific, tasty, tdigest + , text, vector, vector-algorithms + }: + mkDerivation { + pname = "online"; + version = "0.2.1.0"; + sha256 = "16s1hcf2jk8lzs3z0v2xp4jn2q6idzhqaksy97r64hcgnys7sylx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base foldl numhask protolude tdigest vector vector-algorithms + ]; + executableHaskellDepends = [ + base foldl formatting numhask optparse-generic perf protolude + scientific text + ]; + testHaskellDepends = [ base doctest protolude tasty ]; + homepage = "https://github.com/tonyday567/online#readme"; + description = "online statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "only" = callPackage ({ mkDerivation, base, parsec, regex-compat }: mkDerivation { @@ -151742,30 +151041,6 @@ self: { }) {}; "pandoc-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.17.3"; - sha256 = "0k6z5ixgpi7gm4wlpvy2j7zzv68xsqak7fhajrf0fb60dpn4ac0n"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim QuickCheck syb - transformers - ]; - testHaskellDepends = [ - aeson base bytestring containers HUnit QuickCheck string-qq syb - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "http://johnmacfarlane.net/pandoc"; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-types_1_17_3_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -151787,7 +151062,6 @@ self: { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-unlit" = callPackage @@ -153329,6 +152603,7 @@ self: { homepage = "https://github.com/PasswordManager/passman-core#readme"; description = "Deterministic password generator core"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "passwords" = callPackage @@ -153395,8 +152670,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.6.0.0"; - sha256 = "0pf5baidncam2c2xjm5w4kd48210ng36xsj7wr81v2pwdxp18r7h"; + version = "0.6.1.0"; + sha256 = "1i6vql76j5439bwdd1z7haphgm4x82rh08s22fc70hmfzkrln733"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155176,27 +154451,6 @@ self: { }) {}; "persistent-postgresql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, persistent - , postgresql-libpq, postgresql-simple, resource-pool, resourcet - , text, time, transformers - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.6.2.2"; - sha256 = "057x064kvmnj1z0a726wphzdqf49ms0pxjq3bmp3h36kqg4zcwm9"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger persistent postgresql-libpq - postgresql-simple resource-pool resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-postgresql_2_6_3" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, persistent , postgresql-libpq, postgresql-simple, resource-pool, resourcet @@ -155214,7 +154468,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -156301,32 +155554,6 @@ self: { }) {}; "pinboard" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , http-client, http-client-tls, http-types, monad-logger, mtl - , network, profunctors, QuickCheck, random, safe-exceptions - , semigroups, text, time, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "pinboard"; - version = "0.9.12.6"; - sha256 = "0z5sfgvbckd636hi1girlfpfz2v21xydzi3d1py3q6hyq34b67iq"; - libraryHaskellDepends = [ - aeson base bytestring containers http-client http-client-tls - http-types monad-logger mtl network profunctors random - safe-exceptions text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec mtl QuickCheck - safe-exceptions semigroups text time transformers - unordered-containers - ]; - homepage = "https://github.com/jonschoning/pinboard"; - description = "Access to the Pinboard API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pinboard_0_9_12_8" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, safe-exceptions @@ -156350,7 +155577,6 @@ self: { homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinch" = callPackage @@ -156998,6 +156224,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-group_1_0_9" = callPackage + ({ mkDerivation, base, doctest, free, lens-family-core, pipes + , pipes-parse, transformers + }: + mkDerivation { + pname = "pipes-group"; + version = "1.0.9"; + sha256 = "16yczij987r6j7gzp3nvgl1c5x2b7skvqsq38ns7p9z34kvy8sby"; + libraryHaskellDepends = [ + base free pipes pipes-parse transformers + ]; + testHaskellDepends = [ base doctest lens-family-core ]; + description = "Group streams into substreams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , pipes @@ -158384,27 +157627,6 @@ self: { }) {}; "pointed" = callPackage - ({ mkDerivation, base, comonad, containers, data-default-class - , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged - , transformers, transformers-compat, unordered-containers - }: - mkDerivation { - pname = "pointed"; - version = "5"; - sha256 = "05sxac90xv4j8glmf2mxs0smmv6vhia0qaaag5v37ar5a6pvh1l9"; - revision = "2"; - editedCabalFile = "0x0x44mm29s3ycx17hw0clqvicbypf1w4r01gv3sbvzyy31qph7g"; - libraryHaskellDepends = [ - base comonad containers data-default-class hashable kan-extensions - semigroupoids semigroups stm tagged transformers - transformers-compat unordered-containers - ]; - homepage = "http://github.com/ekmett/pointed/"; - description = "Pointed and copointed data"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pointed_5_0_1" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged , transformers, transformers-compat, unordered-containers @@ -158421,7 +157643,6 @@ self: { homepage = "http://github.com/ekmett/pointed/"; description = "Pointed and copointed data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointedalternative" = callPackage @@ -159723,19 +158944,6 @@ self: { }) {}; "postgresql-libpq" = callPackage - ({ mkDerivation, base, bytestring, postgresql }: - mkDerivation { - pname = "postgresql-libpq"; - version = "0.9.3.1"; - sha256 = "0x0bjnwqhdlxba345yjkf978wfsy8g5xsjdbrckrnb2dvsfscqih"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ postgresql ]; - homepage = "http://github.com/lpsmith/postgresql-libpq"; - description = "low-level binding to libpq"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) postgresql;}; - - "postgresql-libpq_0_9_4_0" = callPackage ({ mkDerivation, base, bytestring, postgresql, unix }: mkDerivation { pname = "postgresql-libpq"; @@ -159746,7 +158954,6 @@ self: { homepage = "https://github.com/lpsmith/postgresql-libpq"; description = "low-level binding to libpq"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) postgresql;}; "postgresql-named" = callPackage @@ -160778,8 +159985,8 @@ self: { ({ mkDerivation, base, hspec, regex-pcre-builtin }: mkDerivation { pname = "prefix-expression"; - version = "1.2.2"; - sha256 = "0i0npw5wn8fa0ix91792bm249zdn5w146i44x0p6wqlx409b3837"; + version = "1.2.3"; + sha256 = "0hcp7wfgqcbqlkg60zy5c1b9gyvzkr678m4qpjxsv07x33h0xgnr"; libraryHaskellDepends = [ base regex-pcre-builtin ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/VonFry/prefix-expression"; @@ -161094,14 +160301,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pretty_1_1_3_5" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }: + "pretty_1_1_3_6" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-prim, QuickCheck }: mkDerivation { pname = "pretty"; - version = "1.1.3.5"; - sha256 = "0ibgg8hrizf8dqbpznk85w612nyn349l26c5pwg9b9qmg56rs05h"; + version = "1.1.3.6"; + sha256 = "1s363nax6zxqs4bnciddsfc2sanv1lp4x02y58z3yzdgrciwq4pb"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://github.com/haskell/pretty"; description = "Pretty-printing library"; license = stdenv.lib.licenses.bsd3; @@ -161190,27 +160398,6 @@ self: { }) {}; "pretty-show" = callPackage - ({ mkDerivation, array, base, filepath, ghc-prim, happy - , haskell-lexer, pretty - }: - mkDerivation { - pname = "pretty-show"; - version = "1.6.15"; - sha256 = "16ik7dhagyr3is5dmkihw109l4d0500vi55z46p8lhigmfwqpn2n"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base filepath ghc-prim haskell-lexer pretty - ]; - libraryToolDepends = [ happy ]; - executableHaskellDepends = [ base ]; - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived `Show` instances and generic inspection of values"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pretty-show_1_6_16" = callPackage ({ mkDerivation, array, base, filepath, ghc-prim, happy , haskell-lexer, pretty }: @@ -161229,31 +160416,9 @@ self: { homepage = "http://wiki.github.com/yav/pretty-show"; description = "Tools for working with derived `Show` instances and generic inspection of values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-simple" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , criterion, doctest, Glob, mtl, parsec, text, transformers - }: - mkDerivation { - pname = "pretty-simple"; - version = "2.0.1.0"; - sha256 = "0a72kns4ydh22q1kwbljknrbgcpvh9l4jx16fm2s3hkkw9fivl27"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base containers mtl parsec text transformers - ]; - executableHaskellDepends = [ aeson base bytestring text ]; - testHaskellDepends = [ base doctest Glob ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/cdepillabout/pretty-simple"; - description = "pretty printer for data types with a 'Show' instance"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-simple_2_0_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , criterion, doctest, Glob, mtl, parsec, text, transformers }: @@ -161272,7 +160437,6 @@ self: { homepage = "https://github.com/cdepillabout/pretty-simple"; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-sop" = callPackage @@ -161566,21 +160730,6 @@ self: { }) {}; "primitive" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "primitive"; - version = "0.6.2.0"; - sha256 = "1q9a537av81c0lvcdzc8i5hqjx3209f5448d1smkyaz22c1dgs5q"; - revision = "1"; - editedCabalFile = "0d61g8ppsdajdqykl2kc46kq00aamsf12v60ilgrf58dbji9sz56"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - testHaskellDepends = [ base ghc-prim ]; - homepage = "https://github.com/haskell/primitive"; - description = "Primitive memory-related operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "primitive_0_6_3_0" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -161591,7 +160740,6 @@ self: { homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive-simd" = callPackage @@ -161932,24 +161080,6 @@ self: { }) {}; "process-extras" = callPackage - ({ mkDerivation, base, bytestring, data-default, deepseq - , generic-deriving, HUnit, ListLike, mtl, process, text - }: - mkDerivation { - pname = "process-extras"; - version = "0.7.2"; - sha256 = "0n79m1kj59w4s2a86m1hm98019452mhh06szn0jwsvb9xhqi0v77"; - libraryHaskellDepends = [ - base bytestring data-default deepseq generic-deriving ListLike mtl - process text - ]; - testHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/seereason/process-extras"; - description = "Process extras"; - license = stdenv.lib.licenses.mit; - }) {}; - - "process-extras_0_7_3" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq , generic-deriving, HUnit, ListLike, mtl, process, text }: @@ -161965,7 +161095,6 @@ self: { homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-iterio" = callPackage @@ -162346,23 +161475,6 @@ self: { }) {}; "profunctors" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, comonad - , contravariant, distributive, tagged, transformers - }: - mkDerivation { - pname = "profunctors"; - version = "5.2.1"; - sha256 = "0pcwjp813d3mrzb7qf7dzkspf85xnfj1m2snhjgnvwx6vw07w877"; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad contravariant distributive - tagged transformers - ]; - homepage = "http://github.com/ekmett/profunctors/"; - description = "Profunctors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "profunctors_5_2_2" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, semigroups, tagged, transformers }: @@ -162377,7 +161489,6 @@ self: { homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "progress" = callPackage @@ -162552,28 +161663,6 @@ self: { }) {}; "project-template" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, conduit - , conduit-extra, containers, directory, filepath, hspec, mtl - , QuickCheck, resourcet, text, transformers - }: - mkDerivation { - pname = "project-template"; - version = "0.2.0"; - sha256 = "0433a2cmximz2jbg0m97h80pvmb7vafjvw3qzjpsncavg38xgaxf"; - libraryHaskellDepends = [ - base base64-bytestring bytestring conduit conduit-extra containers - directory filepath mtl resourcet text transformers - ]; - testHaskellDepends = [ - base base64-bytestring bytestring conduit containers hspec - QuickCheck resourcet text transformers - ]; - homepage = "https://github.com/fpco/haskell-ide"; - description = "Specify Haskell project templates and generate files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "project-template_0_2_0_1" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit , conduit-extra, containers, directory, filepath, hspec, mtl , QuickCheck, resourcet, text, transformers @@ -162593,7 +161682,6 @@ self: { homepage = "https://github.com/fpco/haskell-ide"; description = "Specify Haskell project templates and generate files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "projectile" = callPackage @@ -163285,24 +162373,6 @@ self: { }) {}; "protolude" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text - , transformers - }: - mkDerivation { - pname = "protolude"; - version = "0.2"; - sha256 = "1ky72pv1icrcj9s3al23nwylyv7l60s2h0m2hs85wdb3kn1c042n"; - libraryHaskellDepends = [ - array async base bytestring containers deepseq ghc-prim hashable - mtl mtl-compat safe stm text transformers - ]; - homepage = "https://github.com/sdiehl/protolude"; - description = "A small prelude"; - license = stdenv.lib.licenses.mit; - }) {}; - - "protolude_0_2_1" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text , transformers, transformers-compat @@ -163318,7 +162388,6 @@ self: { homepage = "https://github.com/sdiehl/protolude"; description = "A small prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protolude-lifted" = callPackage @@ -163531,29 +162600,6 @@ self: { }) {}; "psqueues" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq - , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue - , QuickCheck, random, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2, unordered-containers - }: - mkDerivation { - pname = "psqueues"; - version = "0.2.4.0"; - sha256 = "1lbjm6mnw91qg1ik73mwh48cq79k4kkaj4l380ilqp0p05a386j9"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq fingertree-psqueue ghc-prim - hashable mtl PSQueue random unordered-containers - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "psqueues_0_2_5_0" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue , QuickCheck, random, tagged, test-framework, test-framework-hunit @@ -163574,7 +162620,6 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pstemmer" = callPackage @@ -164398,6 +163443,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pusher-http-haskell_1_5_1_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-types, memory + , QuickCheck, scientific, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "1.5.1.1"; + sha256 = "0j8gsarczvdidri63s162flzdkb6w0sysawairlxmmgcdbybfci5"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-types memory text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hspec + http-client http-types QuickCheck scientific text time transformers + unordered-containers vector + ]; + homepage = "https://github.com/pusher-community/pusher-http-haskell"; + description = "Haskell client library for the Pusher HTTP API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -164942,11 +164013,14 @@ self: { qtc_opengl = null; qtc_script = null; qtc_tools = null;}; "qtah-cpp-qt5" = callPackage - ({ mkDerivation, base, process, qtah-generator, qtbase }: + ({ mkDerivation, base, Cabal, directory, filepath, process + , qtah-generator, qtbase + }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.3.1"; - sha256 = "0yy6q10lsjhjnvirs2d8pdivs9d0kdilwsm4j7s59jz5xhwzbqzl"; + version = "0.4.0"; + sha256 = "03m45jc5jpkjfcx0dr1lb2nsajbhkfb5phsx7v909hj8d7j7swvz"; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; homepage = "http://khumba.net/projects/qtah"; @@ -164961,8 +164035,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.3.0"; - sha256 = "0scb00dilgbiqzp1jq0jknx76qb0fc9l9wsv214k9x741q7cv71b"; + version = "0.4.0"; + sha256 = "0q8k2diyrxpvsnhlw484lxy3j6qbk07hkqj0hg2cxv8whhi02bp9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164975,15 +164049,17 @@ self: { }) {}; "qtah-generator" = callPackage - ({ mkDerivation, base, containers, directory, filepath, haskell-src - , hoppy-generator, hoppy-std, mtl, process, transformers + ({ mkDerivation, base, Cabal, containers, directory, filepath + , haskell-src, hoppy-generator, hoppy-std, mtl, process + , transformers }: mkDerivation { pname = "qtah-generator"; - version = "0.3.0"; - sha256 = "0zyhpb70lcp9r8skq6lzw4xqpa3fndbq4vxk098diqivknl064ff"; + version = "0.4.0"; + sha256 = "1fxv8g3rrhf9q7g90phqji4q5yb2l0sfi0qm81zp9ya91wmcfsg5"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base containers directory filepath haskell-src hoppy-generator @@ -164997,13 +164073,15 @@ self: { }) {}; "qtah-qt5" = callPackage - ({ mkDerivation, base, binary, bytestring, hoppy-runtime, HUnit - , qtah, qtah-cpp-qt5, qtah-generator, qtbase + ({ mkDerivation, base, binary, bytestring, Cabal, directory + , filepath, hoppy-runtime, HUnit, qtah, qtah-cpp-qt5 + , qtah-generator, qtbase }: mkDerivation { pname = "qtah-qt5"; - version = "0.3.0"; - sha256 = "0rrg0ymkhvgdhwcabr4n4alrqkzyyzyggdclygmjp7l2lq4md1ad"; + version = "0.4.0"; + sha256 = "1b20wrbyldxx6vsxax3kdfxikv0v79m3qcbwhjwgyp586gk9pl63"; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -165504,32 +164582,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring - , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, tagged, text, time, transformers, transformers-compat - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.16"; - sha256 = "07xqbjb3rb5hzhjak3qpvj4hl91gc0z2272n60hv67zmv3w8kcf1"; - revision = "1"; - editedCabalFile = "1sfqjhk7z185l0gxrvn5pi3s8mvnqv1d1yzrx0k0mi48y5421jcm"; - libraryHaskellDepends = [ - array base base-compat bytestring case-insensitive containers - hashable old-time QuickCheck scientific tagged text time - transformers transformers-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - base containers QuickCheck tagged uuid-types - ]; - homepage = "https://github.com/phadej/qc-instances"; - description = "Common quickcheck instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_16_1" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck , scientific, tagged, text, time, transformers, transformers-compat @@ -165551,7 +164603,6 @@ self: { homepage = "https://github.com/phadej/qc-instances"; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -165729,27 +164780,6 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, containers - , lifted-async, lifted-base, monad-control, mtl, QuickCheck - , quickcheck-with-counterexamples, random, stm, template-haskell - , th-abstraction - }: - mkDerivation { - pname = "quickcheck-state-machine"; - version = "0.3.0"; - sha256 = "0rcfc6yk5x99jk2zppfnzkkhc3k2wkvz6jh1h80l0zdpdhbd191a"; - libraryHaskellDepends = [ - ansi-wl-pprint async base containers lifted-async lifted-base - monad-control mtl QuickCheck quickcheck-with-counterexamples random - stm template-haskell th-abstraction - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme"; - description = "Test monadic programs using state machine based models"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-state-machine_0_3_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, containers , lifted-async, lifted-base, monad-control, mtl, QuickCheck , quickcheck-with-counterexamples, random, stm, template-haskell @@ -165768,7 +164798,6 @@ self: { homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme"; description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-string-random" = callPackage @@ -166616,31 +165645,6 @@ self: { }) {}; "rakuten" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, constraints - , data-default-class, extensible, hspec, http-api-data, http-client - , http-client-tls, http-types, lens, req, servant-server, text - , unordered-containers, warp - }: - mkDerivation { - pname = "rakuten"; - version = "0.1.0.4"; - sha256 = "0nxnw5b0qhjzb0zwak74x84f081p1giyzbvpinhx527ph4j96aqf"; - libraryHaskellDepends = [ - aeson base bytestring connection constraints data-default-class - extensible http-api-data http-client http-client-tls http-types - lens req text unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring connection constraints data-default-class - extensible hspec http-api-data http-client http-client-tls - http-types lens req servant-server text unordered-containers warp - ]; - homepage = "https://github.com/matsubara0507/rakuten#readme"; - description = "The Rakuten API in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rakuten_0_1_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, constraints , data-default-class, extensible, hspec, http-api-data, http-client , http-client-tls, http-types, lens, req, servant-server, text @@ -166663,7 +165667,6 @@ self: { homepage = "https://github.com/matsubara0507/rakuten#readme"; description = "The Rakuten API in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ralist" = callPackage @@ -167488,25 +166491,6 @@ self: { }) {}; "ratel" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, http-client, http-client-tls, http-types - , tasty, tasty-hspec, text, uuid - }: - mkDerivation { - pname = "ratel"; - version = "0.3.8"; - sha256 = "1zd5dc21y60yjzbwgr8vf099y0rqmdirn1mq6s03jpiyar33lv3b"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ base filepath tasty tasty-hspec ]; - homepage = "https://github.com/tfausak/ratel#readme"; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel_0_3_10" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, filepath, hspec, http-client, http-client-tls , http-types, text, uuid @@ -167523,6 +166507,25 @@ self: { homepage = "https://github.com/tfausak/ratel#readme"; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; + }) {}; + + "ratel_1_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, text, uuid + }: + mkDerivation { + pname = "ratel"; + version = "1.0.1"; + sha256 = "1cspvwnq7v0ngxlc0w0f2fv14m3ndi8nkvcglygbac454nlka12s"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types text uuid + ]; + testHaskellDepends = [ base filepath hspec ]; + homepage = "https://github.com/tfausak/ratel#readme"; + description = "Notify Honeybadger about exceptions"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -167542,6 +166545,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel-wai_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "1.0.1"; + sha256 = "190kgqhvda3r5gqk0j8pzr6d123fl77dv3i1csglq22yzrwynkv3"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + homepage = "https://github.com/tfausak/ratel-wai#readme"; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rating-systems" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -167598,15 +166618,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rattletrap_4_0_3" = callPackage + "rattletrap_4_0_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, containers, filepath, http-client, http-client-tls , HUnit, template-haskell, temporary, text, transformers }: mkDerivation { pname = "rattletrap"; - version = "4.0.3"; - sha256 = "04pad6qd7x7bx5xmmd8wyfd421rsnbgwqkipy3ygh056624xb4bz"; + version = "4.0.5"; + sha256 = "0yxmym79xrs35lz8qyrkyqa9vihng4p3448085ybwbfqmaqk6pl5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168847,6 +167867,8 @@ self: { pname = "recursion-schemes"; version = "5.0.2"; sha256 = "1lmayskniljw3lxk64apvshn9h90gwfpflgxilfivsqhrjxnaj9s"; + revision = "1"; + editedCabalFile = "1mmq9dx0dgws4dbmij76snj91dv6czigs1kchi0vy01hplsb0wks"; libraryHaskellDepends = [ base base-orphans bifunctors comonad free semigroups template-haskell transformers transformers-compat @@ -169329,18 +168351,6 @@ self: { }) {}; "reflection" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "reflection"; - version = "2.1.2"; - sha256 = "0f9w0akbm6p8h7kzgcd2f6nnpw1wy84pqn45vfz1ch5j0hn8h2d9"; - libraryHaskellDepends = [ base template-haskell ]; - homepage = "http://github.com/ekmett/reflection"; - description = "Reifies arbitrary terms into types that can be reflected back into terms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "reflection_2_1_3" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "reflection"; @@ -169350,7 +168360,6 @@ self: { homepage = "http://github.com/ekmett/reflection"; description = "Reifies arbitrary terms into types that can be reflected back into terms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflection-extras" = callPackage @@ -171963,25 +170972,6 @@ self: { }) {}; "resourcet" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat, unliftio-core - }: - mkDerivation { - pname = "resourcet"; - version = "1.1.10"; - sha256 = "1hhw9w85nj8i2azzj5sxixffdvciq96b0jhl0zz24038bij66cyl"; - libraryHaskellDepends = [ - base containers exceptions lifted-base mmorph monad-control mtl - transformers transformers-base transformers-compat unliftio-core - ]; - testHaskellDepends = [ base hspec lifted-base transformers ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_1_11" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base , transformers-compat, unliftio-core @@ -171998,7 +170988,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -172621,30 +171610,32 @@ self: { }) {}; "rfc" = callPackage - ({ mkDerivation, aeson, aeson-diff, async, base, blaze-html + ({ mkDerivation, aeson, aeson-diff, async, base, binary, blaze-html , classy-prelude, containers, data-default, exceptions, hedis , http-api-data, http-client-tls, http-types, lens, lifted-async , markdown, monad-control, postgresql-simple, resource-pool - , servant, servant-blaze, servant-docs, servant-server - , servant-swagger, simple-logger, string-conversions, swagger2 - , temporary, text, time-units, unordered-containers, url - , uuid-types, vector, wai, wai-cors, wai-extra, wreq + , servant, servant-blaze, servant-client, servant-docs + , servant-server, servant-swagger, simple-logger + , string-conversions, swagger2, temporary, text, time-units + , unordered-containers, url, uuid-types, vector, wai, wai-cors + , wai-extra, wreq }: mkDerivation { pname = "rfc"; - version = "0.0.0.4"; - sha256 = "1zsbgq8f2a0sr575lkz6r5n0vq8jyn32q1sjxkw7d1zqkmzx1f0b"; + version = "0.0.0.13"; + sha256 = "06bjxgfhqjbgnkvk6vb42v3c8mi934y2dfb4hafzdgknwnlcsy19"; libraryHaskellDepends = [ - aeson aeson-diff async base blaze-html classy-prelude containers - data-default exceptions hedis http-api-data http-client-tls - http-types lens lifted-async markdown monad-control - postgresql-simple resource-pool servant servant-blaze servant-docs - servant-server servant-swagger simple-logger string-conversions - swagger2 temporary text time-units unordered-containers url - uuid-types vector wai wai-cors wai-extra wreq + aeson aeson-diff async base binary blaze-html classy-prelude + containers data-default exceptions hedis http-api-data + http-client-tls http-types lens lifted-async markdown monad-control + postgresql-simple resource-pool servant servant-blaze + servant-client servant-docs servant-server servant-swagger + simple-logger string-conversions swagger2 temporary text time-units + unordered-containers url uuid-types vector wai wai-cors wai-extra + wreq ]; homepage = "https://github.com/RobertFischer/rfc#README.md"; - description = "Robert Fischer's Common library, for all Robert Fischer's common needs"; + description = "Robert Fischer's Common library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -174496,17 +173487,18 @@ self: { }) {}; "ruler" = callPackage - ({ mkDerivation, base, containers, mtl, shuffle, uhc-util, uuagc - , uuagc-cabal, uulib + ({ mkDerivation, base, Cabal, containers, mtl, shuffle, uhc-util + , uuagc, uuagc-cabal, uulib }: mkDerivation { pname = "ruler"; - version = "0.4.0.2"; - sha256 = "1kcca2h3gvp63s9frnq4dmhaiw5pxhk5ji86bar0cwyrc9all8v5"; + version = "0.4.1.0"; + sha256 = "1qa0d2jaws5wn2npjcsc66m59d64dxbm074h7lkysawdgq9hzdy1"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal shuffle uuagc uuagc-cabal ]; executableHaskellDepends = [ - base containers mtl shuffle uhc-util uuagc uuagc-cabal uulib + base Cabal containers mtl shuffle uhc-util uuagc uuagc-cabal uulib ]; homepage = "https://github.com/UU-ComputerScience/ruler"; description = "Ruler tool for UHC"; @@ -175023,28 +174015,6 @@ self: { }) {}; "safeio" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , directory, filepath, HUnit, resourcet, test-framework - , test-framework-hunit, test-framework-th, unix - }: - mkDerivation { - pname = "safeio"; - version = "0.0.4.0"; - sha256 = "1abbg6nxpz4va54r2005swlyw8k4y61xjhcz4s3rshc09cmrrn6l"; - libraryHaskellDepends = [ - base bytestring conduit conduit-combinators directory filepath - resourcet unix - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators directory filepath - HUnit resourcet test-framework test-framework-hunit - test-framework-th unix - ]; - description = "Write output to disk atomically"; - license = stdenv.lib.licenses.mit; - }) {}; - - "safeio_0_0_5_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , directory, exceptions, filepath, HUnit, resourcet, test-framework , test-framework-hunit, test-framework-th, unix @@ -175065,7 +174035,6 @@ self: { homepage = "https://github.com/luispedro/safeio#readme"; description = "Write output to disk atomically"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safepath" = callPackage @@ -175231,8 +174200,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "0.0.10"; - sha256 = "0d31pza3i06bs95ngspkabqrlfqjqmarmfjbpqir2xd1bz3xybjr"; + version = "1.0.0"; + sha256 = "0s7np2xdzc7sbhyh0hwfx6bznjxji5cg4ymvqncjdcdkb8w31gdk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/tfausak/salve#readme"; @@ -175775,8 +174744,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.3.2"; - sha256 = "19r6a5sh2shaxzkvcysjk2ibfx85w0s1yvg2zjznka4wpzihfs91"; + version = "2.3.6"; + sha256 = "05n81l73r1w39cwrjyapwddhq9fcgj22cpn2y5ccjk7mj72jknhk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175794,34 +174763,6 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; - "sbp_2_3_5" = callPackage - ({ mkDerivation, aeson, array, base, base64-bytestring - , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , resourcet, tasty, tasty-hunit, template-haskell, text, yaml - }: - mkDerivation { - pname = "sbp"; - version = "2.3.5"; - sha256 = "11jyvlpgy05y5602pi8mxpdrc1jg0lgaam2ijhyh7g33696rclgs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text - ]; - executableHaskellDepends = [ - aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet yaml - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; - homepage = "https://github.com/swift-nav/libsbp"; - description = "SwiftNav's SBP Library"; - license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -176654,8 +175595,8 @@ self: { pname = "scotty"; version = "0.11.0"; sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "7"; - editedCabalFile = "0mn4v7sgnihxvd9wmdqlfhz8818n4r4kgqvrz7sn4raqq5jxkdyr"; + revision = "8"; + editedCabalFile = "1jjpaiksvdhsmvv6p267w5grkiv4xmd59xsgwhhyhp5v2503p8sn"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -177690,23 +176631,6 @@ self: { }) {sedna = null;}; "selda" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hashable, mtl - , psqueues, text, time, unordered-containers - }: - mkDerivation { - pname = "selda"; - version = "0.1.11.2"; - sha256 = "0ahh54sz40d4gcfgx6fb0cy1447b3qlk9kir89wk3brzfaglyyn9"; - libraryHaskellDepends = [ - base bytestring exceptions hashable mtl psqueues text time - unordered-containers - ]; - homepage = "https://selda.link"; - description = "Type-safe, high-level EDSL for interacting with relational databases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda_0_1_12" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, mtl , psqueues, text, time, unordered-containers }: @@ -177721,28 +176645,9 @@ self: { homepage = "https://selda.link"; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-postgresql" = callPackage - ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq - , selda, text - }: - mkDerivation { - pname = "selda-postgresql"; - version = "0.1.7.0"; - sha256 = "0smx2hvpdxjcw58zchwmzcqz4xr5m1idv5y5rrj20df190r4l3l2"; - revision = "2"; - editedCabalFile = "01ghxjlbw2fbbkwyl1q1randxy1bybf3ilkfaz8hq1h37nvyfzmi"; - libraryHaskellDepends = [ - base bytestring exceptions postgresql-libpq selda text - ]; - homepage = "https://github.com/valderman/selda"; - description = "PostgreSQL backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda-postgresql_0_1_7_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text }: @@ -177756,7 +176661,6 @@ self: { homepage = "https://github.com/valderman/selda"; description = "PostgreSQL backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-sqlite" = callPackage @@ -178031,6 +176935,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroups_0_18_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "semigroups"; + version = "0.18.4"; + sha256 = "09sxd17h1kcjsjaf1am2nwpb4vaq8d0q718fbkxwysws691317jq"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/ekmett/semigroups/"; + description = "Anything that associates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroups-actions" = callPackage ({ mkDerivation, base, containers, semigroups }: mkDerivation { @@ -178238,6 +177155,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sensu-run_0_4_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, http-client + , http-types, lens, network, optparse-applicative, process + , temporary, text, time, unix, unix-compat, vector, wreq + }: + mkDerivation { + pname = "sensu-run"; + version = "0.4.0.4"; + sha256 = "1pgzfa6ns67fq5cx7qizwjfb2gw6awx012iwhskx8s4wg9snbq5y"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring filepath http-client http-types lens network + optparse-applicative process temporary text time unix unix-compat + vector wreq + ]; + homepage = "https://github.com/maoe/sensu-run#readme"; + description = "A tool to send command execution results to Sensu"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sentence-jp" = callPackage ({ mkDerivation, base, mecab, random-shuffle, text, transformers }: mkDerivation { @@ -178816,8 +177755,8 @@ self: { }: mkDerivation { pname = "servant-aeson-specs"; - version = "0.6.0.0"; - sha256 = "0ylwd5dawhgfwhmzndc2950zkwg3xm2zv9az4a4pb9pxnpmb4z7n"; + version = "0.6.1.0"; + sha256 = "0246bdrcy0rq0jyba2c945hlz8csaff9zakv0g5qpzylsc5dnwmd"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random @@ -179562,28 +178501,6 @@ self: { }) {}; "servant-exceptions" = callPackage - ({ mkDerivation, aeson, base, exceptions, http-media, http-types - , mtl, servant, servant-server, text, wai, warp - }: - mkDerivation { - pname = "servant-exceptions"; - version = "0.1.0"; - sha256 = "0dkwggl7d8drnd2msk3cniyi7ia58d7cwi1hb0zcqgc0p9br7lbn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base exceptions http-media http-types mtl servant - servant-server text wai - ]; - executableHaskellDepends = [ - aeson base exceptions http-types servant-server text warp - ]; - homepage = "https://github.com/ch1bo/servant-exceptions#readme"; - description = "Extensible exceptions for servant APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-exceptions_0_1_1" = callPackage ({ mkDerivation, aeson, base, exceptions, http-media, http-types , mtl, servant, servant-server, text, wai, warp }: @@ -179602,7 +178519,6 @@ self: { ]; homepage = "https://github.com/ch1bo/servant-exceptions#readme"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-foreign" = callPackage @@ -179796,32 +178712,6 @@ self: { }) {}; "servant-kotlin" = callPackage - ({ mkDerivation, aeson, base, containers, directory, formatting - , hspec, http-api-data, lens, servant, servant-foreign, shelly - , text, time, wl-pprint-text - }: - mkDerivation { - pname = "servant-kotlin"; - version = "0.1.0.2"; - sha256 = "0dwm9aia14hr2gblcak7vyh7jgs1mnfwqq131rxyygf9d11wpx41"; - libraryHaskellDepends = [ - base containers directory formatting lens servant servant-foreign - text time wl-pprint-text - ]; - testHaskellDepends = [ - aeson base containers directory formatting hspec http-api-data lens - servant servant-foreign text time wl-pprint-text - ]; - benchmarkHaskellDepends = [ - aeson base containers directory formatting http-api-data lens - servant servant-foreign shelly text time wl-pprint-text - ]; - homepage = "https://github.com/matsubara0507/servant-kotlin#readme"; - description = "Automatically derive Kotlin class to query servant webservices"; - license = stdenv.lib.licenses.mit; - }) {}; - - "servant-kotlin_0_1_0_3" = callPackage ({ mkDerivation, aeson, base, containers, directory, formatting , hspec, http-api-data, lens, servant, servant-foreign, shelly , text, time, wl-pprint-text @@ -179845,7 +178735,6 @@ self: { homepage = "https://github.com/matsubara0507/servant-kotlin#readme"; description = "Automatically derive Kotlin class to query servant webservices"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage @@ -180253,21 +179142,6 @@ self: { }) {}; "servant-ruby" = callPackage - ({ mkDerivation, base, casing, doctest, lens, QuickCheck - , servant-foreign, text - }: - mkDerivation { - pname = "servant-ruby"; - version = "0.5.0.0"; - sha256 = "07rjrx5g41yz4wiax4z535zrdcyfvwpbjm81sdyskmkv44mv5g8z"; - libraryHaskellDepends = [ base casing lens servant-foreign text ]; - testHaskellDepends = [ base doctest QuickCheck ]; - homepage = "https://github.com/joneshf/servant-ruby#readme"; - description = "Generate a Ruby client from a Servant API with Net::HTTP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-ruby_0_5_1_0" = callPackage ({ mkDerivation, base, casing, doctest, lens, QuickCheck , servant-foreign, text }: @@ -180280,7 +179154,6 @@ self: { homepage = "https://github.com/joneshf/servant-ruby#readme"; description = "Generate a Ruby client from a Servant API with Net::HTTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-scotty" = callPackage @@ -180734,8 +179607,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.3.1"; - sha256 = "1s4b0x6hs0dighmqgpwnifhy7w5cszd207lwwryn2qp1zq463i2h"; + version = "0.4.0"; + sha256 = "12nwj81hwlqmmr4d0vgi4a5gd2zcnndn5rhkx33b0cflfrqcwyp3"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring lens text time unix unordered-containers @@ -180822,28 +179695,6 @@ self: { }) {}; "serversession-backend-redis" = callPackage - ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces - , serversession, tagged, text, time, transformers - , unordered-containers - }: - mkDerivation { - pname = "serversession-backend-redis"; - version = "1.0.2"; - sha256 = "05zrkdxsb86qb0zgjfk8swihfg0cs8kds51xvsqnny9yz216cx6p"; - libraryHaskellDepends = [ - base bytestring hedis path-pieces serversession tagged text time - transformers unordered-containers - ]; - testHaskellDepends = [ - base bytestring hedis hspec path-pieces serversession text time - transformers unordered-containers - ]; - homepage = "https://github.com/yesodweb/serversession"; - description = "Storage backend for serversession using Redis"; - license = stdenv.lib.licenses.mit; - }) {}; - - "serversession-backend-redis_1_0_3" = callPackage ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces , serversession, tagged, text, time, transformers , unordered-containers @@ -180863,7 +179714,6 @@ self: { homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using Redis"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession-frontend-snap" = callPackage @@ -181658,8 +180508,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "0.1.0.3"; - sha256 = "05qsmdm1sdfw7zg6s0sfabkqrgi8jgxrvabnpikcbx7rjvaqjh7i"; + version = "0.2.0.4"; + sha256 = "0n4sxla0ribkr2m5bbbh6h0lhp3ddiaan8w1k34ca1qbjwj1xz77"; libraryHaskellDepends = [ base directory language-ats shake shake-ext text ]; @@ -181691,8 +180541,8 @@ self: { }: mkDerivation { pname = "shake-ext"; - version = "1.4.0.1"; - sha256 = "12rrrabi4vz7ajjw66kx52lgyybjhmp5aybk7d66sl2bql7phndc"; + version = "1.4.0.7"; + sha256 = "00c4yv2gdrzi4cm9n3k8s33xmv6p78ips1l809qbjpkdpn2dc5jy"; libraryHaskellDepends = [ base composition-prelude directory language-ats mtl shake text ]; @@ -182272,37 +181122,6 @@ self: { }) {}; "shelly" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async - , lifted-base, monad-control, mtl, process, system-fileio - , system-filepath, text, time, transformers, transformers-base - , unix-compat - }: - mkDerivation { - pname = "shelly"; - version = "1.7.0"; - sha256 = "0jscygg381hzb4mjknrwsfw0q3j4sf1w4qrz1mf4k38794axx21q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions lifted-async lifted-base monad-control mtl process - system-fileio system-filepath text time transformers - transformers-base unix-compat - ]; - testHaskellDepends = [ - async base bytestring containers directory enclosed-exceptions - exceptions hspec HUnit lifted-async lifted-base monad-control mtl - process system-fileio system-filepath text time transformers - transformers-base unix-compat - ]; - homepage = "https://github.com/yesodweb/Shelly.hs"; - description = "shell-like (systems) programming in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "shelly_1_7_0_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, HUnit , lifted-async, lifted-base, monad-control, mtl, process @@ -182391,28 +181210,6 @@ self: { }) {}; "shikensu" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow - , Glob, tasty, tasty-hunit, text, unordered-containers - }: - mkDerivation { - pname = "shikensu"; - version = "0.3.7"; - sha256 = "1gi1l8rs093s2jxyqwpg7yjbyjc9km87hdxai2j832viwrd828b5"; - libraryHaskellDepends = [ - aeson base bytestring directory filepath flow Glob text - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath flow Glob tasty - tasty-hunit text unordered-containers - ]; - homepage = "https://github.com/icidasset/shikensu#readme"; - description = "Run a sequence of functions on in-memory representations of files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "shikensu_0_3_8" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow , Glob, tasty, tasty-hunit, text, unordered-containers }: @@ -182946,18 +181743,20 @@ self: { }) {}; "silvi" = callPackage - ({ mkDerivation, base, bytestring, chronos, http-types, ip - , quantification, savage, text + ({ mkDerivation, attoparsec, base, bytestring, chronos, http-types + , ip, quantification, savage, text }: mkDerivation { pname = "silvi"; - version = "0.0.4"; - sha256 = "18dc13g0w3y0v8s44vif2w302inbha57cz9ijjzr3s4maq6czw1a"; + version = "0.1.0"; + sha256 = "1sgx40fmlf3188j4bl647f8psvpf7xfbzzzilgicg3w49dwxxq2q"; libraryHaskellDepends = [ - base bytestring chronos http-types ip quantification savage text + attoparsec base bytestring chronos http-types ip quantification + savage text ]; + testHaskellDepends = [ base quantification savage text ]; homepage = "https://github.com/chessai/silvi#readme"; - description = "A generator for different kinds of logs"; + description = "A generator for different kinds of data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -184023,18 +182822,6 @@ self: { }) {}; "singleton-nats" = callPackage - ({ mkDerivation, base, singletons }: - mkDerivation { - pname = "singleton-nats"; - version = "0.4.0.3"; - sha256 = "150pfyfgyvksx600c9c7pyw154dvjgfiykas3wxfzkm3l9mhg32v"; - libraryHaskellDepends = [ base singletons ]; - homepage = "https://github.com/AndrasKovacs/singleton-nats"; - description = "Unary natural numbers relying on the singletons infrastructure"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "singleton-nats_0_4_0_4" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; @@ -184044,7 +182831,6 @@ self: { homepage = "https://github.com/AndrasKovacs/singleton-nats"; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singleton-typelits" = callPackage @@ -184536,14 +183322,14 @@ self: { "skylighting" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion - , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random - , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text - , utf8-string + , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show + , QuickCheck, random, regex-pcre-builtin, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, utf8-string }: mkDerivation { pname = "skylighting"; - version = "0.5.0.1"; - sha256 = "1jq61wdb83by5qkyfjp9bda2651ddnbskldc4cisr2xm4qjds1ap"; + version = "0.5.1"; + sha256 = "0l5lhhqqlfaq1fs7pn3n3b25kmazk8p4ahwvhagbrhcbm5hsigdg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184558,7 +183344,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers Diff directory filepath HUnit - pretty-show random tasty tasty-golden tasty-hunit text + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text ]; benchmarkHaskellDepends = [ base containers criterion directory filepath text @@ -188471,18 +187258,6 @@ self: { }) {}; "split" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "split"; - version = "0.2.3.2"; - sha256 = "0fmnkvq1ky4dgyh1z2mvdal5pw103irvkf4p9d5x8wyl1nnylhs9"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck ]; - description = "Combinator library for splitting lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "split_0_2_3_3" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "split"; @@ -188492,7 +187267,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Combinator library for splitting lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "split-channel" = callPackage @@ -189576,8 +188350,8 @@ self: { pname = "stack"; version = "1.6.3"; sha256 = "0ylika6qf7agj07wh47xjirhg74l63lx80q0xm41yd9g5ssk9cbj"; - revision = "2"; - editedCabalFile = "01kpvjg6a71yf1l4mlm292wr75vhgjvkkqzxkycimdjnn4j89bds"; + revision = "3"; + editedCabalFile = "0sqhg84iyh8rmsls5lgk0and68rxkp6m4668z42y5zzy810xgd4i"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -190397,24 +189171,6 @@ self: { }) {}; "stateWriter" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, dlist, free - , hspec, lens, mtl, QuickCheck, transformers, vector - }: - mkDerivation { - pname = "stateWriter"; - version = "0.2.9"; - sha256 = "0kvkf3lh60sz0nfscjd6skr52b11mh7wk4ls64z5hmdjr4cnjgmm"; - libraryHaskellDepends = [ base mtl transformers ]; - testHaskellDepends = [ base free hspec mtl QuickCheck ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq dlist lens mtl transformers - vector - ]; - description = "A faster variant of the RWS monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stateWriter_0_2_10" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, dlist, free , hspec, lens, mtl, QuickCheck, transformers, vector }: @@ -190432,7 +189188,6 @@ self: { ]; description = "A faster variant of the RWS monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statechart" = callPackage @@ -191704,6 +190459,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stratosphere_0_15_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable + , hspec, hspec-discover, lens, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "stratosphere"; + version = "0.15.1"; + sha256 = "13221ynzcaj6hilvbcllnjf1ixv6zmsp7jnhp1ishmj42z5qarbl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring hashable lens template-haskell + text unordered-containers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring hashable lens template-haskell + text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring hashable hspec hspec-discover + lens template-haskell text unordered-containers + ]; + homepage = "https://github.com/frontrowed/stratosphere#readme"; + description = "EDSL for AWS CloudFormation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -192332,6 +191116,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-base-types_0_6_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim + , hashable, lens, QuickCheck, strict + }: + mkDerivation { + pname = "strict-base-types"; + version = "0.6.0"; + sha256 = "01i8v4l47xp5f4i9czlwg1kk4lvnfmxhgqlcnacirrp0pfjmrq7p"; + libraryHaskellDepends = [ + aeson base bifunctors binary deepseq ghc-prim hashable lens + QuickCheck strict + ]; + homepage = "https://github.com/meiersi/strict-base-types"; + description = "Strict variants of the types provided in base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strict-concurrency" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -192943,15 +191745,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "strive_5_0_1" = callPackage + "strive_5_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit , template-haskell, text, time, transformers }: mkDerivation { pname = "strive"; - version = "5.0.1"; - sha256 = "01v2g2qbfjlzx8vfyix5g7lbb5hsa59xlywiphhq5sy1dp9cxciz"; + version = "5.0.2"; + sha256 = "1dx93rda40nv87amgk885bg4dn96qhmnq4mmfiqwb09mp6g1a0m5"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -193408,15 +192210,16 @@ self: { }) {}; "substring-parser" = callPackage - ({ mkDerivation, attoparsec, base, containers, hspec, NoTrace, text + ({ mkDerivation, attoparsec, base, dlist, hspec, NoTrace + , QuickCheck, text }: mkDerivation { pname = "substring-parser"; - version = "0.3.0.0"; - sha256 = "0yfdrmadsra7692zsqm2cnmx0hr2lrkx0swvhk3gw3666453x84j"; - libraryHaskellDepends = [ attoparsec base NoTrace text ]; + version = "0.4.0.0"; + sha256 = "0xi3yjgp87515g99qxnhjkcr2ddqc0b6rz0whg2zsi00z1sb6wc3"; + libraryHaskellDepends = [ attoparsec base dlist NoTrace text ]; testHaskellDepends = [ - attoparsec base containers hspec NoTrace text + attoparsec base hspec NoTrace QuickCheck text ]; homepage = "https://gitlab.com/igrep/substring-parser"; description = "Match / replace substrings with a parser combinators"; @@ -194147,8 +192950,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.6"; - sha256 = "0whvh1b2s6jzr885avakswrcriv8hs4x36gdx22hg0fj77dh3b5q"; + version = "0.0.1.7"; + sha256 = "07p2hd35wg5g1r3lmhffvjch5vy6idmhdv21k1g8v3131apgjpxy"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -194165,7 +192968,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "swagger-petstore_0_0_1_7" = callPackage + "swagger-petstore_0_0_1_8" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, deepseq, exceptions, hspec , http-api-data, http-client, http-client-tls, http-media @@ -194175,8 +192978,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.7"; - sha256 = "07p2hd35wg5g1r3lmhffvjch5vy6idmhdv21k1g8v3131apgjpxy"; + version = "0.0.1.8"; + sha256 = "1rslv21lg7jfc6vb8yyb6kkg3cma2300h4hld3m8zwfxgzcq79h7"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -195301,23 +194104,6 @@ self: { }) {}; "system-filepath" = callPackage - ({ mkDerivation, base, bytestring, chell, chell-quickcheck, deepseq - , QuickCheck, text - }: - mkDerivation { - pname = "system-filepath"; - version = "0.4.13.4"; - sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l"; - libraryHaskellDepends = [ base bytestring deepseq text ]; - testHaskellDepends = [ - base bytestring chell chell-quickcheck QuickCheck text - ]; - homepage = "https://github.com/fpco/haskell-filesystem"; - description = "High-level, byte-based file and directory path manipulations (deprecated)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "system-filepath_0_4_14" = callPackage ({ mkDerivation, base, bytestring, chell, chell-quickcheck, deepseq , QuickCheck, text }: @@ -195332,7 +194118,6 @@ self: { homepage = "https://github.com/fpco/haskell-filesystem"; description = "High-level, byte-based file and directory path manipulations (deprecated)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-gpio" = callPackage @@ -196195,24 +194980,6 @@ self: { }) {}; "tagsoup" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , process, QuickCheck, text, time - }: - mkDerivation { - pname = "tagsoup"; - version = "0.14.2"; - sha256 = "1j7gliwn4x6i25zlhc8f704pbc96ddn9gb9czq3a4m0k1sfpm3w8"; - libraryHaskellDepends = [ base bytestring containers text ]; - testHaskellDepends = [ - base bytestring containers deepseq directory process QuickCheck - text time - ]; - homepage = "https://github.com/ndmitchell/tagsoup#readme"; - description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tagsoup_0_14_3" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , process, QuickCheck, text, time }: @@ -196227,7 +194994,6 @@ self: { homepage = "https://github.com/ndmitchell/tagsoup#readme"; description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagsoup-ht" = callPackage @@ -196840,24 +195606,6 @@ self: { }) {}; "tasty-ant-xml" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers - , xml - }: - mkDerivation { - pname = "tasty-ant-xml"; - version = "1.1.1"; - sha256 = "0asvz2jjk1zf3ylps1277kf4yy6bifascblsd3vjfk9k9rh52w3j"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving ghc-prim mtl - stm tagged tasty transformers xml - ]; - homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_1_2" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml @@ -196873,7 +195621,6 @@ self: { homepage = "http://github.com/ocharles/tasty-ant-xml"; description = "Render tasty output to XML for Jenkins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-auto" = callPackage @@ -197041,18 +195788,16 @@ self: { }) {}; "tasty-hspec" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random - , tagged, tasty, tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty + , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.3.2"; - sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv"; - revision = "3"; - editedCabalFile = "1qyk0mrzy4nv175xhva1wp7dchx7jnzb5p32bc0vd8pxz19pfljm"; + version = "1.1.3.3"; + sha256 = "00ym5jlh11smmg3aryfylnwjbmi62gsy5jl1pv85bc8gl0kqa85d"; libraryHaskellDepends = [ - base hspec hspec-core QuickCheck random tagged tasty - tasty-quickcheck tasty-smallcheck + base hspec hspec-core QuickCheck tasty tasty-quickcheck + tasty-smallcheck ]; homepage = "https://github.com/mitchellwrosen/tasty-hspec"; description = "Hspec support for the Tasty test framework"; @@ -197267,23 +196012,6 @@ self: { }) {}; "tasty-rerun" = callPackage - ({ mkDerivation, base, containers, mtl, optparse-applicative - , reducers, split, stm, tagged, tasty, transformers - }: - mkDerivation { - pname = "tasty-rerun"; - version = "1.1.8"; - sha256 = "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788"; - libraryHaskellDepends = [ - base containers mtl optparse-applicative reducers split stm tagged - tasty transformers - ]; - homepage = "http://github.com/ocharles/tasty-rerun"; - description = "Run tests by filtering the test tree depending on the result of previous test runs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-rerun_1_1_9" = callPackage ({ mkDerivation, base, containers, mtl, optparse-applicative , reducers, split, stm, tagged, tasty, transformers }: @@ -197298,7 +196026,6 @@ self: { homepage = "http://github.com/ocharles/tasty-rerun"; description = "Run tests by filtering the test tree depending on the result of previous test runs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-silver" = callPackage @@ -198543,14 +197270,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "terminal-progress-bar_0_1_2" = callPackage + "terminal-progress-bar_0_2" = callPackage ({ mkDerivation, async, base, HUnit, stm, stm-chans, terminal-size , test-framework, test-framework-hunit }: mkDerivation { pname = "terminal-progress-bar"; - version = "0.1.2"; - sha256 = "1r4i8h4625f4ixnppx3ng5lsay4msdgqy0mzl3p1z57aqxg1l84l"; + version = "0.2"; + sha256 = "052az3lxmhfssvm1i5md5d9la7vhfy560ls101kvw73vdzxk9cfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base stm stm-chans terminal-size ]; @@ -199302,30 +198029,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, network-uri, pandoc-types, parsec, process, split, syb - , temporary, text, utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.10.1"; - sha256 = "04qygn60f7920vm1f2xkf686kaimng8k030xlp3iy2hbgs33sxbj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - executableHaskellDepends = [ network-uri ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - }) {}; - - "texmath_0_10_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, network-uri, pandoc-types, parsec, process, split, syb , temporary, text, utf8-string, xml @@ -199347,7 +198050,6 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -200727,22 +199429,6 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift - , th-lift-instances, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.4"; - sha256 = "0cab6hmyii42p157jhm0sd5jzdlxms4ip2ncrmcmc47dl3pxk5gk"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-lift-instances th-reify-many - ]; - testHaskellDepends = [ base hspec template-haskell ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-orphans_0_13_5" = callPackage ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell , th-lift, th-lift-instances, th-reify-many }: @@ -200757,7 +199443,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-pprint" = callPackage @@ -201066,8 +199751,8 @@ self: { pname = "these"; version = "0.7.4"; sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; - revision = "4"; - editedCabalFile = "15pkx470kqx0a6rlxmwn8hdh6nlddncw040i4g5b8rphdr65whbn"; + revision = "5"; + editedCabalFile = "1jx0p6z91nz5dagw4bcvb7lr9a15ahjnx0nhyv8cmd8p056m5515"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -202961,29 +201646,6 @@ self: { }) {}; "tldr" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory - , filepath, optparse-applicative, semigroups, shell-conduit, text - }: - mkDerivation { - pname = "tldr"; - version = "0.2.4"; - sha256 = "0kn3ns2v99z6lx6inphl140rlhdmmlig0z4jkdlimkmfss21d33v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring cmark text - ]; - executableHaskellDepends = [ - base directory filepath optparse-applicative semigroups - shell-conduit - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/psibi/tldr-hs#readme"; - description = "Haskell tldr client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tldr_0_2_5" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory , filepath, optparse-applicative, semigroups, shell-conduit, text }: @@ -203004,7 +201666,6 @@ self: { homepage = "https://github.com/psibi/tldr-hs#readme"; description = "Haskell tldr client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls" = callPackage @@ -204583,34 +203244,6 @@ self: { }) {}; "tree-diff" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , base-compat, bytestring, containers, generics-sop, hashable - , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged - , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "tree-diff"; - version = "0.0.0.1"; - sha256 = "0km6himykj2q9ymaivv67dvlk7ia9dli2zhyx6g8yh8963mcn91v"; - revision = "1"; - editedCabalFile = "1vvqpxccmpw7nrrhkcmhcwv3y7cirm4wzw8r3my025x3icwkcf57"; - libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat bytestring - containers generics-sop hashable MemoTrie parsec parsers pretty - QuickCheck scientific tagged text time unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck - tasty tasty-golden tasty-quickcheck trifecta - ]; - homepage = "https://github.com/phadej/tree-diff"; - description = "Diffing of (expression) trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tree-diff_0_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, bytestring, containers, generics-sop, hashable , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged @@ -204636,7 +203269,6 @@ self: { homepage = "https://github.com/phadej/tree-diff"; description = "Diffing of (expression) trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tree-fun" = callPackage @@ -205482,8 +204114,8 @@ self: { ({ mkDerivation, base, type-combinators }: mkDerivation { pname = "tuple-ops"; - version = "0.0.0.1"; - sha256 = "0hhj6dlyrsw1yvbzjmvknbbl292rzb8hyy2llr09yc1k13gxgx1i"; + version = "0.0.0.2"; + sha256 = "05hmw9s4bync4j9sr8cs9nknkgpzwqd55aiw5s3iax4qnbxsccyp"; libraryHaskellDepends = [ base type-combinators ]; homepage = "https://github.com/pierric/tuple-ops"; description = "various operations on n-ary tuples via GHC.Generics"; @@ -205984,23 +204616,25 @@ self: { }) {}; "twilio" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal - , containers, errors, exceptions, free, http-client + ({ mkDerivation, aeson, base, binary, bytestring, Cabal, containers + , deepseq, errors, exceptions, free, hashable, hspec, http-client , http-client-tls, http-types, mtl, network-uri, old-locale - , scientific, text, time, transformers, unordered-containers + , QuickCheck, quickcheck-instances, scientific, template-haskell + , text, time, transformers, unordered-containers }: mkDerivation { pname = "twilio"; - version = "0.1.3.2"; - sha256 = "1vbb846cdav6csm2y9asrdzvmh9s3pf4apyharrr1hwd2xz3jcga"; + version = "0.2.0.0"; + sha256 = "0shjhdb3iabbs7hy89hv3fawzxilc7djgpacgydnzl2290dm17yl"; libraryHaskellDepends = [ - aeson base bifunctors bytestring containers errors exceptions free - http-client http-client-tls http-types mtl network-uri old-locale - scientific text time transformers unordered-containers + aeson base binary bytestring containers deepseq errors exceptions + free hashable http-client http-client-tls http-types mtl + network-uri old-locale scientific template-haskell text time + transformers unordered-containers ]; testHaskellDepends = [ - aeson base bytestring Cabal http-client http-client-tls network-uri - text transformers + aeson base bytestring Cabal hspec http-client http-client-tls + network-uri QuickCheck quickcheck-instances text transformers ]; doCheck = false; homepage = "https://github.com/markandrus/twilio-haskell"; @@ -206786,26 +205420,6 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion - , double-conversion, ghc-prim, hspec, QuickCheck, text - }: - mkDerivation { - pname = "type-of-html"; - version = "1.3.2.0"; - sha256 = "0zayqf18z3h4ix38gyqqvq2g3k74cm5f9gzkg4sh8ijw30xszq8p"; - libraryHaskellDepends = [ - base bytestring double-conversion ghc-prim text - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion QuickCheck text - ]; - homepage = "https://github.com/knupfer/type-of-html"; - description = "High performance type driven html generation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-of-html_1_3_2_1" = callPackage ({ mkDerivation, base, blaze-html, bytestring, criterion , double-conversion, ghc-prim, hspec, QuickCheck, text }: @@ -206823,7 +205437,6 @@ self: { homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-operators" = callPackage @@ -208054,22 +206667,6 @@ self: { }) {}; "unfoldable" = callPackage - ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck - , random, transformers - }: - mkDerivation { - pname = "unfoldable"; - version = "0.9.4"; - sha256 = "0qqjr060d79g5lnsdzx9ff6ava78441h8wvkn38hs7y3rvzw9vzd"; - libraryHaskellDepends = [ - base containers ghc-prim one-liner QuickCheck random transformers - ]; - homepage = "https://github.com/sjoerdvisscher/unfoldable"; - description = "Class of data structures that can be unfolded"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unfoldable_0_9_5" = callPackage ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck , random, transformers }: @@ -208083,7 +206680,6 @@ self: { homepage = "https://github.com/sjoerdvisscher/unfoldable"; description = "Class of data structures that can be unfolded"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unfoldable-restricted" = callPackage @@ -208794,6 +207390,8 @@ self: { pname = "universe-instances-base"; version = "1.0"; sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2"; + revision = "1"; + editedCabalFile = "13s8gxsvkw6phwvd79h9f3xaqbyzsx1svpysbmq72z1hv3mqyz8a"; libraryHaskellDepends = [ base containers universe-base ]; homepage = "https://github.com/dmwit/universe"; description = "Universe instances for types from the base package"; @@ -208808,8 +207406,8 @@ self: { pname = "universe-instances-extended"; version = "1.0.0.1"; sha256 = "15y9f0hbxqsksclxrssj4h08y0yb3nm9clqasjw6nsmi04kjfnv6"; - revision = "1"; - editedCabalFile = "1nsi34kjpyski2vip436m19m41as7zf1h8npd50sh8xa6cjhl98r"; + revision = "2"; + editedCabalFile = "1di3jk3ciikjrxzr76i0mqqza26mclnbxxak7ybkk4l06yqanj38"; libraryHaskellDepends = [ adjunctions base comonad universe-instances-base void ]; @@ -208842,6 +207440,8 @@ self: { pname = "universe-reverse-instances"; version = "1.0"; sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79"; + revision = "1"; + editedCabalFile = "0rq6h7yghnzrnv56pxnlfr6cfih8dbnhc6hh5416pgy5bxsa0ydj"; libraryHaskellDepends = [ base containers universe-instances-base ]; @@ -208898,21 +207498,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_0_3" = callPackage + "universum_1_0_4" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , ghc-prim, hashable, microlens, microlens-mtl, mtl + , doctest, ghc-prim, Glob, hashable, microlens, microlens-mtl, mtl , safe-exceptions, semigroups, stm, text, text-format, transformers , type-operators, unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.0.3"; - sha256 = "0d7aca78s5qkixfn95xfbvsz23xdv47pad4fl63jg7g8dykap4n0"; + version = "1.0.4"; + sha256 = "1r5hwmwj5s2xpnjy9r0a6wpz9hv63bwqs7m96zj0rkip9f6nvpyv"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text text-format transformers type-operators unordered-containers utf8-string vector ]; + testHaskellDepends = [ base doctest Glob ]; benchmarkHaskellDepends = [ base containers criterion deepseq hashable mtl semigroups text unordered-containers @@ -209106,27 +207707,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, hspec - , stm, transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.2.0"; - sha256 = "0qqacdzwbrynk2ma49q830irpya1il8m5b9rkklm906k60yjz9b9"; - libraryHaskellDepends = [ - async base deepseq directory filepath stm transformers unix - unliftio-core - ]; - testHaskellDepends = [ - async base deepseq directory filepath hspec stm transformers unix - unliftio-core - ]; - homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_4_0" = callPackage ({ mkDerivation, async, base, deepseq, directory, filepath, hspec , stm, transformers, unix, unliftio-core }: @@ -209145,7 +207725,6 @@ self: { homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -210944,18 +209523,6 @@ self: { }) {}; "validity" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "validity"; - version = "0.4.0.2"; - sha256 = "1ppisj45dccymlid7xwp1r2rgzql435smhl6s0n2b6alsx2h9qnz"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Validity typeclass"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity_0_4_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "validity"; @@ -210965,7 +209532,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-aeson" = callPackage @@ -211648,6 +210214,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-binary-instances_0_2_4" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-binary-instances"; + version = "0.2.4"; + sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb"; + libraryHaskellDepends = [ base binary vector ]; + testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq vector + ]; + homepage = "https://github.com/bos/vector-binary-instances"; + description = "Instances of Data.Binary and Data.Serialize for vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-buffer" = callPackage ({ mkDerivation, base, deepseq, vector }: mkDerivation { @@ -212264,25 +210849,6 @@ self: { }) {}; "viewprof" = callPackage - ({ mkDerivation, base, brick, containers, ghc-prof, lens - , scientific, text, vector, vector-algorithms, vty - }: - mkDerivation { - pname = "viewprof"; - version = "0.0.0.12"; - sha256 = "0a9bf8smqjjwz4m0gqac9zf9qp6ka3dhy2qrflbg1k5spd0dqqh5"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick containers ghc-prof lens scientific text vector - vector-algorithms vty - ]; - homepage = "https://github.com/maoe/viewprof"; - description = "Text-based interactive GHC .prof viewer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "viewprof_0_0_0_13" = callPackage ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: @@ -212299,7 +210865,6 @@ self: { homepage = "https://github.com/maoe/viewprof"; description = "Text-based interactive GHC .prof viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "views" = callPackage @@ -212891,41 +211456,6 @@ self: { }) {inherit (pkgs.gnome2) vte;}; "vty" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , deepseq, directory, filepath, hashable, HUnit, microlens - , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck - , quickcheck-assertions, random, smallcheck, stm, string-qq - , terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; - version = "5.19.1"; - sha256 = "13vip07b1mgr8qgxl97ni87910lrl1yjg5lvnfjzyvfyn0vw47zl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers deepseq directory filepath - hashable microlens microlens-mtl microlens-th mtl parallel parsec - stm terminfo text transformers unix utf8-string vector - ]; - executableHaskellDepends = [ - base containers microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers deepseq HUnit - microlens microlens-mtl mtl QuickCheck quickcheck-assertions random - smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - homepage = "https://github.com/jtdaugherty/vty"; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vty_5_19_2" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , deepseq, directory, filepath, hashable, HUnit, microlens , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck @@ -212958,7 +211488,6 @@ self: { homepage = "https://github.com/jtdaugherty/vty"; description = "A simple terminal UI library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vty-examples" = callPackage @@ -213358,37 +211887,6 @@ self: { }) {}; "wai-extra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, lifted-base, network, old-locale - , resourcet, streaming-commons, stringsearch, text, time - , transformers, unix, unix-compat, vault, void, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.21.0"; - sha256 = "1kngdp16hia9x3i47a6f3cwbsn58678madzmj3l4qb6mcfnk1a3y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute lifted-base network - old-locale resourcet streaming-commons stringsearch text time - transformers unix unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive cookie fast-logger - hspec http-types HUnit resourcet text time transformers wai zlib - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_0_22_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -213417,7 +211915,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-frontend-monadcgi" = callPackage @@ -213960,8 +212457,8 @@ self: { }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.5.1"; - sha256 = "1xvb38nq7mb4gpraj46j39hgf9vqcqng3hxhlj52zj7yn7d6279q"; + version = "0.5.2"; + sha256 = "0v9gi7lljfn58g558xlxhlmp4chq7m6a4kf0b4k23scygwh727jj"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions extractable-singleton hashable http-media http-types lucid mmorph @@ -214195,8 +212692,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.8.1"; - sha256 = "1h12fypbk1y96s8v4qb44b6lvccgxy5namvd9blza222crmiriv1"; + version = "0.8.2"; + sha256 = "08bzikcfgrni328mmxwxsr4kbsc5bjjacbxm18hs74b8n4g5f1qd"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -214211,7 +212708,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-middleware-rollbar_0_8_2" = callPackage + "wai-middleware-rollbar_0_8_3" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, hostname, hspec, hspec-golden-aeson, http-client , http-conduit, http-types, lens, lens-aeson, network, QuickCheck @@ -214219,8 +212716,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.8.2"; - sha256 = "08bzikcfgrni328mmxwxsr4kbsc5bjjacbxm18hs74b8n4g5f1qd"; + version = "0.8.3"; + sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -214268,8 +212765,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.1"; sha256 = "0xaksnb1lzbw6rj62l4x9jpx40c1l2c33x5cb5vqk08g84zz3dg0"; - revision = "4"; - editedCabalFile = "0yxrs5dzd79pklvk014nj4dq8arjzyr3bhq432rzqzr4zjijyblf"; + revision = "5"; + editedCabalFile = "1lb4whil5x1arjb3503x8j9i3wmf678ii1dx0paqqx7dchs6cfwl"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups @@ -215472,6 +213969,8 @@ self: { pname = "web-routes"; version = "0.27.13"; sha256 = "10b0hs7mmvs9ay3ik93s8xd7zlx8pyz20626nrha4mwyixgkmc59"; + revision = "1"; + editedCabalFile = "1s8ax7r8l0484730p36c3gn3n28zhl2p1nwjnprsbhcxd83yq4dh"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -215482,6 +213981,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-routes_0_27_14" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, exceptions + , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck + , split, text, utf8-string + }: + mkDerivation { + pname = "web-routes"; + version = "0.27.14"; + sha256 = "1m5ywqy2c9v478ybyrzqc407zdqcg18p5587mrq34v7bnjk27rak"; + revision = "1"; + editedCabalFile = "061kp8rpmbpr9f9n3kja8160z209hwz42yy3kikn6b446rdc4pdr"; + libraryHaskellDepends = [ + base blaze-builder bytestring exceptions ghc-prim http-types mtl + parsec split text utf8-string + ]; + testHaskellDepends = [ base hspec HUnit QuickCheck text ]; + homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; + description = "portable, type-safe URL routing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "web-routes-boomerang" = callPackage ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { @@ -215603,6 +214124,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-routes-wai_0_24_3_1" = callPackage + ({ mkDerivation, base, bytestring, http-types, text, wai + , web-routes + }: + mkDerivation { + pname = "web-routes-wai"; + version = "0.24.3.1"; + sha256 = "0j9h22nsj7zf5qpf4i07jdcih00r2fivdilvj8wsylk4d23x27wf"; + libraryHaskellDepends = [ + base bytestring http-types text wai web-routes + ]; + description = "Library for maintaining correctness of URLs within an application"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "web-routing" = callPackage ({ mkDerivation, base, bytestring, criterion, doctest, primitive , text, types-compat, unordered-containers @@ -216057,45 +214594,6 @@ self: { }) {}; "websockets" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, containers - , criterion, entropy, HUnit, network, QuickCheck, random, SHA - , streaming-commons, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.12.3.0"; - sha256 = "1k7mh4gpgzw83ck66kncz8jvmwc21jd2i36xnj78zbyi2sbclx86"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA - streaming-commons text - ]; - executableHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy HUnit network QuickCheck random - SHA streaming-commons test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers criterion entropy network random SHA - text - ]; - doCheck = false; - homepage = "http://jaspervdj.be/websockets"; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_12_3_1" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers , criterion, entropy, HUnit, network, QuickCheck, random, SHA @@ -216132,7 +214630,6 @@ self: { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-rpc" = callPackage @@ -216261,8 +214758,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "0.1.11"; - sha256 = "072gz2pwmzy7y4fnqgwwghgmcn5qy5aw8n9mhzwdspqjwyxr4rmh"; + version = "0.1.13"; + sha256 = "0a0zfp1g5mh393v4d1js5a0fnkj03q5kzycsyp3x4nk37dnc67fy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -217673,22 +216170,21 @@ self: { }) {}; "wrecker" = callPackage - ({ mkDerivation, aeson, aeson-qq, ansi-terminal, ansigraph, array + ({ mkDerivation, aeson, ansi-terminal, ansigraph, array , authenticate-oauth, base, base64-bytestring, blaze-builder , bytestring, case-insensitive, clock, clock-extras, connection , containers, cookie, cryptonite, data-default, data-default-class - , deepseq, exceptions, filepath, hspec, hspec-discover, http-client - , http-client-tls, http-types, immortal, lens, markdown-unlit - , memory, mime-types, network, network-uri, next-ref - , optparse-applicative, random, scotty, statistics, stm, stm-chans - , streaming-commons, tabular, tdigest, text, threads - , threads-extras, time, tls, transformers, unagi-chan, unix - , unordered-containers, vector, vty, wai, warp, wreq + , deepseq, exceptions, filepath, http-client, http-client-tls + , http-types, immortal, lens, markdown-unlit, memory, mime-types + , network, network-uri, next-ref, optparse-applicative, random + , statistics, stm, stm-chans, streaming-commons, tabular, tdigest + , text, threads, threads-extras, time, tls, transformers + , unagi-chan, unix, unordered-containers, vector, vty, wreq }: mkDerivation { pname = "wrecker"; - version = "1.2.3.0"; - sha256 = "138a8az5500ys2yvwif17vbmsmisd0r3q4yc8azfrd09y359ndlq"; + version = "1.2.4.0"; + sha256 = "1yrjr1mhywxwdcnakyfgga7jlwpxzb4clldp21igw35y3n53i6y8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217704,12 +216200,7 @@ self: { ]; executableHaskellDepends = [ base http-client http-client-tls lens markdown-unlit - optparse-applicative wreq - ]; - testHaskellDepends = [ - aeson aeson-qq base bytestring connection hspec hspec-discover - http-client immortal markdown-unlit network next-ref scotty text - transformers unordered-containers wai warp wreq + optparse-applicative transformers wreq ]; homepage = "https://github.com/lorenzo/wrecker#readme"; description = "An HTTP Performance Benchmarker"; @@ -217872,18 +216363,6 @@ self: { }) {}; "wreq-stringless" = callPackage - ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: - mkDerivation { - pname = "wreq-stringless"; - version = "0.5.2.0"; - sha256 = "0nswlrrs5pby5l758i5bbrfj0rpjxb71jak26gzwkm674kby9hjq"; - libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; - homepage = "https://github.com/j-keck/wreq-stringless#readme"; - description = "Simple wrapper to use wreq without Strings"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wreq-stringless_0_5_9_1" = callPackage ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: mkDerivation { pname = "wreq-stringless"; @@ -217893,7 +216372,6 @@ self: { homepage = "https://github.com/j-keck/wreq-stringless#readme"; description = "Simple wrapper to use wreq without Strings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wright" = callPackage @@ -219204,6 +217682,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xlsx_0_7_0" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search + , bytestring, conduit, containers, criterion, data-default, deepseq + , Diff, errors, extra, filepath, groom, lens, mtl, network-uri + , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xeno + , xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.7.0"; + sha256 = "1fg0y6raxavqnk6hnchjppizc01zszav78hdf38d3c7rgnd0vnmd"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary-search bytestring conduit + containers data-default deepseq errors extra filepath lens mtl + network-uri old-locale safe text time transformers vector xeno + xml-conduit zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck text time vector + xml-conduit + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + homepage = "https://github.com/qrilka/xlsx"; + description = "Simple and incomplete Excel file parser/writer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsx-tabular" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx @@ -219287,30 +217795,6 @@ self: { }) {}; "xml-conduit" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , data-default-class, deepseq, hspec, HUnit, monad-control - , resourcet, text, transformers, xml-types - }: - mkDerivation { - pname = "xml-conduit"; - version = "1.7.0.1"; - sha256 = "16pg2zzh0nz16zg6y5s7392d76fnhlki48ni1c18dzn41ybj8vll"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - conduit conduit-extra containers data-default-class deepseq - monad-control resourcet text transformers xml-types - ]; - testHaskellDepends = [ - base blaze-markup bytestring conduit containers hspec HUnit - resourcet text transformers xml-types - ]; - homepage = "http://github.com/snoyberg/xml"; - description = "Pure-Haskell utilities for dealing with XML with the conduit package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "xml-conduit_1_7_1_2" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default-class, deepseq, hspec, HUnit, monad-control @@ -219332,7 +217816,6 @@ self: { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-decode" = callPackage @@ -220893,36 +219376,6 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, resourcet, scientific, semigroups, template-haskell - , temporary, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.25.1"; - sha256 = "0s5db3ayjb9cs1pah1dggy9v95jnxis6v038jkh6229vi1piq4gz"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text - transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson base base-compat bytestring conduit directory hspec HUnit - mockery resourcet temporary text transformers unordered-containers - vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; - - "yaml_0_8_28" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, resourcet, scientific, semigroups, template-haskell @@ -220952,7 +219405,6 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-combinators" = callPackage @@ -221012,8 +219464,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.3.3"; - sha256 = "1kqia8i7vi7fbcrlwjv7yn09xnlm34k40qhb050rqzfrmyhpk2kq"; + version = "0.3.3.4"; + sha256 = "1vvwgb302w2nz05c97gzxkjx7m2lp25bpp3l16bzh92mjvqddpbd"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -222135,49 +220587,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , criterion, data-default, deepseq, deepseq-generics, directory - , exceptions, fast-logger, hspec, hspec-expectations, http-types - , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.37.2"; - sha256 = "0pip1y97zwfy073rc5yrhfcfj1m0nwrzih8f27m77y9dbdcwgmhs"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion shakespeare text transformers - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_4_37_3" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -222218,7 +220627,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -224907,35 +223315,7 @@ self: { "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, zip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.3.1.1"; - sha256 = "09c3y13r77shyamibr298i4l0rp31i41w3rg1ksnrl3gkrj8x1ly"; - revision = "1"; - editedCabalFile = "0n8f1075gz5q2k9mqzadca6is0fi1bgi91sfw1yq2kqakkbrbkqy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - executableHaskellDepends = [ base bytestring directory ]; - testHaskellDepends = [ - base bytestring directory HUnit old-time process temporary time - unix - ]; - testToolDepends = [ zip ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) zip;}; - - "zip-archive_0_3_2_2" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, zip, zlib + , process, temporary, text, time, unix, unzip, zip, zlib }: mkDerivation { pname = "zip-archive"; @@ -224952,12 +223332,11 @@ self: { base bytestring directory filepath HUnit old-time process temporary time unix ]; - testToolDepends = [ zip ]; + testToolDepends = [ unzip zip ]; homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) zip;}; + }) {inherit (pkgs) unzip; inherit (pkgs) zip;}; "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra @@ -225057,25 +223436,6 @@ self: { }) {}; "zippers" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest - , lens, profunctors, semigroupoids - }: - mkDerivation { - pname = "zippers"; - version = "0.2.4"; - sha256 = "1nzjs1s0lb0gr0n2qib4pdp24k7q707261n8icxzg81f0c04yafb"; - revision = "1"; - editedCabalFile = "18a7wlklxvl9fhk8j7njf8ifn2781vfiqz0vxk6ljx30f1p7plq1"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base lens profunctors semigroupoids ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ base criterion lens ]; - homepage = "http://github.com/ekmett/zippers/"; - description = "Traversal based zippers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zippers_0_2_5" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest , lens, profunctors, semigroupoids, semigroups }: @@ -225092,7 +223452,6 @@ self: { homepage = "http://github.com/ekmett/zippers/"; description = "Traversal based zippers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zippo" = callPackage From 866a1ed2d5a31ac0b8a208c7c57e826b776fb7fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Jan 2018 12:20:08 +0100 Subject: [PATCH 165/797] cabal2nix: build with hpack 0.23 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index acae897609b..746c00b037d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -606,7 +606,7 @@ self: super: { }; # Need newer versions of their dependencies than the ones we have in LTS-10.x. - cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_22_0; }; + cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_23_0; }; hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; }); # https://github.com/bos/configurator/issues/22 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ecb22c15dfa..b0d7c77dd32 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2695,7 +2695,6 @@ extra-packages: - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hoogle == 5.0.14 # required by hie-hoogle - - hpack == 0.20.* # required by stack-1.6.1 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x - language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192. From 6f93e0f749614ce8a02c0b8b09ef63208a8ec9ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Jan 2018 13:50:03 +0100 Subject: [PATCH 166/797] fix GHC 8.4.x builds of hspec and test-framework --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 03e42463fee..49c8ac0d005 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -41,4 +41,9 @@ self: super: { transformers = null; unix = null; xhtml = null; + + # GHC 8.4.x needs newer versions than LTS-10.x offers by default. + hspec = dontCheck super.hspec_2_4_7; # test suite causes an infinite loop + test-framework = self.test-framework_0_8_2_0; + } From b3970e7f5c2368fa9063aacbc2d6c99c62f78e9c Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 31 Jan 2018 16:41:15 +0100 Subject: [PATCH 167/797] mumble: Fix build with boost version 1.66 This is already tracked in upstream issue mumble-voip/mumble#3281 and a fix has been merged in mumble-voip/mumble@caa187373ec2f8bcf5b88e6340973. The patch I'm adding here is using the merged commit mumble-voip/mumble@ea861fe86743c8402bbad77d8d1dd9de8dce447e and I've only added it for the stable release because the patch is already included in the git version. @pbogdan also had a similar commit to this (pbogdan/nixpkgs@8029edea298b36df6494885055c8bf123aa4d26b), but the patch was applied to both stable and git and thus the git version would have been broken. Tested by building mumble and mumble_git and running the mumble NixOS VM test. Signed-off-by: aszlig Cc: @viric, @jgeerds, @abbradar Fixes: #33655 --- pkgs/applications/networking/mumble/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index dd4491be341..d8029f02a6f 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, pkgconfig +{ stdenv, fetchurl, fetchgit, fetchpatch, pkgconfig , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , jackSupport ? false, libjack2 ? null @@ -17,7 +17,7 @@ let generic = overrides: source: stdenv.mkDerivation (source // overrides // { name = "${overrides.type}-${source.version}"; - patches = optional jackSupport ./mumble-jack-support.patch; + patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; nativeBuildInputs = [ pkgconfig python ] ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}" @@ -116,6 +116,13 @@ let url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz"; sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh"; }; + + # Fix compile error against boost 1.66 (#33655): + patches = singleton (fetchpatch { + url = "https://github.com/mumble-voip/mumble/commit/" + + "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch"; + sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh"; + }); }; gitSource = rec { From 0d7a0d7572d35526ddf34b6d011b7b88a8904b36 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Jan 2018 18:56:47 +0100 Subject: [PATCH 168/797] titaniumenv: fix nasty IPA generation bug --- pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix index fac8af2b6f7..53963c100c7 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix @@ -23,7 +23,11 @@ stdenv.mkDerivation { cd mobilesdk/* mv * 6.3.1.GA cd * - + ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # Fixes a bad archive copying error when generating an IPA file + sed -i -e "s|cp -rf|/bin/cp -rf|" iphone/cli/commands/_build.js + ''} + # Patch some executables ${if stdenv.system == "i686-linux" then From 943592f69850fd07dd2422da062b1c1ebc45974d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 31 Jan 2018 14:02:19 -0500 Subject: [PATCH 169/797] Add setFunctionArgs lib function. Among other things, this will allow *2nix tools to output plain data while still being composable with the traditional callPackage/.override interfaces. --- lib/customisation.nix | 14 +++++----- lib/debug.nix | 4 +-- lib/default.nix | 4 +-- lib/deprecated.nix | 8 +++--- lib/generators.nix | 4 ++- lib/modules.nix | 2 +- lib/trivial.nix | 27 ++++++++++++++++++- nixos/doc/manual/default.nix | 2 +- nixos/lib/testing.nix | 2 +- nixos/modules/misc/nixpkgs.nix | 6 ++--- nixos/modules/profiles/clone-config.nix | 2 +- nixos/tests/make-test.nix | 2 +- pkgs/build-support/emacs/wrapper.nix | 2 +- pkgs/development/beam-modules/lib.nix | 4 +-- .../haskell-modules/make-package-set.nix | 4 +-- .../darwin/apple-source-releases/default.nix | 2 +- pkgs/top-level/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 18 files changed, 60 insertions(+), 33 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 3988f4e9b69..823395f04d4 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -1,7 +1,7 @@ { lib }: let - inherit (builtins) attrNames isFunction; + inherit (builtins) attrNames; in @@ -72,7 +72,7 @@ rec { makeOverridable = f: origArgs: let ff = f origArgs; - overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); + overrideWith = newArgs: origArgs // (if lib.isFunction newArgs then newArgs origArgs else newArgs); in if builtins.isAttrs ff then (ff // { override = newArgs: makeOverridable f (overrideWith newArgs); @@ -81,7 +81,7 @@ rec { ${if ff ? overrideAttrs then "overrideAttrs" else null} = fdrv: makeOverridable (args: (f args).overrideAttrs fdrv) origArgs; }) - else if builtins.isFunction ff then { + else if lib.isFunction ff then { override = newArgs: makeOverridable f (overrideWith newArgs); __functor = self: ff; overrideDerivation = throw "overrideDerivation not yet supported for functors"; @@ -112,8 +112,8 @@ rec { */ callPackageWith = autoArgs: fn: args: let - f = if builtins.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + f = if lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; in makeOverridable f (auto // args); @@ -122,8 +122,8 @@ rec { individual attributes. */ callPackagesWith = autoArgs: fn: args: let - f = if builtins.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + f = if lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; origArgs = auto // args; pkgs = f origArgs; mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) origArgs; diff --git a/lib/debug.nix b/lib/debug.nix index 646ef220ad0..d163e60b695 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -2,10 +2,10 @@ let -inherit (builtins) trace attrNamesToStr isAttrs isFunction isList isInt +inherit (builtins) trace attrNamesToStr isAttrs isList isInt isString isBool head substring attrNames; -inherit (lib) all id mapAttrsFlatten elem; +inherit (lib) all id mapAttrsFlatten elem isFunction; in diff --git a/lib/default.nix b/lib/default.nix index 6d2a95e559c..97d7c10192a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -51,12 +51,12 @@ let inherit (builtins) add addErrorContext attrNames concatLists deepSeq elem elemAt filter genericClosure genList - getAttr hasAttr head isAttrs isBool isFunction isInt isList + getAttr hasAttr head isAttrs isBool isInt isList isString length lessThan listToAttrs pathExists readFile replaceStrings seq stringLength sub substring tail; inherit (trivial) id const concat or and boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info - nixpkgsVersion mod; + nixpkgsVersion mod functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 2a0f5a55bf1..34cf336d1f4 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -1,6 +1,6 @@ { lib }: let - inherit (builtins) isFunction head tail isList isAttrs isInt attrNames; + inherit (builtins) head tail isList isAttrs isInt attrNames; in @@ -53,7 +53,7 @@ rec { f: # the function applied to the arguments initial: # you pass attrs, the functions below are passing a function taking the fix argument let - takeFixed = if isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument + takeFixed = if lib.isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument tidy = args: let # apply all functions given in "applyPreTidy" in sequence applyPreTidyFun = fold ( n: a: x: n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args); @@ -63,7 +63,7 @@ rec { let args = takeFixed fixed; mergeFun = args.${n}; in if isAttrs x then (mergeFun args x) - else assert isFunction x; + else assert lib.isFunction x; mergeFun args (x ( args // { inherit fixed; })); in overridableDelayableArgs f newArgs; in @@ -374,7 +374,7 @@ rec { if isAttrs x then if x ? outPath then "derivation" else "attrs" - else if isFunction x then "function" + else if lib.isFunction x then "function" else if isList x then "list" else if x == true then "bool" else if x == false then "bool" diff --git a/lib/generators.nix b/lib/generators.nix index f207033c955..73017f2c679 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -14,6 +14,8 @@ let libAttr = lib.attrsets; flipMapAttrs = flip libAttr.mapAttrs; + + inherit (lib) isFunction; in rec { @@ -110,7 +112,7 @@ rec { else if isString v then "\"" + v + "\"" else if null == v then "null" else if isFunction v then - let fna = functionArgs v; + let fna = lib.functionArgs v; showFnas = concatStringsSep "," (libAttr.mapAttrsToList (name: hasDefVal: if hasDefVal then "(${name})" else name) fna); diff --git a/lib/modules.nix b/lib/modules.nix index 8c3584bbbf4..654c4c588de 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -155,7 +155,7 @@ rec { # a module will resolve strictly the attributes used as argument but # not their values. The values are forwarding the result of the # evaluation of the option. - requiredArgs = builtins.attrNames (builtins.functionArgs f); + requiredArgs = builtins.attrNames (lib.functionArgs f); context = name: ''while evaluating the module argument `${name}' in "${key}":''; extraArgs = builtins.listToAttrs (map (name: { inherit name; diff --git a/lib/trivial.nix b/lib/trivial.nix index c452c7b65bc..d8d51298143 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -52,7 +52,7 @@ rec { # Pull in some builtins not included elsewhere. inherit (builtins) - pathExists readFile isBool isFunction + pathExists readFile isBool isInt add sub lessThan seq deepSeq genericClosure; @@ -99,4 +99,29 @@ rec { */ warn = msg: builtins.trace "WARNING: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; + + # | Add metadata about expected function arguments to a function. + # The metadata should match the format given by + # builtins.functionArgs, i.e. a set from expected argument to a bool + # representing whether that argument has a default or not. + # setFunctionArgs : (a → b) → Map String Bool → (a → b) + # + # This function is necessary because you can't dynamically create a + # function of the { a, b ? foo, ... }: format, but some facilities + # like callPackage expect to be able to query expected arguments. + setFunctionArgs = f: args: + { # TODO: Should we add call-time "type" checking like built in? + __functor = self: f; + __functionArgs = args; + }; + + # | Extract the expected function arguments from a function. + # This works both with nix-native { a, b ? foo, ... }: style + # functions and functions with args set with 'setFunctionArgs'. It + # has the same return type and semantics as builtins.functionArgs. + # setFunctionArgs : (a → b) → Map String Bool. + functionArgs = f: f.__functionArgs or (builtins.functionArgs f); + + isFunction = f: builtins.isFunction f || + (f ? __functor && isFunction (f.__functor f)); } diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 9bc83be6610..8079a2feb29 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -12,7 +12,7 @@ let substFunction = x: if builtins.isAttrs x then lib.mapAttrs (name: substFunction) x else if builtins.isList x then map substFunction x - else if builtins.isFunction x then "" + else if lib.isFunction x then "" else x; # Clean up declaration sites to not refer to the NixOS source tree. diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 532fff681d3..cf213d906f5 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -85,7 +85,7 @@ rec { testScript' = # Call the test script with the computed nodes. - if builtins.isFunction testScript + if lib.isFunction testScript then testScript { inherit nodes; } else testScript; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 1793c1447d6..b01f5431909 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -4,10 +4,10 @@ with lib; let isConfig = x: - builtins.isAttrs x || builtins.isFunction x; + builtins.isAttrs x || lib.isFunction x; optCall = f: x: - if builtins.isFunction f + if lib.isFunction f then f x else f; @@ -38,7 +38,7 @@ let overlayType = mkOptionType { name = "nixpkgs-overlay"; description = "nixpkgs overlay"; - check = builtins.isFunction; + check = lib.isFunction; merge = lib.mergeOneOption; }; diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix index 77d86f8d740..5b4e68beb6a 100644 --- a/nixos/modules/profiles/clone-config.nix +++ b/nixos/modules/profiles/clone-config.nix @@ -17,7 +17,7 @@ let # you should use files). moduleFiles = # FIXME: use typeOf (Nix 1.6.1). - filter (x: !isAttrs x && !builtins.isFunction x) modules; + filter (x: !isAttrs x && !lib.isFunction x) modules; # Partition module files because between NixOS and non-NixOS files. NixOS # files may change if the repository is updated. diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix index f3e26aa7e74..1b571a008e0 100644 --- a/nixos/tests/make-test.nix +++ b/nixos/tests/make-test.nix @@ -2,4 +2,4 @@ f: { system ? builtins.currentSystem, ... } @ args: with import ../lib/testing.nix { inherit system; }; -makeTest (if builtins.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) +makeTest (if lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 27633c912b2..4e780b104b0 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -40,7 +40,7 @@ packagesFun: # packages explicitly requested by the user let explicitRequires = - if builtins.isFunction packagesFun + if lib.isFunction packagesFun then packagesFun self else packagesFun; in diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 26d868a8e7c..d6b83cb1af0 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -6,8 +6,8 @@ rec { */ callPackageWith = autoArgs: fn: args: let - f = if builtins.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs; + f = if pkgs.lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (stdenv.lib.functionArgs f) autoArgs; in f (auto // args); callPackage = callPackageWith pkgs; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 223f0652887..0f866a96e71 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -81,8 +81,8 @@ let # lost on `.override`) but determine the auto-args based on `drv` (the problem here # is that nix has no way to "passthrough" args while preserving the reflection # info that callPackage uses to determine the arguments). - drv = if builtins.isFunction fn then fn else import fn; - auto = builtins.intersectAttrs (builtins.functionArgs drv) scope; + drv = if stdenv.lib.isFunction fn then fn else import fn; + auto = builtins.intersectAttrs (stdenv.lib.functionArgs drv) scope; # this wraps the `drv` function to add a `overrideScope` function to the result. drvScope = allArgs: drv allArgs // { diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 478f9e7e303..cca729016c2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -186,7 +186,7 @@ let # There should be an IOVideo here, but they haven't released it :( }; - IOKitSrcs = stdenv.lib.mapAttrs (name: value: if builtins.isFunction value then value name else value) IOKitSpecs; + IOKitSrcs = stdenv.lib.mapAttrs (name: value: if stdenv.lib.isFunction value then value name else value) IOKitSpecs; adv_cmds = applePackage "adv_cmds" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 96d5e1fe283..9cf9eb4db65 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -49,7 +49,7 @@ in let # { /* the config */ } and # { pkgs, ... } : { /* the config */ } config = - if builtins.isFunction configExpr + if lib.isFunction configExpr then configExpr { inherit pkgs; } else configExpr; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1820125b0a5..bc3ea1027e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -40,7 +40,7 @@ let makeOverridablePythonPackage = f: origArgs: let ff = f origArgs; - overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); + overrideWith = newArgs: origArgs // (if pkgs.lib.isFunction newArgs then newArgs origArgs else newArgs); in if builtins.isAttrs ff then (ff // { overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); From 404475a783fc378f8024494316df884289ade905 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 31 Jan 2018 14:13:10 +0100 Subject: [PATCH 170/797] tp_smapi: 0.42 -> unstable-2017-12-04 make it build for kernel 4.15 see https://github.com/evgeni/tp_smapi/issues/31 and #32 --- pkgs/os-specific/linux/tp_smapi/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index c3adcc6cdba..9c8bf559751 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tp_smapi-${version}-${kernel.version}"; - version = "0.42"; + version = "unstable-2017-12-04"; src = fetchFromGitHub { owner = "evgeni"; repo = "tp_smapi"; - rev = "tp-smapi/${version}"; - sha256 = "12lnig90lrmkmqwl386q7ssqs9p0jikqhwl2wsmcmii1gn92hzfy"; + rev = "76c5120f7be4880cf2c6801f872327e4e70c449f"; + sha256 = "0g8l7rmylspl17qnqpa2h4yj7h3zvy6xlmj5nlnixds9avnbz2vy"; name = "tp-smapi-${version}"; }; @@ -39,11 +39,10 @@ stdenv.mkDerivation rec { meta = { description = "IBM ThinkPad hardware functions driver"; - homepage = https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41; + homepage = https://github.com/evgeni/tp_smapi; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.garbas ]; # driver is only ment for linux thinkpads i think bellow platforms should cover it. platforms = [ "x86_64-linux" "i686-linux" ]; }; } - From 0307a1acf60e9f14debb8c5cbe82e104f153153e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 31 Jan 2018 21:28:08 +0100 Subject: [PATCH 171/797] i2pd: 2.17.0 -> 2.18.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index bd98eca5354..dad00cfd9ee 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1yl5h7mls50vkg7x5510mljmgsm02arqhcanwkrqw4ilwvcp1mgz"; + sha256 = "019psm86n4k7nzxhw7cnbw144gqni59sf35wiy58a6x6dabmvq8h"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] From 505cebebd313147e28484f5d6d901affbf16b7c9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 31 Jan 2018 21:43:20 +0100 Subject: [PATCH 172/797] pdf2djvu: 0.9.7 -> 0.9.8 --- pkgs/tools/typesetting/pdf2djvu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 84747780940..9a7dac0a0ca 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; name = "pdf2djvu-${version}"; src = fetchurl { url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; - sha256 = "1h92f9prx69wz9h57lncxj8ddh2xg6q7hjhlqqzzf30k59il4zcy"; + sha256 = "0kc3n4lm9dd13w66ng7l637ha241q89xrv9da0wzsdg6v0gp6ifg"; }; nativeBuildInputs = [ pkgconfig ]; From 561b9ca8ac37509213369797fc56437cda2961ca Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 31 Jan 2018 21:56:01 +0100 Subject: [PATCH 173/797] moreutils: 0.61 -> 0.62 --- pkgs/tools/misc/moreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index dbb80067e6d..7d40a820702 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "moreutils-${version}"; - version = "0.61"; + version = "0.62"; src = fetchgit { url = "git://git.joeyh.name/moreutils"; rev = "refs/tags/${version}"; - sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr"; + sha256 = "0sk7rgqsqbdwr69mh7y4v9lv4v0nfmsrqgvbpy2gvy82snhfzar"2; }; preBuild = '' From 293424b745161fa7b9f7f725355b8d0337ed055f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 31 Jan 2018 14:56:55 -0600 Subject: [PATCH 174/797] gdb: 8.0.1 -> 8.1 https://sourceware.org/ml/gdb/2018-01/msg00026.html --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index d1148ad48d8..e068b908caf 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -18,7 +18,7 @@ let basename = "gdb-${version}"; - version = "8.0.1"; + version = "8.1"; in assert targetPlatform.isHurd -> mig != null && hurd != null; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "1qwmcbaxf0jc7yjl0fimgcfj2yqcrl6h7azgs1d838kbwf9mzg9x"; + sha256 = "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg"; }; patches = [ ./debug-info-from-env.patch ]; From df45c65aaea5bcf84474f8679c6ac52a0a5e9d0c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 31 Jan 2018 22:00:05 +0100 Subject: [PATCH 175/797] homebank: 5.1.6 -> 5.1.7 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 1d90e8be282..3d63b4195a2 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor_icon_theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.1.6"; + name = "homebank-5.1.7"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1q4h890g6a6pm6kfiavbq9sbpsnap0f854sja2y5q3x0j0ay2q98"; + sha256 = "19szz86jxya8v4r3pa5czng9q2kn5hhbk273x1wqvdv40z0577jp"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From ef351646bad830097a5dde943337432754119f11 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jan 2018 22:22:47 +0100 Subject: [PATCH 176/797] Revert "Restore "nixUnstable: rename to nix-unstable"" This reverts commit 695027f61c702ea0de6baa3122b282d672fede09. We really can't have "nix-env -i nix" *not* upgrade nixUnstable to a newer nixStable. For instance, it would cause "nix upgrade-nix" to produce a user environment with collisions. --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d67aebb5236..faee8f6cb96 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -160,7 +160,7 @@ in rec { }) // { perl-bindings = nixStable; }; nixUnstable = (lib.lowPrio (common rec { - name = "nix-unstable-1.12${suffix}"; + name = "nix-1.12${suffix}"; suffix = "pre5873_b76e282d"; src = fetchFromGitHub { owner = "NixOS"; From 75a20284f4c2257f9017d15265c277885b732828 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jan 2018 21:55:11 +0100 Subject: [PATCH 177/797] nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731 --- pkgs/tools/package-management/nix/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index faee8f6cb96..81031c0a547 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -26,7 +26,7 @@ let inherit name src; version = lib.getVersion name; - is112 = lib.versionAtLeast version "1.12pre"; + is20 = lib.versionAtLeast version "2.0pre"; VERSION_SUFFIX = lib.optionalString fromGit suffix; @@ -34,14 +34,14 @@ let nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals (!is112) [ perl ] + ++ lib.optionals (!is20) [ perl ] ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals fromGit [ brotli ] # Since 1.12 ++ lib.optional stdenv.isLinux libseccomp - ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112) + ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) (aws-sdk-cpp.override { apis = ["s3"]; customMemoryManagement = false; @@ -65,11 +65,11 @@ let "--disable-init-state" "--enable-gc" ] - ++ lib.optionals (!is112) [ + ++ lib.optionals (!is20) [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" - ] ++ lib.optionals (is112 && stdenv.isLinux) [ + ] ++ lib.optionals (is20 && stdenv.isLinux) [ "--with-sandbox-shell=${sh}/bin/busybox" ]; @@ -160,13 +160,13 @@ in rec { }) // { perl-bindings = nixStable; }; nixUnstable = (lib.lowPrio (common rec { - name = "nix-1.12${suffix}"; - suffix = "pre5873_b76e282d"; + name = "nix-2.0${suffix}"; + suffix = "pre5889_c287d731"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "b76e282da8824b679368370e43c994e588994a9a"; - sha256 = "11clfc8fh8q8s3k4canmn36xhh3zcl2zd8wwddp4pdvdal16b5n6"; + rev = "c287d7312103bae5e154c0c4dd493371a22ea207"; + sha256 = "1dwhz93dlk62prh3wfwf8vxfcqjdn21wk0ms65kf5r8ahkfgpgq4"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; From 700e21d6dac4683ef40f20127a6eb2a74b9bd8c6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jan 2018 22:20:39 +0100 Subject: [PATCH 178/797] nix-daemon.nix: Updates for Nix 2.0 * The environment variables NIX_CONF_DIR, NIX_BUILD_HOOK and NIX_REMOTE are no longer needed. * A /bin/sh (from busybox) is provided by default in sandboxes. * Various options were renamed. --- nixos/modules/services/misc/nix-daemon.nix | 58 ++++++++++++---------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index beca820d2d6..a169b0f2c78 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -8,7 +8,7 @@ let nix = cfg.package.out; - isNix112 = versionAtLeast (getVersion nix) "1.12pre"; + isNix20 = versionAtLeast (getVersion nix) "2.0pre"; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -26,32 +26,40 @@ let nixConf = let - # If we're using sandbox for builds, then provide /bin/sh in - # the sandbox as a bind-mount to bash. This means we also need to - # include the entire closure of bash. + # In Nix < 2.0, If we're using sandbox for builds, then provide + # /bin/sh in the sandbox as a bind-mount to bash. This means we + # also need to include the entire closure of bash. Nix >= 2.0 + # provides a /bin/sh by default. sh = pkgs.stdenv.shell; binshDeps = pkgs.writeReferencesToFile sh; in - pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } '' - extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) + pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; inherit binshDeps; } '' + ${optionalString (!isNix20) '' + extraPaths=$(for i in $(cat binshDeps); do if test -d $i; then echo $i; fi; done) + ''} cat > $out < Date: Wed, 31 Jan 2018 17:09:34 -0500 Subject: [PATCH 179/797] moreutils: Fix eval Was broken in 561b9ca8ac37509213369797fc56437cda2961ca. --- pkgs/tools/misc/moreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 7d40a820702..a8d08018c74 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.joeyh.name/moreutils"; rev = "refs/tags/${version}"; - sha256 = "0sk7rgqsqbdwr69mh7y4v9lv4v0nfmsrqgvbpy2gvy82snhfzar"2; + sha256 = "0sk7rgqsqbdwr69mh7y4v9lv4v0nfmsrqgvbpy2gvy82snhfzar2"; }; preBuild = '' From 5cf9424632a3789b3c22519bf15ceb89e58f95aa Mon Sep 17 00:00:00 2001 From: tilpner Date: Wed, 31 Jan 2018 23:32:49 +0100 Subject: [PATCH 180/797] elvish: 0.10 -> 0.11 --- pkgs/shells/elvish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index a598d57808c..5a00a1ee419 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "elvish-${version}"; - version = "0.10"; + version = "0.11"; goPackagePath = "github.com/elves/elvish"; @@ -10,7 +10,7 @@ buildGoPackage rec { repo = "elvish"; owner = "elves"; rev = version; - sha256 = "0v6byd81nz0fbd3sdlippi1jn1z3gbqc2shnr7akd1n6k9259vrj"; + sha256 = "1rzgy1ql381nwsdjgiwv4mdr1xwivnpmzgkdzms8ipn2lbwhff87"; }; meta = with stdenv.lib; { From f96aafd4035595144375c92c23159b67f7c40446 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 31 Jan 2018 22:56:09 +0100 Subject: [PATCH 181/797] virtualbox: 5.2.4 -> 5.2.6 Upstream changes without issue IDs: * GUI: fixed occasional screen corruption when host screen resolution is changed * User interface: increase proposed disk size when creating new VMs for Windows 7 and newer * User interface: various improvements for high resolution screens * VMM: Fixed problems using 256MB VRAM in raw-mode VMs * Audio: implemented support for audio playback and recording for macOS guests * Audio: further timing improvements for Windows 10 guests * Linux hosts: fixed problem accessing mini-toolbar under XFCE The full changelog including issue IDs can be found at: https://www.virtualbox.org/wiki/Changelog#v6 What was not mentioned in the changelog is that this release fixes compiling the VirtualBox modules against kernel 4.15, which was added in commit 61043ad4d1425af2d2b5cb3af8b3740fdd90e3ad. Tested this by running all of the tests in nixos/tests/virtualbox.nix. Signed-off-by: aszlig Cc: @flokli, @svanderburg --- pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++---- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3e9322ddeaf..38509d299d9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,10 +21,10 @@ let buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "98e9df4f23212c3de827af9d770b391cf2dba8d21f4de597145512c1479302cd"; - extpackRev = "119785"; - main = "053xpf0kxrig4jq5djfz9drhkxy1x5a4p9qvgxc0b3hnk6yn1869"; - version = "5.2.4"; + extpack = "70584a70b666e9332ae2c6be0e64da4b8e3a27124801156577f205750bdde4f5"; + extpackRev = "120293"; + main = "1rx45ivwk89ghjc5zdd7c7j92w0w3930xj7l1zhwrvshxs454w7y"; + version = "5.2.6"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 8f789cdf170..f82eec07a29 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "0qhsr6vc48ld2p9q3a6n6rfg57rsn163axr3r1m2yqr2snr4pnk0"; + sha256 = "1px9jp6lv7ff7kn4ns5r4dq7xl4wiz3h4ckgdhgvxs040njpdzy5"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; From 65187722ec07fec21b2c8c53019255c6a9a5c4f8 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 31 Jan 2018 22:59:09 +0000 Subject: [PATCH 182/797] linuxPackages.broadcom-sta: fix build with Linux 4.15 See: https://lkml.org/lkml/2017/11/25/90 --- .../linux/broadcom-sta/default.nix | 1 + .../linux/broadcom-sta/linux-4.15.patch | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index c6bd4f4b206..9423e7a33f4 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { ./linux-4.11.patch # source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl ./linux-4.12.patch + ./linux-4.15.patch ./null-pointer-fix.patch ./gcc.patch ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch new file mode 100644 index 00000000000..523fa291d52 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch @@ -0,0 +1,47 @@ +See: https://lkml.org/lkml/2017/11/25/90 + +diff -urNZ a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2015-09-18 22:47:30.000000000 +0000 ++++ b/src/wl/sys/wl_linux.c 2018-01-31 22:52:10.859856221 +0000 +@@ -93,7 +93,11 @@ + + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static void wl_timer(struct timer_list *tl); ++#else + static void wl_timer(ulong data); ++#endif + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); + +@@ -2298,9 +2302,15 @@ + } + + static void ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++wl_timer(struct timer_list *tl) ++{ ++ wl_timer_t *t = from_timer(t, tl, timer); ++#else + wl_timer(ulong data) + { + wl_timer_t *t = (wl_timer_t *)data; ++#endif + + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); +@@ -2352,9 +2362,13 @@ + + bzero(t, sizeof(wl_timer_t)); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ timer_setup(&t->timer, wl_timer, 0); ++#else + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; ++#endif + t->wl = wl; + t->fn = fn; + t->arg = arg; From 6f3e450bdf06b91b1895057ec70fb4dab5dc69bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Feb 2018 00:27:46 +0100 Subject: [PATCH 183/797] spectre-meltdown-checker: 0.33 -> 0.34 --- pkgs/tools/security/spectre-meltdown-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 39770433ff3..d03c387a7c6 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.33"; + version = "0.34"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0a0vbzjfmvcvak804y2s0301f9bcnr0nwg2piafx6i6ibisp917y"; + sha256 = "0jlqxzii883yl5iqmywqqqjlhgswn033566a3vpspycj3sr8zrd2"; }; prePatch = '' From 82b6c6939bb674da1ad3cbe09009bd34078104db Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 31 Jan 2018 00:38:48 +0100 Subject: [PATCH 184/797] pixie: remove deprecated alias --- pkgs/development/interpreters/pixie/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index d41977b4f5c..ce8331a0936 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -68,12 +68,6 @@ let --prefix C_INCLUDE_PATH : ${include-path} \ --prefix LIBRARY_PATH : ${library-path} \ --prefix PATH : ${bin-path} - cat > $out/bin/pxi <&2 echo "[\$\$] WARNING: 'pxi' and 'pixie-vm' are deprecated aliases for 'pixie', please update your scripts." - exec $out/bin/pixie "\$@" - EOF - chmod +x $out/bin/pxi ''; meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; From 1965804664a4742c71f0e8a9a2ef6019c26a80ea Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 31 Jan 2018 00:44:32 +0100 Subject: [PATCH 185/797] pixie: implement checkPhase --- .../interpreters/pixie/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index ce8331a0936..f2e987323c0 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -56,18 +56,31 @@ let RPYTHON="`pwd`/pypy-src/rpython/bin/rpython"; cd pixie-src $PYTHON $RPYTHON ${common-flags} ${target} - export LD_LIBRARY_PATH="${library-path}:$LD_LIBRARY_PATH" find pixie -name "*.pxi" -exec ./pixie-vm -c {} \; )''; + LD_LIBRARY_PATH = library-path; + C_INCLUDE_PATH = include-path; + LIBRARY_PATH = library-path; + PATH = bin-path; installPhase = '' mkdir -p $out/share $out/bin cp pixie-src/pixie-vm $out/share/pixie-vm cp -R pixie-src/pixie $out/share/pixie makeWrapper $out/share/pixie-vm $out/bin/pixie \ - --prefix LD_LIBRARY_PATH : ${library-path} \ - --prefix C_INCLUDE_PATH : ${include-path} \ - --prefix LIBRARY_PATH : ${library-path} \ - --prefix PATH : ${bin-path} + --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \ + --prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \ + --prefix LIBRARY_PATH : ${LIBRARY_PATH} \ + --prefix PATH : ${PATH} + ''; + doCheck = true; + checkPhase = '' + RES=$(./pixie-src/pixie-vm -e "(print :ok)") + if [ "$RES" != ":ok" ]; then + echo "ERROR Unexpected output: '$RES'" + return 1 + else + echo "$RES" + fi ''; meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; From d5bc23c45c825edb2e2be5b7ffb7da9362f628fa Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 1 Aug 2017 17:12:35 +0200 Subject: [PATCH 186/797] pixie: 1356 -> 1364 --- pkgs/development/interpreters/pixie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index f2e987323c0..928a5517324 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -3,7 +3,7 @@ variant ? "jit", buildWithPypy ? false }: let - commit-count = "1356"; + commit-count = "1364"; common-flags = "--thread --gcrootfinder=shadowstack --continuation"; variants = { jit = { flags = "--opt=jit"; target = "target.py"; }; @@ -13,8 +13,8 @@ let }; pixie-src = fetchgit { url = "https://github.com/pixie-lang/pixie.git"; - rev = "d2a4267ea088f711af36a74928e8dfd8360584ad"; - sha256 = "1asf6yx7zy9cx4bsg8iai57dy3r3m45xcmkmw2vix70xvfy23ryf"; + rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62"; + sha256 = "0pf31x5h2m6dpxlidv98qay1y179qw40cw4cb4v4xa88gmq2f3vm"; }; pypy-tag = "91db1a9"; pypy-src = fetchurl { From f29b993825adbd117b727d09d0c2559e337e0fb6 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 1 Feb 2018 00:41:42 +0100 Subject: [PATCH 187/797] i2p: 0.9.32 -> 0.9.33 --- pkgs/tools/networking/i2p/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index d66ff70180a..ec268d5d77f 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.32"; + name = "i2p-0.9.33"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1c82yckwzp51wqrr8qhww3sifm1a9nzrymsf9qv99ngsxq4n5l6i"; + sha256 = "1hlildi34p34xgpm0gqh09r2jb6nsa7a52gr074r6203xkl2racw"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; From e69f0053e674202c64696656d537a4ca81b2a7f7 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 31 Jan 2018 22:37:47 +0100 Subject: [PATCH 188/797] grv: init at 0.1.0 --- .../git-and-tools/default.nix | 2 + .../git-and-tools/grv/default.nix | 29 +++++ .../git-and-tools/grv/deps.nix | 102 ++++++++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/grv/default.nix create mode 100644 pkgs/applications/version-management/git-and-tools/grv/deps.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7056249de3f..96e2220f582 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -100,6 +100,8 @@ rec { gitflow = callPackage ./gitflow { }; + grv = callPackage ./grv { }; + hub = callPackage ./hub { inherit (darwin) Security; }; diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix new file mode 100644 index 00000000000..386589aaf05 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }: +let + version = "0.1.0"; +in +buildGoPackage { + name = "grv-${version}"; + + buildInputs = [ ncurses readline curl libgit2_0_25 ]; + nativeBuildInputs = [ pkgconfig ]; + + goPackagePath = "github.com/rgburke/grv"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "rgburke"; + repo = "grv"; + rev = "v${version}"; + sha256 = "1qd9kq8l29v3gwwls98933bk0rdw44mrbnqgb1r6hm9m6vzjfcn3"; + }; + + meta = with stdenv.lib; { + description = " GRV is a terminal interface for viewing git repositories"; + homepage = https://github.com/rgburke/grv; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/grv/deps.nix b/pkgs/applications/version-management/git-and-tools/grv/deps.nix new file mode 100644 index 00000000000..8de555df2e8 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/grv/deps.nix @@ -0,0 +1,102 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "768a92a02685ee7535069fc1581341b41bab9b72"; + sha256 = "1m67cxb6p0zgq0xba63qb4vvy6z5d78alya0vnx5djfixygiij53"; + }; + } + { + goPackagePath = "github.com/bradfitz/slice"; + fetch = { + type = "git"; + url = "https://github.com/bradfitz/slice"; + rev = "d9036e2120b5ddfa53f3ebccd618c4af275f47da"; + sha256 = "189h48w3ppvx2kqyxq0s55kxv629lljjxbyqjnlrgg8fy6ya8wgy"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "51eb1ee00b6d931c66d229ceeb7c31b985563420"; + sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; + }; + } + { + goPackagePath = "github.com/rgburke/goncurses"; + fetch = { + type = "git"; + url = "https://github.com/rgburke/goncurses"; + rev = "9a788ac9d81e61c6a2ca6205ee8d72d738ed12b9"; + sha256 = "0xqwxscdszbybriyzqmsd2zkzda9anckx56q8gksfy3gwj286gpb"; + }; + } + { + goPackagePath = "github.com/rjeczalik/notify"; + fetch = { + type = "git"; + url = "https://github.com/rjeczalik/notify"; + rev = "27b537f07230b3f917421af6dcf044038dbe57e2"; + sha256 = "05alsqjz2x8jzz2yp8r20zwglcg7y1ywq60zy6icj18qs3abmlp0"; + }; + } + { + goPackagePath = "github.com/tchap/go-patricia"; + fetch = { + type = "git"; + url = "https://github.com/tchap/go-patricia"; + rev = "5ad6cdb7538b0097d5598c7e57f0a24072adf7dc"; + sha256 = "0351x63zqympgfsnjl78cgvqhvipl3kfs1i15hfaw91hqin6dykr"; + }; + } + { + goPackagePath = "go4.org"; + fetch = { + type = "git"; + url = "https://github.com/camlistore/go4"; + rev = "fba789b7e39ba524b9e60c45c37a50fae63a2a09"; + sha256 = "01irxqy8na646b4zbw7v3zwy3yx9m7flhim5c3z4lzq5hiy2h75i"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1875d0a70c90e57f11972aefd42276df65e895b9"; + sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "3dbebcf8efb6a5011a60c2b4591c1022a759af8a"; + sha256 = "02pwjyimpm13km3fk0rg2l9p37w7qycdwp74piawwgcgh80qnww9"; + }; + } + { + goPackagePath = "gopkg.in/libgit2/git2go.v25"; + fetch = { + type = "git"; + url = "https://gopkg.in/libgit2/git2go.v25"; + rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5"; + sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc"; + }; + } +] From e27e02653991c297ba174de053f60a0ccded7baf Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 1 Feb 2018 03:55:38 +0100 Subject: [PATCH 189/797] dovecot: fix CVE-2017-15132 --- pkgs/servers/mail/dovecot/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index e995763a4a2..6b2adf57217 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer # Auth modules @@ -47,6 +47,16 @@ stdenv.mkDerivation rec { # so we can symlink plugins from several packages there. # The symlinking needs to be done in NixOS. ./2.2.x-module_dir.patch + (fetchpatch { + name = "CVE-2017-14132_part1.patch"; + url = https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060.patch; + sha256 = "1pcfzxr8xlwbpa7z19grp7mlvdnan6ln8zw74dj4pdmynmlk4aw9"; + }) + (fetchpatch { + name = "CVE-2017-14132_part2.patch"; + url = https://github.com/dovecot/core/commit/a9b135760aea6d1790d447d351c56b78889dac22.patch; + sha256 = "0082iid5rvjmh003xi9s09jld2rb31hbvni0yai1h1ggbmd5zf8l"; + }) ]; configureFlags = [ From 4dd92c4466b109f721790ac8ea9bda8694e73a2d Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 1 Feb 2018 04:49:43 +0100 Subject: [PATCH 190/797] dovecot_antispam: removed since upstream deprecated the package [1] and it fails to build anyway [1] https://wiki2.dovecot.org/Plugins/Antispam --- .../mail/dovecot/plugins/antispam/default.nix | 34 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 35 deletions(-) delete mode 100644 pkgs/servers/mail/dovecot/plugins/antispam/default.nix diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix deleted file mode 100644 index 1a1ba1ad448..00000000000 --- a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchhg, autoconf, automake, dovecot, openssl }: - -stdenv.mkDerivation { - name = "dovecot-antispam-20130429"; - - src = fetchhg { - url = "http://hg.dovecot.org/dovecot-antispam-plugin/"; - rev = "5ebc6aae4d7c"; - sha256 = "181i79c9sf3a80mgmycfq1f77z7fpn3j2s0qiddrj16h3yklf4gv"; - }; - - buildInputs = [ dovecot openssl ]; - nativeBuildInputs = [ autoconf automake ]; - - preConfigure = '' - ./autogen.sh - # Ugly hack; any ideas? - sed "s,^dovecot_moduledir=.*,dovecot_moduledir=$out/lib/dovecot," ${dovecot}/lib/dovecot/dovecot-config > dovecot-config - ''; - - configureFlags = [ - "--with-dovecot=." - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://wiki2.dovecot.org/Plugins/Antispam; - description = "An antispam plugin for the Dovecot IMAP server"; - license = licenses.gpl2; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d89ab305966..c35c1c60b80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11901,7 +11901,6 @@ with pkgs; dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; - dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { }; dspam = callPackage ../servers/mail/dspam { inherit (perlPackages) NetSMTP; From f08e330ed46c25f5e0356b6c1af76b0539bb9d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 31 Jan 2018 21:00:32 +0100 Subject: [PATCH 191/797] lttng-modules: 2.10.0 -> 2.10.5 Fixes build failure against newer linux kernels. --- pkgs/os-specific/linux/lttng-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 435a11f1599..ff6db1b41ee 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.10.0"; + version = "2.10.5"; src = fetchurl { url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "1gzi7j97zymzfj6b7mlih35djflwfgg93b63q9rbs5w1kclmsrgz"; + sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq"; }; hardeningDisable = [ "pic" ]; From 75867d89676979c32b52a9b26f74f47ae19da0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 31 Jan 2018 21:16:05 +0100 Subject: [PATCH 192/797] liburcu: 0.9.3 -> 0.9.5 --- pkgs/development/libraries/liburcu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 3b92aff72a5..0c88f987104 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.9.3"; + version = "0.9.5"; name = "liburcu-${version}"; src = fetchurl { url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "01j0xp3f0w147yfyzybkjvb7i67i7prsvnkssgvgwry9lvk35khv"; + sha256 = "19iq7985rhvbrj99hlmbyq2wjrkhssvigh5454mhaprn3c7jaj6r"; }; nativeBuildInputs = stdenv.lib.optional doCheck perl; From 7c1e44f7b63b4cb9672f35e095fa018e416341bd Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 31 Jan 2018 19:58:52 +0100 Subject: [PATCH 193/797] qtile: 0.10.4 -> 0.10.7 --- ...Substitution-vars-for-absolute-paths.patch | 21 +----- .../0002-Restore-PATH-and-PYTHONPATH.patch | 75 +++++++++---------- .../qtile/0003-Restart-executable.patch | 18 +---- .../window-managers/qtile/default.nix | 4 +- 4 files changed, 44 insertions(+), 74 deletions(-) diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch index e3c88a5fa55..71d3d9cafaa 100644 --- a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch +++ b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch @@ -1,15 +1,5 @@ -From 00c5af939567429d40877845dc52b54fde2d8a50 Mon Sep 17 00:00:00 2001 -From: "Alexander V. Nikolaev" -Date: Thu, 26 Nov 2015 10:53:12 +0200 -Subject: [PATCH 1/3] Substitution vars for absolute paths - ---- - libqtile/pangocffi.py | 6 +++--- - libqtile/xcursors.py | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py -index 27691d1..25f690d 100644 +index 1e8f5c04..e860d43a 100644 --- a/libqtile/pangocffi.py +++ b/libqtile/pangocffi.py @@ -58,9 +58,9 @@ except ImportError: @@ -26,18 +16,15 @@ index 27691d1..25f690d 100644 def CairoContext(cairo_t): diff --git a/libqtile/xcursors.py b/libqtile/xcursors.py -index e0e55e1..59b6428 100644 +index f1133555..3e61204a 100644 --- a/libqtile/xcursors.py +++ b/libqtile/xcursors.py -@@ -114,7 +114,7 @@ class Cursors(dict): +@@ -112,7 +112,7 @@ class Cursors(dict): def _setup_xcursor_binding(self): try: - xcursor = ffi.dlopen('libxcb-cursor.so') + xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so') except OSError: - self.log.warning("xcb-cursor not found, fallback to font pointer") + logger.warning("xcb-cursor not found, fallback to font pointer") return False --- -2.6.3 - diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch index b620bfb2501..7d184838fba 100644 --- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch +++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch @@ -1,57 +1,52 @@ -From f299a0aa0eefcf16bb4990f00ac3946727f43ef3 Mon Sep 17 00:00:00 2001 -From: "Alexander V. Nikolaev" -Date: Fri, 27 Nov 2015 10:49:48 +0200 -Subject: [PATCH 2/3] Restore PATH and PYTHONPATH - ---- - bin/qtile | 1 + - bin/qtile-run | 1 + - bin/qtile-session | 2 ++ - libqtile/utils.py | 7 +++++++ - 4 files changed, 11 insertions(+) - +diff --git a/bin/qshell b/bin/qshell +index 2ba7e61c..0ac2a2ef 100755 +--- a/bin/qshell ++++ b/bin/qshell +@@ -28,5 +28,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) + sys.path.insert(0, base_dir) + + if __name__ == '__main__': ++ __import__("importlib").import_module("libqtile.utils").restore_os_environment() + from libqtile.scripts import qshell + qshell.main() diff --git a/bin/qtile b/bin/qtile -index 66034fe..ce3fcd1 100755 +index 3e82814d..335b5cea 100755 --- a/bin/qtile +++ b/bin/qtile -@@ -131,6 +131,7 @@ def make_qtile(): +@@ -29,5 +29,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) + sys.path.insert(0, base_dir) - - if __name__ == "__main__": + if __name__ == '__main__': + __import__("importlib").import_module("libqtile.utils").restore_os_environment() - rename_process() - q = make_qtile() - try: + from libqtile.scripts import qtile + qtile.main() diff --git a/bin/qtile-run b/bin/qtile-run -index ccedb96..646a476 100755 +index e4b121be..1c203bc9 100755 --- a/bin/qtile-run +++ b/bin/qtile-run -@@ -50,6 +50,7 @@ def main(): - proc.wait() +@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) + sys.path.insert(0, base_dir) - if __name__ == "__main__": + if __name__ == '__main__': + __import__("importlib").import_module("libqtile.utils").restore_os_environment() - try: - main() - except KeyboardInterrupt: -diff --git a/bin/qtile-session b/bin/qtile-session -index 84f6a2d..da31b12 100755 ---- a/bin/qtile-session -+++ b/bin/qtile-session -@@ -25,6 +25,8 @@ - Qtile session manager. - """ + from libqtile.scripts import qtile_run + qtile_run.main() +diff --git a/bin/qtile-top b/bin/qtile-top +index 5316e0e7..272c6430 100755 +--- a/bin/qtile-top ++++ b/bin/qtile-top +@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, "..")) + sys.path.insert(0, base_dir) -+__import__("importlib").import_module("libqtile.utils").restore_os_environment() -+ - from libqtile.log_utils import init_log - import logging - import os + if __name__ == '__main__': ++ __import__("importlib").import_module("libqtile.utils").restore_os_environment() + from libqtile.scripts import qtile_top + qtile_top.main() diff --git a/libqtile/utils.py b/libqtile/utils.py -index 284089b..ec3539e 100644 +index 36ed0a58..bca9eab3 100644 --- a/libqtile/utils.py +++ b/libqtile/utils.py -@@ -227,3 +227,11 @@ def describe_attributes(obj, attrs, func=None): +@@ -240,3 +240,11 @@ def describe_attributes(obj, attrs, func=None): pairs.append('%s=%s' % (attr, value)) return ', '.join(pairs) diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch index d9377897fc6..c9ae57c8615 100644 --- a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch +++ b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch @@ -1,17 +1,8 @@ -From b560c11078fecc35df2c62f34beda06c4e80a10d Mon Sep 17 00:00:00 2001 -From: "Alexander V. Nikolaev" -Date: Fri, 27 Nov 2015 10:54:35 +0200 -Subject: [PATCH 3/3] Restart executable - ---- - libqtile/manager.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/libqtile/manager.py b/libqtile/manager.py -index b1a38e2..110f7d8 100644 +index 36518a74..9b6bdd02 100644 --- a/libqtile/manager.py +++ b/libqtile/manager.py -@@ -1339,7 +1339,7 @@ class Qtile(command.CommandObject): +@@ -1386,7 +1386,7 @@ class Qtile(command.CommandObject): argv = [s for s in argv if not s.startswith('--with-state')] argv.append('--with-state=' + buf.getvalue().decode()) @@ -19,7 +10,4 @@ index b1a38e2..110f7d8 100644 + self.cmd_execute(os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:]) def cmd_spawn(self, cmd): - """ --- -2.6.3 - + """Run cmd in a shell. diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index a7b9a77b3db..79752829e2a 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -7,13 +7,13 @@ in python27Packages.buildPythonApplication rec { name = "qtile-${version}"; - version = "0.10.4"; + version = "0.10.7"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "0rwklzgkp3x242xql6qmfpfnhr788hd3jc1l80pc5ybxlwyfx59i"; + sha256 = "18szgplyym0b65vnaa8nqzadq6q0mhsiky9g5hqhn7xzf4kykmj8"; }; patches = [ From 1b0f730a7371b4222c9570f3f224835c00b086be Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 1 Feb 2018 15:48:49 +0800 Subject: [PATCH 194/797] pythonPackages.xcffib: 0.3.2 -> 0.5.1 --- .../python-modules/xcffib/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------- 2 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/xcffib/default.nix diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix new file mode 100644 index 00000000000..9b136531a4b --- /dev/null +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, xorg +, cffi +, six +}: + +buildPythonPackage rec { + version = "0.5.1"; + pname = "xcffib"; + + src = fetchPypi { + inherit pname version; + sha256 = "09gbnmr5vn58mm8xi3fmd7fz6743cks6c46dphnxzwax6zsxmy60"; + }; + + patchPhase = '' + # Hardcode cairo library path + sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py + ''; + + propagatedBuildInputs = [ cffi six ]; + + meta = with stdenv.lib; { + description = "A drop in replacement for xpyb, an XCB python binding"; + homepage = "https://github.com/tych0/xcffib"; + license = licenses.asl20; + maintainers = with maintainers; [ kamilchm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 272b57298e5..6394d1c3c00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21012,29 +21012,7 @@ EOF pluggy = callPackage ../development/python-modules/pluggy {}; - xcffib = buildPythonPackage rec { - version = "0.3.2"; - name = "xcffib-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/x/xcffib/${name}.tar.gz"; - sha256 = "a84eecd5a1bb7570e26c83aca87a2016578ca4e353e1fa56189e95bdef063e6a"; - }; - - patchPhase = '' - # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py - ''; - - propagatedBuildInputs = [ self.cffi self.six ]; - - meta = { - description = "A drop in replacement for xpyb, an XCB python binding"; - homepage = "https://github.com/tych0/xcffib"; - license = licenses.asl20; - maintainers = with maintainers; [ kamilchm ]; - }; - }; + xcffib = callPackage ../development/python-modules/xcffib {}; pafy = callPackage ../development/python-modules/pafy { }; From 8377958fdde31509b71068d435c56ab7e9eff244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Feb 2018 10:27:50 +0100 Subject: [PATCH 195/797] ttwatch: 2017-12-31 -> 2018-02-01 --- pkgs/tools/misc/ttwatch/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index b816b5225ca..d7e1171064c 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1 }: +{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1 +, enableUnsafe ? false }: stdenv.mkDerivation rec { name = "ttwatch-${version}"; - version = "2017-12-31"; + version = "2018-02-01"; src = fetchFromGitHub { owner = "ryanbinns"; repo = "ttwatch"; - rev = "a261851d91e3304a47a04995758f6940747bc54a"; - sha256 = "0llcai1yxikh8nvzry71rr1zz365rg0k0lwp24np5w74kzza3kwx"; + rev = "b5c54647ed9b640584e53c4c15ee12d210790021"; + sha256 = "136sskz9hnbwp49gxp983mswzgpl8yfc25ni79csbsnwp0k4lb94"; }; nativeBuildInputs = [ cmake perl ]; buildInputs = [ openssl curl libusb1 ]; + cmakeFlags = stdenv.lib.optional enableUnsafe [ "-Dunsafe=on" ]; + preFixup = '' chmod +x $out/bin/ttbin2mysports ''; From f55fffc1cf6b811be742bd67800f6d02ef795918 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 1 Feb 2018 10:31:32 +0100 Subject: [PATCH 196/797] android-studio-preview: 3.1.0.8 -> 3.1.0.9 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 86faeeb0533..4cd0553e4d2 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio { pname = "android-studio-preview"; - version = "3.1.0.8"; # "Android Studio 3.1 Canary 9" - build = "173.4559767"; - sha256Hash = "0wy3bqd4wvvcwlqcv06mwlqgc119pjpc102ix3yacqvki9qyi1r0"; + version = "3.1.0.9"; # "Android Studio 3.1 Beta 1" + build = "173.4567466"; + sha256Hash = "01c6a46pk5zbhwk2w038nm68fkx86nafiw1v2i5rdr93mxvx9cag"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; From e28ecd55285aa1d08b46c57396c21b85c428d083 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 1 Feb 2018 10:51:35 +0100 Subject: [PATCH 197/797] fix --- nixos/modules/tasks/network-interfaces.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 2a17ae934f8..f4851988d63 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -274,7 +274,7 @@ let virtualType = mkOption { default = if hasPrefix "tun" name then "tun" else "tap"; - defaultText = ''if hasPrefix "tun" name then "tun" else "tap"''; + defaultText = literalExample ''if hasPrefix "tun" name then "tun" else "tap"''; type = with types; enum [ "tun" "tap" ]; description = '' The type of interface to create. From 6aee1a81d2397ac403ab6ec4e717d298fc0e5bda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Feb 2018 09:47:43 +0100 Subject: [PATCH 198/797] python.pkgs.ptyprocess: move expression --- .../python-modules/ptyprocess/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +-------------- 2 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/ptyprocess/default.nix diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix new file mode 100644 index 00000000000..a041254201f --- /dev/null +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ptyprocess"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59"; + }; + + meta = { + description = "Run a subprocess in a pseudo terminal"; + homepage = https://github.com/pexpect/ptyprocess; + license = lib.licenses.isc; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82007b63fb2..7a279d96591 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14450,21 +14450,7 @@ in { }; }; - ptyprocess = buildPythonPackage rec { - name = "ptyprocess-${version}"; - version = "0.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/ptyprocess/${name}.tar.gz"; - sha256= "dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59"; - }; - - meta = { - description = "Run a subprocess in a pseudo terminal"; - homepage = https://github.com/pexpect/ptyprocess; - license = licenses.isc; - }; - }; + ptyprocess = callPackage ../development/python-modules/ptyprocess { }; pylibacl = callPackage ../development/python-modules/pylibacl { }; From 356b5532392a0d6df2c99f28964803d989e31f89 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Feb 2018 10:42:21 +0100 Subject: [PATCH 199/797] python.pkgs.ptyprocess: 0.5 -> 0.5.2 --- pkgs/development/python-modules/ptyprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index a041254201f..c1c9ce18c56 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ptyprocess"; - version = "0.5"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59"; + sha256 = "e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365"; }; meta = { From adfeacc547d71e5033966ac658b6e18bb9000a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 1 Feb 2018 10:27:07 +0000 Subject: [PATCH 200/797] teleport: use fetchFromGitHub instead of fetchurl --- pkgs/servers/teleport/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index ae8ea331716..0c6a197b1da 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,10 +1,18 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ stdenv, buildGoPackage, zip, fetchurl }: +{ stdenv, buildGoPackage, zip, fetchFromGitHub }: buildGoPackage rec { name = "teleport-${version}"; version = "2.4.0"; + # This repo has a private submodule "e" which fetchgit cannot handle without failing. + src = fetchFromGitHub { + owner = "gravitational"; + repo = "teleport"; + rev = "v${version}"; + sha256 = "1x4xnqjyb87pzmn2c59fwmzfx1f2k0xhqn2xgki3722qmj2ss846"; + }; + goPackagePath = "github.com/gravitational/teleport"; subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; buildInputs = [ zip ]; @@ -23,13 +31,6 @@ buildGoPackage rec { dontStrip = true; - # This repo has a private submodule "e" which fetchgit cannot handle - # without failing. Using fetchurl instead on the latest tagged release. - src = fetchurl { - url = "https://github.com/gravitational/teleport/archive/v2.4.0.tar.gz"; - sha256 = "01qcr6vml3ias3gbkqjnb5fmc6ap1fd5mi52ygn3agafy63jb5rd"; - }; - meta = { description = "A SSH CA management suite"; homepage = "https://gravitational.com/teleport/"; From 480e3f343a058fdc8c618d0ffb1dda2b7b06ad23 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 1 Feb 2018 10:04:28 +0000 Subject: [PATCH 201/797] buildkite-agent: enable building on darwin --- .../tools/continuous-integration/buildkite-agent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 46cee51e0e6..ab090e6dc12 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -44,6 +44,6 @@ buildGoPackage { homepage = https://buildkite.com/docs/agent; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From ce08581088897860dd3b7b510f30b093095592f3 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 31 Jan 2018 17:50:10 +0100 Subject: [PATCH 202/797] firefox: enable official branding As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we have permission to use the official firefox branding. Fur purposes of documentation the statement of @sylvestre: > As the person who did part of the work described in the LWN article > and release manager working for Mozilla, I can confirm the statement > that I made in > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006 > > @garbas shared with me the list of patches applied for the Nix package. > As they are just for portability and tiny modifications, they don't > alter the experience of the product. In parallel, Rok also shared the > build options. They seem good (even if I cannot judge the quality of the > packaging of the underlying dependencies like sqlite, png, etc). > Therefor, as long as you keep the patch queue sane and you don't alter > the experience of Firefox users, you won't have any issues using the > official branding. --- .../networking/browsers/firefox/common.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 0d72b8e55ee..13d0953d4bd 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -38,12 +38,25 @@ ## other -# If you want the resulting program to call itself -# "Firefox"/"Torbrowser" instead of "Nightly" or whatever, enable this -# option. However, in Firefox's case, those binaries may not be -# distributed without permission from the Mozilla Foundation, see -# http://www.mozilla.org/foundation/trademarks/. -, enableOfficialBranding ? isTorBrowserLike +# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at +# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we +# have permission to use the official firefox branding. +# +# Fur purposes of documentation the statement of @sylvestre: +# > As the person who did part of the work described in the LWN article +# > and release manager working for Mozilla, I can confirm the statement +# > that I made in +# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006 +# > +# > @garbas shared with me the list of patches applied for the Nix package. +# > As they are just for portability and tiny modifications, they don't +# > alter the experience of the product. In parallel, Rok also shared the +# > build options. They seem good (even if I cannot judge the quality of the +# > packaging of the underlying dependencies like sqlite, png, etc). +# > Therefor, as long as you keep the patch queue sane and you don't alter +# > the experience of Firefox users, you won't have any issues using the +# > official branding. +, enableOfficialBranding ? true }: assert stdenv.cc ? libc && stdenv.cc.libc != null; From 50ad913420070468d1d30489dfc7176c48742fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 1 Feb 2018 13:06:21 +0100 Subject: [PATCH 203/797] signal-desktop: 1.1.0 -> 1.3.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 373adc42d22..f79d708ec5d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.1.0"; + version = "1.3.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1v0ydfdgcnkh6rk7gmqbjrzpz56mw2gjmakz58gpn167ln7l1vkl"; + sha256 = "047l3yyqvzyi5969r0n9cwdarsxfbssj415ysh57w7vkdp01axsr"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; From 42b9b8f7c8687cb26e69c3559e0e1346fb0e680f Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 1 Feb 2018 13:38:16 +0100 Subject: [PATCH 204/797] firefox{-esr,}: fix failing build due to the google-api-key Since firefox 58.0.1 the google api key is now stored at an absolute path ($TMPDIR/ga). Since variable expansion in `configureFlags` does not really work (as expected) the build started failing when using the legacy firefox build system. With the newer `./mach` based builds firefox reads the configure flags from `.mozconfig` instead. This commit moves the `with-google-api-keyfile=` setting into the `preConfigure` phase where we can properly expand `$TMPDIR` into whatever the path is. --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 13d0953d4bd..91b86a18375 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -104,12 +104,14 @@ stdenv.mkDerivation (rec { '' + lib.optionalString (stdenv.lib.versionAtLeast version "58.0.0") '' cat >.mozconfig < $TMPDIR/ga + configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") '' + '' # this will run autoconf213 ${if (stdenv.lib.versionAtLeast version "58.0.0") then "./mach configure" else "make -f client.mk configure-files"} @@ -184,7 +186,6 @@ stdenv.mkDerivation (rec { ++ flag gssSupport "negotiateauth" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ flag webrtcSupport "webrtc" - ++ lib.optional googleAPISupport "--with-google-api-keyfile=$TMPDIR/ga" ++ flag crashreporterSupport "crashreporter" ++ lib.optional drmSupport "--enable-eme=widevine" From 28f7f0794e978230117445aed783582ee9420e90 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 1 Feb 2018 07:20:07 -0600 Subject: [PATCH 205/797] vim: 8.0.1428 -> 8.0.1451 Changes: https://github.com/vim/vim/compare/v8.0.1428...v8.0.1451 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 21b0f7a85d2..5155f94eef5 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.0.1428"; + version = "8.0.1451"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0pqqh7g96w8jfc5kvv2il6fcbhccwhk4k5skk52g1c1ixsblwz3y"; + sha256 = "1vxd5mr8c62qyf7ax7gi2wka48282yplckq91154yd55xcqw36zx"; }; enableParallelBuilding = true; From ec99a3de1be447bae36b2ffd79bd67726e80aa17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 1 Feb 2018 15:55:52 +0100 Subject: [PATCH 206/797] texlive: add comments, whitespace cleanup Fixes #34490. The FIXME has been long obsolete. --- pkgs/tools/typesetting/tex/texlive/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index a6b1ac6c9f4..dc8f0908ea8 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -37,8 +37,10 @@ let /* # beware: the URL below changes contents continuously curl http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz \ | xzcat | uniq -u | sed -rn -f ./tl2nix.sed > ./pkgs.nix */ - orig = import ./pkgs.nix tl; # XXX XXX XXX FIXME: the file is probably too big now XXX XXX XXX XXX XXX XXX - removeSelfDep = lib.mapAttrs (n: p: if p ? deps then p // { deps = lib.filterAttrs (dn: _: n != dn) p.deps; } else p); + orig = import ./pkgs.nix tl; + removeSelfDep = lib.mapAttrs + (n: p: if p ? deps then p // { deps = lib.filterAttrs (dn: _: n != dn) p.deps; } + else p); clean = removeSelfDep (orig // { # overrides of texlive.tlpdb @@ -112,6 +114,10 @@ let urls = args.urls or (if args ? url then [ args.url ] else map (up: "${up}/${urlName}.tar.xz") urlPrefixes ); + + # Upstream refuses to distribute stable tarballs, so we host snapshots on IPFS. + # Common packages should get served from the binary cache anyway. + # See discussions, e.g. https://github.com/NixOS/nixpkgs/issues/24683 urlPrefixes = args.urlPrefixes or [ http://146.185.144.154/texlive-2017 # IPFS GW is second, as it doesn't have a good time-outing behavior From 9096a92a4d736751c3eca95aa66da67015e73565 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:44:15 +0100 Subject: [PATCH 207/797] vim-plugins/peskcolor.vim.git init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index c772f4173ce..729e3b15888 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -107,6 +107,7 @@ rec { webapi-vim = WebAPI; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; + peskcolor = peskcolor-vim-git; # do not auto-update this one, as the name clashes with vim-snippets vim-docbk-snippets = buildVimPluginFrom2Nix { @@ -553,6 +554,17 @@ rec { }; + peskcolor-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "peskcolor-vim-git-2016-06-11"; + src = fetchgit { + url = "https://github.com/andsild/peskcolor.vim.git"; + rev = "cba4fc739bbebacd503158f6509d9c226651f363"; + sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq"; + }; + dependencies = []; + + }; + flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "flake8-vim-2017-02-17"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 661917c955b..795e2b43f79 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -239,3 +239,4 @@ "vundle" "xterm-color-table" "zeavim" +"github:andsild/peskcolor.vim.git" From 89763446e9f4d40cb7699b38a60defcdb984b1aa Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:49:50 +0100 Subject: [PATCH 208/797] vim-plugins/vim-bazel: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 729e3b15888..be9396ea4ec 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -598,6 +598,17 @@ rec { }; + vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-bazel-2018-01-10"; + src = fetchgit { + url = "https://github.com/bazelbuild/vim-bazel"; + rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3"; + sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy"; + }; + dependencies = ["maktaba"]; + + }; + clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "clighter8-2017-11-30"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 795e2b43f79..9960a41e2b0 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -240,3 +240,4 @@ "xterm-color-table" "zeavim" "github:andsild/peskcolor.vim.git" +"github:bazelbuild/vim-bazel" From 3bc1af57c7d23c7e8dcd73c393ed93c4394df351 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:50:40 +0100 Subject: [PATCH 209/797] vim-plugins/vim-grepper: init --- pkgs/misc/vim-plugins/default.nix | 18 +++++++++++++++--- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index be9396ea4ec..98db9b6187d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -107,6 +107,7 @@ rec { webapi-vim = WebAPI; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; + vim-grepper = vim-grepper-git; peskcolor = peskcolor-vim-git; # do not auto-update this one, as the name clashes with vim-snippets @@ -1320,12 +1321,23 @@ rec { }; + vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-grepper-git-2018-01-16"; + src = fetchgit { + url = "https://github.com/mhinz/vim-grepper.git"; + rev = "4fd6260c56ffa0642095143f802d1cbfceb7437d"; + sha256 = "11rhj6m85hxd4kf8yms4mab8553dcgl0yxm9r7nhdqpz6mljsir9"; + }; + dependencies = []; + + }; + vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-12-06"; + name = "vim-startify-2017-12-20"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "c905a0c9598c72cb4311ca88f3eb664d05e4d66b"; - sha256 = "1zdqr2lg1cf7dix6yvx7hmxcb698hb2zdimiqv2kgpdqlc40agcy"; + rev = "5e476d8e00da70bc33c54a174fd8cb18ed991868"; + sha256 = "07k7ddjqc2jisk0sh9k8w6r5xhh47cbzbxdnbkjz7bdskkwsdsay"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9960a41e2b0..efef9b61ec8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -239,5 +239,6 @@ "vundle" "xterm-color-table" "zeavim" +"github:mhinz/vim-grepper.git" "github:andsild/peskcolor.vim.git" "github:bazelbuild/vim-bazel" From f90e3bae4ebd40575b053d7d4c9f9fef66dbfd0d Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:52:32 +0100 Subject: [PATCH 210/797] vim-plugins/vim-toml: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 98db9b6187d..aa7ffc5a7c3 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -657,6 +657,17 @@ rec { }; + vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-toml-2017-12-10"; + src = fetchgit { + url = "https://github.com/cespare/vim-toml"; + rev = "b531aac0d45aaa373070c4cc30d7ead91960f5a7"; + sha256 = "14g3zvyfvhilr5ka3jhja4jxjn99957sk6hlv13yfkg349f57dvg"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-sort-motion-2017-10-03"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index efef9b61ec8..1fc25863753 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -239,6 +239,7 @@ "vundle" "xterm-color-table" "zeavim" +"github:cespare/vim-toml" "github:mhinz/vim-grepper.git" "github:andsild/peskcolor.vim.git" "github:bazelbuild/vim-bazel" From 6b4c5326327dc6330b2d38b4aac6b295ad7be8b5 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:53:02 +0100 Subject: [PATCH 211/797] vim-plugins/vim-operator-surround: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index aa7ffc5a7c3..e3c68032215 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1553,6 +1553,17 @@ rec { ]; }; + vim-operator-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-operator-surround-2017-12-23"; + src = fetchgit { + url = "https://github.com/rhysd/vim-operator-surround"; + rev = "001c0da077b5b38a723151b19760d220e02363db"; + sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh"; + }; + dependencies = []; + + }; + vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-puppet-2017-08-25"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1fc25863753..553421dba72 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -239,6 +239,7 @@ "vundle" "xterm-color-table" "zeavim" +"github:rhysd/vim-operator-surround" "github:cespare/vim-toml" "github:mhinz/vim-grepper.git" "github:andsild/peskcolor.vim.git" From 140ddbd1c57124443fb8109e8d4114b2057d7c01 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:53:32 +0100 Subject: [PATCH 212/797] vim-plugins/mayansmoke: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e3c68032215..0f192045c1c 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -109,6 +109,7 @@ rec { yankring = YankRing; vim-grepper = vim-grepper-git; peskcolor = peskcolor-vim-git; + mayansmoke = mayansmoke-git; # do not auto-update this one, as the name clashes with vim-snippets vim-docbk-snippets = buildVimPluginFrom2Nix { @@ -2037,6 +2038,17 @@ rec { }; + mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "mayansmoke-git-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/mayansmoke.git"; + rev = "168883af7aec05f139af251f47eadd5dfb802c9d"; + sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd"; + }; + dependencies = []; + + }; + random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "random-vim-2010-10-17"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 553421dba72..35c891a162a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -243,4 +243,5 @@ "github:cespare/vim-toml" "github:mhinz/vim-grepper.git" "github:andsild/peskcolor.vim.git" +"github:vim-scripts/mayansmoke.git" "github:bazelbuild/vim-bazel" From d12a748955d6dd5d2644bb778d4e2f33e90ddeb2 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:54:22 +0100 Subject: [PATCH 213/797] vim-plugins/denite-extra: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 0f192045c1c..1f68b4a1090 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -669,6 +669,17 @@ rec { }; + denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "denite-extra-2017-11-03"; + src = fetchgit { + url = "https://github.com/chemzqm/denite-extra"; + rev = "2cea3e857b51fcde425339adeec12854e6cecbb6"; + sha256 = "1qa0ajs6vix0vvm1z7rhxq9bfx4aggq97gxghrxpvsc059c7w9wv"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-sort-motion-2017-10-03"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 35c891a162a..3e756cc90f9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -244,4 +244,5 @@ "github:mhinz/vim-grepper.git" "github:andsild/peskcolor.vim.git" "github:vim-scripts/mayansmoke.git" +"github:chemzqm/denite-extra" "github:bazelbuild/vim-bazel" From edeeae7b5c066449954f6e94425b949899536d95 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:56:12 +0100 Subject: [PATCH 214/797] vim-plugins/denite-git: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 1f68b4a1090..9f87d83aaa8 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -680,6 +680,17 @@ rec { }; + denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "denite-git-2017-11-02"; + src = fetchgit { + url = "https://github.com/chemzqm/denite-git"; + rev = "d40026c9b2c0e53ecdd3883d26260f19c74c7dfe"; + sha256 = "0c9602pj67hqfkyvanz5gw1s6vlf8q7s9r55g4dws5aakvjbqc0g"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-sort-motion-2017-10-03"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3e756cc90f9..d48267921dd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -244,5 +244,6 @@ "github:mhinz/vim-grepper.git" "github:andsild/peskcolor.vim.git" "github:vim-scripts/mayansmoke.git" +"github:chemzqm/denite-git" "github:chemzqm/denite-extra" "github:bazelbuild/vim-bazel" From e55ffc0c3e4e373bf73d9c72d613b2cd12849f3d Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:56:58 +0100 Subject: [PATCH 215/797] vim-plugins/concealedyank: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 9f87d83aaa8..c34b99a18e9 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -107,6 +107,7 @@ rec { webapi-vim = WebAPI; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; + concealedyank = concealedyank-vim; vim-grepper = vim-grepper-git; peskcolor = peskcolor-vim-git; mayansmoke = mayansmoke-git; @@ -691,6 +692,17 @@ rec { }; + concealedyank-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "concealedyank-vim-2013-03-24"; + src = fetchgit { + url = "https://github.com/chikatoike/concealedyank.vim"; + rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd"; + sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-sort-motion-2017-10-03"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d48267921dd..4c31e9961e9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -240,6 +240,7 @@ "xterm-color-table" "zeavim" "github:rhysd/vim-operator-surround" +"github:chikatoike/concealedyank.vim" "github:cespare/vim-toml" "github:mhinz/vim-grepper.git" "github:andsild/peskcolor.vim.git" From 40f8ccbb3cd0442a4e9a3c80c604358b7b4a0fb4 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 12:57:29 +0100 Subject: [PATCH 216/797] vim-plugins/cute-python: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index c34b99a18e9..6c80ed7e3cd 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -108,6 +108,7 @@ rec { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; concealedyank = concealedyank-vim; + cute-python = vim-cute-python-git; vim-grepper = vim-grepper-git; peskcolor = peskcolor-vim-git; mayansmoke = mayansmoke-git; @@ -835,6 +836,17 @@ rec { }; + vim-cute-python-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-cute-python-git-2016-04-04"; + src = fetchgit { + url = "https://github.com/ehamberg/vim-cute-python.git"; + rev = "d7a6163f794500447242df2bedbe20bd751b92da"; + sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf"; + }; + dependencies = []; + + }; + acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "acp-2013-02-05"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4c31e9961e9..08731537d24 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -242,6 +242,7 @@ "github:rhysd/vim-operator-surround" "github:chikatoike/concealedyank.vim" "github:cespare/vim-toml" +"github:ehamberg/vim-cute-python.git" "github:mhinz/vim-grepper.git" "github:andsild/peskcolor.vim.git" "github:vim-scripts/mayansmoke.git" From b39683a4df71a8cbeb319bad52b0774f624990e4 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 13:28:32 +0100 Subject: [PATCH 217/797] vim-plugins/vim-json: init --- pkgs/misc/vim-plugins/default.nix | 17 ++++++++++++++--- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 6c80ed7e3cd..bb005ffa1e2 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -880,12 +880,23 @@ rec { }; + vim-json = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-json-2018-01-10"; + src = fetchgit { + url = "https://github.com/elzr/vim-json"; + rev = "3727f089410e23ae113be6222e8a08dd2613ecf2"; + sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1"; + }; + dependencies = []; + + }; + vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2017-07-06"; + name = "vim-localvimrc-2018-01-04"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "48c01c214ea0312e8045aaa1a28b30850e98a194"; - sha256 = "158ajdg3n8j0cxk2ry8rmnpfvnzmznhl573v8ddw6xni58b7bg4d"; + rev = "b915ce29c619fb367ed41d4c95d57eaaaed31b39"; + sha256 = "13bc3davmw2pms663yniiha8bayzy1m08xjhyrnlqqb2dz77m5gy"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 08731537d24..f33cb8f8951 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -239,6 +239,7 @@ "vundle" "xterm-color-table" "zeavim" +"github:elzr/vim-json" "github:rhysd/vim-operator-surround" "github:chikatoike/concealedyank.vim" "github:cespare/vim-toml" From 4b036bb0191a5c826ea53814f038741ec70b5373 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:12:16 +0100 Subject: [PATCH 218/797] vim-plugins/vim-gitbranch: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index bb005ffa1e2..723fa190c27 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1067,6 +1067,17 @@ rec { }; + vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gitbranch-2017-05-28"; + src = fetchgit { + url = "https://github.com/itchyny/vim-gitbranch"; + rev = "8118dc1cdd387bd609852be4bf350360ce881193"; + sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j"; + }; + dependencies = []; + + }; + vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-ipython-2015-06-23"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f33cb8f8951..0de98a32947 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -250,3 +250,4 @@ "github:chemzqm/denite-git" "github:chemzqm/denite-extra" "github:bazelbuild/vim-bazel" +"github:itchyny/vim-gitbranch" From cee0a1c1a1527da7f9e59f5015db3c448249417c Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:27:18 +0100 Subject: [PATCH 219/797] vim-plugins/vim-test: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 723fa190c27..e895a3f47d3 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -110,6 +110,7 @@ rec { concealedyank = concealedyank-vim; cute-python = vim-cute-python-git; vim-grepper = vim-grepper-git; + vim-test = vim-test-git; peskcolor = peskcolor-vim-git; mayansmoke = mayansmoke-git; @@ -1089,6 +1090,17 @@ rec { }; + vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-test-git-2018-01-16"; + src = fetchgit { + url = "https://github.com/janko-m/vim-test.git"; + rev = "731ad6942f9449d2ed22f6d9ccc8d1ce613b1f19"; + sha256 = "14xwsc23zmkfl6ydvqiqf7l0gn5nxqdm62rvgiky5j5ii9iqj3hr"; + }; + dependencies = []; + + }; + vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-hier-2011-08-27"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0de98a32947..39b23919c63 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -245,6 +245,7 @@ "github:cespare/vim-toml" "github:ehamberg/vim-cute-python.git" "github:mhinz/vim-grepper.git" +"github:janko-m/vim-test.git" "github:andsild/peskcolor.vim.git" "github:vim-scripts/mayansmoke.git" "github:chemzqm/denite-git" From d718644baf32e1aa26ab3736303204b5ba3ff55a Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:34:32 +0100 Subject: [PATCH 220/797] vim-plugins/vim-textobj-multiblock: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e895a3f47d3..9b40d02aaca 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1559,6 +1559,17 @@ rec { }; + vim-textobj-multiblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-textobj-multiblock-2014-06-02"; + src = fetchgit { + url = "https://github.com/osyo-manga/vim-textobj-multiblock"; + rev = "670a5ba57d73fcd793f480e262617c6eb0103355"; + sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf"; + }; + dependencies = []; + + }; + vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-watchdogs-2017-12-03"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 39b23919c63..084868d8229 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -242,6 +242,7 @@ "github:elzr/vim-json" "github:rhysd/vim-operator-surround" "github:chikatoike/concealedyank.vim" +"github:osyo-manga/vim-textobj-multiblock" "github:cespare/vim-toml" "github:ehamberg/vim-cute-python.git" "github:mhinz/vim-grepper.git" From e77a83b8087e9bd8b3ce8bfb91eb45f4bbc7c71f Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:36:14 +0100 Subject: [PATCH 221/797] vim-plugins/vim-niceblock: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 9b40d02aaca..16db44f8ebc 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1266,6 +1266,17 @@ rec { }; + vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-niceblock-2015-08-22"; + src = fetchgit { + url = "https://github.com/kana/vim-niceblock"; + rev = "03c59f648fcadd415fc91d7b100cf48bd0a55fac"; + sha256 = "05p3xr61v3infi07r9ahr30190kamgdjxkjjlawbqnrn8pv9fws4"; + }; + dependencies = []; + + }; + latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "latex-box-2015-06-01"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 084868d8229..22cf5b2e31d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -240,6 +240,7 @@ "xterm-color-table" "zeavim" "github:elzr/vim-json" +"github:kana/vim-niceblock" "github:rhysd/vim-operator-surround" "github:chikatoike/concealedyank.vim" "github:osyo-manga/vim-textobj-multiblock" From 5fa0183d00945a25bd78431efb2c5e26ffe885a4 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:36:58 +0100 Subject: [PATCH 222/797] vim-plugins/vim-operator-replace: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 16db44f8ebc..b35a6633b40 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1277,6 +1277,17 @@ rec { }; + vim-operator-replace = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-operator-replace-2015-02-25"; + src = fetchgit { + url = "https://github.com/kana/vim-operator-replace"; + rev = "1345a556a321a092716e149d4765a5e17c0e9f0f"; + sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q"; + }; + dependencies = []; + + }; + latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "latex-box-2015-06-01"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 22cf5b2e31d..b26047dc4f7 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -241,6 +241,7 @@ "zeavim" "github:elzr/vim-json" "github:kana/vim-niceblock" +"github:kana/vim-operator-replace" "github:rhysd/vim-operator-surround" "github:chikatoike/concealedyank.vim" "github:osyo-manga/vim-textobj-multiblock" From 4d5acac34b4ee104d9ec3ae1d5c76b8693e315e4 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:37:50 +0100 Subject: [PATCH 223/797] vim-plugins/vim-operator-user: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b35a6633b40..9751b588734 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1288,6 +1288,17 @@ rec { }; + vim-operator-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-operator-user-2015-02-17"; + src = fetchgit { + url = "https://github.com/kana/vim-operator-user"; + rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa"; + sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb"; + }; + dependencies = []; + + }; + latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "latex-box-2015-06-01"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b26047dc4f7..421c388b114 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -240,6 +240,7 @@ "xterm-color-table" "zeavim" "github:elzr/vim-json" +"github:kana/vim-operator-user" "github:kana/vim-niceblock" "github:kana/vim-operator-replace" "github:rhysd/vim-operator-surround" From 44a4844744d899ce74b57bca1f25e5a4ee19e63d Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Tue, 23 Jan 2018 19:48:53 +0100 Subject: [PATCH 224/797] openafs: Break into multiple packages with multiple outputs Two packages: - pkgs.linuxPackages.openafs (only kernel module) - pkgs.openafs (client/server programs, manpages, docs) Disable `ncurses` by default - Only needed for debugging tools Introduce but disable `tsmbac` by default - IBM's on-site backup service called Tivoli Storage Manager Backup Client - Make openafs ready to use tsmbac when supplied via local overlay (needs special patching) - TSM is not in nixpkgs due to unclear/unfree licensing. (Binaries need to be modified to work with nixos) --- pkgs/servers/openafs/default.nix | 70 ++++++++++++++++++++++++------- pkgs/servers/openafs/module.nix | 57 +++++++++++++++++++++++++ pkgs/servers/openafs/srcs.nix | 14 +++++++ pkgs/servers/openafs/tsmbac.patch | 62 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 5 files changed, 189 insertions(+), 17 deletions(-) create mode 100644 pkgs/servers/openafs/module.nix create mode 100644 pkgs/servers/openafs/srcs.nix create mode 100644 pkgs/servers/openafs/tsmbac.patch diff --git a/pkgs/servers/openafs/default.nix b/pkgs/servers/openafs/default.nix index 232fb135bd8..3f92299c2a0 100644 --- a/pkgs/servers/openafs/default.nix +++ b/pkgs/servers/openafs/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc, - kernel, glibc, ncurses, perl, kerberos, fetchpatch }: +{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 +, ncurses # Extra ncurses utilities. Only needed for debugging. +, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM +}: + +with (import ./srcs.nix { inherit fetchurl; }); stdenv.mkDerivation rec { - name = "openafs-${version}-${kernel.version}"; - version = "1.6.22.1"; + name = "openafs-${version}"; + inherit version srcs; - src = fetchurl { - url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "19nfbksw7b34jc3mxjk7cbz26zg9k5myhzpv2jf0fnmznr47jqaw"; - }; - - nativeBuildInputs = [ autoconf automake flex yacc perl which ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ autoconf automake flex yacc perl which libxslt ]; buildInputs = [ ncurses ]; - hardeningDisable = [ "pic" ]; + patches = stdenv.lib.optional (tsmbac != null) ./tsmbac.patch; + + outputs = [ "out" "dev" "man" "doc" ]; preConfigure = '' - ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux patchShebangs . for i in `grep -l -R '/usr/\(include\|src\)' .`; do @@ -27,25 +28,62 @@ stdenv.mkDerivation rec { --replace "/usr/src" "$TMP" done + for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do + substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ + "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" + done + ./regen.sh ${stdenv.lib.optionalString (kerberos != null) "export KRB5_CONFIG=${kerberos.dev}/bin/krb5-config"} + export AFS_SYSKVERS=26 + configureFlagsArray=( - "--with-linux-kernel-build=$TMP/linux" ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"} - "--sysconfdir=/etc/static" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-kernel-module" + "--disable-fuse-client" + "--with-html-xsl=${docbook_xsl}/share/xml/docbook-xsl/html/chunk.xsl" + ${stdenv.lib.optionalString (tsmbac != null) "--enable-tivoli-tsm"} + ${stdenv.lib.optionalString (ncurses == null) "--disable-gtx"} "--disable-linux-d_splice-alias-extra-iput" ) + '' + stdenv.lib.optionalString (tsmbac != null) '' + export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\"" + export XBSA_XLIBS="-ldl" + ''; + + buildFlags = [ "all_nolibafs" ]; + + postBuild = '' + for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do + make -C "''${d}" html + done + ''; + + postInstall = '' + mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide} + cp -r doc/{arch,examples,pdf,protocol,txt} README NEWS $doc/share/doc/openafs + for d in AdminGuide QuickStartUnix UserGuide ; do + cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}" + done + + rm -r $out/lib/{openafs,afs,*.a} + rm $out/bin/kpasswd + rm $out/sbin/{kas,kdb,ka-forwarder,kadb_check} + rm $out/libexec/openafs/kaserver + rm $man/share/man/man{1/kpasswd*,5/kaserver*,8/{ka*,kdb*}} ''; meta = with stdenv.lib; { + outputsToInstall = [ "out" "doc" "man" ]; description = "Open AFS client"; homepage = https://www.openafs.org; license = licenses.ipl10; platforms = platforms.linux; - maintainers = [ maintainers.z77z ]; - broken = versionOlder kernel.version "3.18"; + maintainers = [ maintainers.z77z maintainers.spacefrogg ]; }; } diff --git a/pkgs/servers/openafs/module.nix b/pkgs/servers/openafs/module.nix new file mode 100644 index 00000000000..8cd9287a777 --- /dev/null +++ b/pkgs/servers/openafs/module.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc +, kernel, glibc, perl }: + +with (import ./srcs.nix { inherit fetchurl; }); + +let + modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; + kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + +in stdenv.mkDerivation rec { + name = "openafs-${version}-${kernel.version}"; + inherit version src; + + nativeBuildInputs = [ autoconf automake flex perl yacc which ] ++ kernel.moduleBuildDependencies; + + hardeningDisable = [ "pic" ]; + + configureFlags = [ + "--with-linux-kernel-build=${kernelBuildDir}" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-linux-d_splice-alias-extra-iput" + ]; + + preConfigure = '' + patchShebangs . + for i in `grep -l -R '/usr/\(include\|src\)' .`; do + echo "Patch /usr/include and /usr/src in $i" + substituteInPlace $i \ + --replace "/usr/include" "${glibc.dev}/include" \ + --replace "/usr/src" "${kernelBuildDir}" + done + + ./regen.sh -q + + ''; + + buildPhase = '' + make V=1 only_libafs + ''; + + installPhase = '' + mkdir -p ${modDestDir} + cp src/libafs/MODLOAD-*/libafs-${kernel.version}.* ${modDestDir}/libafs.ko + xz -f ${modDestDir}/libafs.ko + ''; + + meta = with stdenv.lib; { + description = "Open AFS client kernel module"; + homepage = https://www.openafs.org; + license = licenses.ipl10; + platforms = platforms.linux; + maintainers = [ maintainers.z77z maintainers.spacefrogg ]; + broken = versionOlder kernel.version "3.18"; + }; + +} diff --git a/pkgs/servers/openafs/srcs.nix b/pkgs/servers/openafs/srcs.nix new file mode 100644 index 00000000000..4f2bb190f85 --- /dev/null +++ b/pkgs/servers/openafs/srcs.nix @@ -0,0 +1,14 @@ +{ fetchurl }: +rec { + version = "1.6.22.1"; + src = fetchurl { + url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; + sha256 = "19nfbksw7b34jc3mxjk7cbz26zg9k5myhzpv2jf0fnmznr47jqaw"; + }; + + srcs = [ src + (fetchurl { + url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; + sha256 = "1875hn8rvlxj4icja8k6hprxprvp2k1f3iilb15lsafhmfz1scg3"; + })]; +} diff --git a/pkgs/servers/openafs/tsmbac.patch b/pkgs/servers/openafs/tsmbac.patch new file mode 100644 index 00000000000..412765fe8a5 --- /dev/null +++ b/pkgs/servers/openafs/tsmbac.patch @@ -0,0 +1,62 @@ +diff -ru3 openafs-1.6.18.1/acinclude.m4 openafs-1.6.18.1.new/acinclude.m4 +--- openafs-1.6.18.1/acinclude.m4 2016-06-21 17:13:39.000000000 +0200 ++++ openafs-1.6.18.1.new/acinclude.m4 2016-11-02 18:44:30.423039662 +0100 +@@ -1373,45 +1373,7 @@ + + dnl check for tivoli + AC_MSG_CHECKING(for tivoli tsm butc support) +-XBSA_CFLAGS="" +-if test "$enable_tivoli_tsm" = "yes"; then +- XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen +- XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen +- XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample +- XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample +- XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample +- XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample +- +- if test -r "$XBSADIR3/dsmapifp.h"; then +- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3" +- XBSA_XLIBS="-ldl" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR4/dsmapifp.h"; then +- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4" +- XBSA_XLIBS="-ldl" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR5/dsmapifp.h"; then +- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5" +- XBSA_XLIBS="-ldl" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR6/dsmapifp.h"; then +- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6" +- XBSA_XLIBS="-ldl" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR1/xbsa.h"; then +- XBSA_CFLAGS="-Dxbsa -I$XBSADIR1" +- XBSA_XLIBS="" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- elif test -r "$XBSADIR2/xbsa.h"; then +- XBSA_CFLAGS="-Dxbsa -I$XBSADIR2" +- XBSA_XLIBS="" +- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) +- else +- AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files]) +- fi +-else +- AC_MSG_RESULT([no]) +-fi ++AC_MSG_RESULT([yes]) + AC_SUBST(XBSA_CFLAGS) + AC_SUBST(XBSA_XLIBS) + +diff -ru3 openafs-1.6.18.1/src/butc/afsxbsa.c openafs-1.6.18.1.new/src/butc/afsxbsa.c +--- openafs-1.6.18.1/src/butc/afsxbsa.c 2016-06-21 17:13:39.000000000 +0200 ++++ openafs-1.6.18.1.new/src/butc/afsxbsa.c 2016-11-02 18:45:10.734662987 +0100 +@@ -651,7 +651,7 @@ + #if defined(AFS_AIX_ENV) + dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER); + #elif defined (AFS_AMD64_LINUX26_ENV) +- dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL); ++ dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL); + #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) + dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL); + #else diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff3d87cde0a..94902610c04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12055,6 +12055,7 @@ with pkgs; oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + openafs = callPackage ../servers/openafs { tsmbac = null; ncurses = null; }; openpts = callPackage ../servers/openpts { }; openresty = callPackage ../servers/http/openresty { }; @@ -13022,7 +13023,7 @@ with pkgs; rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; - openafs = callPackage ../servers/openafs { }; + openafs = callPackage ../servers/openafs/module.nix { }; facetimehd = callPackage ../os-specific/linux/facetimehd { }; From 7ee75b8cf4049580accaa348ac62b19c6801ed76 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:44:50 +0100 Subject: [PATCH 225/797] vim-plugins/vim-wordy: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 9751b588734..09a3da91995 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1658,6 +1658,17 @@ rec { }; + vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-wordy-2016-11-07"; + src = fetchgit { + url = "https://github.com/reedes/vim-wordy"; + rev = "bd37684a041fce85c34bb56c41c5a12c04a376ca"; + sha256 = "0lv3ff1yfqdz2vj6lwaygslds1ccidbb09f4x1cdwlawxdgh3w2v"; + }; + dependencies = []; + + }; + vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-grammarous-2017-08-25"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 421c388b114..a62a837ebe0 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -255,4 +255,5 @@ "github:chemzqm/denite-git" "github:chemzqm/denite-extra" "github:bazelbuild/vim-bazel" +"github:reedes/vim-wordy" "github:itchyny/vim-gitbranch" From 5f93dc591819744ffaf505c9cca7455511518b79 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:45:53 +0100 Subject: [PATCH 226/797] vim-plugins/committia: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 09a3da91995..1fa6cebdd93 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -110,6 +110,7 @@ rec { concealedyank = concealedyank-vim; cute-python = vim-cute-python-git; vim-grepper = vim-grepper-git; + committia = committia-vim-git; vim-test = vim-test-git; peskcolor = peskcolor-vim-git; mayansmoke = mayansmoke-git; @@ -1669,6 +1670,17 @@ rec { }; + committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "committia-vim-git-2017-12-04"; + src = fetchgit { + url = "https://github.com/rhysd/committia.vim.git"; + rev = "51aec02e5ab07c89fa5d5445cfe3a8e0098bec27"; + sha256 = "08nqncgnmbvhnn850s6hhp6p6scqg2iiwrl9air952yh9pl91h84"; + }; + dependencies = []; + + }; + vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-grammarous-2017-08-25"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a62a837ebe0..0984a00f908 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -248,6 +248,7 @@ "github:osyo-manga/vim-textobj-multiblock" "github:cespare/vim-toml" "github:ehamberg/vim-cute-python.git" +"github:rhysd/committia.vim.git" "github:mhinz/vim-grepper.git" "github:janko-m/vim-test.git" "github:andsild/peskcolor.vim.git" From 355062b3a92ce1266d5f8b817c66beea8db0fca0 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:50:18 +0100 Subject: [PATCH 227/797] vim-plugins/context-filetype: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 1fa6cebdd93..104fb34e1d5 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -107,6 +107,7 @@ rec { webapi-vim = WebAPI; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; + context-filetype = context_filetype-vim; concealedyank = concealedyank-vim; cute-python = vim-cute-python-git; vim-grepper = vim-grepper-git; @@ -1800,6 +1801,17 @@ rec { }; + context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "context_filetype-vim-2017-11-15"; + src = fetchgit { + url = "https://github.com/shougo/context_filetype.vim"; + rev = "6856503cd938d018c2d42277ee6ca896fd63f5a2"; + sha256 = "1s4nimpvc5ps602h8xb231nvmk9jbzs981an5kxr3idmmk44j5ms"; + }; + dependencies = []; + + }; + neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-vim-2017-10-01"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0984a00f908..ec25f7e5d06 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -239,6 +239,7 @@ "vundle" "xterm-color-table" "zeavim" +"github:shougo/context_filetype.vim" "github:elzr/vim-json" "github:kana/vim-operator-user" "github:kana/vim-niceblock" From 7e8f2864999d95af4283c1d0559c0dda4f30bebe Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:50:58 +0100 Subject: [PATCH 228/797] vim-plugins/denite: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 104fb34e1d5..8e5885365ab 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -63,6 +63,7 @@ rec { command_T = command-t; # backwards compat, added 2014-10-18 css_color_5056 = vim-css-color; ctrlp = ctrlp-vim; + denite = denite-nvim; easy-align = vim-easy-align; easymotion = vim-easymotion; eighties = vim-eighties; @@ -1812,6 +1813,17 @@ rec { }; + denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "denite-nvim-2018-01-16"; + src = fetchgit { + url = "https://github.com/shougo/denite.nvim"; + rev = "0d48d8d498d410a5ea4403648d528e7267d87461"; + sha256 = "1npag0da8s3jv4jm8waqvsdfg0gnqhkc07r3m17zp2r2bh3b9bjc"; + }; + dependencies = []; + + }; + neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-vim-2017-10-01"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ec25f7e5d06..dae5f59781c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -239,6 +239,7 @@ "vundle" "xterm-color-table" "zeavim" +"github:shougo/denite.nvim" "github:shougo/context_filetype.vim" "github:elzr/vim-json" "github:kana/vim-operator-user" From 555306364ef388c2cc7ebd51f6aa026887951d8a Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:52:18 +0100 Subject: [PATCH 229/797] vim-plugins/echodoc: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8e5885365ab..bf64c932548 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -108,6 +108,7 @@ rec { webapi-vim = WebAPI; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; + echodoc = echodoc-vim; context-filetype = context_filetype-vim; concealedyank = concealedyank-vim; cute-python = vim-cute-python-git; @@ -1824,6 +1825,17 @@ rec { }; + echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "echodoc-vim-2018-01-12"; + src = fetchgit { + url = "https://github.com/shougo/echodoc.vim"; + rev = "410ead5a9fa4400b51771cba3b7599722c9e65b1"; + sha256 = "01czpvn5rs37x0ml8bc5vwyhklm6fk3wl339smc3jvyr1w73rrf5"; + }; + dependencies = []; + + }; + neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-vim-2017-10-01"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index dae5f59781c..a0684b221c6 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -240,6 +240,7 @@ "xterm-color-table" "zeavim" "github:shougo/denite.nvim" +"github:shougo/echodoc.vim" "github:shougo/context_filetype.vim" "github:elzr/vim-json" "github:kana/vim-operator-user" From 7e7c89d7df34ef247e671caae676cdb031044f26 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:52:47 +0100 Subject: [PATCH 230/797] vim-plugins/necosyntax: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index bf64c932548..22a119f6cfa 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1836,6 +1836,17 @@ rec { }; + neco-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-syntax-2017-10-01"; + src = fetchgit { + url = "https://github.com/shougo/neco-syntax"; + rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3"; + sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip"; + }; + dependencies = []; + + }; + neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-vim-2017-10-01"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a0684b221c6..4fa78b02adf 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -252,6 +252,7 @@ "github:cespare/vim-toml" "github:ehamberg/vim-cute-python.git" "github:rhysd/committia.vim.git" +"github:shougo/neco-syntax" "github:mhinz/vim-grepper.git" "github:janko-m/vim-test.git" "github:andsild/peskcolor.vim.git" From b1a60ba86bf4775a9107b793c56e57170625af5b Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:53:18 +0100 Subject: [PATCH 231/797] vim-plugins/neoinclude: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 22a119f6cfa..d060522f4bf 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -113,6 +113,7 @@ rec { concealedyank = concealedyank-vim; cute-python = vim-cute-python-git; vim-grepper = vim-grepper-git; + neoinclude = neoinclude-vim; committia = committia-vim-git; vim-test = vim-test-git; peskcolor = peskcolor-vim-git; @@ -1869,6 +1870,17 @@ rec { }; + neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neoinclude-vim-2017-10-01"; + src = fetchgit { + url = "https://github.com/shougo/neoinclude.vim"; + rev = "b5956ac824fdd60d6eacaa597c8d329252972d8b"; + sha256 = "07x7hxqhklcr5y8zkw9939cwx7rpiicjlc65bn526fkmhcc2hng6"; + }; + dependencies = []; + + }; + neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neosnippet-snippets-2017-09-26"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4fa78b02adf..3cb924e7e72 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -251,6 +251,7 @@ "github:osyo-manga/vim-textobj-multiblock" "github:cespare/vim-toml" "github:ehamberg/vim-cute-python.git" +"github:shougo/neoinclude.vim" "github:rhysd/committia.vim.git" "github:shougo/neco-syntax" "github:mhinz/vim-grepper.git" From fffe2f83845a426766bd7de8cff2c502e7f428bd Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:53:39 +0100 Subject: [PATCH 232/797] vim-plugins/neomru: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d060522f4bf..9724306265d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -108,6 +108,7 @@ rec { webapi-vim = WebAPI; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; + neomru = neomru-vim; echodoc = echodoc-vim; context-filetype = context_filetype-vim; concealedyank = concealedyank-vim; @@ -1881,6 +1882,17 @@ rec { }; + neomru-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neomru-vim-2017-10-01"; + src = fetchgit { + url = "https://github.com/shougo/neomru.vim"; + rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d"; + sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7"; + }; + dependencies = []; + + }; + neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neosnippet-snippets-2017-09-26"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3cb924e7e72..4f5bc851ce1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -240,6 +240,7 @@ "xterm-color-table" "zeavim" "github:shougo/denite.nvim" +"github:shougo/neomru.vim" "github:shougo/echodoc.vim" "github:shougo/context_filetype.vim" "github:elzr/vim-json" From dea716d801eb9c2b290aa52d0e0c892719b27aef Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:54:22 +0100 Subject: [PATCH 233/797] vim-plugins/neoyank: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 9724306265d..ca7234087e4 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -117,6 +117,7 @@ rec { neoinclude = neoinclude-vim; committia = committia-vim-git; vim-test = vim-test-git; + neoyank = neoyank-vim-git; peskcolor = peskcolor-vim-git; mayansmoke = mayansmoke-git; @@ -1915,6 +1916,17 @@ rec { }; + neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neoyank-vim-git-2017-12-19"; + src = fetchgit { + url = "https://github.com/shougo/neoyank.vim.git"; + rev = "5d6e6f80e1920fc38ab5cf779c424a1fdb49202d"; + sha256 = "0l2gfwyiyzppb0hs9sx3x7ndq9zzinppzqq3njwjzd1qgfv29jpq"; + }; + dependencies = []; + + }; + unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "unite-vim-2017-12-06"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4f5bc851ce1..141fc21facf 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -259,6 +259,7 @@ "github:janko-m/vim-test.git" "github:andsild/peskcolor.vim.git" "github:vim-scripts/mayansmoke.git" +"github:shougo/neoyank.vim.git" "github:chemzqm/denite-git" "github:chemzqm/denite-extra" "github:bazelbuild/vim-bazel" From 45ab7091a775dbd29c74887bd67cc6e97a34d66b Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 14:55:25 +0100 Subject: [PATCH 234/797] vim-plugins/tabpagebuffer: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index ca7234087e4..bc52e67a89b 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -96,6 +96,7 @@ rec { supertab = Supertab; syntastic = Syntastic; tabular = Tabular; + tabpagebuffer = tabpagebuffer-vim; tagbar = Tagbar; thumbnail = thumbnail-vim; tmux-navigator = vim-tmux-navigator; @@ -1927,6 +1928,17 @@ rec { }; + tabpagebuffer-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tabpagebuffer-vim-2014-09-30"; + src = fetchgit { + url = "https://github.com/shougo/tabpagebuffer.vim"; + rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc"; + sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f"; + }; + dependencies = []; + + }; + unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "unite-vim-2017-12-06"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 141fc21facf..5f227e2638d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -240,6 +240,7 @@ "xterm-color-table" "zeavim" "github:shougo/denite.nvim" +"github:shougo/tabpagebuffer.vim" "github:shougo/neomru.vim" "github:shougo/echodoc.vim" "github:shougo/context_filetype.vim" From 18dd939118c426db3782dc20067e8a646dc05b7f Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 15:00:14 +0100 Subject: [PATCH 235/797] vim-plugins/vim-smalls: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index bc52e67a89b..af685f4e0d8 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2001,6 +2001,17 @@ rec { }; + vim-smalls = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-smalls-2015-05-02"; + src = fetchgit { + url = "https://github.com/t9md/vim-smalls"; + rev = "9619eae81626bd63f88165e0520c467698264e34"; + sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad"; + }; + dependencies = []; + + }; + vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-hardtime-2017-03-31"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5f227e2638d..4e8f265fc99 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -252,6 +252,7 @@ "github:chikatoike/concealedyank.vim" "github:osyo-manga/vim-textobj-multiblock" "github:cespare/vim-toml" +"github:t9md/vim-smalls" "github:ehamberg/vim-cute-python.git" "github:shougo/neoinclude.vim" "github:rhysd/committia.vim.git" From 7aa5e6bfafe9d6436a019c692e3638bc918e6ebe Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 15:00:42 +0100 Subject: [PATCH 236/797] vim-plugins/vim-themis: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index af685f4e0d8..1fcc187d75e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2056,6 +2056,17 @@ rec { }; + vim-themis = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-themis-2017-12-28"; + src = fetchgit { + url = "https://github.com/thinca/vim-themis"; + rev = "691cd3912ba318dbd8d9fa0035fee629b424766d"; + sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd"; + }; + dependencies = []; + + }; + molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "molokai-2015-11-11"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4e8f265fc99..ed316d609f1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -251,6 +251,7 @@ "github:rhysd/vim-operator-surround" "github:chikatoike/concealedyank.vim" "github:osyo-manga/vim-textobj-multiblock" +"github:thinca/vim-themis" "github:cespare/vim-toml" "github:t9md/vim-smalls" "github:ehamberg/vim-cute-python.git" From 1af14e0f1e0d7287b83066fe492e0b4e9eb20adc Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 15:03:24 +0100 Subject: [PATCH 237/797] vim-plugins/open-browser: init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 1fcc187d75e..9ede44ab879 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -112,6 +112,7 @@ rec { neomru = neomru-vim; echodoc = echodoc-vim; context-filetype = context_filetype-vim; + open-browser = open-browser-vim; concealedyank = concealedyank-vim; cute-python = vim-cute-python-git; vim-grepper = vim-grepper-git; @@ -2155,6 +2156,17 @@ rec { }; + open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "open-browser-vim-2017-12-15"; + src = fetchgit { + url = "https://github.com/tyru/open-browser.vim"; + rev = "ee8decb2b26020320128eecd7a96383d995c8804"; + sha256 = "1a9j13h174lkp1gqd80idwdb8d74gdkyfgvb2l153jcqyvwpzcl2"; + }; + dependencies = []; + + }; + youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "youcompleteme-2017-12-03"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ed316d609f1..73db1956069 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -245,6 +245,7 @@ "github:shougo/echodoc.vim" "github:shougo/context_filetype.vim" "github:elzr/vim-json" +"github:tyru/open-browser.vim" "github:kana/vim-operator-user" "github:kana/vim-niceblock" "github:kana/vim-operator-replace" From b0864c33e34b2dac0c467cb29de3299d6f73c22c Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 15:03:57 +0100 Subject: [PATCH 238/797] vim-plugins/improved-ansiesc: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 9ede44ab879..aa49742e70a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2248,6 +2248,17 @@ rec { }; + Improved-AnsiEsc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Improved-AnsiEsc-2015-08-25"; + src = fetchgit { + url = "https://github.com/vim-scripts/Improved-AnsiEsc"; + rev = "e1c59a8e9203fab6b9150721f30548916da73351"; + sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz"; + }; + dependencies = []; + + }; + Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Rename-2011-08-30"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 73db1956069..15e55a0a4bb 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -268,4 +268,5 @@ "github:chemzqm/denite-extra" "github:bazelbuild/vim-bazel" "github:reedes/vim-wordy" +"github:vim-scripts/Improved-AnsiEsc" "github:itchyny/vim-gitbranch" From d8311b87c2fd52aff413234dfe735bc57a5b2417 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 15:59:42 +0100 Subject: [PATCH 239/797] vim-plugins/vim-textobj-user: init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index aa49742e70a..042c4548816 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1308,6 +1308,17 @@ rec { }; + vim-textobj-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-textobj-user-2017-09-28"; + src = fetchgit { + url = "https://github.com/kana/vim-textobj-user"; + rev = "e231b65797b5765b3ee862d71077e9bd56f3ca3e"; + sha256 = "0zsgr2cn8s42d7jllnxw2cvqkl27lc921d1mkph7ny7jgnghaay9"; + }; + dependencies = []; + + }; + latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "latex-box-2015-06-01"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 15e55a0a4bb..492218d3349 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -249,6 +249,7 @@ "github:kana/vim-operator-user" "github:kana/vim-niceblock" "github:kana/vim-operator-replace" +"github:kana/vim-textobj-user" "github:rhysd/vim-operator-surround" "github:chikatoike/concealedyank.vim" "github:osyo-manga/vim-textobj-multiblock" From 81d444102c8c4f724ca47c520ac38a7a0a5a3788 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 16:59:49 +0100 Subject: [PATCH 240/797] vim-plugins/auto_pairs: remove redundant/dead reference --- pkgs/misc/vim-plugins/default.nix | 11 ----------- pkgs/misc/vim-plugins/vim-plugin-names | 1 - 2 files changed, 12 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 042c4548816..3899e4ca6f6 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -142,17 +142,6 @@ rec { # --- generated packages bellow this line --- - Auto_Pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Auto_Pairs-2017-07-03"; - src = fetchgit { - url = "git://github.com/jiangmiao/auto-pairs"; - rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; - sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; - }; - dependencies = []; - - }; - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 492218d3349..bcdcd255727 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -175,7 +175,6 @@ "github:zig-lang/zig.vim" "goyo" "gruvbox" -"jiangmiao-auto-pairs" "matchit.zip" "neco-look" "pathogen" From cf0a87b44ed079fd02a9407e557aed7693e2fe11 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 15:21:36 +0100 Subject: [PATCH 241/797] vim-plugins: sort plugin-names and fix indentation --- pkgs/misc/vim-plugins/default.nix | 32 ++++++------ pkgs/misc/vim-plugins/vim-plugin-names | 69 +++++++++++++------------- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 3899e4ca6f6..39b1e4f6e77 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -52,6 +52,7 @@ rec { # aliasess "sourcemap.vim" = sourcemap; Colour_Sampler_Pack = Colour-Sampler-Pack; + Gundo = gundo-vim; # backwards compat, added 2015-10-03 YouCompleteMe = youcompleteme; airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 @@ -61,31 +62,41 @@ rec { colors-solarized = Solarized; colorsamplerpack = Colour_Sampler_Pack; command_T = command-t; # backwards compat, added 2014-10-18 + committia = committia-vim-git; + concealedyank = concealedyank-vim; + context-filetype = context_filetype-vim; css_color_5056 = vim-css-color; ctrlp = ctrlp-vim; + cute-python = vim-cute-python-git; denite = denite-nvim; easy-align = vim-easy-align; easymotion = vim-easymotion; + echodoc = echodoc-vim; eighties = vim-eighties; ghc-mod-vim = ghcmod; gist-vim = Gist; gitgutter = vim-gitgutter; gundo = gundo-vim; - Gundo = gundo-vim; # backwards compat, added 2015-10-03 haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 - haskellconceal = vim-haskellconceal; haskellConcealPlus = vim-haskellConcealPlus; + haskellconceal = vim-haskellconceal; hier = vim-hier; hlint-refactor = hlint-refactor-vim; hoogle = Hoogle; ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; + mayansmoke = mayansmoke-git; multiple-cursors = vim-multiple-cursors; necoGhc = neco-ghc; # backwards compat, added 2014-10-18 neocomplete = neocomplete-vim; + neoinclude = neoinclude-vim; + neomru = neomru-vim; neosnippet = neosnippet-vim; + neoyank = neoyank-vim-git; nerdcommenter = The_NERD_Commenter; nerdtree = The_NERD_tree; + open-browser = open-browser-vim; + peskcolor = peskcolor-vim-git; polyglot = vim-polyglot; quickrun = vim-quickrun; repeat = vim-repeat; @@ -95,33 +106,22 @@ rec { stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 supertab = Supertab; syntastic = Syntastic; - tabular = Tabular; tabpagebuffer = tabpagebuffer-vim; + tabular = Tabular; tagbar = Tagbar; thumbnail = thumbnail-vim; tmux-navigator = vim-tmux-navigator; tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = tslime-vim; unite = unite-vim; + vim-grepper = vim-grepper-git; + vim-test = vim-test-git; vimproc = vimproc-vim; vimshell = vimshell-vim; watchdogs = vim-watchdogs; webapi-vim = WebAPI; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; - neomru = neomru-vim; - echodoc = echodoc-vim; - context-filetype = context_filetype-vim; - open-browser = open-browser-vim; - concealedyank = concealedyank-vim; - cute-python = vim-cute-python-git; - vim-grepper = vim-grepper-git; - neoinclude = neoinclude-vim; - committia = committia-vim-git; - vim-test = vim-test-git; - neoyank = neoyank-vim-git; - peskcolor = peskcolor-vim-git; - mayansmoke = mayansmoke-git; # do not auto-update this one, as the name clashes with vim-snippets vim-docbk-snippets = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bcdcd255727..5df03c0f0cb 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -34,13 +34,19 @@ "github:ajh17/Spacegray.vim" "github:albfan/nerdtree-git-plugin" "github:alvan/vim-closetag" +"github:andsild/peskcolor.vim.git" "github:andviro/flake8-vim" "github:ap/vim-css-color" "github:autozimu/LanguageClient-neovim" +"github:bazelbuild/vim-bazel" "github:bbchung/clighter8" "github:benekastah/neomake" "github:bitc/vim-hdevtools" "github:bronson/vim-trailing-whitespace" +"github:cespare/vim-toml" +"github:chemzqm/denite-extra" +"github:chemzqm/denite-git" +"github:chikatoike/concealedyank.vim" "github:christoomey/vim-sort-motion" "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" @@ -53,9 +59,11 @@ "github:drmingdrmer/xptemplate" "github:eagletmt/neco-ghc" "github:editorconfig/editorconfig-vim" +"github:ehamberg/vim-cute-python.git" "github:eikenb/acp" "github:elixir-lang/vim-elixir" "github:elmcast/elm-vim" +"github:elzr/vim-json" "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" "github:ensime/ensime-vim" @@ -74,7 +82,9 @@ "github:itchyny/calendar.vim" "github:itchyny/lightline.vim" "github:itchyny/thumbnail.vim" +"github:itchyny/vim-gitbranch" "github:ivanov/vim-ipython" +"github:janko-m/vim-test.git" "github:jceb/vim-hier" "github:jceb/vim-orgmode" "github:jeetsukumaran/vim-buffergator" @@ -89,6 +99,9 @@ "github:junegunn/limelight.vim" "github:junegunn/vim-peekaboo" "github:justincampbell/vim-eighties" +"github:kana/vim-niceblock" +"github:kana/vim-operator-replace" +"github:kana/vim-operator-user" "github:latex-box-team/latex-box" "github:leafgarland/typescript-vim" "github:lepture/vim-jinja" @@ -102,6 +115,7 @@ "github:megaannum/forms" "github:megaannum/self" "github:mfukar/robotframework-vim" +"github:mhinz/vim-grepper.git" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" "github:mileszs/ack.vim" @@ -113,33 +127,47 @@ "github:neovimhaskell/haskell-vim" "github:nixprime/cpsm" "github:osyo-manga/shabadou.vim" +"github:osyo-manga/vim-textobj-multiblock" "github:osyo-manga/vim-watchdogs" "github:plasticboy/vim-markdown" "github:python-mode/python-mode" "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" +"github:reedes/vim-wordy" +"github:rhysd/committia.vim.git" "github:rhysd/vim-grammarous" +"github:rhysd/vim-operator-surround" "github:rodjek/vim-puppet" -"github:roxma/nvim-completion-manager" "github:roxma/nvim-cm-racer" -"github:ryanoasis/vim-devicons" +"github:roxma/nvim-completion-manager" "github:rust-lang/rust.vim" +"github:ryanoasis/vim-devicons" "github:sbdchd/neoformat" "github:sebastianmarkow/deoplete-rust" "github:sheerun/vim-polyglot" +"github:shougo/context_filetype.vim" +"github:shougo/denite.nvim" +"github:shougo/echodoc.vim" +"github:shougo/neco-syntax" "github:shougo/neco-vim" "github:shougo/neocomplete.vim" +"github:shougo/neoinclude.vim" +"github:shougo/neomru.vim" "github:shougo/neosnippet-snippets" "github:shougo/neosnippet.vim" +"github:shougo/neoyank.vim.git" +"github:shougo/tabpagebuffer.vim" "github:shougo/unite.vim" "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" "github:sjl/gundo.vim" "github:slashmili/alchemist.vim" +"github:t9md/vim-smalls" "github:takac/vim-hardtime" "github:terryma/vim-expand-region" "github:tex/vimpreviewpandoc" "github:thinca/vim-quickrun" +"github:thinca/vim-themis" "github:tomasr/molokai" "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" @@ -148,25 +176,28 @@ "github:tpope/vim-speeddating" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" +"github:tyru/open-browser.vim" "github:valloric/youcompleteme" "github:vim-airline/vim-airline-themes" "github:vim-pandoc/vim-pandoc" "github:vim-pandoc/vim-pandoc-after" "github:vim-pandoc/vim-pandoc-syntax" "github:vim-scripts/Colour-Sampler-Pack" +"github:vim-scripts/Improved-AnsiEsc" "github:vim-scripts/Rename" "github:vim-scripts/ReplaceWithRegister" "github:vim-scripts/a.vim" "github:vim-scripts/align" "github:vim-scripts/argtextobj.vim" "github:vim-scripts/changeColorScheme.vim" +"github:vim-scripts/mayansmoke.git" "github:vim-scripts/random.vim" "github:vim-scripts/tabmerge" "github:vim-scripts/wombat256.vim" "github:w0rp/ale" "github:wakatime/vim-wakatime" -"github:wincent/command-t" "github:will133/vim-dirdiff" +"github:wincent/command-t" "github:xolox/vim-easytags" "github:xolox/vim-misc" "github:zah/nim.vim" @@ -238,35 +269,3 @@ "vundle" "xterm-color-table" "zeavim" -"github:shougo/denite.nvim" -"github:shougo/tabpagebuffer.vim" -"github:shougo/neomru.vim" -"github:shougo/echodoc.vim" -"github:shougo/context_filetype.vim" -"github:elzr/vim-json" -"github:tyru/open-browser.vim" -"github:kana/vim-operator-user" -"github:kana/vim-niceblock" -"github:kana/vim-operator-replace" -"github:kana/vim-textobj-user" -"github:rhysd/vim-operator-surround" -"github:chikatoike/concealedyank.vim" -"github:osyo-manga/vim-textobj-multiblock" -"github:thinca/vim-themis" -"github:cespare/vim-toml" -"github:t9md/vim-smalls" -"github:ehamberg/vim-cute-python.git" -"github:shougo/neoinclude.vim" -"github:rhysd/committia.vim.git" -"github:shougo/neco-syntax" -"github:mhinz/vim-grepper.git" -"github:janko-m/vim-test.git" -"github:andsild/peskcolor.vim.git" -"github:vim-scripts/mayansmoke.git" -"github:shougo/neoyank.vim.git" -"github:chemzqm/denite-git" -"github:chemzqm/denite-extra" -"github:bazelbuild/vim-bazel" -"github:reedes/vim-wordy" -"github:vim-scripts/Improved-AnsiEsc" -"github:itchyny/vim-gitbranch" From 544e214975559b02f7461e403e9206b6d6fec0ea Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Thu, 25 Jan 2018 17:07:57 +0100 Subject: [PATCH 242/797] vim-plugins: correct name for vim-github-dashboard --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5df03c0f0cb..a60bb197677 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -246,11 +246,11 @@ "vim-airline" "vim-coffee-script" "vim-cursorword" -"vim-dashboard" "vim-easy-align" "vim-ft-diff_fold" "vim-gista" "vim-gitgutter" +"vim-github-dashboard" "vim-iced-coffee-script" "vim-javascript" "vim-jsbeautify" From c389d705f3b50d88ec46ad6dccf028efa660edad Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Wed, 24 Jan 2018 15:09:28 +0100 Subject: [PATCH 243/797] nixos/openafsClient: relocate nixos module --- nixos/modules/module-list.nix | 2 +- .../{openafs-client/default.nix => openafs/client.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename nixos/modules/services/network-filesystems/{openafs-client/default.nix => openafs/client.nix} (100%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e512881765e..f23b5873b52 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -415,7 +415,7 @@ ./services/network-filesystems/ipfs.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix - ./services/network-filesystems/openafs-client/default.nix + ./services/network-filesystems/openafs/client.nix ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba.nix ./services/network-filesystems/tahoe.nix diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs/client.nix similarity index 100% rename from nixos/modules/services/network-filesystems/openafs-client/default.nix rename to nixos/modules/services/network-filesystems/openafs/client.nix From ce74e1cc3681b1607822ba84184cde84b057ab32 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Wed, 24 Jan 2018 17:28:31 +0100 Subject: [PATCH 244/797] nixos/openafsClient: Extend client service functionality Add a lot of options to the client to make it more usable and compatible with the OpenAFS server module. --- .../network-filesystems/openafs/client.nix | 192 +++++++++++++++--- .../network-filesystems/openafs/lib.nix | 28 +++ 2 files changed, 194 insertions(+), 26 deletions(-) create mode 100644 nixos/modules/services/network-filesystems/openafs/lib.nix diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index e5f89a9a0d2..3826fe3edfd 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -1,7 +1,9 @@ { config, pkgs, lib, ... }: +with import ./lib.nix { inherit lib; }; + let - inherit (lib) mkOption mkIf; + inherit (lib) getBin mkOption mkIf optionalString singleton types; cfg = config.services.openafsClient; @@ -10,14 +12,17 @@ let sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc"; }; + clientServDB = pkgs.writeText "client-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.cellServDB); + afsConfig = pkgs.runCommand "afsconfig" {} '' mkdir -p $out echo ${cfg.cellName} > $out/ThisCell - cp ${cellServDB} $out/CellServDB - echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo + cat ${cellServDB} ${clientServDB} > $out/CellServDB + echo "${cfg.mountPoint}:${cfg.cache.directory}:${toString cfg.cache.blocks}" > $out/cacheinfo ''; - openafsPkgs = config.boot.kernelPackages.openafs; + openafsMod = config.boot.kernelPackages.openafs; + openafsBin = lib.getBin pkgs.openafs; in { ###### interface @@ -28,34 +33,136 @@ in enable = mkOption { default = false; + type = types.bool; description = "Whether to enable the OpenAFS client."; }; + afsdb = mkOption { + default = true; + type = types.bool; + description = "Resolve cells via AFSDB DNS records."; + }; + cellName = mkOption { - default = "grand.central.org"; + default = ""; + type = types.str; description = "Cell name."; + example = "grand.central.org"; }; - cacheSize = mkOption { - default = "100000"; - description = "Cache size."; + cellServDB = mkOption { + default = []; + type = with types; listOf (submodule { options = cellServDBConfig; }); + description = '' + This cell's database server records, added to the global + CellServDB. See CellServDB(5) man page for syntax. Ignored when + afsdb is set to true. + ''; + example = '' + [ { ip = "1.2.3.4"; dnsname = "first.afsdb.server.dns.fqdn.org"; } + { ip = "2.3.4.5"; dnsname = "second.afsdb.server.dns.fqdn.org"; } + ] + ''; }; - cacheDirectory = mkOption { - default = "/var/cache/openafs"; - description = "Cache directory."; + cache = { + blocks = mkOption { + default = 100000; + type = types.int; + description = "Cache size in 1KB blocks."; + }; + + chunksize = mkOption { + default = 0; + type = types.ints.between 0 30; + description = '' + Size of each cache chunk given in powers of + 2. 0 resets the chunk size to its default + values (13 (8 KB) for memcache, 18-20 (256 KB to 1 MB) for + diskcache). Maximum value is 30. Important performance + parameter. Set to higher values when dealing with large files. + ''; + }; + + directory = mkOption { + default = "/var/cache/openafs"; + type = types.str; + description = "Cache directory."; + }; + + diskless = mkOption { + default = false; + type = types.bool; + description = '' + Use in-memory cache for diskless machines. Has no real + performance benefit anymore. + ''; + }; }; crypt = mkOption { - default = false; + default = true; + type = types.bool; description = "Whether to enable (weak) protocol encryption."; }; - sparse = mkOption { + daemons = mkOption { + default = 2; + type = types.int; + description = '' + Number of daemons to serve user requests. Numbers higher than 6 + usually do no increase performance. Default is sufficient for up + to five concurrent users. + ''; + }; + + fakestat = mkOption { default = false; + type = types.bool; + description = '' + Return fake data on stat() calls. If true, + always do so. If false, only do so for + cross-cell mounts (as these are potentially expensive). + ''; + }; + + inumcalc = mkOption { + default = "compat"; + type = types.strMatching "compat|md5"; + description = '' + Inode calculation method. compat is + computationally less expensive, but md5 greatly + reduces the likelihood of inode collisions in larger scenarios + involving multiple cells mounted into one AFS space. + ''; + }; + + mountPoint = mkOption { + default = "/afs"; + type = types.str; + description = '' + Mountpoint of the AFS file tree, conventionally + /afs. When set to a different value, only + cross-cells that use the same value can be accessed. + ''; + }; + + sparse = mkOption { + default = true; + type = types.bool; description = "Minimal cell list in /afs."; }; + startDisconnected = mkOption { + default = false; + type = types.bool; + description = '' + Start up in disconnected mode. You need to execute + fs disco online (as root) to switch to + connected mode. Useful for roaming devices. + ''; + }; + }; }; @@ -64,26 +171,58 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ openafsPkgs ]; - - environment.etc = [ - { source = afsConfig; - target = "openafs"; + assertions = [ + { assertion = cfg.afsdb || cfg.cellServDB != []; + message = "You should specify all cell-local database servers in config.services.openafsClient.cellServDB or set config.services.openafsClient.afsdb."; + } + { assertion = cfg.cellName != ""; + message = "You must specify the local cell name in config.services.openafsClient.cellName."; } ]; + environment.systemPackages = [ pkgs.openafs ]; + + environment.etc = { + clientCellServDB = { + source = pkgs.runCommand "CellServDB" {} '' + cat ${cellServDB} ${clientServDB} > $out + ''; + target = "openafs/CellServDB"; + mode = "0644"; + }; + clientCell = { + text = '' + ${cfg.cellName} + ''; + target = "openafs/ThisCell"; + mode = "0644"; + }; + }; + systemd.services.afsd = { description = "AFS client"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = singleton (if cfg.startDisconnected then "network.target" else "network-online.target"); serviceConfig = { RemainAfterExit = true; }; + restartIfChanged = false; preStart = '' - mkdir -p -m 0755 /afs - mkdir -m 0700 -p ${cfg.cacheDirectory} - ${pkgs.kmod}/bin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true - ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb - ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} + mkdir -p -m 0755 ${cfg.mountPoint} + mkdir -m 0700 -p ${cfg.cache.directory} + ${pkgs.kmod}/bin/insmod ${openafsMod}/lib/modules/*/extra/openafs/libafs.ko.xz + ${openafsBin}/sbin/afsd \ + -mountdir ${cfg.mountPoint} \ + -confdir ${afsConfig} \ + ${optionalString (!cfg.cache.diskless) "-cachedir ${cfg.cache.directory}"} \ + -blocks ${toString cfg.cache.blocks} \ + -chunksize ${toString cfg.cache.chunksize} \ + ${optionalString cfg.cache.diskless "-memcache"} \ + -inumcalc ${cfg.inumcalc} \ + ${if cfg.fakestat then "-fakestat-all" else "-fakestat"} \ + ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} \ + ${optionalString cfg.afsdb "-afsdb"} + ${openafsBin}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} + ${optionalString cfg.startDisconnected "${openafsBin}/bin/fs discon offline"} ''; # Doing this in preStop, because after these commands AFS is basically @@ -91,8 +230,9 @@ in # postStop, then we get a hang + kernel oops, because AFS can't be # stopped simply by sending signals to processes. preStop = '' - ${pkgs.utillinux}/bin/umount /afs - ${openafsPkgs}/sbin/afsd -shutdown + ${pkgs.utillinux}/bin/umount ${cfg.mountPoint} + ${openafsBin}/sbin/afsd -shutdown + ${pkgs.kmod}/sbin/rmmod libafs ''; }; }; diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix new file mode 100644 index 00000000000..ecfc72d2eaf --- /dev/null +++ b/nixos/modules/services/network-filesystems/openafs/lib.nix @@ -0,0 +1,28 @@ +{ lib, ...}: + +let + inherit (lib) concatStringsSep mkOption types; + +in rec { + + mkCellServDB = cellName: db: '' + >${cellName} + '' + (concatStringsSep "\n" (map (dbm: if (dbm.ip != "" && dbm.dnsname != "") then dbm.ip + " #" + dbm.dnsname else "") + db)); + + # CellServDB configuration type + cellServDBConfig = { + ip = mkOption { + type = types.str; + default = ""; + example = "1.2.3.4"; + description = "IP Address of a database server"; + }; + dnsname = mkOption { + type = types.str; + default = ""; + example = "afs.example.org"; + description = "DNS full-qualified domain name of a database server"; + }; + }; +} From e9559e6b0916d5e47f710f6f759e1597a36b0618 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Mon, 29 Jan 2018 18:05:31 +0100 Subject: [PATCH 245/797] awstats: add tools directory --- pkgs/tools/system/awstats/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index 9f0e50642ac..aaf5bf136cb 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -41,6 +41,9 @@ perlPackages.buildPerlPackage rec { mv wwwroot "$out/wwwroot" rm -r "$out/wwwroot/classes/src/" + mkdir -p "$out/share/awstats" + mv tools "$out/share/awstats/tools" + mkdir -p "$bin/bin" ln -s "$out/wwwroot/cgi-bin/awstats.pl" "$bin/bin/awstats" From 8818546d48f4a57128ba640ee930c62a40b69ceb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 1 Feb 2018 19:06:03 +0100 Subject: [PATCH 246/797] lispPackages.clwrapper: recognise CCL in setup-hook --- pkgs/development/lisp-modules/clwrapper/setup-hook.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index eb6052d58db..8975ada5320 100644 --- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -15,6 +15,8 @@ setLisp () { sbcl) NIX_LISP_COMMAND="$j" ;; ecl) NIX_LISP_COMMAND="$j" ;; clisp) NIX_LISP_COMMAND="$j" ;; + lx86cl) NIX_LISP_COMMAND="$j" ;; + lx86cl64) NIX_LISP_COMMAND="$j" ;; esac done fi From bdc48d3b610199407c6a84d710611e553f293974 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 1 Feb 2018 14:04:56 -0600 Subject: [PATCH 247/797] maloader: fix hash (currently broken) --- pkgs/os-specific/darwin/maloader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 1684c0e92ce..5f4306ec0c1 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/shinh/maloader.git"; rev = "5f220393e0b7b9ad0cf1aba0e89df2b42a1f0442"; - sha256 = "07j9b7n0grrbxxyn2h8pnk6pa8b370wq5z5zwbds8dlhi7q37rhn"; + sha256 = "0dd1pn07x1y8pyn5wz8qcl1c1xwghyya4d060m3y9vx5dhv9xmzw"; }; postPatch = '' From 5dc6306e9cc2ed15b4a556f77af4b7721ebc08c8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 1 Feb 2018 14:12:18 -0600 Subject: [PATCH 248/797] xpwn: build usb-based tools by replacing libusb1 dep with libusb Otherwise the build fails to detect libusb and doesn't build the 'xpwn' and 'dfu-util' tools. New tools run but I don't have any suitable devices to test :). (I believe latest iGadgets need a newer version of xpwn anyway) --- pkgs/development/mobile/xpwn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index e1b2b0cb2fa..d5ffb7f6c01 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, zlib, libpng, bzip2, libusb1, openssl }: +{ stdenv, fetchgit, cmake, zlib, libpng, bzip2, libusb, openssl }: stdenv.mkDerivation { name = "xpwn-0.5.8git"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { sed -i -e '/install/d' CMakeLists.txt ''; - buildInputs = [ cmake zlib libpng bzip2 libusb1 openssl ]; + buildInputs = [ cmake zlib libpng bzip2 libusb openssl ]; cmakeFlags = [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=" From 4c379dbbdd57078c7e9713542a4af1fa7bd5d262 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 1 Feb 2018 21:32:21 +0100 Subject: [PATCH 249/797] lispPackages.clwrapper: Fix a typo in dynamic-library-hack --- pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index fa914f6d26b..a1cfae0e606 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -101,7 +101,7 @@ nix_lisp_build_system(){ :separator \":\") for l in sb-alien::*shared-objects* for ns := (sb-alien::shared-object-namestring l) - do (and (> (length ns) 0) (not (equal (elt ns 0) "/")) + do (and (> (length ns) 0) (not (equal (elt ns 0) \"/\")) (let* ((prefix (find-if (lambda (s) (probe-file (format nil \"~a/~a\" s ns))) libpath)) (fullpath (and prefix (format nil \"~a/~a\" prefix ns)))) From 4311bebd45dea329914953a8dcc3a45ca2cf7bb9 Mon Sep 17 00:00:00 2001 From: dywedir Date: Thu, 1 Feb 2018 23:09:20 +0200 Subject: [PATCH 250/797] tlp: 1.0 -> 1.1 --- pkgs/tools/misc/tlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 3614ec3bc68..91eeb6b0a51 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation rec { name = "tlp-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = "${version}"; - sha256 = "0gq1y1qnzwyv7cw32g4ymlfssi2ayrbnd04y4l242k6n41d05bij"; + sha256 = "01bhb9hdsck1g2s5jvafr3ywml9k2qz7x2cf42a3z8g5d23pdfpy"; }; makeFlags = [ "DESTDIR=$(out)" From 0d71207862f26de809b9b38a24df6840e136baea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 29 Jan 2018 14:13:13 +0100 Subject: [PATCH 251/797] =?UTF-8?q?babl:=200.1.38=20=E2=86=92=200.1.42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/babl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 04e714f886e..f7788eb93cb 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.38"; + name = "babl-0.1.42"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "11pfbyzq20596p9sgwraxspg3djg1jzz6wvz4bapf0yyr97jiyd0"; + sha256 = "1wc7fyj9bfqfiwf1w33g3vv3wcl18pd9cxr9fc0iy391szrsynb8"; }; doCheck = true; From 27ac1bfaf9070e50a654afcf7a20d1c7de2c3759 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 29 Jan 2018 14:13:39 +0100 Subject: [PATCH 252/797] =?UTF-8?q?gegl=5F0=5F3:=200.3.26=20=E2=86=92=200.?= =?UTF-8?q?3.28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gegl/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 158707557a5..6325efcbc2a 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -3,11 +3,11 @@ , libwebp, gnome3 }: stdenv.mkDerivation rec { - name = "gegl-0.3.26"; + name = "gegl-0.3.28"; src = fetchurl { url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "1a9zbi6ws0r0sqynvg2fh3ad0ipnphg7w62y7whlcrbpqi29izvf"; + sha256 = "1zr3gmmzjhp2d3d3h51x80r5q7gs9rv67ywx69sif6as99h8fbqm"; }; hardeningDisable = [ "format" ]; From e621f17274330378a45cad3265124929797d3703 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 30 Jan 2018 19:13:53 +0100 Subject: [PATCH 253/797] gegl_0_3: loosen platforms --- pkgs/development/libraries/gegl/3.0.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 6325efcbc2a..2bb773a17b8 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1zr3gmmzjhp2d3d3h51x80r5q7gs9rv67ywx69sif6as99h8fbqm"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + hardeningDisable = [ "format" ]; # needs fonts otherwise don't know how to pass them @@ -28,11 +30,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; - meta = { + meta = with stdenv.lib; { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ jtojnar ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; } From effa9e40457e801577b672dadbcc169fd1ad20a3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 30 Jan 2018 19:24:52 +0100 Subject: [PATCH 254/797] =?UTF-8?q?gnome3.gexiv2:=200.10.6=20=E2=86=92=200?= =?UTF-8?q?.10.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/gexiv2/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix index d0801714a0f..41040db72ce 100644 --- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix @@ -1,29 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3 }: let majorVersion = "0.10"; in stdenv.mkDerivation rec { name = "gexiv2-${version}"; - version = "${majorVersion}.6"; + version = "${majorVersion}.7"; src = fetchurl { url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk"; + sha256 = "1f7312zygw77ml37i5qilhfvmjm59dn753ax71rcb2jm1p76vgcb"; }; + patches = [ + # https://bugzilla.gnome.org/show_bug.cgi?id=791941 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=365969; + sha256 = "06w744acgnz3hym7sm8c245yzlg05ldkmwgiz3yz4pp6h72brizj"; + }) + ]; + preConfigure = '' patchShebangs . ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libtool m4 ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/gexiv2; description = "GObject wrapper around the Exiv2 photo metadata library"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = gnome3.maintainers; }; } From d2e518c4c57cd985a4965e560d72e45a6ff1fa49 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Tue, 30 Jan 2018 22:26:56 -0500 Subject: [PATCH 255/797] gnomeExtensions.icon-hider: init at 19 Add the Icon Hider GNOME Shell extension. --- .../gnome-3/extensions/icon-hider/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/desktops/gnome-3/extensions/icon-hider/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix new file mode 100644 index 00000000000..7ad26a7c6d4 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-icon-hider-${version}"; + version = "19"; + + src = fetchFromGitHub { + owner = "ikalnytskyi"; + repo = "gnome-shell-extension-icon-hider"; + rev = "v${version}"; + sha256 = "0cifm6cmxwxrrrva41wvjvrzsdqaczfbillf2vv3wsb60dqr6h39"; + }; + + uuid = "icon-hider@kalnitsky.org"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + ''; + + meta = with stdenv.lib; { + description = "Icon Hider is a GNOME Shell extension for managing status area items"; + license = licenses.bsd3; + maintainers = with maintainers; [ jonafato ]; + platforms = platforms.linux; + homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f53d06e186..7275950f103 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18876,6 +18876,7 @@ with pkgs; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; + icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; pixel-saver = callPackage ../desktops/gnome-3/extensions/pixel-saver { }; From c138308ec1b4bf47d50d2f63ac37374df62ff82b Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Mon, 29 Jan 2018 23:29:33 -0500 Subject: [PATCH 256/797] gnomeExtensions.clipboard-indicator: init at 30 Add the Clipboard Indicator GNOME Shell extension. --- .../clipboard-indicator/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix new file mode 100644 index 00000000000..e41227e8513 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-clipboard-indicator-${version}"; + version = "30"; + + src = fetchFromGitHub { + owner = "Tudmotu"; + repo = "gnome-shell-extension-clipboard-indicator"; + rev = "v${version}"; + sha256 = "1fmgmxv2y678bj0kmymkgnnglcpqk8ww053izlq46xg7s27jjdf6"; + }; + + uuid = "clipboard-indicator@tudmotu.com"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r * $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "Adds a clipboard indicator to the top panel and saves clipboard history"; + license = licenses.mit; + maintainers = with maintainers; [ jonafato ]; + platforms = platforms.linux; + homepage = https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7275950f103..2b94fcfb298 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15010,7 +15010,7 @@ with pkgs; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; - keepass = callPackage ../applications/misc/keepass { + keepass = callPackage ../applications/misc/keepass { buildDotnetPackage = buildDotnetPackage.override { mono = mono54; }; }; @@ -18874,6 +18874,7 @@ with pkgs; gnomeExtensions = { caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; + clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; From 583af89fc003b0f65971c696596b5d69f430c5eb Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 2 Feb 2018 01:32:17 +0200 Subject: [PATCH 257/797] ncdu: 1.12 -> 1.13 --- pkgs/tools/misc/ncdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 1cb71ce9dd6..330210269d5 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.12"; + version = "1.13"; src = fetchurl { url = "http://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "16j9fyw73y1lk05a35i4q9i66laklgsx41lz5rxfr8m28x3lw3l2"; + sha256 = "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl"; }; buildInputs = [ ncurses ]; From d2f065b79355755c02b0e8fb32e4d2d3b6a3cd45 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Thu, 1 Feb 2018 10:45:48 +1100 Subject: [PATCH 258/797] gnome-power-manager: init at 3.26.0 Provides an app to view battery and power statistics. This app is badly documented on the web, but is in the default Fedora install; hence to motivation to add it to Nix. --- .../apps/gnome-power-manager/default.nix | 47 +++++++++++++++++++ .../gnome-3/apps/gnome-power-manager/src.nix | 10 ++++ pkgs/desktops/gnome-3/default.nix | 3 ++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix create mode 100644 pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix new file mode 100644 index 00000000000..2fd0dfa5ac9 --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, intltool +, fetchurl +, pkgconfig +, gtk3 +, glib +, meson +, ninja +, upower +, desktop_file_utils +, wrapGAppsHook +, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + wrapGAppsHook + intltool + + # needed by meson_post_install.sh + glib.dev + desktop_file_utils + ]; + + buildInputs = [ + gtk3 + glib + upower + gnome3.defaultIconTheme + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://projects.gnome.org/gnome-power-manager/; + description = "View battery and power statistics provided by UPower"; + maintainers = gnome3.maintainers; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix new file mode 100644 index 00000000000..bdffa453504 --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-power-manager-3.26.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-power-manager/3.26/gnome-power-manager-3.26.0.tar.xz; + sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e"; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d60fddb589b..0650ddf04ea 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -36,6 +36,7 @@ let nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-getting-started-docs gnome-packagekit gnome-software + gnome-power-manager ]; gamesPackages = with gnome3; [ swell-foop lightsoff iagno @@ -297,6 +298,8 @@ let gegl = gegl_0_3; }; + gnome-power-manager = callPackage ./apps/gnome-power-manager { }; + gnome-weather = callPackage ./apps/gnome-weather { }; nautilus-sendto = callPackage ./apps/nautilus-sendto { }; From 93532b0d3a1a5208778835e670c7d318c119ff22 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Sun, 28 Jan 2018 09:08:37 -0500 Subject: [PATCH 259/797] looking-glass-client: init at a10 --- lib/maintainers.nix | 1 + .../looking-glass-client/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 50 insertions(+) create mode 100644 pkgs/applications/virtualization/looking-glass-client/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b892f29a8e6..348212df095 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -543,6 +543,7 @@ pmahoney = "Patrick Mahoney "; pmeunier = "Pierre-Étienne Meunier "; pmiddend = "Philipp Middendorf "; + pneumaticat = "Kevin Liu "; polyrod = "Maurizio Di Pietro "; pradeepchhetri = "Pradeep Chhetri "; prikhi = "Pavan Rikhi "; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix new file mode 100644 index 00000000000..16be0cc5b6d --- /dev/null +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice_protocol, fontconfig +, libX11, freefont_ttf +}: + +stdenv.mkDerivation rec { + name = "looking-glass-client-${version}"; + version = "a10"; + + src = fetchFromGitHub { + owner = "gnif"; + repo = "LookingGlass"; + rev = version; + sha256 = "10jxnkrvskjzkg86iz3hnb5v91ykzx6pvcnpy1v4436g5f2d62wn"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + SDL SDL2 SDL2_ttf openssl spice_protocol fontconfig + libX11 freefont_ttf + ]; + + enableParallelBuilding = true; + + sourceRoot = "source/client"; + + installPhase = '' + mkdir -p $out + mv bin $out/ + ''; + + meta = with stdenv.lib; { + description = "A KVM Frame Relay (KVMFR) implementation"; + longDescription = '' + Looking Glass is an open source application that allows the use of a KVM + (Kernel-based Virtual Machine) configured for VGA PCI Pass-through + without an attached physical monitor, keyboard or mouse. This is the final + step required to move away from dual booting with other operating systems + for legacy programs that require high performance graphics. + ''; + homepage = https://looking-glass.hostfission.com/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.pneumaticat ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b94fcfb298..defd9e93d10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16038,6 +16038,8 @@ with pkgs; flavour = "git"; }; + looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; + lumail = callPackage ../applications/networking/mailreaders/lumail { }; lv2bm = callPackage ../applications/audio/lv2bm { }; From 25225f0b4646f0353e079d0b19739494d63f249f Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 1 Feb 2018 21:57:21 -0500 Subject: [PATCH 260/797] libqalculate: fix build with clang This addresses a security complaint clang makes about the source code, and allows the build to succeed on darwin. --- pkgs/development/libraries/libqalculate/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 0e67f970b76..89b71c1855d 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { substituteInPlace libqalculate/Calculator.cc \ --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ --replace '"gnuplot -"' '"${gnuplot}/bin/gnuplot -"' + '' + stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/qalc.cc \ + --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))' ''; preBuild = '' From 6944860c6e4fa2dec871b04fecf32fa34b86e061 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 1 Feb 2018 20:59:53 +0000 Subject: [PATCH 261/797] ocamlPackages.tyxml: 4.0.1 -> 4.2.0 --- pkgs/development/ocaml-modules/tyxml/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 49cc56a1db6..a965d6ed116 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,26 +1,21 @@ -{ stdenv, fetchzip, fetchpatch, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camlp4, uutf, markup, ppx_tools_versioned, re }: assert stdenv.lib.versionAtLeast ocaml.version "4.02"; stdenv.mkDerivation rec { pname = "tyxml"; - version = "4.0.1"; + version = "4.2.0"; name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchzip { url = "http://github.com/ocsigen/tyxml/archive/${version}.tar.gz"; - sha256 = "1mwkjvl78gvw7pvql5qp64cfjjca6aqsb04999qkllifyicaaq8y"; + sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8"; }; - patches = [ (fetchpatch { - url = https://github.com/dbuenzli/tyxml/commit/a2bf5ccc0b6e684e7b81274ff19df8d72e2def8d.diff; - sha256 = "11sidgiwz3zqw815vlslbfzb456z0lndkh425mlmvnmck4d2v2i3"; - })]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned markup ]; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - - propagatedBuildInputs = [uutf re ppx_tools markup]; + propagatedBuildInputs = [ uutf re ]; createFindlibDestdir = true; From 490ae6a50e829224defa9ab19ae2b092414f82c7 Mon Sep 17 00:00:00 2001 From: dywedir Date: Fri, 2 Feb 2018 10:09:53 +0200 Subject: [PATCH 262/797] tiled: 1.1.1 -> 1.1.2 --- pkgs/applications/editors/tiled/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 1c5767d17f4..438ae26f06f 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "1c6n5xshadxv5qwv8kfrj1kbfnkvx6nyxc9p4mpzkjrkxw1b1qf1"; + sha256 = "1bzp89914rlrwf2whky3fx10rwxqiwbw9acyqllvam3l4hmv4nlz"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { bsd2 # libtiled and tmxviewer gpl2Plus # all the rest ]; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; }; } From 78c2ca326e4320ca9b53d2dc7eca8b385d2681af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Feb 2018 13:42:07 +0100 Subject: [PATCH 263/797] home-assistant: compute extraComponents from config --- .../modules/services/misc/home-assistant.nix | 36 +- nixos/tests/home-assistant.nix | 7 +- .../home-assistant/component-packages.nix | 431 ++++++++++++++++++ pkgs/servers/home-assistant/default.nix | 20 +- .../home-assistant/parse-requirements.py | 97 ++++ 5 files changed, 581 insertions(+), 10 deletions(-) create mode 100644 pkgs/servers/home-assistant/component-packages.nix create mode 100755 pkgs/servers/home-assistant/parse-requirements.py diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index bc463d3e670..4fbf5a412d1 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -6,6 +6,19 @@ let cfg = config.services.home-assistant; configFile = pkgs.writeText "configuration.yaml" (builtins.toJSON cfg.config); + + availableComponents = pkgs.home-assistant.availableComponents; + + # Returns whether component is used in config + useComponent = component: hasAttrByPath (splitString "." component) cfg.config; + + # List of components used in config + extraComponents = filter useComponent availableComponents; + + package = if cfg.autoExtraComponents + then (cfg.package.override { inherit extraComponents; }) + else cfg.package; + in { meta.maintainers = with maintainers; [ dotlambda ]; @@ -29,6 +42,7 @@ in { }; frontend = { }; http = { }; + feedreader.urls = [ "https://nixos.org/blogs.xml" ]; } ''; description = '' @@ -48,10 +62,22 @@ in { ''; description = '' Home Assistant package to use. - Most Home Assistant components require additional dependencies, - which are best specified by overriding pkgs.home-assistant. - You can find the dependencies by searching for failed imports in your log or by looking at this list: - + Override extraPackages in order to add additional dependencies. + ''; + }; + + autoExtraComponents = mkOption { + default = true; + type = types.bool; + description = '' + If set to true, the components used in config + are set as the specified package's extraComponents. + This in turn adds all packaged dependencies to the derivation. + You might still see import errors in your log. + In this case, you will need to package the necessary dependencies yourself + or ask for someone else to package them. + If a dependency is packaged but not automatically added to this list, + you might need to specify it in extraPackages. ''; }; }; @@ -67,7 +93,7 @@ in { ''; serviceConfig = { ExecStart = '' - ${cfg.package}/bin/hass --config "${cfg.configDir}" + ${package}/bin/hass --config "${cfg.configDir}" ''; User = "hass"; Group = "hass"; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 0e2fee8e808..5d7e0ec65e7 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -17,13 +17,16 @@ in { homeassistant = { name = "Home"; time_zone = "UTC"; + latitude = "0.0"; + longitude = "0.0"; + elevation = 0; }; frontend = { }; http = { }; }; }; }; - }; + }; testScript = '' startAll; @@ -37,5 +40,7 @@ in { $hass->waitForOpenPort(8123); $hass->succeed("curl --fail http://localhost:8123/states"); $hass->succeed("curl --fail http://localhost:8123/api/ | grep 'API running'"); + + $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR"); ''; }) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix new file mode 100644 index 00000000000..679ca2afd43 --- /dev/null +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -0,0 +1,431 @@ +# Generated from parse-requirements.py +# Do not edit! + +{ + version = "0.62.1"; + components = { + "nuimo_controller" = ps: with ps; [ ]; + "bbb_gpio" = ps: with ps; [ ]; + "doorbird" = ps: with ps; [ ]; + "isy994" = ps: with ps; [ ]; + "notify.html5" = ps: with ps; [ pyjwt ]; + "sensor.mvglive" = ps: with ps; [ ]; + "arduino" = ps: with ps; [ ]; + "xiaomi_aqara" = ps: with ps; [ ]; + "rpi_gpio" = ps: with ps; [ ]; + "remember_the_milk" = ps: with ps; [ httplib2 ]; + "media_player.sonos" = ps: with ps; [ ]; + "sensor.travisci" = ps: with ps; [ ]; + "notify.twitter" = ps: with ps; [ ]; + "notify.yessssms" = ps: with ps; [ ]; + "abode" = ps: with ps; [ ]; + "device_tracker.automatic" = ps: with ps; [ ]; + "sensor.dnsip" = ps: with ps; [ aiodns ]; + "emulated_hue" = ps: with ps; [ aiohttp-cors ]; + "http" = ps: with ps; [ aiohttp-cors ]; + "sensor.imap" = ps: with ps; [ ]; + "light.lifx" = ps: with ps; [ ]; + "scene.hunterdouglas_powerview" = ps: with ps; [ ]; + "alarmdecoder" = ps: with ps; [ ]; + "sensor.alpha_vantage" = ps: with ps; [ ]; + "amcrest" = ps: with ps; [ ]; + "media_player.anthemav" = ps: with ps; [ ]; + "apcupsd" = ps: with ps; [ ]; + "notify.apns" = ps: with ps; [ ]; + "asterisk_mbox" = ps: with ps; [ ]; + "light.avion" = ps: with ps; [ ]; + "axis" = ps: with ps; [ ]; + "tts.baidu" = ps: with ps; [ ]; + "sensor.modem_callerid" = ps: with ps; [ ]; + "sensor.linux_battery" = ps: with ps; [ batinfo ]; + "sensor.eddystone_temperature" = ps: with ps; [ ]; + "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; + "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ]; + "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; + "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ]; + "zha" = ps: with ps; [ ]; + "blink" = ps: with ps; [ ]; + "light.blinksticklight" = ps: with ps; [ BlinkStick ]; + "light.blinkt" = ps: with ps; [ ]; + "sensor.bitcoin" = ps: with ps; [ ]; + "light.decora" = ps: with ps; [ ]; + "sensor.bme680" = ps: with ps; [ ]; + "notify.aws_lambda" = ps: with ps; [ boto3 ]; + "notify.aws_sns" = ps: with ps; [ boto3 ]; + "notify.aws_sqs" = ps: with ps; [ boto3 ]; + "tts.amazon_polly" = ps: with ps; [ boto3 ]; + "sensor.broadlink" = ps: with ps; [ ]; + "switch.broadlink" = ps: with ps; [ ]; + "sensor.buienradar" = ps: with ps; [ ]; + "weather.buienradar" = ps: with ps; [ ]; + "calendar.caldav" = ps: with ps; [ ]; + "notify.ciscospark" = ps: with ps; [ ]; + "coinbase" = ps: with ps; [ ]; + "sensor.coinmarketcap" = ps: with ps; [ ]; + "alarm_control_panel.concord232" = ps: with ps; [ ]; + "binary_sensor.concord232" = ps: with ps; [ ]; + "sensor.crimereports" = ps: with ps; [ ]; + "datadog" = ps: with ps; [ datadog ]; + "sensor.metoffice" = ps: with ps; [ ]; + "weather.metoffice" = ps: with ps; [ ]; + "light.decora_wifi" = ps: with ps; [ ]; + "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; + "sensor.deluge" = ps: with ps; [ ]; + "switch.deluge" = ps: with ps; [ ]; + "media_player.denonavr" = ps: with ps; [ ]; + "media_player.directv" = ps: with ps; [ ]; + "sensor.discogs" = ps: with ps; [ discogs_client ]; + "notify.discord" = ps: with ps; [ ]; + "updater" = ps: with ps; [ distro ]; + "switch.digitalloggers" = ps: with ps; [ ]; + "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; + "sensor.dovado" = ps: with ps; [ ]; + "sensor.dsmr" = ps: with ps; [ ]; + "dweet" = ps: with ps; [ ]; + "sensor.dweet" = ps: with ps; [ ]; + "sensor.eliqonline" = ps: with ps; [ ]; + "enocean" = ps: with ps; [ ]; + "sensor.envirophat" = ps: with ps; [ ]; + "sensor.season" = ps: with ps; [ ephem ]; + "keyboard_remote" = ps: with ps; [ ]; + "climate.honeywell" = ps: with ps; [ ]; + "image_processing.dlib_face_detect" = ps: with ps; [ ]; + "image_processing.dlib_face_identify" = ps: with ps; [ ]; + "sensor.fastdotcom" = ps: with ps; [ ]; + "sensor.fedex" = ps: with ps; [ ]; + "feedreader" = ps: with ps; [ feedparser ]; + "sensor.geo_rss_events" = ps: with ps; [ feedparser ]; + "sensor.fitbit" = ps: with ps; [ ]; + "sensor.fixer" = ps: with ps; [ ]; + "light.flux_led" = ps: with ps; [ ]; + "notify.free_mobile" = ps: with ps; [ ]; + "device_tracker.fritz" = ps: with ps; [ ]; + "sensor.fritzbox_callmonitor" = ps: with ps; [ ]; + "sensor.fritzbox_netmonitor" = ps: with ps; [ ]; + "switch.fritzdect" = ps: with ps; [ ]; + "media_player.frontier_silicon" = ps: with ps; [ ]; + "conversation" = ps: with ps; [ ]; + "tts.google" = ps: with ps; [ ]; + "device_tracker.bluetooth_le_tracker" = ps: with ps; [ ]; + "sensor.gearbest" = ps: with ps; [ ]; + "sensor.gitter" = ps: with ps; [ ]; + "notify.gntp" = ps: with ps; [ ]; + "google" = ps: with ps; [ google_api_python_client oauth2client ]; + "sensor.google_travel_time" = ps: with ps; [ ]; + "sensor.gpsd" = ps: with ps; [ ]; + "light.greenwave" = ps: with ps; [ ]; + "media_player.gstreamer" = ps: with ps; [ ]; + "ffmpeg" = ps: with ps; [ ]; + "media_player.philips_js" = ps: with ps; [ ]; + "mqtt.server" = ps: with ps; [ hbmqtt ]; + "climate.heatmiser" = ps: with ps; [ ]; + "switch.hikvisioncam" = ps: with ps; [ ]; + "notify.hipchat" = ps: with ps; [ ]; + "binary_sensor.workday" = ps: with ps; [ ]; + "frontend" = ps: with ps; [ user-agents ]; + "camera.onvif" = ps: with ps; [ ]; + "sensor.dht" = ps: with ps; [ ]; + "media_player.braviatv" = ps: with ps; [ ]; + "media_player.spotify" = ps: with ps; [ ]; + "netatmo" = ps: with ps; [ ]; + "neato" = ps: with ps; [ ]; + "sensor.sabnzbd" = ps: with ps; [ ]; + "switch.anel_pwrctrl" = ps: with ps; [ ]; + "switch.edimax" = ps: with ps; [ ]; + "sensor.gtfs" = ps: with ps; [ ]; + "binary_sensor.flic" = ps: with ps; [ ]; + "media_player.lg_netcast" = ps: with ps; [ ]; + "sensor.bh1750" = ps: with ps; [ ]; + "sensor.bme280" = ps: with ps; [ ]; + "sensor.htu21d" = ps: with ps; [ ]; + "light.iglo" = ps: with ps; [ ]; + "ihc" = ps: with ps; [ ]; + "influxdb" = ps: with ps; [ influxdb ]; + "sensor.influxdb" = ps: with ps; [ influxdb ]; + "insteon_local" = ps: with ps; [ ]; + "insteon_plm" = ps: with ps; [ ]; + "verisure" = ps: with ps; [ ]; + "media_player.kodi" = ps: with ps; [ ]; + "notify.kodi" = ps: with ps; [ ]; + "device_tracker.owntracks" = ps: with ps; [ libnacl ]; + "device_tracker.owntracks_http" = ps: with ps; [ libnacl ]; + "dyson" = ps: with ps; [ ]; + "camera.foscam" = ps: with ps; [ ]; + "device_tracker.mikrotik" = ps: with ps; [ ]; + "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; + "light.lifx_legacy" = ps: with ps; [ ]; + "light.osramlightify" = ps: with ps; [ ]; + "light.limitlessled" = ps: with ps; [ ]; + "linode" = ps: with ps; [ linode-api ]; + "media_player.liveboxplaytv" = ps: with ps; [ ]; + "lametric" = ps: with ps; [ ]; + "notify.lametric" = ps: with ps; [ ]; + "sensor.luftdaten" = ps: with ps; [ ]; + "sensor.lyft" = ps: with ps; [ ]; + "notify.matrix" = ps: with ps; [ matrix-client ]; + "maxcube" = ps: with ps; [ ]; + "notify.message_bird" = ps: with ps; [ ]; + "sensor.mfi" = ps: with ps; [ ]; + "switch.mfi" = ps: with ps; [ ]; + "sensor.miflora" = ps: with ps; [ ]; + "upnp" = ps: with ps; [ ]; + "sensor.mopar" = ps: with ps; [ ]; + "tts" = ps: with ps; [ mutagen ]; + "mychevy" = ps: with ps; [ ]; + "mycroft" = ps: with ps; [ ]; + "usps" = ps: with ps; [ ]; + "media_player.nad" = ps: with ps; [ ]; + "media_player.nadtcp" = ps: with ps; [ ]; + "discovery" = ps: with ps; [ netdisco ]; + "sensor.neurio_energy" = ps: with ps; [ ]; + "sensor.nederlandse_spoorwegen" = ps: with ps; [ ]; + "nuheat" = ps: with ps; [ ]; + "binary_sensor.trend" = ps: with ps; [ numpy ]; + "image_processing.opencv" = ps: with ps; [ numpy ]; + "climate.oem" = ps: with ps; [ ]; + "media_player.onkyo" = ps: with ps; [ ]; + "sensor.openevse" = ps: with ps; [ ]; + "media_player.openhome" = ps: with ps; [ ]; + "switch.orvibo" = ps: with ps; [ ]; + "mqtt" = ps: with ps; [ paho-mqtt ]; + "shiftr" = ps: with ps; [ paho-mqtt ]; + "media_player.panasonic_viera" = ps: with ps; [ ]; + "media_player.dunehd" = ps: with ps; [ ]; + "device_tracker.aruba" = ps: with ps; [ pexpect ]; + "device_tracker.asuswrt" = ps: with ps; [ pexpect ]; + "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; + "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; + "media_player.pandora" = ps: with ps; [ pexpect ]; + "hue" = ps: with ps; [ ]; + "rpi_pfio" = ps: with ps; [ ]; + "light.piglow" = ps: with ps; [ ]; + "pilight" = ps: with ps; [ ]; + "dominos" = ps: with ps; [ ]; + "media_player.plex" = ps: with ps; [ ]; + "sensor.plex" = ps: with ps; [ ]; + "sensor.mhz19" = ps: with ps; [ ]; + "sensor.serial_pm" = ps: with ps; [ ]; + "sensor.pocketcasts" = ps: with ps; [ ]; + "climate.proliphix" = ps: with ps; [ ]; + "prometheus" = ps: with ps; [ ]; + "sensor.systemmonitor" = ps: with ps; [ psutil ]; + "wink" = ps: with ps; [ ]; + "notify.pushbullet" = ps: with ps; [ pushbullet ]; + "sensor.pushbullet" = ps: with ps; [ pushbullet ]; + "notify.pushetta" = ps: with ps; [ ]; + "light.rpi_gpio_pwm" = ps: with ps; [ ]; + "canary" = ps: with ps; [ ]; + "sensor.cpuspeed" = ps: with ps; [ ]; + "camera.synology" = ps: with ps; [ ]; + "hdmi_cec" = ps: with ps; [ ]; + "light.tplink" = ps: with ps; [ ]; + "switch.tplink" = ps: with ps; [ ]; + "rfxtrx" = ps: with ps; [ ]; + "sensor.tibber" = ps: with ps; [ ]; + "switch.dlink" = ps: with ps; [ ]; + "ads" = ps: with ps; [ ]; + "sensor.airvisual" = ps: with ps; [ ]; + "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; + "arlo" = ps: with ps; [ ]; + "apple_tv" = ps: with ps; [ ]; + "device_tracker.bbox" = ps: with ps; [ ]; + "sensor.bbox" = ps: with ps; [ ]; + "device_tracker.bluetooth_tracker" = ps: with ps; [ ]; + "media_player.cast" = ps: with ps; [ PyChromecast ]; + "media_player.cmus" = ps: with ps; [ ]; + "comfoconnect" = ps: with ps; [ ]; + "tts.microsoft" = ps: with ps; [ ]; + "sensor.cups" = ps: with ps; [ ]; + "daikin" = ps: with ps; [ ]; + "climate.daikin" = ps: with ps; [ ]; + "deconz" = ps: with ps; [ ]; + "zwave" = ps: with ps; [ pydispatcher ]; + "android_ip_webcam" = ps: with ps; [ ]; + "sensor.ebox" = ps: with ps; [ ]; + "climate.econet" = ps: with ps; [ ]; + "eight_sleep" = ps: with ps; [ ]; + "media_player.emby" = ps: with ps; [ ]; + "envisalink" = ps: with ps; [ ]; + "climate.ephember" = ps: with ps; [ ]; + "sensor.fido" = ps: with ps; [ ]; + "climate.flexit" = ps: with ps; [ ]; + "ifttt" = ps: with ps; [ ]; + "remote.harmony" = ps: with ps; [ ]; + "binary_sensor.hikvision" = ps: with ps; [ ]; + "hive" = ps: with ps; [ ]; + "homematic" = ps: with ps; [ pyhomematic ]; + "sensor.hydroquebec" = ps: with ps; [ ]; + "alarm_control_panel.ialarm" = ps: with ps; [ ]; + "device_tracker.icloud" = ps: with ps; [ ]; + "sensor.irish_rail_transport" = ps: with ps; [ ]; + "binary_sensor.iss" = ps: with ps; [ ]; + "remote.itach" = ps: with ps; [ ]; + "kira" = ps: with ps; [ ]; + "sensor.kwb" = ps: with ps; [ ]; + "sensor.lacrosse" = ps: with ps; [ ]; + "sensor.lastfm" = ps: with ps; [ pylast ]; + "media_player.webostv" = ps: with ps; [ websockets ]; + "notify.webostv" = ps: with ps; [ ]; + "litejet" = ps: with ps; [ ]; + "sensor.loopenergy" = ps: with ps; [ ]; + "lutron_caseta" = ps: with ps; [ ]; + "lutron" = ps: with ps; [ ]; + "notify.mailgun" = ps: with ps; [ ]; + "mochad" = ps: with ps; [ ]; + "modbus" = ps: with ps; [ ]; + "media_player.monoprice" = ps: with ps; [ ]; + "media_player.yamaha_musiccast" = ps: with ps; [ ]; + "cover.myq" = ps: with ps; [ ]; + "mysensors" = ps: with ps; [ ]; + "lock.nello" = ps: with ps; [ ]; + "device_tracker.netgear" = ps: with ps; [ ]; + "switch.netio" = ps: with ps; [ ]; + "lock.nuki" = ps: with ps; [ ]; + "sensor.nut" = ps: with ps; [ ]; + "alarm_control_panel.nx584" = ps: with ps; [ ]; + "binary_sensor.nx584" = ps: with ps; [ ]; + "iota" = ps: with ps; [ ]; + "sensor.otp" = ps: with ps; [ ]; + "sensor.openweathermap" = ps: with ps; [ ]; + "weather.openweathermap" = ps: with ps; [ ]; + "qwikswitch" = ps: with ps; [ ]; + "rainbird" = ps: with ps; [ ]; + "climate.sensibo" = ps: with ps; [ ]; + "sensor.serial" = ps: with ps; [ ]; + "switch.acer_projector" = ps: with ps; [ pyserial ]; + "lock.sesame" = ps: with ps; [ ]; + "sensor.sma" = ps: with ps; [ ]; + "device_tracker.snmp" = ps: with ps; [ pysnmp ]; + "sensor.snmp" = ps: with ps; [ pysnmp ]; + "switch.snmp" = ps: with ps; [ pysnmp ]; + "sensor.thinkingcleaner" = ps: with ps; [ ]; + "switch.thinkingcleaner" = ps: with ps; [ ]; + "sensor.blockchain" = ps: with ps; [ ]; + "media_player.clementine" = ps: with ps; [ ]; + "digital_ocean" = ps: with ps; [ digital-ocean ]; + "ecobee" = ps: with ps; [ ]; + "climate.eq3btsmart" = ps: with ps; [ ]; + "sensor.etherscan" = ps: with ps; [ ]; + "sensor.darksky" = ps: with ps; [ ]; + "weather.darksky" = ps: with ps; [ ]; + "gc100" = ps: with ps; [ ]; + "sensor.hp_ilo" = ps: with ps; [ ]; + "joaoapps_join" = ps: with ps; [ ]; + "notify.joaoapps_join" = ps: with ps; [ ]; + "juicenet" = ps: with ps; [ ]; + "lirc" = ps: with ps; [ ]; + "fan.xiaomi_miio" = ps: with ps; [ ]; + "light.xiaomi_miio" = ps: with ps; [ ]; + "switch.xiaomi_miio" = ps: with ps; [ ]; + "vacuum.xiaomi_miio" = ps: with ps; [ ]; + "media_player.mpd" = ps: with ps; [ ]; + "light.mystrom" = ps: with ps; [ ]; + "switch.mystrom" = ps: with ps; [ ]; + "nest" = ps: with ps; [ ]; + "device_tracker.nmap_tracker" = ps: with ps; [ ]; + "notify.pushover" = ps: with ps; [ ]; + "sensor.ripple" = ps: with ps; [ ]; + "media_player.roku" = ps: with ps; [ ]; + "sensor.sochain" = ps: with ps; [ ]; + "sensor.synologydsm" = ps: with ps; [ ]; + "tado" = ps: with ps; [ ]; + "telegram_bot" = ps: with ps; [ ]; + "sensor.twitch" = ps: with ps; [ ]; + "velbus" = ps: with ps; [ ]; + "media_player.vlc" = ps: with ps; [ ]; + "sensor.swiss_public_transport" = ps: with ps; [ ]; + "alarm_control_panel.egardia" = ps: with ps; [ ]; + "sensor.whois" = ps: with ps; [ ]; + "device_tracker.tile" = ps: with ps; [ ]; + "climate.touchline" = ps: with ps; [ ]; + "device_tracker.trackr" = ps: with ps; [ ]; + "tradfri" = ps: with ps; [ ]; + "device_tracker.unifi" = ps: with ps; [ ]; + "keyboard" = ps: with ps; [ ]; + "vera" = ps: with ps; [ ]; + "media_player.vizio" = ps: with ps; [ ]; + "velux" = ps: with ps; [ ]; + "wemo" = ps: with ps; [ ]; + "camera.xeoma" = ps: with ps; [ ]; + "zabbix" = ps: with ps; [ ]; + "sensor.qnap" = ps: with ps; [ ]; + "switch.rachio" = ps: with ps; [ ]; + "climate.radiotherm" = ps: with ps; [ ]; + "raincloud" = ps: with ps; [ ]; + "raspihats" = ps: with ps; [ ]; + "switch.rainmachine" = ps: with ps; [ ]; + "python_script" = ps: with ps; [ ]; + "rflink" = ps: with ps; [ ]; + "ring" = ps: with ps; [ ]; + "notify.rocketchat" = ps: with ps; [ ]; + "vacuum.roomba" = ps: with ps; [ ]; + "switch.rpi_rf" = ps: with ps; [ ]; + "media_player.russound_rnet" = ps: with ps; [ ]; + "media_player.russound_rio" = ps: with ps; [ ]; + "media_player.yamaha" = ps: with ps; [ ]; + "media_player.samsungtv" = ps: with ps; [ ]; + "satel_integra" = ps: with ps; [ ]; + "sensor.deutsche_bahn" = ps: with ps; [ ]; + "scsgate" = ps: with ps; [ ]; + "notify.sendgrid" = ps: with ps; [ ]; + "light.sensehat" = ps: with ps; [ ]; + "sensor.sensehat" = ps: with ps; [ ]; + "media_player.aquostv" = ps: with ps; [ ]; + "sensor.shodan" = ps: with ps; [ ]; + "notify.simplepush" = ps: with ps; [ ]; + "alarm_control_panel.simplisafe" = ps: with ps; [ ]; + "skybell" = ps: with ps; [ ]; + "notify.slack" = ps: with ps; [ ]; + "sleepiq" = ps: with ps; [ ]; + "media_player.snapcast" = ps: with ps; [ ]; + "sensor.speedtest" = ps: with ps; [ ]; + "recorder" = ps: with ps; [ sqlalchemy ]; + "statsd" = ps: with ps; [ statsd ]; + "sensor.steam_online" = ps: with ps; [ ]; + "tahoma" = ps: with ps; [ ]; + "sensor.tank_utility" = ps: with ps; [ ]; + "binary_sensor.tapsaff" = ps: with ps; [ ]; + "tellstick" = ps: with ps; [ ]; + "tellduslive" = ps: with ps; [ ]; + "sensor.temper" = ps: with ps; [ ]; + "tesla" = ps: with ps; [ ]; + "thingspeak" = ps: with ps; [ ]; + "light.tikteck" = ps: with ps; [ ]; + "calendar.todoist" = ps: with ps; [ todoist ]; + "toon" = ps: with ps; [ ]; + "alarm_control_panel.totalconnect" = ps: with ps; [ ]; + "sensor.transmission" = ps: with ps; [ transmissionrpc ]; + "switch.transmission" = ps: with ps; [ transmissionrpc ]; + "twilio" = ps: with ps; [ twilio ]; + "sensor.uber" = ps: with ps; [ ]; + "sensor.ups" = ps: with ps; [ ]; + "camera.uvc" = ps: with ps; [ ]; + "climate.venstar" = ps: with ps; [ ]; + "volvooncall" = ps: with ps; [ ]; + "sensor.vasttrafik" = ps: with ps; [ ]; + "vultr" = ps: with ps; [ vultr ]; + "wake_on_lan" = ps: with ps; [ ]; + "switch.wake_on_lan" = ps: with ps; [ ]; + "sensor.waqi" = ps: with ps; [ ]; + "cloud" = ps: with ps; [ ]; + "waterfurnace" = ps: with ps; [ ]; + "media_player.gpmdp" = ps: with ps; [ ]; + "spc" = ps: with ps; [ websockets ]; + "zigbee" = ps: with ps; [ ]; + "sensor.xbox_live" = ps: with ps; [ ]; + "knx" = ps: with ps; [ ]; + "media_player.bluesound" = ps: with ps; [ xmltodict ]; + "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ]; + "sensor.ted5000" = ps: with ps; [ xmltodict ]; + "sensor.yr" = ps: with ps; [ xmltodict ]; + "sensor.yahoo_finance" = ps: with ps; [ ]; + "sensor.yweather" = ps: with ps; [ ]; + "weather.yweather" = ps: with ps; [ ]; + "light.yeelight" = ps: with ps; [ ]; + "light.yeelightsunflower" = ps: with ps; [ ]; + "media_extractor" = ps: with ps; [ ]; + "light.zengge" = ps: with ps; [ ]; + "zeroconf" = ps: with ps; [ zeroconf ]; + "media_player.ziggo_mediabox_xl" = ps: with ps; [ ]; + }; +} diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9ec314e5c73..bce0369cb52 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, python3 +, extraComponents ? [] , extraPackages ? ps: [] , skipPip ? true }: @@ -24,14 +25,25 @@ let }; }; + componentPackages = import ./component-packages.nix; + + availableComponents = builtins.attrNames componentPackages.components; + + getPackages = component: builtins.getAttr component componentPackages.components; + + componentBuildInputs = map (component: getPackages component py.pkgs) extraComponents; + # Ensure that we are using a consistent package set extraBuildInputs = extraPackages py.pkgs; + # Don't forget to run parse-requirements.py after updating + hassVersion = "0.62.1"; + in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; - version = "0.62.1"; + version = assert (componentPackages.version == hassVersion); hassVersion; - diabled = !isPy3k; + inherit availableComponents; # PyPI tarball is missing tests/ directory src = fetchFromGitHub { @@ -45,8 +57,8 @@ in with py.pkgs; buildPythonApplication rec { # From setup.py requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi # From the components that are part of the default configuration.yaml - sqlalchemy aiohttp-cors hass-frontend user-agents distro mutagen xmltodict netdisco - ] ++ extraBuildInputs; + sqlalchemy aiohttp-cors hass-frontend user-agents distro mutagen xmltodict netdisco + ] ++ componentBuildInputs ++ extraBuildInputs; checkInputs = [ pytest requests-mock pydispatcher pytest-aiohttp diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py new file mode 100755 index 00000000000..aa293921e87 --- /dev/null +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -0,0 +1,97 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ setuptools ])" +# +# This script downloads https://github.com/home-assistant/home-assistant/blob/master/requirements_all.txt. +# This file contains lines of the form +# +# # homeassistant.components.foo +# # homeassistant.components.bar +# foobar==1.2.3 +# +# i.e. it lists dependencies and the components that require them. +# By parsing the file, a dictionary mapping component to dependencies is created. +# For all of these dependencies, Nixpkgs' python3Packages are searched for appropriate names. +# Then, a Nix attribute set mapping component name to dependencies is created. + +from urllib.request import urlopen +import subprocess +import os +import sys +import json +import re +from pkg_resources import Requirement, RequirementParseError + +PREFIX = '# homeassistant.components.' +PKG_SET = 'python3Packages' + +def get_version(): + with open(os.path.dirname(sys.argv[0]) + '/default.nix') as f: + m = re.search('hassVersion = "([\\d\\.]+)";', f.read()) + return m.group(1) + +def fetch_reqs(version='master'): + requirements = {} + with urlopen('https://github.com/home-assistant/home-assistant/raw/{}/requirements_all.txt'.format(version)) as response: + components = [] + for line in response.read().decode().splitlines(): + if line == '': + components = [] + elif line[:len(PREFIX)] == PREFIX: + component = line[len(PREFIX):] + components.append(component) + if component not in requirements: + requirements[component] = [] + elif line[0] != '#': + for component in components: + requirements[component].append(line) + return requirements + +# Store a JSON dump of Nixpkgs' python3Packages +output = subprocess.check_output(['nix-env', '-f', os.path.dirname(sys.argv[0]) + '/../../..', '-qa', '-A', PKG_SET, '--json']) +packages = json.loads(output) + +def name_to_attr_path(req): + attr_paths = [] + pattern = re.compile('python3\\.6-{}-\\d'.format(req), re.I) + for attr_path, package in packages.items(): + if pattern.match(package['name']): + attr_paths.append(attr_path) + # Let's hope there's only one derivation with a matching name + assert(len(attr_paths) <= 1) + if attr_paths: + return attr_paths[0] + else: + return None + +version = get_version() +requirements = fetch_reqs(version=version) +build_inputs = {} +for component, reqs in requirements.items(): + attr_paths = [] + for req in reqs: + try: + name = Requirement.parse(req).project_name + attr_path = name_to_attr_path(name) + if attr_path is not None: + # Add attribute path without "python3Packages." prefix + attr_paths.append(attr_path[len(PKG_SET + '.'):]) + except RequirementParseError: + continue + else: + build_inputs[component] = attr_paths + +# Only select components which have any dependency +#build_inputs = {k: v for k, v in build_inputs.items() if len(v) > 0} + +with open(os.path.dirname(sys.argv[0]) + '/component-packages.nix', 'w') as f: + f.write('# Generated from parse-requirements.py\n') + f.write('# Do not edit!\n\n') + f.write('{\n') + f.write(' version = "{}";\n'.format(version)) + f.write(' components = {\n') + for component, attr_paths in build_inputs.items(): + f.write(' "{}" = ps: with ps; [ '.format(component)) + f.write(' '.join(attr_paths)) + f.write(' ];\n') + f.write(' };\n') + f.write('}\n') From b7b4f7bdbd8351362c89ee3d4894f42651cbcd7a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 2 Feb 2018 10:23:29 +0100 Subject: [PATCH 264/797] tasknc: update (0.8 -> 2017-05-15), fix, cleanup and man pages --- pkgs/applications/misc/tasknc/default.nix | 58 ++++++++++------------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 1b3ca7dfc03..0deda8ce35a 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,48 +1,42 @@ -{ stdenv, fetchurl, taskwarrior, perl, ncurses }: +{ stdenv, fetchFromGitHub, makeWrapper, perl, ncurses, taskwarrior }: stdenv.mkDerivation rec { - version = "0.8"; + version = "2017-05-15"; name = "tasknc-${version}"; - src = fetchurl { - url = "https://github.com/mjheagle8/tasknc/archive/v${version}.tar.gz"; - sha256 = "0max5schga9hmf3vfqk2ic91dr6raxglyyjcqchzla280kxn5c28"; + src = fetchFromGitHub { + owner = "lharding"; + repo = "tasknc"; + rev = "c41d0240e9b848e432f01de735f28de93b934ae7"; + sha256 = "0f7l7fy06p33vw6f6sjnjxfhw951664pmwhjl573jvmh6gi2h1yr"; }; + nativeBuildInputs = [ + makeWrapper + perl # For generating the man pages with pod2man + ]; + + buildInputs = [ ncurses ]; + hardeningDisable = [ "format" ]; - # - # I know this is ugly, but the Makefile does strange things in this package, - # so we have to: - # - # 1. Remove the "doc" task dependency from the "all" target - # 2. Remove the "tasknc.1" task dependency from the "install" target - # 3. Remove the installing of the tasknc.1 file from the install target as - # we just removed the build target for it. - # - # TODO : One could also provide a patch for the doc/manual.pod file so it - # actually builds, but I'm not familiar with this, so this is the faster - # approach for me. We have no manpage, though. - # - preConfigure = '' - sed -i -r 's,(all)(.*)doc,\1\2,' Makefile - sed -i -r 's,(install)(.*)tasknc\.1,\1\2,' Makefile - sed -i -r 's,install\ -D\ -m644\ tasknc\.1\ (.*),,' Makefile - ''; + buildFlags = [ "VERSION=${version}" ]; installPhase = '' - mkdir $out/bin/ -p - mkdir $out/share/man1 -p - mkdir $out/share/tasknc -p - DESTDIR=$out PREFIX= MANPREFIX=share make install + mkdir -p $out/bin/ + mkdir -p $out/share/man/man1 + mkdir -p $out/share/tasknc + + DESTDIR=$out PREFIX= MANPREFIX=/share/man make install + + wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior}/bin ''; - buildInputs = [ taskwarrior perl ncurses ]; - meta = { - homepage = https://github.com/mjheagle8/tasknc; + meta = with stdenv.lib; { + homepage = https://github.com/lharding/tasknc; description = "A ncurses wrapper around taskwarrior"; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = stdenv.lib.platforms.linux; # Cannot test others + maintainers = with maintainers; [ matthiasbeyer infinisil ]; + platforms = platforms.linux; # Cannot test others }; } From 81334e531e689dce1e15f61ec5d8643b73666d3e Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Fri, 2 Feb 2018 10:56:22 +0100 Subject: [PATCH 265/797] vim-elixir: 2017-10-20 -> 2018-02-01 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index c772f4173ce..d041d6de4f6 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -777,11 +777,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2017-10-20"; + name = "vim-elixir-2018-02-01"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "3066d5fb5e1c694e607b2bb5d8277266ca524262"; - sha256 = "1j5sic3rssh2kaj73lv4m5sck3irn1jzgkpdr5qw7qi0gyfgpg81"; + rev = "8ca41c1f02208dd5ca68c7bcb6c71b3b92f46af6"; + sha256 = "0dp9cqflbwc3h1hzgn9fyaxhcn6q9bclgfy9kkgywp8zk5kwzb7p"; }; dependencies = []; From 35b8a406bb3ee1b344018849e22b5b56f00d31b7 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 2 Feb 2018 22:04:16 +1100 Subject: [PATCH 266/797] librarian-puppet-go: init at 0.3.9 --- .../tools/librarian-puppet-go/default.nix | 25 +++++++++++++++++++ .../tools/librarian-puppet-go/deps.nix | 12 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/librarian-puppet-go/default.nix create mode 100644 pkgs/development/tools/librarian-puppet-go/deps.nix diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix new file mode 100644 index 00000000000..1e2a421a670 --- /dev/null +++ b/pkgs/development/tools/librarian-puppet-go/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "librarian-puppet-go-${version}"; + version = "0.3.9"; + + goPackagePath = "github.com/tmtk75/librarian-puppet-go"; + + src = fetchFromGitHub { + owner = "tmtk75"; + repo = "librarian-puppet-go"; + rev = "v${version}"; + sha256 = "19x2hz3b8xkhy2nkyjg6s4qvs55mh84fvjwp157a86dmxwkdf45y"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + inherit (src.meta) homepage; + description = "librarian-puppet implementation in go."; + license = licenses.unfree; # still unspecified https://github.com/tmtk75/librarian-puppet-go/issues/5 + maintainers = with maintainers; [ womfoo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/librarian-puppet-go/deps.nix b/pkgs/development/tools/librarian-puppet-go/deps.nix new file mode 100644 index 00000000000..e5729707d8a --- /dev/null +++ b/pkgs/development/tools/librarian-puppet-go/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/jawher/mow.cli"; + fetch = { + type = "git"; + url = "https://github.com/jawher/mow.cli"; + rev = "3ff64ca21987cfa628bd8d1865162b7ccd6107d7"; + sha256 = "0vws79q4x3c9kjdsin3vw5200sinkxag3bfa0n9k69svsb222bij"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index defd9e93d10..483bd9e0bc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7414,6 +7414,8 @@ with pkgs; libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; + librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; + libstdcxx5 = callPackage ../development/libraries/libstdc++5 { }; libsigrok = callPackage ../development/tools/libsigrok { }; From 64e4c98a7f3a04d9d52a9d477dafc9fe2cc9798c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 2 Feb 2018 06:30:09 -0600 Subject: [PATCH 267/797] llvm-5: add extra 'python' output for opt-viewer tool --- pkgs/development/compilers/llvm/5/llvm.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 1f55e6c54e7..1067fa886bc 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation (rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; - outputs = [ "out" ] + outputs = [ "out" "python" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; nativeBuildInputs = [ cmake python ] @@ -120,7 +120,11 @@ in stdenv.mkDerivation (rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ''; - postInstall = stdenv.lib.optionalString enableSharedLibraries '' + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + '' + + stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ From b2cf8cff7d434e7979a6a70a3fec43dbecb27335 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Thu, 1 Feb 2018 13:36:44 +0100 Subject: [PATCH 268/797] udocker: init at 1.1.1 --- pkgs/tools/virtualization/udocker/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/virtualization/udocker/default.nix diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix new file mode 100644 index 00000000000..cad6b986617 --- /dev/null +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: + +buildPythonApplication rec { + + version = "1.1.1"; + pname = "udocker"; + + src = fetchFromGitHub rec { + owner = "indigo-dc"; + repo = "udocker" ; + rev = "v${version}"; + sha256 = "134xk7rfj0xki9znryk5qf1nsfa318ahrrsi1k6ia7kipp7i3hb4"; + }; + + buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils nose mock ]; + + postPatch = '' + substituteInPlace udocker.py --replace /usr/sbin:/sbin:/usr/bin:/bin $PATH + substituteInPlace udocker.py --replace /bin/chmod ${coreutils}/bin/chmod + substituteInPlace udocker.py --replace /bin/rm ${coreutils}/bin/rm + substituteInPlace tests/unit_tests.py --replace /bin/rm ${coreutils}/bin/rm + substituteInPlace udocker.py --replace "autoinstall = True" "autoinstall = False" + ''; + + checkPhase = '' + NOSE_EXCLUDE=test_03_create_repo,test_04_is_repo,test_02__get_group_from_host nosetests -v tests/unit_tests.py + ''; + + meta = with stdenv.lib; { + description = "basic user tool to execute simple docker containers in user space without root privileges"; + homepage = https://www.gitbook.com/book/indigo-dc/udocker; + license = licenses.asl20; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d89ab305966..7042a9ed3d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17453,6 +17453,8 @@ with pkgs; testssl = callPackage ../applications/networking/testssl { }; umurmur = callPackage ../applications/networking/umurmur { }; + + udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; unigine-valley = callPackage ../applications/graphics/unigine-valley { }; From cfd22b733bc4c4d6486e179b45b671b25b546778 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 2 Feb 2018 14:00:01 +0100 Subject: [PATCH 269/797] physlock: add allowAnyUser option --- nixos/modules/services/security/physlock.nix | 60 +++++++++++++------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 30224d7fc6b..97fbd6aae6e 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -30,6 +30,20 @@ in ''; }; + allowAnyUser = mkOption { + type = types.bool; + default = false; + description = '' + Whether to allow any user to lock the screen. This will install a + setuid wrapper to allow any user to start physlock as root, which + is a minor security risk. Call the physlock binary to use this instead + of using the systemd service. + + Note that you might need to relog to have the correct binary in your + PATH upon changing this option. + ''; + }; + disableSysRq = mkOption { type = types.bool; default = true; @@ -79,28 +93,36 @@ in ###### implementation - config = mkIf cfg.enable { + config = mkIf cfg.enable (mkMerge [ + { - # for physlock -l and physlock -L - environment.systemPackages = [ pkgs.physlock ]; + # for physlock -l and physlock -L + environment.systemPackages = [ pkgs.physlock ]; - systemd.services."physlock" = { - enable = true; - description = "Physlock"; - wantedBy = optional cfg.lockOn.suspend "suspend.target" - ++ optional cfg.lockOn.hibernate "hibernate.target" - ++ cfg.lockOn.extraTargets; - before = optional cfg.lockOn.suspend "systemd-suspend.service" - ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" - ++ cfg.lockOn.extraTargets; - serviceConfig.Type = "forking"; - script = '' - ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"} - ''; - }; + systemd.services."physlock" = { + enable = true; + description = "Physlock"; + wantedBy = optional cfg.lockOn.suspend "suspend.target" + ++ optional cfg.lockOn.hibernate "hibernate.target" + ++ cfg.lockOn.extraTargets; + before = optional cfg.lockOn.suspend "systemd-suspend.service" + ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" + ++ cfg.lockOn.extraTargets; + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}"; + }; + }; - security.pam.services.physlock = {}; + security.pam.services.physlock = {}; - }; + } + + (mkIf cfg.allowAnyUser { + + security.wrappers.physlock = { source = "${pkgs.physlock}/bin/physlock"; user = "root"; }; + + }) + ]); } From bbfca0f371d8c41009e812f3e50e5b93eb457cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 1 Feb 2018 17:15:28 +0100 Subject: [PATCH 270/797] knot-resolver: 1.5.3 -> 2.0.0 (feature update) Also split extraFeatures into a wrapper derivation. So far, no changes like user renaming nor systemd unit rework. --- nixos/modules/services/networking/kresd.nix | 6 +- pkgs/servers/dns/knot-resolver/default.nix | 71 ++++++++++++--------- 2 files changed, 44 insertions(+), 33 deletions(-) diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 011a9b2f58e..d0c19c4ecb7 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -43,7 +43,7 @@ in type = with types; listOf str; default = [ "::1" "127.0.0.1" ]; description = '' - What addresses the server should listen on. + What addresses the server should listen on. (UDP+TCP 53) ''; }; # TODO: perhaps options for more common stuff like cache size or forwarding @@ -99,9 +99,9 @@ in Restart = "on-failure"; }; + # Trust anchor goes from dns-root-data by default. script = '' - exec '${package}/bin/kresd' --config '${configFile}' \ - -k '${pkgs.dns-root-data}/root.key' + exec '${package}/bin/kresd' --config '${configFile}' --forks=1 ''; requires = [ "kresd.socket" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 7a5aa8da550..2ec12b81f84 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,63 +1,55 @@ -{ stdenv, fetchurl, pkgconfig, hexdump, which +{ stdenv, fetchurl, runCommand, pkgconfig, hexdump, which , knot-dns, luajit, libuv, lmdb, gnutls, nettle , cmocka, systemd, dns-root-data, makeWrapper , extraFeatures ? false /* catch-all if defaults aren't enough */ , hiredis, libmemcached, luajitPackages }: +let # un-indented, over the whole file -let - inherit (stdenv.lib) optional optionals optionalString; -in -stdenv.mkDerivation rec { +result = if extraFeatures then wrapped-full else unwrapped; + +inherit (stdenv.lib) optional optionals optionalString concatStringsSep; + +unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.5.3"; + version = "2.0.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "03sb05zz6qn966apcprdqhmirkz7kjdbx8hswbvgamk1s2xd7v6f"; + sha256 = "b40d9dbef05031464dfff57712f476e7cddc0fda26b41daf660c5a33ea203ce0"; }; outputs = [ "out" "dev" ]; configurePhase = ":"; - nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ]; + nativeBuildInputs = [ pkgconfig which hexdump ]; # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns luajit libuv gnutls nettle lmdb ] - ++ optional doInstallCheck cmocka + ++ optional doCheck cmocka ++ optional stdenv.isLinux systemd # sd_notify - ++ optionals extraFeatures [ - hiredis libmemcached # additional cache backends - ]; - ## optional dependencies; TODO: libedit, dnstap, http2 module? + ## optional dependencies; TODO: libedit, dnstap + ; - makeFlags = [ "PREFIX=$(out)" "ROOTHINTS=${dns-root-data}/root.hints" ]; + makeFlags = [ + "PREFIX=$(out)" + "ROOTHINTS=${dns-root-data}/root.hints" + "KEYFILE_DEFAULT=${dns-root-data}/root.ds" + ]; CFLAGS = [ "-O2" "-DNDEBUG" ]; enableParallelBuilding = true; doCheck = true; - doInstallCheck = true; + doInstallCheck = false; # FIXME preInstallCheck = '' patchShebangs tests/config/runtest.sh ''; postInstall = '' - rm "$out"/etc/kresd/root.hints # using system-wide instead - '' - # optional: to allow auto-bootstrapping root trust anchor via https - + (with luajitPackages; '' - wrapProgram "$out/sbin/kresd" \ - --set LUA_PATH '${ - stdenv.lib.concatStringsSep ";" - (map getLuaPath [ luasec luasocket ]) - }' \ - --set LUA_CPATH '${ - stdenv.lib.concatStringsSep ";" - (map getLuaCPath [ luasec luasocket ]) - }' - ''); + rm "$out"/etc/knot-resolver/root.hints # using system-wide instead + ''; meta = with stdenv.lib; { description = "Caching validating DNS resolver, from .cz domain registry"; @@ -67,5 +59,24 @@ stdenv.mkDerivation rec { platforms = filter (p: p != "aarch64-linux") platforms.unix; maintainers = [ maintainers.vcunat /* upstream developer */ ]; }; -} +}; + +wrapped-full = with luajitPackages; let + luaPkgs = [ luasec luasocket ]; # TODO: cqueues and others for http2 module + in runCommand unwrapped.name + { + nativeBuildInputs = [ makeWrapper ]; + preferLocalBuild = true; + allowSubstitutes = false; + } + '' + mkdir -p "$out/sbin" "$out/share" + makeWrapper '${unwrapped}/sbin/kresd' "$out"/sbin/kresd \ + --set LUA_PATH '${concatStringsSep ";" (map getLuaPath luaPkgs)}' \ + --set LUA_CPATH '${concatStringsSep ";" (map getLuaCPath luaPkgs)}' + ln -sr '${unwrapped}/share/man' "$out"/share/ + ln -sr "$out"/{sbin,bin} + ''; + +in result From b31642ac72440a53ce510fa08c4cbe8061877a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 2 Feb 2018 13:15:20 +0100 Subject: [PATCH 271/797] knot-dns: 2.6.3 -> 2.6.4 (bugfix) --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index d3fffe12da4..478fcb9aad7 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2fb27a4006865fc12873cbadc5b4a870ec65d3293a284972c031522282987790"; + sha256 = "1d0d37b5047ecd554d927519d5565c29c1ba9b501c100eb5f3a5af184d75386a"; }; outputs = [ "bin" "out" "dev" ]; From f8c59e083ab2f70457c0b4f2086100d916a60c77 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Feb 2018 13:21:02 +0100 Subject: [PATCH 272/797] gnome3.gexiv2: re-enable bindings After effa9e40457e801577b672dadbcc169fd1ad20a3, which switched to Meson, the Vala bindings were not built which broke Shotwell. Enabling Vala was not enough due to a bug, though, so we have to patch it. --- pkgs/desktops/gnome-3/misc/gexiv2/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix index 41040db72ce..852ed00ed90 100644 --- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobjectIntrospection, vala }: let majorVersion = "0.10"; @@ -13,18 +13,23 @@ stdenv.mkDerivation rec { }; patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=791941 + # Darwin compatibility (https://bugzilla.gnome.org/show_bug.cgi?id=791941) (fetchurl { url = https://bugzilla.gnome.org/attachment.cgi?id=365969; sha256 = "06w744acgnz3hym7sm8c245yzlg05ldkmwgiz3yz4pp6h72brizj"; }) + # GIR & Vala bindings fix (https://bugzilla.gnome.org/show_bug.cgi?id=792431) + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=366662; + sha256 = "1ljb2pap5v9z3zhx69ghfyrbl2b62ck35nyn7h5h410d008lcb4v"; + }) ]; preConfigure = '' patchShebangs . ''; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ]; buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; From b403a17db8cc54ef69d11cb9965c4db69148bd08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Feb 2018 14:54:23 +0100 Subject: [PATCH 273/797] pythonPackages.idna-ssl: init at 1.0.0 --- .../python-modules/idna-ssl/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/idna-ssl/default.nix diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix new file mode 100644 index 00000000000..177e68f6295 --- /dev/null +++ b/pkgs/development/python-modules/idna-ssl/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, idna }: + +buildPythonPackage rec { + pname = "idna_ssl"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1227e44039bd31e02adaeafdbba61281596d623d222643fb021f87f2144ea147"; + }; + + propagatedBuildInputs = [ idna ]; + + # Infinite recursion: tests require aiohttp, aiohttp requires idna-ssl + doCheck = false; + + meta = with lib; { + description = "Patch ssl.match_hostname for Unicode(idna) domains support"; + homepage = https://github.com/aio-libs/idna-ssl; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a279d96591..0876a2d7cf8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5215,6 +5215,8 @@ in { }; }; + idna-ssl = callPackage ../development/python-modules/idna-ssl/default.nix { }; + ijson = callPackage ../development/python-modules/ijson/default.nix {}; imagesize = buildPythonPackage rec { From 7f531568594db46bcd6cfb079a877951eb61e410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Feb 2018 15:13:31 +0100 Subject: [PATCH 274/797] pythonPackages.aiohttp: 2.3.9 -> 2.3.10 and enable tests --- .../python-modules/aiohttp/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 17737c33986..bea839f49e3 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -6,30 +6,33 @@ , multidict , async-timeout , yarl +, idna-ssl , pytest , gunicorn , pytest-raisesregexp +, pytest-mock }: buildPythonPackage rec { pname = "aiohttp"; - version = "2.3.9"; + version = "2.3.10"; src = fetchPypi { inherit pname version; - sha256 = "6003bed78dc591d31bd89ef16e630a1c4fd97a3cd17b975ec945c0f46d6fc881"; + sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; }; disabled = pythonOlder "3.4"; - doCheck = false; # Too many tests fail. + checkInputs = [ pytest gunicorn pytest-raisesregexp pytest-mock ]; - checkInputs = [ pytest gunicorn pytest-raisesregexp ]; - propagatedBuildInputs = [ async-timeout chardet multidict yarl ]; + propagatedBuildInputs = [ async-timeout chardet multidict yarl ] + ++ lib.optional (pythonOlder "3.7") idna-ssl; - meta = { - description = "Http client/server for asyncio"; - license = with lib.licenses; [ asl20 ]; + meta = with lib; { + description = "Asynchronous HTTP Client/Server for Python and asyncio"; + license = licenses.asl20; homepage = https://github.com/KeepSafe/aiohttp/; + maintainers = with maintainers; [ dotlambda ]; }; } From cb8eb4d1b2c6d2fb71c1a21ab48dfbc9e7590179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Feb 2018 15:44:44 +0100 Subject: [PATCH 275/797] pythonPackages.pytest-aiohttp: disable tests --- pkgs/development/python-modules/pytest-aiohttp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index afdc085aa9f..7f707ebc46b 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -11,6 +11,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest aiohttp ]; + # There are no tests + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/aio-libs/pytest-aiohttp/; description = "Pytest plugin for aiohttp support"; From d0ebdbd3085973daf45185a226ce9072092862c1 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Wed, 24 Jan 2018 18:32:33 +0100 Subject: [PATCH 276/797] nixos/openafsServer: OpenAFS server nixos module --- nixos/modules/module-list.nix | 1 + .../network-filesystems/openafs/server.nix | 260 ++++++++++++++++++ 2 files changed, 261 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/openafs/server.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f23b5873b52..3c55952b0b2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -416,6 +416,7 @@ ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix ./services/network-filesystems/openafs/client.nix + ./services/network-filesystems/openafs/server.nix ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba.nix ./services/network-filesystems/tahoe.nix diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix new file mode 100644 index 00000000000..429eb945ac9 --- /dev/null +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -0,0 +1,260 @@ +{ config, pkgs, lib, ... }: + +with import ./lib.nix { inherit lib; }; + +let + inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types; + + bosConfig = pkgs.writeText "BosConfig" ('' + restrictmode 1 + restarttime 16 0 0 0 0 + checkbintime 3 0 5 0 0 + '' + (optionalString cfg.roles.database.enable '' + bnode simple vlserver 1 + parm ${openafsBin}/libexec/openafs/vlserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.vlserverArgs} + end + bnode simple ptserver 1 + parm ${openafsBin}/libexec/openafs/ptserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} ${cfg.roles.database.ptserverArgs} + end + '') + (optionalString cfg.roles.fileserver.enable '' + bnode dafs dafs 1 + parm ${openafsBin}/libexec/openafs/dafileserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.fileserverArgs} + parm ${openafsBin}/libexec/openafs/davolserver ${optionalString cfg.dottedPrincipals "-allow-dotted-principals"} -udpsize ${udpSizeStr} ${cfg.roles.fileserver.volserverArgs} + parm ${openafsBin}/libexec/openafs/salvageserver ${cfg.roles.fileserver.salvageserverArgs} + parm ${openafsBin}/libexec/openafs/dasalvager ${cfg.roles.fileserver.salvagerArgs} + end + '') + (optionalString (cfg.roles.database.enable && cfg.roles.backup.enable) '' + bnode simple buserver 1 + parm ${openafsBin}/libexec/openafs/buserver ${cfg.roles.backup.buserverArgs} ${optionalString (cfg.roles.backup.cellServDB != []) "-cellservdb /etc/openafs/backup/"} + end + '')); + + netInfo = if (cfg.advertisedAddresses != []) then + pkgs.writeText "NetInfo" ((concatStringsSep "\nf " cfg.advertisedAddresses) + "\n") + else null; + + buCellServDB = pkgs.writeText "backup-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.roles.backup.cellServDB); + + cfg = config.services.openafsServer; + + udpSizeStr = toString cfg.udpPacketSize; + + openafsBin = lib.getBin pkgs.openafs; + +in { + + options = { + + services.openafsServer = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable the OpenAFS server. An OpenAFS server needs a + complex setup. So, be aware that enabling this service and setting + some options does not give you a turn-key-ready solution. You need + at least a running Kerberos 5 setup, as OpenAFS relies on it for + authentication. See the Guide "QuickStartUnix" coming with + pkgs.openafs.doc for complete setup + instructions. + ''; + }; + + advertisedAddresses = mkOption { + default = []; + description = "List of IP addresses this server is advertised under. See NetInfo(5)"; + }; + + cellName = mkOption { + default = ""; + type = types.str; + description = "Cell name, this server will serve."; + example = "grand.central.org"; + }; + + cellServDB = mkOption { + default = []; + type = with types; listOf (submodule [ { options = cellServDBConfig;} ]); + description = "Definition of all cell-local database server machines."; + }; + + roles = { + fileserver = { + enable = mkOption { + default = true; + type = types.bool; + description = "Fileserver role, serves files and volumes from its local storage."; + }; + + fileserverArgs = mkOption { + default = "-vattachpar 128 -vhashsize 11 -L -rxpck 400 -cb 1000000"; + type = types.str; + description = "Arguments to the dafileserver process. See its man page."; + }; + + volserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the davolserver process. See its man page."; + example = "-sync never"; + }; + + salvageserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the salvageserver process. See its man page."; + example = "-showlog"; + }; + + salvagerArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the dasalvager process. See its man page."; + example = "-showlog -showmounts"; + }; + }; + + database = { + enable = mkOption { + default = true; + type = types.bool; + description = '' + Database server role, maintains the Volume Location Database, + Protection Database (and Backup Database, see + backup role). There can be multiple + servers in the database role for replication, which then need + reliable network connection to each other. + + Servers in this role appear in AFSDB DNS records or the + CellServDB. + ''; + }; + + vlserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the vlserver process. See its man page."; + example = "-rxbind"; + }; + + ptserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the ptserver process. See its man page."; + example = "-restricted -default_access S---- S-M---"; + }; + }; + + backup = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Backup server role. Use in conjunction with the + database role to maintain the Backup + Database. Normally only used in conjunction with tape storage + or IBM's Tivoli Storage Manager. + ''; + }; + + buserverArgs = mkOption { + default = ""; + type = types.str; + description = "Arguments to the buserver process. See its man page."; + example = "-p 8"; + }; + + cellServDB = mkOption { + default = []; + type = with types; listOf (submodule [ { options = cellServDBConfig;} ]); + description = '' + Definition of all cell-local backup database server machines. + Use this when your cell uses less backup database servers than + other database server machines. + ''; + }; + }; + }; + + dottedPrincipals= mkOption { + default = false; + type = types.bool; + description = '' + If enabled, allow principal names containing (.) dots. Enabling + this has security implications! + ''; + }; + + udpPacketSize = mkOption { + default = 1310720; + type = types.int; + description = '' + UDP packet size to use in Bytes. Higher values can speed up + communications. The default of 1 MB is a sufficient in most + cases. Make sure to increase the kernel's UDP buffer size + accordingly via net.core(w|r|opt)mem_max + sysctl. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.cellServDB != []; + message = "You must specify all cell-local database servers in config.services.openafsServer.cellServDB."; + } + { assertion = cfg.cellName != ""; + message = "You must specify the local cell name in config.services.openafsServer.cellName."; + } + ]; + + environment.systemPackages = [ pkgs.openafs ]; + + environment.etc = { + bosConfig = { + source = bosConfig; + target = "openafs/BosConfig"; + mode = "0644"; + }; + cellServDB = { + text = mkCellServDB cfg.cellName cfg.cellServDB; + target = "openafs/server/CellServDB"; + mode = "0644"; + }; + thisCell = { + text = cfg.cellName; + target = "openafs/server/ThisCell"; + mode = "0644"; + }; + buCellServDB = { + enable = (cfg.roles.backup.cellServDB != []); + text = mkCellServDB cfg.cellName cfg.roles.backup.cellServDB; + target = "openafs/backup/CellServDB"; + }; + }; + + systemd.services = { + openafs-server = { + description = "OpenAFS server"; + after = [ "syslog.target" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartIfChanged = false; + unitConfig.ConditionPathExists = [ "/etc/openafs/server/rxkad.keytab" ]; + preStart = '' + mkdir -m 0755 -p /var/openafs + ${optionalString (netInfo != null) "cp ${netInfo} /var/openafs/netInfo"} + ${optionalString (cfg.roles.backup.cellServDB != []) "cp ${buCellServDB}"} + ''; + serviceConfig = { + ExecStart = "${openafsBin}/bin/bosserver -nofork"; + ExecStop = "${openafsBin}/bin/bos shutdown localhost -wait -localauth"; + }; + }; + }; + }; +} From 0bfa9a9dc2ec99ae4f29c2174a7be43938032d31 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 2 Feb 2018 18:15:12 +0200 Subject: [PATCH 277/797] ethtool: 4.13 -> 4.15 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 85672619d61..2527c34feeb 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "4.13"; + version = "4.15"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "1flwz4x76ajxigadq9knxgwr778g03y3qfx6c7rflc3x020a7hdp"; + sha256 = "06pr3s7wg2pbvfbf7js61bgh3caff4qf50nqqk3cgz9z90rgvxvi"; }; meta = with stdenv.lib; { From 9a8306457e73d8aa66c5b981acedab12603152c4 Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Fri, 2 Feb 2018 11:16:36 -0500 Subject: [PATCH 278/797] src: 1.13 -> 1.17 --- pkgs/applications/version-management/src/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index e75223c6c36..2bde0a68480 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "src-${version}"; - version = "1.13"; + version = "1.17"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "0l13ld8nxm1c720ns22lyx3q1bq2c2zn78vi5w92b7nl6p2nncy8"; + sha256 = "17885hpq8nxhqzwl50nrgdk1q9dq4cxjxldgkk8shdf08s5hcqhk"; }; buildInputs = [ python rcs git makeWrapper ]; From 8a1069bdcb32a0e3fb33da1b795971226d3fd179 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 2 Feb 2018 10:24:18 -0600 Subject: [PATCH 279/797] fastjet: Fix build w/clang5 https://hydra.nixos.org/build/68588849/nixlog/1 libtool: compile: clang++ -DHAVE_CONFIG_H -I. -I../../include/fastjet -O2 -Wall -g -Woverloaded-virtual -DDROP_CGAL -I. -I./siscone -I./../../include -I./siscone -c SISConeBasePlugin.cc -fno-common -DPIC -o .libs/libSISConePlugin_la-SISConeBasePlugin.o SISConeBasePlugin.cc:12:12: error: no matching member function for call to 'structure_of' return a.structure_of().ordering_var2() ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./../../include/fastjet/PseudoJet.hh:1012:60: note: candidate template ignored: substitution failure [with TransformerType = fastjet::SISConeBasePlugin::UserScaleBase::StructureType]: ISO C++ specifies that qualified reference to 'StructureType' is a constructor name rather than a type in this context, despite preceding 'typename' keyword const typename TransformerType::StructureType & PseudoJet::structure_of() const{ ~~~~~~~~ ^ --- pkgs/development/libraries/physics/fastjet/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 780dcc3770f..0ee68415b89 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ python2 ]; + postPatch = '' + substituteInPlace plugins/SISCone/SISConeBasePlugin.cc \ + --replace 'structure_of()' \ + 'structure_of()' + ''; + configureFlags = [ "--enable-allcxxplugins" "--enable-pyext" From 2a09b4275c353bde6ee72d126cd0e99834dcf66e Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 2 Feb 2018 17:44:08 +0100 Subject: [PATCH 280/797] nixos/tests/make-test.nix: Fix eval error Regression introduced by 943592f69850fd07dd2422da062b1c1ebc45974d. The lib attribute isn't in scope here, so we need to use pkgs.lib instead for isFunction. Signed-off-by: aszlig Cc: @shlevy --- nixos/tests/make-test.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix index 1b571a008e0..ee4ba310ad5 100644 --- a/nixos/tests/make-test.nix +++ b/nixos/tests/make-test.nix @@ -2,4 +2,4 @@ f: { system ? builtins.currentSystem, ... } @ args: with import ../lib/testing.nix { inherit system; }; -makeTest (if lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) +makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) From 33e744a5b4cbc8efdd3da870d3fab47c06d49227 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 2 Feb 2018 18:18:04 +0200 Subject: [PATCH 281/797] gdb: 8.0.1 -> 8.1 --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index d1148ad48d8..e068b908caf 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -18,7 +18,7 @@ let basename = "gdb-${version}"; - version = "8.0.1"; + version = "8.1"; in assert targetPlatform.isHurd -> mig != null && hurd != null; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "1qwmcbaxf0jc7yjl0fimgcfj2yqcrl6h7azgs1d838kbwf9mzg9x"; + sha256 = "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg"; }; patches = [ ./debug-info-from-env.patch ]; From 05889c52b9cc857ca7f1a286f40b9c9fcb8fe874 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Fri, 2 Feb 2018 02:24:19 +0100 Subject: [PATCH 282/797] RAxML: init at 8.2.11 (SSE3 & MPI) This can potentially be extended to cover all the other compilation targets. SSE3-PTHREADS and MPI being the most commonly used. --- .../science/biology/raxml/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/science/biology/raxml/default.nix diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix new file mode 100644 index 00000000000..0bac6c77804 --- /dev/null +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, zlib +, pkgs +, mpi ? false +}: + +stdenv.mkDerivation rec { + pname = "RAxML"; + version = "8.2.11"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "stamatak"; + repo = "standard-${pname}"; + rev = "v${version}"; + sha256 = "08fmqrr7y5a2fmmrgfz2p0hmn4mn71l5yspxfcwwsqbw6vmdfkhg"; + }; + + buildInputs = if mpi then [ pkgs.openmpi ] else []; + + # TODO darwin, AVX and AVX2 makefile targets + buildPhase = if mpi then '' + make -f Makefile.MPI.gcc + '' else '' + make -f Makefile.SSE3.PTHREADS.gcc + ''; + + installPhase = if mpi then '' + mkdir -p $out/bin && cp raxmlHPC-MPI $out/bin + '' else '' + mkdir -p $out/bin && cp raxmlHPC-PTHREADS-SSE3 $out/bin + ''; + + meta = with stdenv.lib; { + description = "A tool for Phylogenetic Analysis and Post-Analysis of Large Phylogenies"; + license = licenses.gpl3; + homepage = https://sco.h-its.org/exelixis/web/software/raxml/; + maintainers = [ maintainers.unode ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c5943c5438..cd2c2da4f65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19044,6 +19044,12 @@ with pkgs; plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; + raxml = callPackage ../applications/science/biology/raxml { }; + + raxml-mpi = appendToName "mpi" (raxml.override { + mpi = true; + }); + samtools = callPackage ../applications/science/biology/samtools/default.nix { }; snpeff = callPackage ../applications/science/biology/snpeff/default.nix { }; From d198355ac65b9182b5a3f9b0ff94a28a4193aea5 Mon Sep 17 00:00:00 2001 From: jammerful Date: Fri, 2 Feb 2018 13:06:53 -0500 Subject: [PATCH 283/797] audiofile: Update Patch File Location Debian moved git servers. --- pkgs/development/libraries/audiofile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 80aae344dcd..182471acf4a 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -5,7 +5,7 @@ let fetchDebianPatch = { name, debname, sha256 }: fetchpatch { inherit sha256 name; - url = "https://anonscm.debian.org/cgit/pkg-multimedia/audiofile.git/plain/debian/patches/${debname}?h=debian/0.3.6-4"; + url = "https://salsa.debian.org/multimedia-team/audiofile/raw/debian/0.3.6-4/debian/patches/${debname}"; }; in From d8ba530e64da97cf6f4ff9a01d8d9173cafc0bcb Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 2 Feb 2018 11:20:12 -0600 Subject: [PATCH 284/797] nvidia-x11: stable 387.34 -> 390.25 390.x is Nvidia's latest "Long Lived Branch version" according to https://www.nvidia.com/object/unix.html so this upgrades the stable version from 387.xx. 390.x also also has support for kernel 4.15 and later (due to removal of the old init_timer APIs, among other things), meaning that linuxPackages_4_15.nvidia_x11 now builds correctly. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 22d415213c4..a4d1629a684 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -17,11 +17,11 @@ in { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "387.34"; - sha256_32bit = "1haqk5h1fcmwp7kn9644k280wn409kh0xbivrj1ks8r8f4nbvfmq"; - sha256_64bit = "06w8dw6hb40ymz6ax7v82j29ihmp3d7yxsi8ah9ch10jldl973z4"; - settingsSha256 = "0dpm22ggpr93ypz24ap9vgx43ik7lw6cxcb29v8ys2iinhs7zm7s"; - persistencedSha256 = "02lf9b6j85amc1vr84lj98q74a680nrx4fmpxj17cz597yq8s200"; + version = "390.25"; + sha256_32bit = "0fkbpx01l46pprrd4nlc2y6hfmkb55ddlwm1r84kr6j08qmmb0qi"; + sha256_64bit = "0whsls1mm6vkll5qmxnyz8vjgspp1rmqpsampgi83k62n514c08r"; + settingsSha256 = "1jhbr68z36s3fr9vx3ga2f6yrzlwpc0j5mw8h12g65p7wdsbk6y7"; + persistencedSha256 = "033azbhi50f1b0lw759sncgf7ckh2m2c0khj5v15sch9kl1fzk8i"; }; beta = generic { From d834ae3cbbda522d7e7fe2975262ecc8068e738a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= Date: Fri, 2 Feb 2018 19:16:39 +0100 Subject: [PATCH 285/797] pythonPackages.pwntools: fix build pypandoc is broken (it does not work properly with pandoc 2), so we remove the dependency as it was only used for generating PyPI docs. The patch will be included upstream in the next version, so it should be removed next time this package is updated. --- .../python-modules/pwntools/default.nix | 16 ++++++++++++---- .../python-modules/pypandoc/default.nix | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index b98930dfe59..0ed51d7acec 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -1,24 +1,32 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , Mako, packaging, pysocks, pygments, ROPGadget , capstone, paramiko, pip, psutil -, pyelftools, pypandoc, pyserial, dateutil -, requests, tox, pandoc, unicorn, intervaltree }: +, pyelftools, pyserial, dateutil +, requests, tox, unicorn, intervaltree, fetchpatch }: buildPythonPackage rec { version = "3.11.0"; pname = "pwntools"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; sha256 = "609b3f0ba47c975f4dbedd3da2af4c5ca1b3a2aa13fb99240531b6a68edb87be"; }; - propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ]; + propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pyserial dateutil requests tox unicorn intervaltree ]; disabled = isPy3k; doCheck = false; # no setuptools tests for the package + # Can be removed when 3.12.0 is released + patches = [ + (fetchpatch { + url = "https://github.com/Gallopsled/pwntools/pull/1098.patch"; + sha256 = "0p0h87npn1mwsd8ciab7lg74bk3ahlk5r0mjbvx4jhihl2gjc3z2"; + }) + ]; + + meta = with stdenv.lib; { homepage = "http://pwntools.com"; description = "CTF framework and exploit development library"; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 4c694319563..ba05da884d8 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Thin wrapper for pandoc"; homepage = https://github.com/bebraw/pypandoc; license = licenses.mit; - maintainers = with maintainers; [ bennofs kristoff3r ]; + maintainers = with maintainers; [ bennofs ]; }; } From 56253afe2ec08f1780ca544d92d28702f0facbc8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jan 2018 15:04:51 -0800 Subject: [PATCH 286/797] uhd: 3.10.2.0 -> 3.10.3.0 --- pkgs/development/tools/misc/uhd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 8212eccc6d1..8f7ef254cf8 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "uhd-${version}"; - version = "3.10.2.0"; + version = "3.10.3.0"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "release_003_010_002_000"; - sha256 = "0g6f4amw7h0vr6faa1nc1zs3bc645binza0zqqx5cwgfxybv8cfy"; + rev = "release_003_010_003_000"; + sha256 = "1aj8qizbyz4shwawj3qlhl6pyyda59hhgm9cwrj7s5kfdi4vdlc3"; }; enableParallelBuilding = true; From 67b0496e0b54d3e0f57a4de0c3658a59b996232e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 1 Feb 2018 11:43:40 -0800 Subject: [PATCH 287/797] uhd: uhd firmware 3.7.3->3.10.3, lock img version to host tools thanks to lukeadams for the patch --- pkgs/development/tools/misc/uhd/default.nix | 26 ++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 8f7ef254cf8..78195e994c9 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -7,17 +7,28 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" # SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" -stdenv.mkDerivation rec { - name = "uhd-${version}"; - version = "3.10.3.0"; +let + uhdVer = "003_010_003_000"; + ImgVer = stdenv.lib.replaceStrings ["_"] ["."] uhdVer; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... + version = "3.10.3.0"; + + # Firmware images are downloaded (pre-built) from: + # http://files.ettus.com/binaries/images/ + uhdImagesSrc = fetchurl { + url = "http://files.ettus.com/binaries/images/uhd-images_${ImgVer}-release.tar.gz"; + sha256 = "198awvw6zsh19ydgx5qry5yc6yahdval9wjrsqbyj51pnr6s5qvy"; + }; + +in stdenv.mkDerivation { + name = "uhd-${version}"; src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "release_003_010_003_000"; + rev = "release_${uhdVer}"; sha256 = "1aj8qizbyz4shwawj3qlhl6pyyda59hhgm9cwrj7s5kfdi4vdlc3"; }; @@ -31,13 +42,6 @@ stdenv.mkDerivation rec { # Build only the host software preConfigure = "cd host"; - # Firmware images are downloaded (pre-built) - uhdImagesName = "uhd-images_003.007.003-release"; - uhdImagesSrc = fetchurl { - url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz"; - sha256 = "1pv5c5902041494z0jfw623ca29pvylrw5klybbhklvn5wwlr6cv"; - }; - postPhases = [ "installFirmware" ]; installFirmware = '' From d251a4b40b0eeb96007ab2027e7499fde7c217b6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 2 Feb 2018 11:22:35 -0800 Subject: [PATCH 288/797] uhd: revert boost back standard version --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index defd9e93d10..d3933c3ecee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7971,9 +7971,7 @@ with pkgs; tweak = callPackage ../applications/editors/tweak { }; - uhd = callPackage ../development/tools/misc/uhd { - boost = boost165; - }; + uhd = callPackage ../development/tools/misc/uhd { }; uisp = callPackage ../development/tools/misc/uisp { }; From 65ea5f8857654d6edcb796fbadd42e39f832b666 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Fri, 2 Feb 2018 02:51:34 +0100 Subject: [PATCH 289/797] samtools_0_1_19: init at 0.1.19 samtools-1.5 already exists but some software requires the older version --- .../samtools/samtools-0.1.19-no-curses.patch | 22 ++++++++++++ .../biology/samtools/samtools_0_1_19.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 57 insertions(+) create mode 100644 pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch create mode 100644 pkgs/applications/science/biology/samtools/samtools_0_1_19.nix diff --git a/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch b/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch new file mode 100644 index 00000000000..a7782a1a026 --- /dev/null +++ b/pkgs/applications/science/biology/samtools/samtools-0.1.19-no-curses.patch @@ -0,0 +1,22 @@ +diff --git a/Makefile b/Makefile +index 2f51bfc..395d6f1 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + CC= gcc + CFLAGS= -g -Wall -O2 + #LDFLAGS= -Wl,-rpath,\$$ORIGIN/../lib +-DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE -D_CURSES_LIB=1 ++DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE # -D_CURSES_LIB=1 + KNETFILE_O= knetfile.o + LOBJS= bgzf.o kstring.o bam_aux.o bam.o bam_import.o sam.o bam_index.o \ + bam_pileup.o bam_lpileup.o bam_md.o razf.o faidx.o bedidx.o \ +@@ -15,7 +15,7 @@ PROG= samtools + INCLUDES= -I. + SUBDIRS= . bcftools misc + LIBPATH= +-LIBCURSES= -lcurses # -lXCurses ++LIBCURSES= # -lcurses # -lXCurses + + .SUFFIXES:.c .o + .PHONY: all lib diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix new file mode 100644 index 00000000000..a811bc4412f --- /dev/null +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "samtools"; + version = "0.1.19"; + + src = fetchurl { + url = "mirror://sourceforge/samtools/${name}.tar.bz2"; + sha256 = "d080c9d356e5f0ad334007e4461cbcee3c4ca97b8a7a5a48c44883cf9dee63d4"; + }; + + patches = [ + ./samtools-0.1.19-no-curses.patch + ]; + + buildInputs = [ zlib ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man + + cp samtools $out/bin + cp samtools.1 $out/share/man + ''; + + meta = with stdenv.lib; { + description = "Tools for manipulating SAM/BAM/CRAM format"; + license = licenses.mit; + homepage = http://samtools.sourceforge.net/; + platforms = platforms.unix; + maintainers = [ maintainers.unode ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c5943c5438..c7a105c879e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19045,6 +19045,7 @@ with pkgs; plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; samtools = callPackage ../applications/science/biology/samtools/default.nix { }; + samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix { }; snpeff = callPackage ../applications/science/biology/snpeff/default.nix { }; From 00cafb4c8d48641a7048d9652b70ec12234601a4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Feb 2018 21:50:12 +0100 Subject: [PATCH 290/797] scowl: support installing just words.txt The expression now supports having `words.txt` in some place without tens and tens of megabytes of all the wordlist and spelling dictionaries. Set `singleWordlist` parameter to the string of region and size settings. For example: ``` scowl.override{singleWordlist = "en-gb-ise 60";} ``` Should be useful for #34486 --- pkgs/data/misc/scowl/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 2769ed1a166..5e4d17bcc8f 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix}: +{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix, singleWordlist ? null}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "scowl"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$PWD/varcon" ''; - postBuild = '' + postBuild = stdenv.lib.optionalString (singleWordlist == null) '' ( cd scowl/speller make aspell @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - installPhase = '' + installPhase = if singleWordlist == null then '' eval "$preInstall" mkdir -p "$out/share/scowl" @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { fi echo $region $regcode $regcode_sz - for s in 10 20 30 35 40 50 55 60 70 80 90; do + for s in 10 20 30 35 40 50 55 60 70 80 90 95; do ./mk-list $regcode $s > "$out/share/dict/w$region.$s" ./mk-list --variants=1 $regcode_var $s > "$out/share/dict/w$region.variants.$s" ./mk-list --variants=2 $regcode_var $s > "$out/share/dict/w$region.acceptable.$s" @@ -88,6 +88,10 @@ stdenv.mkDerivation rec { ) eval "$postInstall" + '' else '' + mkdir -p "$out/share/dict" + cd scowl + ./mk-list ${singleWordlist} > "$out/share/dict/words.txt" ''; meta = { From 0380728ddc419d9950765317da056dd9f12fc0ae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 2 Feb 2018 15:21:26 -0600 Subject: [PATCH 291/797] retdec: homepage fixup --- pkgs/development/tools/analysis/retdec/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index adcda4c8324..585fc28345a 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -105,9 +105,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A retargetable machine-code decompiler based on LLVM"; - inherit (src.meta) homepage; + homepage = https://retdec.com; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; } - From 5a08309e8d0ad64e2644a7ab23170625820fcb87 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 2 Feb 2018 15:00:33 -0600 Subject: [PATCH 292/797] retdec: separate "support", greatuly reduce size by default Don't include PE signatures by default, offer "full" variant containing them if desired. --- .../tools/analysis/retdec/default.nix | 22 +++++++++++++------ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 585fc28345a..f88546163d4 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, +{ stdenv, fetchFromGitHub, fetchurl, fetchzip, # Native build inputs cmake, autoconf, automake, libtool, @@ -15,6 +15,8 @@ ncurses, libffi, libxml2, zlib, +# PE (Windows) data, huge space savings if not needed +withPEPatterns ? false, }: let @@ -53,9 +55,14 @@ let sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj"; }; - retdec-support = fetchurl { + retdec-support = fetchzip { url = "https://github.com/avast-tl/retdec-support/releases/download/2017-12-12/retdec-support_2017-12-12.tar.xz"; - sha256 = "6376af57a77147f1363896963d8c1b3745ddb9a6bcec83d63a5846c3f78aeef9"; + sha256 = if withPEPatterns then "0pchl7hb42dm0sdbmpr8d3c6xc0lm6cs4p6g6kdb2cr9c99gjzn3" + else "1hcyq6bf4wk739kb53ic2bs71gsbx6zd07pc07lzfnxf8k497mhv"; + # Removing PE signatures reduces this from 3.8GB -> 642MB (uncompressed) + extraPostFetch = stdenv.lib.optionalString (!withPEPatterns) '' + rm -rf $out/generic/yara_patterns/static-code/pe + ''; }; in stdenv.mkDerivation rec { name = "retdec-${version}"; @@ -90,13 +97,14 @@ in stdenv.mkDerivation rec { find . -wholename "*/deps/openssl/CMakeLists.txt" -print0 | \ xargs -0 sed -i -e 's|OPENSSL_URL .*)|OPENSSL_URL ${openssl})|' + cat > cmake/install-share.sh < Date: Wed, 31 Jan 2018 14:03:11 +0100 Subject: [PATCH 293/797] cups-filters: 1.16.0 -> 1.20.0 --- pkgs/misc/cups/filters.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index be788f9add4..f80f2ddf03e 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.16.0"; + version = "1.20.0"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "1kcndzpbbcaxafnz1wa6acy3p3r5likfqmf057i5q0q6i176lz5k"; + sha256 = "0g6npicm1cwmxqi6ymfvf9wkplp4z2rzvjjl9v4yfvqdjq85gxnp"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From d135d142149bfb222c0ae4f9bea8e91ba9c6103c Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Feb 2018 10:25:10 +1100 Subject: [PATCH 294/797] bonfire: bump arrow dependency --- pkgs/tools/misc/bonfire/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 7937a212951..16b2169769f 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { postPatch = '' # https://github.com/blue-yonder/bonfire/pull/24 substituteInPlace requirements.txt \ - --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4,<0.11" \ + --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4,<0.13" \ --replace "keyring>=9,<10" "keyring>=9,<11" # pip fails when encountering the git hash for the package version substituteInPlace setup.py \ From 2e8d620f047d2e089288c034e0a477befcc9c829 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 22 Jan 2018 17:46:40 +0100 Subject: [PATCH 295/797] infamousPlugins: init at 0.2.03 --- .../audio/infamousPlugins/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/audio/infamousPlugins/default.nix diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix new file mode 100644 index 00000000000..fd9dee62420 --- /dev/null +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: + +stdenv.mkDerivation rec { + name = "infamousPlugins-v${version}"; + version = "0.2.03"; + + src = fetchFromGitHub { + owner = "ssj71"; + repo = "infamousPlugins"; + rev = "v${version}"; + sha256 = "1pb7vmc703j25rnyx81cqlfzi66v7gm4a49s06dbgy8a66s1i2zl"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; + + meta = with stdenv.lib; { + homepage = https://ssj71.github.io/infamousPlugins; + description = "A collection of open-source LV2 plugins"; + longDescription = '' + These are audio plugins in the LV2 format, developed for linux. Most are suitable for live use. + This collection contains: + * Cellular Automaton Synth - additive synthesizer, where 16 harmonics are added according to rules of elementary cellular automata + * Envelope Follower - a fully featured envelope follower plugin + * Hip2B - a distortion/destroyer plugin + * cheap distortion - another distortion plugin, but this one I wanted to get it as light as possible + * stuck - a clone of the electro-harmonix freeze + * power cut - this effect is commonly called tape stop + * power up - the opposite of the power cut + * ewham - a whammy style pitchshifter + * lushlife - a simulated double tracking plugin capable of everything from a thin beatle effect to thick lush choruses to weird outlandish effects + ''; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index defd9e93d10..6920388c623 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2846,6 +2846,8 @@ with pkgs; inform7 = callPackage ../development/compilers/inform7 { }; + infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; + innoextract = callPackage ../tools/archivers/innoextract { }; intecture-agent = callPackage ../tools/admin/intecture/agent.nix { }; From 838783642898b6acea6b7253f30f2bc5ac36732f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2018 01:46:08 +0100 Subject: [PATCH 296/797] pythonPackages.jinja2: 2.9.6 -> 2.10 --- pkgs/development/python-modules/jinja2/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index cb0eb130a2f..7432b3bb99c 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -1,16 +1,13 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchPypi , pytest, markupsafe }: buildPythonPackage rec { pname = "Jinja2"; - version = "2.9.6"; - name = "${pname}-${version}"; + version = "2.10"; - src = fetchFromGitHub { - owner = "pallets"; - repo = "jinja"; - rev = version; - sha256 = "1xxc5vdhz214aawmllv0fi4ak6d7zac662yb7gn1xfgqfz392pg5"; + src = fetchPypi { + inherit pname version; + sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; }; checkInputs = [ pytest ]; @@ -29,7 +26,6 @@ buildPythonPackage rec { Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. ''; - platforms = platforms.all; maintainers = with maintainers; [ pierron garbas sjourdois ]; }; } From 0f15b33912bacf60889fa2213ccc5a304993dd89 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Sat, 3 Feb 2018 13:01:54 +1100 Subject: [PATCH 297/797] granite: 0.4.1 -> 0.5 Upstream has moved to GitHub, as the elementary.io page [1] now links to the GitHub repository. The only current dependant derivation is Pantheon Terminal (pantheon.pantheon-terminal), which continues to work. [1]: https://elementary.io/open-source --- .../development/libraries/granite/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 4e41545687a..e542718502e 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { - majorVersion = "0.4"; - minorVersion = "1"; - name = "granite-${majorVersion}.${minorVersion}"; - src = fetchurl { - url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz"; - sha256 = "177h5h1q4qd7g99mzbczvz78j8c9jf4f1gwdj9f6imbc7r913d4b"; + name = "granite-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "granite"; + rev = version; + sha256 = "15l8z1jkqhvappnr8jww27lfy3dwqybgsxk5iccyvnvzpjdh2s0h"; }; + cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [perl cmake vala gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + meta = { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; - homepage = https://launchpad.net/granite; + homepage = https://github.com/elementary/granite; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vozz ]; From 15d33a4c93d0e27ddc87a8ddef397c017d4844f0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Feb 2018 18:32:53 +0800 Subject: [PATCH 298/797] terragrunt: 0.13.23 -> 0.14.0 --- .../networking/cluster/terragrunt/default.nix | 4 ++-- .../networking/cluster/terragrunt/deps.nix | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 576daa88127..a31c7882693 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.13.23"; + version = "0.14.0"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "1xx3kw38vr563x3bn0rrg1iq4r51rl0qci2magwwng62cgh3zaiy"; + sha256 = "1fz4ny7jmwr1xp68bmzlb6achird7jwbb6n6zim6c1w0qybxiqg9"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index c371c756a15..30d6acb9afa 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "d0cb8551ac28d362e77ea475e5b7b2ebaec06b6b"; - sha256 = "1546kb49wb1qjx6pz7aj4iygmqsjps70npb5csm5q08wxk63vhls"; + rev = "00cca3f093a8236a93fbbeeae7d28ad83811683c"; + sha256 = "1x2frsin6d9drx9k65pv0r0l0asj16fzj815s2a9db2mxh8jycsp"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "994f50a6f071b07cfbea9eca9618c9674091ca51"; - sha256 = "1v2whvi9rnrkz4ji3b3sinvv3ahr5s4iyzchz00wjw0q2kdvj1zj"; + rev = "285374cdfad63de2c43d7562f49ced6dde5a7ba0"; + sha256 = "0xmwxfb0vm20ga1j1r3lavxm15vwqdkisdkshw1nia7byhwmb4xm"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6"; - sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn"; + rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; + sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "06020f85339e21b2478f756a78e295255ffa4d6a"; - sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9"; + rev = "b4575eea38cca1123ec2dc90c26529b5c5acfcff"; + sha256 = "1x80f3kcb1wd2mdxks3wcsp26q9g7ahr8b18z1anl5igg6zl61kf"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"; - sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml"; + rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; + sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; }; } { @@ -122,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "39908eb08fee7c10d842622a114a5c133fb0a3c6"; - sha256 = "1s0whq54xmcljdg94g6sghpf6mkhf6fdxxb18zg0yzzj6fz9yj8j"; + rev = "75104e932ac2ddb944a6ea19d9f9f26316ff1145"; + sha256 = "13iagavgqq3sn9m3sck0chydwy5rcbhj0ylvc1169vs8q2m13yh9"; }; } ] From 27a4a5511dc2cf9756943458d7a752617e4ad6e3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Feb 2018 18:41:01 +0800 Subject: [PATCH 299/797] terraform: 0.11.1 -> 0.11.3 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 54a54b37cad..890fe231cbf 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -100,8 +100,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.1"; - sha256 = "04qyhlif3b3kjs3m6c3mx45sgr5r13x55aic638zzlrhbpmqiih1"; + version = "0.11.3"; + sha256 = "0637x7jcm62pdnivmh4rggly6dmlvdh3jpsd1z4vba15gbm203nz"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From da6b85be5198e8c46a3dd11ea3bdd0bfa52a78d1 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sun, 28 Jan 2018 00:25:04 +0100 Subject: [PATCH 300/797] nixops-dns: init at 1.0 --- pkgs/tools/package-management/nixops/deps.nix | 20 ++++++++++++++ .../package-management/nixops/nixops-dns.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/tools/package-management/nixops/deps.nix create mode 100644 pkgs/tools/package-management/nixops/nixops-dns.nix diff --git a/pkgs/tools/package-management/nixops/deps.nix b/pkgs/tools/package-management/nixops/deps.nix new file mode 100644 index 00000000000..7da38f83e7f --- /dev/null +++ b/pkgs/tools/package-management/nixops/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "75229eecb7af00b2736e93b779a78429dcb19472"; + sha256 = "1vsjy07kkyx11iz4qsihhykac3ddq3ywdgv6bwrv407504f7x6wl"; + }; + } +] diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix new file mode 100644 index 00000000000..afb0353e687 --- /dev/null +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildGoPackage +, fetchFromGitHub }: + +buildGoPackage rec { + name = "nixops-dns"; + version = "1.0"; + + goDeps = ./deps.nix; + goPackagePath = "github.com/kamilchm/nixops-dns"; + + src = fetchFromGitHub { + owner = "kamilchm"; + repo = "nixops-dns"; + rev = "v${version}"; + sha256 = "1fyqwk2knrv40zpf71a56bjyaycr3p6fzrqq7gaan056ydy83cai"; + }; + + meta = with lib; { + homepage = https://github.com/kamilchm/nixops-dns/; + description = "DNS server for resolving NixOps machines"; + license = licenses.mit; + maintainers = with maintainers; [ kamilchm sorki ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b94fcfb298..a88cca7d64c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19832,6 +19832,8 @@ with pkgs; nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { }); + nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; + nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; From 096a07f5e274c2cfdcdb5c9b26d347517d5419ef Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 1 Feb 2018 22:30:26 +0100 Subject: [PATCH 301/797] python-can: init at 2.0.0 --- .../python-modules/can/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/can/default.nix diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix new file mode 100644 index 00000000000..fbb53828d2a --- /dev/null +++ b/pkgs/development/python-modules/can/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pyserial +, nose +, mock }: + +buildPythonPackage rec { + pname = "python-can"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c6zfd29ck9ffdklfb5xgxvfl52xdaqd89isykkypm1ll97yk2fs"; + }; + + propagatedBuildInputs = [ pyserial ]; + checkInputs = [ nose mock ]; + + meta = with lib; { + homepage = https://github.com/hardbyte/python-can; + description = "CAN support for Python"; + license = licenses.lgpl3; + maintainers = with maintainers; [ sorki ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cabc5f5796c..aefff25ec59 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2014,6 +2014,7 @@ in { doCheck = false; }); + can = callPackage ../development/python-modules/can {}; cairocffi = buildPythonPackage rec { name = "cairocffi-0.7.2"; From 87451cc113b9ea9372f58a41182381f64367a44c Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Wed, 31 Jan 2018 22:10:21 +0300 Subject: [PATCH 302/797] xfce4-weather-plugin 0.8.7 -> 0.8.10; add glib_networking --- pkgs/desktops/xfce/core/xfce4-panel.nix | 5 +++-- pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e91a3ab25ee..e9f6240cbdf 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification , makeWrapper, xfce4mixer, hicolor_icon_theme -, withGtk3 ? false, gtk3, gettext +, withGtk3 ? false, gtk3, gettext, glib_networking }: let inherit (stdenv.lib) optional; @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xfce4-panel" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 419efbcbf95..0af0e62244f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; p_name = "xfce4-weather-plugin"; ver_maj = "0.8"; - ver_min = "7"; + ver_min = "10"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7"; + sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf"; }; nativeBuildInputs = [ pkgconfig intltool ]; From 54abfdc667d9736cf3ba3eb826bc235ba9339f30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 09:35:22 +0100 Subject: [PATCH 303/797] python.pkgs.rdflib: move expression --- .../python-modules/rdflib/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +--------- 2 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/rdflib/default.nix diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix new file mode 100644 index 00000000000..cdbba180673 --- /dev/null +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isodate +, html5lib +, SPARQLWrapper +, networkx +, nose +, python +}: + +buildPythonPackage rec { + pname = "rdflib"; + version = "4.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0398c714znnhaa2x7v51b269hk20iz073knq2mvmqp2ma92z27fs"; + }; + + propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; + + checkInputs = [ networkx nose ]; + + # Python 2 syntax + # Failing doctest + doCheck = false; + + checkPhase = '' + ${python.interpreter} run_tests.py + ''; + + meta = { + description = "A Python library for working with RDF, a simple yet powerful language for representing information"; + homepage = http://www.rdflib.net/; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ddf1edef32a..a09fa9a66e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15440,24 +15440,7 @@ in { }; - rdflib = buildPythonPackage (rec { - name = "rdflib-4.2.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/rdflib/${name}.tar.gz"; - sha256 = "0398c714znnhaa2x7v51b269hk20iz073knq2mvmqp2ma92z27fs"; - }; - - # error: invalid command 'test' - doCheck = false; - - propagatedBuildInputs = with self; [ isodate html5lib SPARQLWrapper ]; - - meta = { - description = "A Python library for working with RDF, a simple yet powerful language for representing information"; - homepage = http://www.rdflib.net/; - }; - }); + rdflib = callPackage ../development/python-modules/rdflib { }; isodate = buildPythonPackage rec { name = "isodate-${version}"; From 213ee4419e8573ddd76e17338589dc84a0968b48 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Feb 2018 09:40:09 +0100 Subject: [PATCH 304/797] perl-Cpanel-JSON-XS: 3.0237 -> 4.00 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7989f742b83..006794fa56d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2544,10 +2544,10 @@ let self = _self // overrides; _self = with self; { }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-3.0237"; + name = "Cpanel-JSON-XS-4.00"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "da86fffdbe6c1b7a023e95e2b8db7d6b45a08871c8312f23e45253c78e662d07"; + sha256 = "4dedf770cab3009b08bca108266b941097ae1c55c674c500e3145e2f23a628ac"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; From b99c86fde8c8005645da2a5f69331b4aae65f023 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 17 Dec 2017 15:25:44 +0100 Subject: [PATCH 305/797] pythonPackages.vobject: 0.9.3 -> 0.9.5 --- 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 a09fa9a66e0..254bcede94c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13311,13 +13311,13 @@ in { vobject = buildPythonPackage rec { - version = "0.9.3"; + version = "0.9.5"; name = "vobject-${version}"; src = pkgs.fetchFromGitHub { owner = "eventable"; repo = "vobject"; - sha256 = "00vbii5awwqwfh5hfklj1q79w7d85gjigvf2imgyb71g03sb8cjv"; + sha256 = "1f5lw9kpssr66bdirkjba3izbnm68p8pd47546m5yl4c7x76s1ld"; rev = version; }; From 6f58503c1f971622f99d16eabac94560f09a5c5c Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 19 Oct 2017 22:52:24 +0100 Subject: [PATCH 306/797] tokenserver: 1.2.11 -> 1.2.27 --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 254bcede94c..f380cb5851c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19184,17 +19184,18 @@ EOF tokenserver = buildPythonPackage rec { name = "tokenserver-${version}"; - version = "1.2.11"; + version = "1.2.27"; src = pkgs.fetchgit { url = https://github.com/mozilla-services/tokenserver.git; rev = "refs/tags/${version}"; - sha256 = "1cvkvxcday1qc3zyarasj3l7322w8afhrcxcsvb5wac1ryh1w6y2"; + sha256 = "0il3bgjld495g9gxvvrm56kpan5swaizzg216qz3zxmb6w9ly3fm"; }; doCheck = false; buildInputs = [ self.testfixtures ]; - propagatedBuildInputs = with self; [ cornice mozsvc pybrowserid tokenlib ]; + propagatedBuildInputs = with self; [ cornice mozsvc pybrowserid tokenlib + pymysql umemcache hawkauthlib alembic pymysqlsa paste boto ]; meta = { platforms = platforms.all; From 757ec05d3bfa30f8962273072ff996783848d9ac Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 19 Oct 2017 22:52:43 +0100 Subject: [PATCH 307/797] syncserver: 1.5.2 -> 1.6.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 f380cb5851c..dcc75a69a24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20133,13 +20133,13 @@ EOF syncserver = buildPythonPackage rec { name = "syncserver-${version}"; - version = "1.5.2"; + version = "1.6.0"; disabled = ! isPy27; src = pkgs.fetchgit { url = https://github.com/mozilla-services/syncserver.git; rev = "refs/tags/${version}"; - sha256 = "1pk4rvwvsd1vxbpzg39hxqi8pi9v6b4s6m0mqbpg88s6s7i6ks3m"; + sha256 = "1fsiwihgq3z5b5kmssxxil5g2abfvsf6wfikzyvi4sy8hnym77mb"; }; buildInputs = with self; [ unittest2 ]; From c8b6e1fa3c24568587ffcd9d6e93761d469376a6 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 19 Oct 2017 22:53:04 +0100 Subject: [PATCH 308/797] serversyncstorage: 1.5.13 -> 1.6.11 --- 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 dcc75a69a24..dd1dfa6a37d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20156,13 +20156,13 @@ EOF serversyncstorage = buildPythonPackage rec { name = "serversyncstorage-${version}"; - version = "1.5.13"; + version = "1.6.11"; disabled = !isPy27; src = pkgs.fetchgit { url = https://github.com/mozilla-services/server-syncstorage.git; rev = "refs/tags/${version}"; - sha256 = "0m14v7n105y06w3mdp35pyxyzjj5vqwbznzdbixhkms3df6md2lq"; + sha256 = "197gj2jfs2c6nzs20j37kqxwi91wabavxnfm4rqmrjwhgqjwhnm0"; }; propagatedBuildInputs = with self; [ From 0c139e218677313219f094736adfa448faa7ca12 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 5 Dec 2017 22:28:58 +0000 Subject: [PATCH 309/797] tokenserver: move to python-modules --- .../python-modules/tokenserver/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 ++---------- 2 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/tokenserver/default.nix diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix new file mode 100644 index 00000000000..af7acbc0218 --- /dev/null +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, testfixtures +, cornice +, mozsvc +, pybrowserid +, tokenlib +, pymysql +, umemcache +, hawkauthlib +, alembic +, pymysqlsa +, paste +, boto +}: + +buildPythonPackage rec { + name = "tokenserver-${version}"; + version = "1.2.27"; + + src = fetchgit { + url = https://github.com/mozilla-services/tokenserver.git; + rev = "refs/tags/${version}"; + sha256 = "0il3bgjld495g9gxvvrm56kpan5swaizzg216qz3zxmb6w9ly3fm"; + }; + + doCheck = false; + buildInputs = [ testfixtures ]; + propagatedBuildInputs = [ cornice mozsvc pybrowserid tokenlib + pymysql umemcache hawkauthlib alembic pymysqlsa paste boto ]; + + meta = { + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd1dfa6a37d..d94bbd6c6aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -374,6 +374,8 @@ in { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + tokenserver = callPackage ../development/python-modules/tokenserver {}; + unifi = callPackage ../development/python-modules/unifi { }; pyunbound = callPackage ../tools/networking/unbound/python.nix { }; @@ -19182,26 +19184,6 @@ EOF ''; }; - tokenserver = buildPythonPackage rec { - name = "tokenserver-${version}"; - version = "1.2.27"; - - src = pkgs.fetchgit { - url = https://github.com/mozilla-services/tokenserver.git; - rev = "refs/tags/${version}"; - sha256 = "0il3bgjld495g9gxvvrm56kpan5swaizzg216qz3zxmb6w9ly3fm"; - }; - - doCheck = false; - buildInputs = [ self.testfixtures ]; - propagatedBuildInputs = with self; [ cornice mozsvc pybrowserid tokenlib - pymysql umemcache hawkauthlib alembic pymysqlsa paste boto ]; - - meta = { - platforms = platforms.all; - }; - }; - testfixtures = callPackage ../development/python-modules/testfixtures {}; tissue = buildPythonPackage rec { From 5b2484ab86afcd639a7d71b123d1d3cee0f8902e Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 5 Dec 2017 22:32:14 +0000 Subject: [PATCH 310/797] syncserver: move to python-modules --- .../python-modules/syncserver/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +----------- 2 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/syncserver/default.nix diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix new file mode 100644 index 00000000000..e050bcf5404 --- /dev/null +++ b/pkgs/development/python-modules/syncserver/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, isPy27 +, unittest2 +, cornice +, gunicorn +, pyramid +, requests +, simplejson +, sqlalchemy +, mozsvc +, tokenserver +, serversyncstorage +, configparser +}: + +buildPythonPackage rec { + name = "syncserver-${version}"; + version = "1.6.0"; + disabled = ! isPy27; + + src = fetchgit { + url = https://github.com/mozilla-services/syncserver.git; + rev = "refs/tags/${version}"; + sha256 = "1fsiwihgq3z5b5kmssxxil5g2abfvsf6wfikzyvi4sy8hnym77mb"; + }; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ + cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver + serversyncstorage configparser + ]; + + meta = { + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d94bbd6c6aa..fc289b76351 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -370,6 +370,8 @@ in { supervise_api = callPackage ../development/python-modules/supervise_api { }; + syncserver = callPackage ../development/python-modules/syncserver {}; + tables = callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; @@ -20113,29 +20115,6 @@ EOF }; }; - syncserver = buildPythonPackage rec { - name = "syncserver-${version}"; - version = "1.6.0"; - disabled = ! isPy27; - - src = pkgs.fetchgit { - url = https://github.com/mozilla-services/syncserver.git; - rev = "refs/tags/${version}"; - sha256 = "1fsiwihgq3z5b5kmssxxil5g2abfvsf6wfikzyvi4sy8hnym77mb"; - }; - - buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ - cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver - serversyncstorage configparser - ]; - - meta = { - maintainers = [ ]; - platforms = platforms.all; - }; - }; - serversyncstorage = buildPythonPackage rec { name = "serversyncstorage-${version}"; version = "1.6.11"; From d1e2159638d21b499d36b9e1e3ee4663fdf4d2b5 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 5 Dec 2017 22:35:01 +0000 Subject: [PATCH 311/797] serversyncstorage: move to python-modules --- .../serversyncstorage/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +---------- 2 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/serversyncstorage/default.nix diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix new file mode 100644 index 00000000000..40a580877af --- /dev/null +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, isPy27 +, testfixtures +, unittest2 +, webtest +, pyramid +, sqlalchemy +, simplejson +, mozsvc +, cornice +, pyramid_hawkauth +, pymysql +, pymysqlsa +, umemcache +, WSGIProxy +, requests +, pybrowserid +}: + +buildPythonPackage rec { + name = "serversyncstorage-${version}"; + version = "1.6.11"; + disabled = !isPy27; + + src = fetchgit { + url = https://github.com/mozilla-services/server-syncstorage.git; + rev = "refs/tags/${version}"; + sha256 = "197gj2jfs2c6nzs20j37kqxwi91wabavxnfm4rqmrjwhgqjwhnm0"; + }; + + buildInputs = [ testfixtures unittest2 webtest ]; + propagatedBuildInputs = [ + pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql + pymysqlsa umemcache WSGIProxy requests pybrowserid + ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc289b76351..c5f6ac1fb2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -364,6 +364,8 @@ in { salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; + simpleeval = callPackage ../development/python-modules/simpleeval { }; sip = callPackage ../development/python-modules/sip { }; @@ -20115,26 +20117,6 @@ EOF }; }; - serversyncstorage = buildPythonPackage rec { - name = "serversyncstorage-${version}"; - version = "1.6.11"; - disabled = !isPy27; - - src = pkgs.fetchgit { - url = https://github.com/mozilla-services/server-syncstorage.git; - rev = "refs/tags/${version}"; - sha256 = "197gj2jfs2c6nzs20j37kqxwi91wabavxnfm4rqmrjwhgqjwhnm0"; - }; - - propagatedBuildInputs = with self; [ - pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql - pymysqlsa umemcache WSGIProxy requests pybrowserid - ]; - buildInputs = with self; [ testfixtures unittest2 webtest ]; - - #doCheck = false; # lazy packager - }; - WSGIProxy = buildPythonPackage rec { name = "WSGIProxy-${version}"; version = "0.2.2"; From 7ebb82e04f17d96313f1d60c748f32a7f7bee9f6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 3 Feb 2018 16:53:54 +0800 Subject: [PATCH 312/797] home-assistant: Fix incorrect xml closing tag --- nixos/modules/services/misc/home-assistant.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 4fbf5a412d1..666fa68b01c 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -70,7 +70,7 @@ in { default = true; type = types.bool; description = '' - If set to true, the components used in config + If set to true, the components used in config are set as the specified package's extraComponents. This in turn adds all packaged dependencies to the derivation. You might still see import errors in your log. From 6c52f36468d2d273397082b60b708cf2693b0897 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 1 Feb 2018 22:31:14 +0100 Subject: [PATCH 313/797] python-canmatrix: init at 0.6 --- .../python-modules/canmatrix/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/canmatrix/default.nix diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix new file mode 100644 index 00000000000..99ac6c3ec45 --- /dev/null +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, lxml +, xlwt +, xlrd +, XlsxWriter +, pyyaml +, future }: + +buildPythonPackage rec { + pname = "canmatrix"; + version = "0.6"; + + # uses fetchFromGitHub as PyPi release misses test/ dir + src = fetchFromGitHub { + owner = "ebroecker"; + repo = pname; + rev = version; + sha256 = "1lb0krhchja2jqfsh5lsfgmqcchs1pd38akvc407jfmll96f4yqz"; + }; + + checkPhase = '' + cd test + ${python.interpreter} ./test.py + ''; + + propagatedBuildInputs = + [ lxml + xlwt + xlrd + XlsxWriter + pyyaml + future + ]; + + meta = with lib; { + homepage = https://github.com/ebroecker/canmatrix; + description = "Support and convert several CAN (Controller Area Network) database formats .arxml .dbc .dbf .kcd .sym fibex xls(x)"; + license = licenses.bsd2; + maintainers = with maintainers; [ sorki ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aefff25ec59..eaa2054a114 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2016,6 +2016,8 @@ in { can = callPackage ../development/python-modules/can {}; + canmatrix = callPackage ../development/python-modules/canmatrix {}; + cairocffi = buildPythonPackage rec { name = "cairocffi-0.7.2"; From 305ed7e50bd2ee37ddf1b43faf3ea0e8920ea0d3 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 1 Feb 2018 22:31:30 +0100 Subject: [PATCH 314/797] python-canopen: init at 0.5.1 --- .../python-modules/canopen/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/canopen/default.nix diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix new file mode 100644 index 00000000000..08ae54e0b73 --- /dev/null +++ b/pkgs/development/python-modules/canopen/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, nose +, can +, canmatrix }: + +buildPythonPackage rec { + pname = "canopen"; + version = "0.5.1"; + + # use fetchFromGitHub until version containing test/sample.eds + # is available on PyPi + # https://github.com/christiansandberg/canopen/pull/57 + + src = fetchFromGitHub { + owner = "christiansandberg"; + repo = "canopen"; + rev = "b20575d84c3aef790fe7c38c5fc77601bade0ea4"; + sha256 = "1qg47qrkyvyxiwi13sickrkk89jp9s91sly2y90bz0jhws2bxh64"; + }; + + #src = fetchPypi { + # inherit pname version; + # sha256 = "0806cykarpjb9ili3mf82hsd9gdydbks8532nxgz93qzg4zdbv2g"; + #}; + + # test_pdo failure https://github.com/christiansandberg/canopen/issues/58 + doCheck = false; + + propagatedBuildInputs = + [ can + canmatrix + ]; + + checkInputs = [ nose ]; + + meta = with lib; { + homepage = https://github.com/christiansandberg/canopen/; + description = "CANopen stack implementation"; + license = licenses.lgpl3; + maintainers = with maintainers; [ sorki ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eaa2054a114..b586a9de0a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2016,6 +2016,8 @@ in { can = callPackage ../development/python-modules/can {}; + canopen = callPackage ../development/python-modules/canopen {}; + canmatrix = callPackage ../development/python-modules/canmatrix {}; cairocffi = buildPythonPackage rec { From 73d985f1b59e0058ae52f6e4f7a32fcdc9205295 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:05:53 +0100 Subject: [PATCH 315/797] buildbot: buildbot-pkg fix Fixes issue mentioned in https://github.com/NixOS/nixpkgs/pull/33992#issuecomment-360937226 --- pkgs/development/tools/build-managers/buildbot/pkg.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index 356ee574429..8b23f8a2488 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -12,6 +12,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; + postPatch = '' + # Their listdir function filters out `node_modules` folders. + # Do we have to care about that with Nix...? + substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" "" + ''; + meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Buildbot Packaging Helper"; From 2996be511d3c4ac16694584fe114edd30a25309e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Sat, 3 Feb 2018 10:17:24 +0100 Subject: [PATCH 316/797] Undo spacing difference --- pkgs/development/idris-modules/idris-wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index 0e3a8393140..155098a4625 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -10,6 +10,7 @@ symlinkJoin { wrapProgram $out/bin/idris \ --suffix PATH : ${ stdenv.lib.makeBinPath path } \ --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} + mkdir -p $out/nix-support substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook ''; From e35090706ca83bb9ad8cc0af1d90000c84e85365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Feb 2018 09:39:55 +0000 Subject: [PATCH 317/797] gdbgui: 0.10.0.1 -> 0.11.0.0 --- .../development/tools/misc/gdbgui/default.nix | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 64b87300cbe..6d5bfef2f80 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -3,42 +3,41 @@ let deps = import ./requirements.nix { inherit pkgs; }; in python27Packages.buildPythonApplication rec { - name = "${pname}-${version}"; - pname = "gdbgui"; - version = "0.10.1.0"; + name = "${pname}-${version}"; + pname = "gdbgui"; + version = "0.11.0.0"; - buildInputs = [ gdb ]; - propagatedBuildInputs = builtins.attrValues deps.packages; + buildInputs = [ gdb ]; + propagatedBuildInputs = builtins.attrValues deps.packages; - src = python27Packages.fetchPypi { - inherit pname version; - sha256 = "1585vjbrc8r0a7069aism66c0kkj91yklpdblb9c34570zbpabvs"; - }; + src = python27Packages.fetchPypi { + inherit pname version; + sha256 = "09bfrln16ai5azpjan1q24xz700sxsaa3ndynq8c8qdan82bfi1g"; + }; - postPatch = '' - echo ${version} > gdbgui/VERSION.txt - ''; + postPatch = '' + echo ${version} > gdbgui/VERSION.txt + ''; - postInstall = '' - wrapProgram $out/bin/gdbgui \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]} - ''; + postInstall = '' + wrapProgram $out/bin/gdbgui \ + --prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]} + ''; - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox - preCheck = stdenv.lib.optionalString stdenv.isLinux '' - export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ - LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so - ''; + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox + preCheck = stdenv.lib.optionalString stdenv.isLinux '' + export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ + LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so + ''; - postCheck = stdenv.lib.optionalString stdenv.isLinux '' - unset NIX_REDIRECTS LD_PRELOAD - ''; + postCheck = stdenv.lib.optionalString stdenv.isLinux '' + unset NIX_REDIRECTS LD_PRELOAD + ''; - meta = with stdenv.lib; { - description = "A browser-based frontend for GDB"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ yrashk ]; - }; - - } + meta = with stdenv.lib; { + description = "A browser-based frontend for GDB"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ yrashk ]; + }; +} From 84fb5c6a0d08530631b60d6a70c9df987c7cd933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Feb 2018 10:45:09 +0100 Subject: [PATCH 318/797] nixos/availableKernelModules: add a keyboard module Non-working keyboards during boot are quite a problem; see: https://github.com/NixOS/nixpkgs/pull/33529#issuecomment-361164997 --- nixos/modules/system/boot/kernel.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index ba9d7285fba..d21908f8453 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -206,7 +206,8 @@ in "xhci_hcd" "xhci_pci" "usbhid" - "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" "hid_logitech_hidpp" + "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" + "hid_logitech_hidpp" "hid_logitech_dj" ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ # Misc. x86 keyboard stuff. From 3ad34f942473cf9a8cec067cd1e1381bda4f3122 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Sat, 3 Feb 2018 11:06:38 +0100 Subject: [PATCH 319/797] kitty: 0.6.0 -> 0.7.1 --- pkgs/applications/misc/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index bd671a6c90d..9e955860bfc 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -2,7 +2,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.6.0"; + version = "0.7.1"; name = "kitty-${version}"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1p86gry91m4kicy79fc1qfr0hcsd5xnvxzmm4q956x883h6h766r"; + sha256 = "0c02xy5psb7v7xfncz4bflrbinifpcm1yn8hvh0zaf7p4vr837p7"; }; buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext ]; From 52f68fec35a940a670f4cea489fed9d3f17698d4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 1 Feb 2018 14:29:52 +0100 Subject: [PATCH 320/797] phpPackages.xdebug: 2.6.0beta1 -> 2.6.0, 2.5.0 -> 2.6.0 --- pkgs/top-level/php-packages.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 80cc5ba05db..6d60ccc833c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -8,8 +8,6 @@ let }; isPhpOlder55 = pkgs.lib.versionOlder php.version "5.5"; isPhp7 = pkgs.lib.versionAtLeast php.version "7.0"; - isPhp72 = pkgs.lib.versionAtLeast php.version "7.2"; - isPhpOlder7 = pkgs.lib.versionOlder php.version "7.0"; apcu = if isPhp7 then apcu51 else apcu40; @@ -181,7 +179,7 @@ let buildInputs = [ pkgs.spidermonkey_1_8_5 ]; }; - xdebug = if isPhp72 then xdebug26 else if isPhp7 then xdebug25 else xdebug23; + xdebug = if isPhp7 then xdebug26 else xdebug23; xdebug23 = assert !isPhp7; buildPecl { name = "xdebug-2.3.1"; @@ -192,19 +190,10 @@ let checkTarget = "test"; }; - xdebug25 = assert !isPhp72; buildPecl { - name = "xdebug-2.5.0"; + xdebug26 = assert isPhp7; buildPecl { + name = "xdebug-2.6.0"; - sha256 = "03c9y25a3gc3kpav0cdgmhjixcaly6974hx7wgihi0wlchgavmlb"; - - doCheck = true; - checkTarget = "test"; - }; - - xdebug26 = assert !isPhpOlder7; buildPecl { - name = "xdebug-2.6.0beta1"; - - sha256 = "0zaj821jbpaqqcbr9a64sa27my9n980pmyy9kxrvvjqq3qg6dpj9"; + sha256 = "1p6b54ypi5lq4ka3pyy2gswdf1d5vjb9y8lp9fqcp3zn7g04q9mm"; doCheck = true; checkTarget = "test"; From 601026650517924bc4a90869171e34e69c825a96 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 1 Feb 2018 14:51:05 +0100 Subject: [PATCH 321/797] php72: 7.2.1 -> 7.2.2 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index c547e3d8ada..08d9d748596 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.1"; - sha256 = "0ygbcilbp3fiswd240ib2mvnhy0yy0az8kjzpjfd4kca4qzpj1py"; + version = "7.2.2"; + sha256 = "1vjaixm4f7rz9vz1yrlzmn9rpp01vd7b74m83qjg4wblw5caqhgq"; }; } From 4a7ae5c6b79b5565c6b95aedeec508e53292ab58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C4=83zvan=20Flavius=20Panda?= Date: Sat, 3 Feb 2018 13:31:10 +0200 Subject: [PATCH 322/797] AntTweakBar: init at 1.16 --- lib/maintainers.nix | 1 + .../libraries/AntTweakBar/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/AntTweakBar/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 348212df095..e9f58185710 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -564,6 +564,7 @@ rasendubi = "Alexey Shmalko "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; ravloony = "Tom Macdonald "; + razvan = "Răzvan Flavius Panda "; rbasso = "Rafael Basso "; redbaron = "Maxim Ivanov "; redvers = "Redvers Davies "; diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix new file mode 100644 index 00000000000..dc30fee954f --- /dev/null +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, unzip, xlibs, mesa }: + +stdenv.mkDerivation rec { + name = "AntTweakBar-1.16"; + + buildInputs = [ unzip xlibs.libX11 mesa ]; + + src = fetchurl { + url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; + sha256 = "0z3frxpzf54cjs07m6kg09p7nljhr7140f4pznwi7srwq4cvgkpv"; + }; + + postPatch = "cd src"; + installPhase = '' + mkdir -p $out/lib/ + cp ../lib/{libAntTweakBar.so,libAntTweakBar.so.1,libAntTweakBar.a} $out/lib/ + cp -r ../include $out/ + ''; + + meta = { + description = "Add a light/intuitive GUI to OpenGL applications"; + longDescription = '' + A small and easy-to-use C/C++ library that allows to quickly add a light + and intuitive graphical user interface into graphic applications based on OpenGL + (compatibility and core profiles), DirectX 9, DirectX 10 or DirectX 11 + to interactively tweak parameters on-screen + ''; + homepage = http://anttweakbar.sourceforge.net/; + license = stdenv.lib.licenses.zlib; + maintainers = [ stdenv.lib.maintainers.razvan ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84b01ae9422..75abccb0998 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8086,6 +8086,8 @@ with pkgs; amrwb = callPackage ../development/libraries/amrwb { }; + anttweakbar = callPackage ../development/libraries/AntTweakBar { }; + appstream = callPackage ../development/libraries/appstream { }; appstream-glib = callPackage ../development/libraries/appstream-glib { }; From 3effd5bb05633ccabe9d0d3349c4b7dff9e6b019 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 3 Feb 2018 13:51:03 +0200 Subject: [PATCH 323/797] cargo: Should be supported on all Linux platforms now --- pkgs/development/compilers/rust/cargo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 386ffa62294..4c397c8c1a4 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -61,6 +61,6 @@ rustPlatform.buildRustPackage rec { description = "Downloads your Rust project's dependencies and builds your project"; maintainers = with maintainers; [ wizeman retrry ]; license = [ licenses.mit licenses.asl20 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } From a67f4753eae5efc60336e36dd84c0190c276689d Mon Sep 17 00:00:00 2001 From: Matan Shenhav Date: Sat, 20 Jan 2018 13:32:04 +0000 Subject: [PATCH 324/797] pythonPackages.globus-sdk: init at 1.4.1 --- .../python-modules/globus-sdk/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/globus-sdk/default.nix diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix new file mode 100644 index 00000000000..4f36a5c1b77 --- /dev/null +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, flake8 +, nose2 +, mock +, requests +, pyjwt +, fetchPypi +}: + +buildPythonPackage rec { + pname = "globus-sdk"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nwdhhn9ib5ln56q8h3g42dl93jl67xlxkgl1wqkh7pacg00r4vs"; + }; + + checkPhase = '' + py.test tests + ''; + + # No tests in archive + doCheck = false; + + checkInputs = [ flake8 nose2 mock ]; + + propagatedBuildInputs = [ requests pyjwt ]; + + meta = with lib; { + description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; + homepage = https://github.com/globus/globus-sdk-python; + license = licenses.asl20; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cecd533146..1c5a9cbb2f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -223,6 +223,8 @@ in { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; + gssapi = callPackage ../development/python-modules/gssapi { }; h5py = callPackage ../development/python-modules/h5py { From e2487ba88d74f9012ca717e302fbf6d6a640c7f7 Mon Sep 17 00:00:00 2001 From: Matan Shenhav Date: Sat, 20 Jan 2018 13:33:21 +0000 Subject: [PATCH 325/797] pythonPackages.mwoauth: init at 0.3.2 --- .../python-modules/mwoauth/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/mwoauth/default.nix diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix new file mode 100644 index 00000000000..e9d43e9e2b6 --- /dev/null +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, six +, pyjwt +, requests +, oauthlib +, requests_oauthlib +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mwoauth"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1krqz755415z37z1znrc77vi4xyp5ys6fnq4zwcwixjjbzddpavj"; + }; + + # package has no tests + doCheck = false; + + propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ]; + + meta = with lib; { + description = "A library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the OAuth Extension installed."; + homepage = https://github.com/mediawiki-utilities/python-mwoauth; + license = licenses.mit; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c5a9cbb2f1..44720e1086d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -243,6 +243,8 @@ in { mpi = pkgs.openmpi; }; + mwoauth = callPackage ../development/python-modules/mwoauth { }; + neuron = pkgs.neuron.override { inherit python; }; From e4718a81bf8ba4de68d8c029edfa8491a78ec79a Mon Sep 17 00:00:00 2001 From: Matan Shenhav Date: Sat, 20 Jan 2018 13:35:03 +0000 Subject: [PATCH 326/797] pythonPackages.oauthenticator: init at 0.7.2 --- .../python-modules/oauthenticator/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/oauthenticator/default.nix diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix new file mode 100644 index 00000000000..ecb21404a08 --- /dev/null +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, jupyterhub +, globus-sdk +, mwoauth +, codecov +, flake8 +, pyjwt +, pytest +, pytestcov +, pytest-tornado +, requests-mock +, pythonOlder +, fetchPypi +}: + +buildPythonPackage rec { + pname = "oauthenticator"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rlg63ii7sxj1xad2nx6wk1xgv3a8dm0az0q9g2v6hdv9cnc4b55"; + }; + + checkPhase = '' + py.test oauthenticator/tests + ''; + + # No tests in archive + doCheck = false; + + checkInputs = [ globus-sdk mwoauth codecov flake8 pytest + pytestcov pytest-tornado requests-mock pyjwt ]; + + propagatedBuildInputs = [ jupyterhub ]; + + disabled = pythonOlder "3.4"; + + meta = with lib; { + description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; + homepage = https://github.com/jupyterhub/oauthenticator; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44720e1086d..aa1bfb40014 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -263,6 +263,8 @@ in { ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; + oauthenticator = callPackage ../development/python-modules/oauthenticator { }; + plantuml = callPackage ../tools/misc/plantuml { }; Pmw = callPackage ../development/python-modules/Pmw { }; From ab4cd34077ad3dd247c79d9d2150138e7333c641 Mon Sep 17 00:00:00 2001 From: Matan Shenhav Date: Sat, 20 Jan 2018 23:45:04 +0000 Subject: [PATCH 327/797] pythonPackages.pytest-tornado: init at 0.4.5 --- .../python-modules/pytest-tornado/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-tornado/default.nix diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix new file mode 100644 index 00000000000..596bae68ed0 --- /dev/null +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, pytest +, tornado +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pytest-tornado"; + version = "0.4.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b1r5im7qmbpmxhfvq13a6rp78sjjrrpysfnjkd9hggavgc75dr8"; + }; + + # package has no tests + doCheck = false; + + propagatedBuildInputs = [ pytest tornado ]; + + meta = with lib; { + description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; + homepage = https://github.com/eugeniy/pytest-tornado; + license = licenses.asl20; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa1bfb40014..4b37ce0df72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -346,6 +346,8 @@ in { slurm = pkgs.slurm; }; + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; From 58ef5957e266f04dd02541b5d615e5c286f2eb0e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 3 Feb 2018 13:57:57 +0200 Subject: [PATCH 328/797] rust binary build: call patchShebangs on install.sh It failed on aarch64 otherwise. The #!/bin/sh inside/outside the sandbox probably matters but I don't investigate more for now. --- pkgs/development/compilers/rust/binaryBuild.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index c8af0d979e2..6c6f6b55e1e 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -91,6 +91,7 @@ rec { buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; installPhase = '' + patchShebangs ./install.sh ./install.sh --prefix=$out \ --components=cargo From 2b2254637b320fc6e5669bb14c23196c2e7a889b Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Feb 2018 23:04:50 +1100 Subject: [PATCH 329/797] forkstat: 0.02.00 -> 0.02.02 --- pkgs/os-specific/linux/forkstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index d69d54af96c..bf7bc8a4546 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "forkstat-${version}"; - version = "0.02.00"; + version = "0.02.02"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz"; - sha256 = "07df2lb32lbr2ggi84h9pjy6ig18n2961ksji4x1hhb4cvc175dg"; + sha256 = "02iqi4xjg2hl4paw88fz9jb88a9p4zprvq3g56cd7jwfx3vmw5a4"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' From 7db36df4fe792f150011ecd82f672e2a3f7803bd Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Feb 2018 23:05:32 +1100 Subject: [PATCH 330/797] fnotifystat: 0.01.17 -> 0.02.00 --- pkgs/os-specific/linux/fnotifystat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index 2c90ff94d4a..d49d0115822 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "fnotifystat-${version}"; - version = "0.01.17"; + version = "0.02.00"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "0ncfbrpyb3ak49nrdr4cb3w082n9s181lizfqx51zi9rdgkj1vm3"; + sha256 = "0sfzmggfhhhp3vxn1s61b5bacr2hz6r7y699n3nysdciaa2scgdq"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' From 33be552211765c440479574b279e504cd58f7e21 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Feb 2018 23:06:11 +1100 Subject: [PATCH 331/797] powerstat: 0.02.12 -> 0.02.15 --- pkgs/os-specific/linux/powerstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 8e52bdf936e..88151fca2f5 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "powerstat-${version}"; - version = "0.02.12"; + version = "0.02.15"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"; - sha256 = "16ls3rs1wfckl0b2szqqgiv072afy4qjd3r4kz4vf2qj77kjm06w"; + sha256 = "0m8662qv77nzbwkdpydiz87kd75cjjajgp30j6mc5padyw65bxxx"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' From 27045bc0198d44632cfaeac85b83c4e40777f62c Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Feb 2018 23:06:41 +1100 Subject: [PATCH 332/797] smemstat: 0.01.17 -> 0.01.18 --- pkgs/os-specific/linux/smemstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index 04f5bf53f93..b4b8606197e 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "smemstat-${version}"; - version = "0.01.17"; + version = "0.01.18"; src = fetchurl { url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz"; - sha256 = "093ifrz688cm0kmzz1c6himhbdr75ig1mcaapmqy8jadc1gaw2im"; + sha256 = "0g262gilj2jk365wj4yl93ifppgvc9rx7dmlw6ychbv72v2pbv6w"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; From 7951e626bdbd82d080ebe3b75ec12f0a189da7a5 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 3 Feb 2018 13:15:39 +0100 Subject: [PATCH 333/797] php71: 7.1.13 -> 7.1.14 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 08d9d748596..6940485788e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,8 +348,8 @@ in { }; php71 = generic { - version = "7.1.13"; - sha256 = "18cqry8jy7q9fp82p3n9ndxffyba6f6q3maz3100jq245lfsbz9m"; + version = "7.1.14"; + sha256 = "1x41qmq66r0ff0573ln34d3qbzwg5z20nagsn1b6frfpkq9zvck3"; }; php72 = generic { From b994a6e6fffbb1775d18b4b4ad2770e37f8070a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Feb 2018 14:58:31 +0100 Subject: [PATCH 334/797] =?UTF-8?q?phpPackages.php-cs-fixer:=202.10.0=20?= =?UTF-8?q?=E2=86=92=202.10.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 80cc5ba05db..0af09473619 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -394,11 +394,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.10.0"; + version = "2.10.2"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "0mi72sg0gms2lg1r1b6qxhsxgi3v07kczmr1hnk7pwa47jb6572q"; + sha256 = "1h089zddza2n5cznq340ijvc34d1ffsja9ks0b67nax52w0197mi"; }; phases = [ "installPhase" ]; From a25e6e1d96b093bf0a5a996560312784c5d57408 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 3 Feb 2018 16:01:17 +0200 Subject: [PATCH 335/797] go_1_8: Scale up test timeouts https://hydra.nixos.org/build/68539514 --- pkgs/development/compilers/go/1.8.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 651eb79d75a..ee71d2aabad 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -134,6 +134,9 @@ stdenv.mkDerivation rec { CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + # The go build actually checks for CC=*/clang and does something different, so we don't # just want the generic `cc` here. CC = if stdenv.isDarwin then "clang" else "cc"; From 97be994d6a2a328e85bdb4cb99397a33ef5292cc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 3 Feb 2018 22:03:40 +0800 Subject: [PATCH 336/797] qcachegrind: Fix build with Qt 5.10 --- .../development/tools/analysis/qcachegrind/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 8db532d2feb..15be7554c19 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind }: +{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind, fetchpatch }: let name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; @@ -12,6 +12,14 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; + patches = [ + (fetchpatch { + name = "fix-qt5_10-build.patch"; + url = https://github.com/KDE/kcachegrind/commit/c41607a.patch; + sha256 = "00kh5im3hpcarch8rc2dsgxsajfmd8vd7rry9x6mxrbkgr4ifq8y"; + }) + ]; + postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree From 5cdcd3fef4705fb24a89b5ff13812b87b9e4c5c8 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 3 Feb 2018 16:11:30 +0100 Subject: [PATCH 337/797] squid4: 4.0.21 -> 4.0.23 (fixes CVE-2018-1000024 & CVE-2018-1000027) --- pkgs/servers/squid/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index f0429475be2..62f0b7c001b 100644 --- a/pkgs/servers/squid/4.nix +++ b/pkgs/servers/squid/4.nix @@ -2,11 +2,11 @@ , expat, libxml2, openssl }: stdenv.mkDerivation rec { - name = "squid-4.0.21"; + name = "squid-4.0.23"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "0cwfj3qpl72k5l1h2rvkv1xg0720rifk4wcvi49z216hznyqwk8m"; + sha256 = "0a8g0zs3xayfkxl8maq823b14lckvh9d5lf7ryh9rx303xh1mdqq"; }; buildInputs = [ From cff5eec3825f6158f8296eb194c2b1d53d36cad8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Feb 2018 17:06:13 +0100 Subject: [PATCH 338/797] perl-CryptX: 0.055 -> 0.057 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bddbcea0136..22bb6acf81d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2931,10 +2931,10 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.055"; + name = "CryptX-0.057"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "4d680e8356497fbd2c66114a2bfbde753d77930f997430ba077db66a4458cee9"; + sha256 = "b85fffbc8ecc0b8f1f768926c6b31e755e6df15556462d101d45ef5c48f9d025"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { From ef933224070c99e618cfe8f80c7791ce0ec6419e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:49:27 +0100 Subject: [PATCH 339/797] python.pkgs.pyopenssl: move expression --- .../python-modules/pyopenssl/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 34 +------------- 2 files changed, 47 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/pyopenssl/default.nix diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix new file mode 100644 index 00000000000..6f028341e97 --- /dev/null +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, openssl +, cryptography +, pyasn1 +, idna +, pytest +, pretend +, flaky +, glibcLocales +}: + +buildPythonPackage rec { + pname = "pyOpenSSL"; + version = "17.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; + }; + + outputs = [ "out" "dev" ]; + + preCheck = '' + sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py + # https://github.com/pyca/pyopenssl/issues/692 + sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py + ''; + + checkPhase = '' + runHook preCheck + export LANG="en_US.UTF-8" + py.test + runHook postCheck + ''; + + # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 + # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. + doCheck = !stdenv.isDarwin; + + buildInputs = [ openssl ]; + propagatedBuildInputs = [ cryptography pyasn1 idna ]; + + checkInputs = [ pytest pretend flaky glibcLocales ]; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c697f3449d4..5c6ba0b0b82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14644,39 +14644,7 @@ in { doCheck = false; }; - pyopenssl = buildPythonPackage rec { - pname = "pyOpenSSL"; - name = "${pname}-${version}"; - version = "17.2.0"; - - src = self.fetchPypi { - inherit pname version; - sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; - }; - - outputs = [ "out" "dev" ]; - - preCheck = '' - sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py - # https://github.com/pyca/pyopenssl/issues/692 - sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py - ''; - - checkPhase = '' - runHook preCheck - export LANG="en_US.UTF-8" - py.test - runHook postCheck - ''; - - # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 - # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. - doCheck = !stdenv.isDarwin; - - buildInputs = [ pkgs.openssl self.pytest pkgs.glibcLocales self.pretend self.flaky ]; - propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ]; - }; - + pyopenssl = callPackage ../development/python-modules/pyopenssl { }; pyquery = buildPythonPackage rec { name = "pyquery-${version}"; From 16754b1a27e3bfe878d41a636a482f2fdcb4d216 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:50:58 +0100 Subject: [PATCH 340/797] python: adal: 0.4.7 -> 0.5.0 --- pkgs/development/python-modules/adal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index a1fb9667395..bfd23ab584f 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "adal"; - version = "0.4.7"; + version = "0.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "114046ac85d0054791c21b00922f26286822bc6f2ba3716db42e7e57f762ef20"; + sha256 = "120821f72ca9d59a7c7197fc14d0e27448ff8d331fae230f92d713b9b5c721f7"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; From 154db19dcefe621c4fe43127c7be1759bc57c662 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:02 +0100 Subject: [PATCH 341/797] python: agate-excel: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/agate-excel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index cb0113c22b3..b39df3959fa 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "agate-excel"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7"; + sha256 = "8923f71ee2b5b7b21e52fb314a769b28fb902f647534f5cbbb41991d8710f4c7"; }; propagatedBuildInputs = [ agate openpyxl xlrd ]; From 127ebeb681e9fdfe66e93783bfb9a58aed9be3ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:07 +0100 Subject: [PATCH 342/797] python: agate-sql: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/agate-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 0167b40ea43..34de9ea06e9 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "agate-sql"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14"; + sha256 = "877b7b85adb5f0325455bba8d50a1623fa32af33680b554feca7c756a15ad9b4"; }; propagatedBuildInputs = [ agate sqlalchemy ]; From e21699a62690e3da83b5ad83fad7ba2e6ef8c726 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:11 +0100 Subject: [PATCH 343/797] python: ansicolor: 0.2.4 -> 0.2.6 --- pkgs/development/python-modules/ansicolor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index ca29b631f47..26b182dfc08 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "ansicolor"; - version = "0.2.4"; + version = "0.2.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h"; + sha256 = "d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d"; }; meta = with stdenv.lib; { From 6e8273a5e18b9c0b7a9f0e346edd0d34e6541b2f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:16 +0100 Subject: [PATCH 344/797] python: asgiref: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/asgiref/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index d88f44149bf..a2815fc0c86 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, six }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.1.1"; pname = "asgiref"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "2bfd70fcc51df4036768b91d7b13524090dc8f366d79fa44ba2b0aeb47306344"; + sha256 = "112828022d772925b47b22caf8108dadd3b26bb0af719eb01b2c3a807795429d"; }; propagatedBuildInputs = [ six ]; From af3b738fc81218434482e80f6c135e6de3e5d03b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:20 +0100 Subject: [PATCH 345/797] python: astroid: 1.6.0 -> 1.6.1 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 862157f686a..d22a10ec150 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "astroid"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "71dadba2110008e2c03f9fde662ddd2053db3c0489d0e03c94e828a0399edd4f"; + sha256 = "f0a0e386dbca9f93ea9f3ea6f32b37a24720502b7baa9cb17c3976a680d43a06"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] From 806fb76b37f2d395f6c6b6905468e794f918f29d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:25 +0100 Subject: [PATCH 346/797] python: autopep8: 1.3.3 -> 1.3.4 --- pkgs/development/python-modules/autopep8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 06ad939cfa8..6e58e3485ab 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.3.3"; + version = "1.3.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0c1gl648g2xnz3j0rsp71ld4i32zlglmqjvqf4q8r08jp3zpny7z"; + sha256 = "c7be71ab0cb2f50c9c22c82f0c9acaafc6f57492c3fbfee9790c415005c2b9a5"; }; propagatedBuildInputs = [ pycodestyle ]; From bfc92f8e0b82060f22c341d4cc9cfed04b35b24c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:29 +0100 Subject: [PATCH 347/797] python: botocore: 1.8.33 -> 1.8.36 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8f9c0fd74e6..897e9c88407 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.8.33"; + version = "1.8.36"; src = fetchPypi { inherit pname version; - sha256 = "fa29ea54f26b1193682332d3b4cdde7aa79b4eaccb23f70e88672509c24546f4"; + sha256 = "b2c9e0fd6d14910f759a33c19f8315dddedbb3c5569472b7be7ceed4f001a675"; }; propagatedBuildInputs = [ From 62bc691bdda106cb2631763a1307a000a8cd066d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:34 +0100 Subject: [PATCH 348/797] python: zc.buildout: 2.10.0 -> 2.11.0 --- pkgs/development/python-modules/buildout-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 43a0a42f8e9..c4cde583f05 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.10.0"; + version = "2.11.0"; name = "${pname}-nix-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "00wi0f6wpfl2gywr02x2yqvx6i1k0ll5w4lhdl0khijk4g7mk8dq"; + sha256 = "092b0a147d5fb4e79ee0afde665570f85738e714463854f9e4f7f38d0b27ea82"; }; patches = [ ./nix.patch ]; From 627785f49ac0a0c25f1ce86bccf8f1f26c007496 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:38 +0100 Subject: [PATCH 349/797] python: chainer: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/chainer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 06a455176a2..b7a58f11a15 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0mbc8kwk7pvg03bf0j57a48gr6rsdg4lzmyj0dak8y2l4lmyskpw"; + sha256 = "0669375e5b09d687781a37d6c025ee0a6015f575b4d2c70a2ad09c33b8228f86"; }; checkInputs = [ From 1f2dc1aa4a5242a0d78237e2b0b3a492f17b395d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:43 +0100 Subject: [PATCH 350/797] python: channels: 1.1.8 -> 2.0.0 --- pkgs/development/python-modules/channels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index e5c92ffcde2..36191b95479 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "channels"; name = "${pname}-${version}"; - version = "1.1.8"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0gsy3hwn1vd709jkw8ay44qrm6aw7qggr312z8xwzq0x4ihjda02"; + sha256 = "c365492b90bd936c763e06cd76bda96cd3e70e5a5d2a196c25754e0c1d8da85a"; }; # Files are missing in the distribution From aaa4e18a21ff5c9872b1cd227f4b857b961f6d90 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:48 +0100 Subject: [PATCH 351/797] python: click-threading: 0.4.2 -> 0.4.4 --- pkgs/development/python-modules/click-threading/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 5be41007c6a..3fe2af19fef 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "click-threading"; - version = "0.4.2"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609"; + sha256 = "b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7"; }; checkInputs = [ pytest ]; From 0ed4180d7559ec37d045795bfb430ff3c32150e7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:52 +0100 Subject: [PATCH 352/797] python: cupy: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 6ac91c0aa25..e020eafc04c 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0si0ri8azxvxh3lpm4l4g60jf4nwzibi53yldbdbzb1svlqq060r"; + sha256 = "7426f6332cb01513d2a6a687792dfa17c678ff64dd1b19b04559ddd5672c833f"; }; checkInputs = [ From c80893f40b0b2ec5d4a7b17ce2fbb0fb5cb3cef0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:51:57 +0100 Subject: [PATCH 353/797] python: daphne: 1.4.2 -> 2.0.0 --- pkgs/development/python-modules/daphne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index f819a234146..6fec8bf882c 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "daphne"; name = "${pname}-${version}"; - version = "1.4.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "302725f223853b05688f28c361e050f8db9568b1ce27340c76272c26b49e6d72"; + sha256 = "ecd43a2dd889fb74e16bf8b7f67c076c4ec1b36229ce782272e46c50d56174dd"; }; buildInputs = [ hypothesis ]; From f50ea6e56e6078ca80495d6e4291f897fd259309 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:01 +0100 Subject: [PATCH 354/797] python: django-polymorphic: 1.3 -> 2.0 --- .../development/python-modules/django-polymorphic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index e2fedfdaaf3..1e3d60b765c 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "django-polymorphic"; - version = "1.3"; + version = "2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8737b465ebf5fad772b4c52272189c352f5904f468d298584a3469187e3207ad"; + sha256 = "78f666149ea10cdda08ac6c25ddf4b4e582ee380be87e7968bfed008ef39dfa5"; }; checkInputs = [ django ]; From 2a8a058a217f286e562a8c8cc5d112f9d614dfeb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:06 +0100 Subject: [PATCH 355/797] python: docker: 2.7.0 -> 3.0.0 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 4ce013ac797..e0ab354173e 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,13 +3,13 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "2.7.0"; + version = "3.0.0"; pname = "docker"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker/${name}.tar.gz"; - sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c"; + sha256 = "4a1083656c6ac7615c19094d9b5e052f36e38d0b07e63d7e506c9b5b32c3abe2"; }; propagatedBuildInputs = [ From a7bbc6f84ab3c6908d4f2fa7d9ef18244b42e06e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:10 +0100 Subject: [PATCH 356/797] python: edward: 1.3.4 -> 1.3.5 --- pkgs/development/python-modules/edward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index d29174209a9..b09bef9fec4 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "edward"; - version = "1.3.4"; + version = "1.3.5"; name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "10d6d7886235f4b9fa4ba401daef87c27937a04d2763f507643d730e51de37b6"; + sha256 = "3818b39e77c26fc1a37767a74fdd5e7d02877d75ed901ead2f40bd03baaa109f"; }; # disabled for now due to Tensorflow trying to create files in $HOME: From 7af35ee618e6f9e5ef5e785d11c2b35d9374c761 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:15 +0100 Subject: [PATCH 357/797] python: filelock: 3.0.0 -> 3.0.4 --- pkgs/development/python-modules/filelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 5d617ba9369..46d26e80d56 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.0.0"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "b3ad481724adfb2280773edd95ce501e497e88fa4489c6e41e637ab3fd9a456c"; + sha256 = "011327d4ed939693a5b28c0fdf2fd9bda1f68614c1d6d0643a89382ce9843a71"; }; meta = with stdenv.lib; { From f3b6425713b9e8491dbbd6864b092f88f5d352f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:19 +0100 Subject: [PATCH 358/797] python: ftfy: 5.2.0 -> 5.3.0 --- pkgs/development/python-modules/ftfy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index e54531017f4..d88c894009c 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ftfy"; # latest is 5.1.1, buy spaCy requires 4.4.3 - version = "5.2.0"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b9f84a1437f68ad0bb964fd9da9f6b88d090113ec9e78f290f6d6d0221468e38"; + sha256 = "0ba702d5138f9b35df32b55920c9466208608108f1f3d5de1a68c17e3d68cb7f"; }; propagatedBuildInputs = [ html5lib wcwidth]; From c63eaa64a1c15e3dc6043273be85bc4643f82465 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:24 +0100 Subject: [PATCH 359/797] python: gensim: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 4edd9ac3e55..0c1ffacd827 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { pname = "gensim"; name = "${pname}-${version}"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "db00b68c6567ba0598d400b917c889e8801adf249170ce0a80ec38187d1b0797"; + sha256 = "6b2a813887583e63c8cedd26a91782e5f1e416a11f85394a92ae3ff908e0be03"; }; propagatedBuildInputs = [ smart_open numpy six scipy From 5b99ddbe112d8f9dd449ce00cfd78c6bbfa50fa7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:28 +0100 Subject: [PATCH 360/797] python: google-cloud-speech: 0.30.0 -> 0.31.0 --- .../python-modules/google_cloud_speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 796bd26febd..a388c0fa70c 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "0.30.0"; + version = "0.31.0"; src = fetchPypi { inherit pname version; - sha256 = "0ckigh6bfzhflhllqdnfygm8w0r6ncp0myf1midifx7sn880g4pa"; + sha256 = "b0f6a542165750e42b1c92e6c465e8dc35c38d138ae7f08174971ab9b0df2a71"; }; propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; From 6d6cef6329d8977e9e0ed12dc5dfc5c7aa0ff8cf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:33 +0100 Subject: [PATCH 361/797] python: grpcio: 1.8.4 -> 1.9.0 --- pkgs/development/python-modules/grpcio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index c22f2c2f4d7..ea59bedc035 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.8.4"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "88d87aab9c7889b3ab29dd74aac1a5493ed78b9bf5afba1c069c9dd5531f951d"; + sha256 = "b61d3a7c45aa08f15dfa735a6a8282b5097be91ff36ad347594d3945ffc12181"; }; propagatedBuildInputs = [ six protobuf ] From 5ce76d041fe87e564048ff30e85f14896da01d43 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:38 +0100 Subject: [PATCH 362/797] python: python-hglib: 2.4 -> 2.5 --- pkgs/development/python-modules/hglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index 4e96f938991..8acaf9f0637 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "python-hglib"; - version = "2.4"; + version = "2.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0qll9cc9ndqizby00gxdcf6d0cysdhjkr8670a4ffrk55bcnwgb9"; + sha256 = "fee180bb6796e5d2d25158b2d3c9f048648e427dd28b23a58d369adb14dd67cb"; }; checkInputs = [ nose ]; From 6c280dad4877f93b4f3b6a240c243411f57290db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:42 +0100 Subject: [PATCH 363/797] python: ipywidgets: 7.1.0 -> 7.1.1 --- pkgs/development/python-modules/ipywidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index f77c3570c02..b41f70c073c 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.1.0"; + version = "7.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3e2be7dea4f97c9a4df71ef065cad9f2e420dd901127bf7cb690fb56d2b34ea3"; + sha256 = "69e8c444e99601e6f9b9e9e596c87c19665fc73c2dd05cd507c94f35fba2959d"; }; # Tests are not distributed From 74e6c1eea45d0c88190ad3cfa9fcc1526dc1ce55 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:47 +0100 Subject: [PATCH 364/797] python: jupyter_client: 5.2.1 -> 5.2.2 --- pkgs/development/python-modules/jupyter_client/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 42d7752eda3..d94842ade12 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -11,19 +11,20 @@ , ipython , mock , pytest +, tornado }: buildPythonPackage rec { pname = "jupyter_client"; - version = "5.2.1"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "462790d46b244f0a631ea5e3cd5cdbad6874d5d24cc0ff512deb7c16cdf8653d"; + sha256 = "83d5e23132f0d8f79ccd3939f53fb9fa97f88a896a85114dc48d0e86909b06c4"; }; checkInputs = [ ipykernel ipython mock pytest ]; - propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py; + propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil tornado ] ++ lib.optional isPyPy py; checkPhase = '' py.test From 933b31989f837b7423b340aba82b43cc2667adde Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:51 +0100 Subject: [PATCH 365/797] python: keyring: 10.6.0 -> 11.0.0 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 0f99152766a..8c97b18e9b6 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "keyring"; - version = "10.6.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; - sha256 = "69c2b69d66a0db1165c6875c1833c52f4dc62179959692b30c8c4a4b8390d895"; + sha256 = "b4607520a7c97be96be4ddc00f4b9dac65f47a45af4b4cd13ed5a8879641d646"; }; buildInputs = [ From 8ba8d263f71f6b4b7f9c1a3f18d5c9670d5d1126 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:52:56 +0100 Subject: [PATCH 366/797] python: limits: 1.2.1 -> 1.3 --- pkgs/development/python-modules/limits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 672cad5bfe1..57f47ff5fd8 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "1.2.1"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "0dfbrmqixsvhvzqgd4s8rfj933k1w5q4bm23pp9zyp70xlb0mfmd"; + sha256 = "a017b8d9e9da6761f4574642149c337f8f540d4edfe573fb91ad2c4001a2bc76"; }; propagatedBuildInputs = [ six ]; From 7fcf58cc0c2d9762206da5c06f5091b9d54b01e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:00 +0100 Subject: [PATCH 367/797] python: magic-wormhole: 0.10.3 -> 0.10.4 --- pkgs/development/python-modules/magic-wormhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index b21643b4547..6afe4cba00d 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.10.3"; + version = "0.10.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "48465d58f9c0d729dc586627cf280830e7ed59f9e7999946ae1d763c6b8db999"; + sha256 = "cd3105975e71bc6437848c7fc9f0b23ef0e0c625c8b19ec66a5ddc727c6d11ae"; }; checkInputs = [ mock ]; From c585a084c34e006a64f5abeaa45c6acce299b1de Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:05 +0100 Subject: [PATCH 368/797] python: matplotlib: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 49bdfa8dc08..3579c22e92b 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -21,13 +21,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.1.1"; + version = "2.1.2"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "659f5e1aa0e0f01488c61eff47560c43b8be511c6a29293d7f3896ae17bd8b23"; + sha256 = "725a3f12739d133adfa381e1b33bd70c6f64db453bfc536e148824816e568894"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; From 34703427ff206181ef43d0cd3bc669ee2b58cd37 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:09 +0100 Subject: [PATCH 369/797] python: nbxmpp: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/nbxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 26525adb1c9..295354003ba 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "10bfb12b083a7509779298c31b4b61e2ed7e78d1960cbcfb3de8d38f3b830991"; + sha256 = "dd66e701a4856e3cace8f4865837ccc9bcfcdb286df01f01aa19531f5d834a83"; }; meta = with stdenv.lib; { From 7cb173ebc5e3fbe704c7cb58048789f3223310ce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:14 +0100 Subject: [PATCH 370/797] python: nipype: 0.14.0 -> 1.0.0 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 8ee6eeb104b..a38f23d5536 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -29,11 +29,11 @@ assert !isPy3k -> configparser != null; buildPythonPackage rec { pname = "nipype"; - version = "0.14.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0airdrh93vwmbfkqxp5cqfzm0zzqcvjnvphv3zhg197y39xxpl1k"; + sha256 = "4c14c6cae1f530f89d76fa8136d52488b1daf3a02179da65121b76eaf4a6f0ea"; }; doCheck = false; # fails with TypeError: None is not callable From 6220aad497f2bad3a9dd594630733142aeb5f150 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:18 +0100 Subject: [PATCH 371/797] python: notebook: 5.3.1 -> 5.4.0 --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 77ff31934c3..be5a798b6c6 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.3.1"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "12vk3shylx61whdchxbg71mdlwiw2l31vl227sqwpb0p67bbw2rq"; + sha256 = "dd431fad9bdd25aa9ff8265da096ef770475e21bf1d327982611a7de5cd904ca"; }; LC_ALL = "en_US.utf8"; From 85e7cb5aa805b0ac4ea3fdc00868195104a8b15a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:27 +0100 Subject: [PATCH 372/797] python: olefile: 0.44 -> 0.45.1 --- pkgs/development/python-modules/olefile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index 5cf51b84132..23b470ed90f 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "olefile"; - version = "0.44"; + version = "0.45.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1bbk1xplmrhymqpk6rkb15sg7v9qfih7zh23p6g2fxxas06cmwk1"; + sha256 = "2b6575f5290de8ab1086f8c5490591f7e0885af682c7c1793bdaf6e64078d385"; }; meta = with stdenv.lib; { From 14f0308f2b4b6d8b14114a97769701993550616f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:32 +0100 Subject: [PATCH 373/797] python: openpyxl: 2.4.9 -> 2.5.0 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 9a94848000c..fe13b575afc 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.4.9"; + version = "2.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "95e007f4d121f4fd73f39a6d74a883c75e9fa9d96de91d43c1641c103c3a9b18"; + sha256 = "0ff2e0c2c85cbf42e82dd223e7f2401a62dc73c18cd9e5dd7763dc6c8014ebde"; }; checkInputs = [ pytest ]; From 150675c01b6be23611cb2344fe16415e5ad10299 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:36 +0100 Subject: [PATCH 374/797] python: pecan: 1.2.1 -> 1.3.2 --- pkgs/development/python-modules/pecan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index b6e022640cb..688c75e570f 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pecan"; - version = "1.2.1"; + version = "1.3.2"; patches = [ ./python36_test_fix.patch @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0ikc32rd2hr8j2jxc0mllvdjvxydx3fwfp3z8sdxmkzdkixlb5cd"; + sha256 = "24f06cf88a488b75f433e62b33c1c97e4575d0cd91eec9eec841a81cecfd6de3"; }; propagatedBuildInputs = [ singledispatch logutils ]; From d151d30c69ad26fc94fb258f573d96eec3f9ae21 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:41 +0100 Subject: [PATCH 375/797] python: pendulum: 1.3.2 -> 1.4.0 --- pkgs/development/python-modules/pendulum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index e75a264de3d..aa8e2d22b43 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pendulum"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1j6hdsdhhw4d6fy9byr0vyxqnb53ap8bh2a0cibl7p0ks0zvb14j"; + sha256 = "e996c34fb101c9c6d88a839c19af74d7c067b92ed3371274efcf4d4b6dc160a6"; }; propagatedBuildInputs = [ dateutil pytzdata tzlocal ]; From a77cef2c3b3f21a510cf4f6e3885b7ed8de6eea8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:46 +0100 Subject: [PATCH 376/797] python: plotly: 2.2.3 -> 2.3.0 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 75f1b060077..bddff8e95f4 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.2.3"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "dadd2263f1c0449b248fd3742a077d9594935921a9597529be76d6a841237ab0"; + sha256 = "95e72273699108f215886ab961dbf0890904d39583be39eabcd0788bc7ccf695"; }; propagatedBuildInputs = [ From 46dc693eb0f4b6a0803af6b56627db26e40af503 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:50 +0100 Subject: [PATCH 377/797] python: pycryptodome: 3.4.7 -> 3.4.9 --- pkgs/development/python-modules/pycryptodome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 9751eaf7ce7..a086658cd7b 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.4.7"; + version = "3.4.9"; pname = "pycryptodome"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7"; + sha256 = "00cc7767c7bbe91f15a65a1b2ebe7a08002b8ae8221c1dcecc5c5c9ab6f79753"; }; meta = { From 0e7162df316ccb71b05a63a72c9240e19d71ce31 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:55 +0100 Subject: [PATCH 378/797] python: pycryptodomex: 3.4.7 -> 3.4.9 --- pkgs/development/python-modules/pycryptodomex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 35a7213306f..8cc22c986e2 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; name = "${pname}-${version}"; - version = "3.4.7"; + version = "3.4.9"; meta = { description = "A self-contained cryptographic library for Python"; @@ -13,6 +13,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "52aa2e540d06d63636e4b5356957c520611e28a88386bad4d18980e4b00e0b5a"; + sha256 = "d078b67be76ccafa8b7cc391e87151b80b0ef9bfbeee8a95d286e522cc7537f7"; }; } From 6a85336105e787cf22b23521bbb5230cf3ac74ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:53:59 +0100 Subject: [PATCH 379/797] python: pyemd: 0.4.4 -> 0.5.1 --- pkgs/development/python-modules/pyemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index 1004d70476c..a7430c94b48 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyemd"; - version = "0.4.4"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "13y06y7r1697cv4r430g45fxs40i2yk9xn0dk9nqlrpddw3a0mr4"; + sha256 = "fc81c2116f8573e559dfbb8d73e03d9f73c22d0770559f406516984302e07e70"; }; propagatedBuildInputs = [ numpy ]; From ee558088fd6056d7dc1f1664c7bb5245a0de7171 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:04 +0100 Subject: [PATCH 380/797] python: pylint: 1.8.1 -> 1.8.2 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 79337663c62..194d91341d8 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.8.1"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "3035e44e37cd09919e9edad5573af01d7c6b9c52a0ebb4781185ae7ab690458b"; + sha256 = "4fe3b99da7e789545327b75548cee6b511e4faa98afe268130fea1af4b5ec022"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; From 1583803ed30033b3a03762be3148a87e417628e4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:08 +0100 Subject: [PATCH 381/797] python: pyOpenSSL: 17.2.0 -> 17.5.0 --- pkgs/development/python-modules/pyopenssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 6f028341e97..f3054e3e4dd 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pyOpenSSL"; - version = "17.2.0"; + version = "17.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; + sha256 = "2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773"; }; outputs = [ "out" "dev" ]; From 20d883917a34d35a086eabf70c3eb63a02736bd1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:13 +0100 Subject: [PATCH 382/797] python: pytest: 3.3.2 -> 3.4.0 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 91e22baa4ad..9b7f5cc12de 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,7 +2,7 @@ , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k }: buildPythonPackage rec { - version = "3.3.2"; + version = "3.4.0"; pname = "pytest"; preCheck = '' @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "53548280ede7818f4dc2ad96608b9f08ae2cc2ca3874f2ceb6f97e3583f25bc4"; + sha256 = "6074ea3b9c999bd6d0df5fa9d12dd95ccd23550df2a582f5f5b848331d2e82ca"; }; checkInputs = [ hypothesis ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c6ba0b0b82..87c96d56e9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3217,9 +3217,9 @@ in { }; }; - pytest = self.pytest_33; + pytest = self.pytest_34; - pytest_33 = callPackage ../development/python-modules/pytest/default.nix{ + pytest_34 = callPackage ../development/python-modules/pytest/default.nix{ hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; From ac0193639f13886de2610e6514b9c5032262023f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:17 +0100 Subject: [PATCH 383/797] python: pytzdata: 2017.3.1 -> 2018.3 --- pkgs/development/python-modules/pytzdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index 6de0431edb3..a7c6b6db6b2 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytzdata"; - version = "2017.3.1"; + version = "2018.3"; src = fetchPypi { inherit pname version; - sha256 = "1wi3jh39zsa9iiyyhynhj7w5b2p9wdyd0ppavpsrmf3wxvr7cwz8"; + sha256 = "4e2cceb54335cd6c28caea46b15cd592e2aec5e8b05b0241cbccfb1b23c02ae7"; }; # No tests From 66672ced1007e1ac21cd2cc8b5ee1699dfad08e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:22 +0100 Subject: [PATCH 384/797] python: requestsexceptions: 1.3.0 -> 1.4.0 --- .../development/python-modules/requestsexceptions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix index 0321f9abec2..87af0e78b18 100644 --- a/pkgs/development/python-modules/requestsexceptions/default.nix +++ b/pkgs/development/python-modules/requestsexceptions/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "requestsexceptions"; - version = "1.3.0"; + version = "1.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0gim00vi7vfq16y8b9m1vpy01grqvrdrbh88jb98qx6n6sk1n54g"; + sha256 = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065"; }; propagatedBuildInputs = [ pbr ]; From dd0381af8e07a7bf2c4b948b736ccb77bae01160 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:26 +0100 Subject: [PATCH 385/797] python: restview: 2.8.0 -> 2.8.1 --- pkgs/development/python-modules/restview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 3c61ea4ded2..a13df64cd03 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "restview"; name = "${pname}-${version}"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "5f6f1523228eab3269f59dd03ac560f7d370cd81df6fdbcb4914b5e6bd896a11"; + sha256 = "45320b4e52945d23b3f1aeacc7ff97a3b798204fe625f8b81ed5322326d5bcd1"; }; propagatedBuildInputs = [ docutils readme_renderer pygments ]; From 6d256b8e792d0ca9429a7ee67f6e8be86de45178 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:35 +0100 Subject: [PATCH 386/797] python: Shapely: 1.6.3 -> 1.6.4.post1 --- pkgs/development/python-modules/shapely/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index dab3542b809..7246205619f 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Shapely"; - version = "1.6.3"; + version = "1.6.4.post1"; src = fetchPypi { inherit pname version; - sha256 = "14152f111c7711fc6756fd538ec12fc8cdde7419f869b244922f71f61b2a6c6b"; + sha256 = "30df7572d311514802df8dc0e229d1660bc4cbdcf027a8281e79c5fc2fcf02f2"; }; buildInputs = [ geos glibcLocales cython ]; From 131a42b918a87ecab96d9641a75bb33240af37f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:40 +0100 Subject: [PATCH 387/797] python: SQLAlchemy: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 175aa4a6c3a..51856ec0da0 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "9ede7070d6fd18f28058be88296ed67893e2637465516d6a596cd9afea97b154"; + sha256 = "64b4720f0a8e033db0154d3824f5bf677cf2797e11d44743cf0aebd2a0499d9d"; }; checkInputs = [ From 48f1fc32d8bab9801cf133c03258829761ae80d6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:45 +0100 Subject: [PATCH 388/797] python: sybil: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/sybil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 1370c59ace8..31fd0977c14 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "5bd7dd09eff68cbec9062e6950124fadfaaccbc0f50b23c1037f4d70ae86f0f1"; + sha256 = "86332553392f865403883e44695bd8d9d47fe3887c01e17591955237b8fd2d8f"; }; checkInputs = [ pytest nose ]; From 25a8116a5b6137a1f647512beaafb293a5e3f3b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:49 +0100 Subject: [PATCH 389/797] python: testfixtures: 5.3.1 -> 5.4.0 --- pkgs/development/python-modules/testfixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 498c722a046..933b4be1caf 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "5.3.1"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "670ade9410b7132278209e6a2e893caf098b040c4ba4d5ea848367a9c5588728"; + sha256 = "338aed9695c432b7c9b8a271dabb521e3e7e2c96b11f7b4e60552f1c8408a8f0"; }; checkInputs = [ mock manuel pytest sybil zope_component ]; From bbcc2eb34e0ba001160b51e5fec4002951237aa9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:54 +0100 Subject: [PATCH 390/797] python: thespian: 3.9.1 -> 3.9.2 --- pkgs/development/python-modules/thespian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 1a2aced6858..e4ed824d230 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.1"; + version = "3.9.2"; pname = "thespian"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0b303bv85176xd5mf3q5j549s28wi70ck2xxgj1cvpydh23dzipb"; + sha256 = "aec9793fecf45bb91fe919dc61b5c48a4aadfb9f94b06cd92883df7952eacf95"; }; # Do not run the test suite: it takes a long time and uses From 21d9ec1f90e6dff58029b7ac4849279555b884f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:54:59 +0100 Subject: [PATCH 391/797] python: tifffile: 0.13.4 -> 0.13.5 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index b0c3131785f..12edef190dc 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "0.13.4"; + version = "0.13.5"; src = fetchPypi { inherit pname version; - sha256 = "43d3903e8ea4542aaa4759ec3683641555d3a15e68fa5a41aaf14cce4110641a"; + sha256 = "bca0fc9eaf609a27ebd99d8466e05d5a6e79389957f17582b70643dbca65e3d8"; }; checkInputs = [ nose ]; From f70f5e19cf1daea8f9b531394da9bab302214dd8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 10:55:08 +0100 Subject: [PATCH 392/797] python: widgetsnbextension: 3.1.0 -> 3.1.3 --- .../development/python-modules/widgetsnbextension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index ab63b444af6..e455f233411 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.1.0"; + version = "3.1.3"; src = fetchPypi { inherit pname version; - sha256 = "67fc28c3b9fede955d69bccbd92784e3f0c6d0dee3a71532cd3367c257feb178"; + sha256 = "02edabcaeaa247721df8027f660f3384c20f30c4865a7ea5dd80685c368736df"; }; propagatedBuildInputs = [ notebook ]; From 763a372911dde44c855b0bfdd7dcd76a61a06d67 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 11:18:34 +0100 Subject: [PATCH 393/797] awscli: 1.4.29 -> 1.4.32 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index bad9ccae799..ef5afb91766 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -26,12 +26,12 @@ let in buildPythonPackage rec { pname = "awscli"; - version = "1.14.29"; + version = "1.14.32"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "96edb1dd72fbc13638967fe07c436e95133169759cc962b973bb79ba959bc652"; + sha256 = "09i82nf43pv5v598wvbj4nk1bfc64wp7xzlx5ykaca5m40lkarz0"; }; # No tests included From c7f535c82df7127000cebc2307e3b5fdefc56c4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 11:21:05 +0100 Subject: [PATCH 394/797] spyder: 3.2.4 -> 3.2.6 --- pkgs/applications/science/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 0952b61551e..3163c7cb40f 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -10,12 +10,12 @@ buildPythonApplication rec { pname = "spyder"; - version = "3.2.4"; + version = "3.2.6"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "028hg71gfq2yrplwhhl7hl4rbwji1l0zxzghblwmb0i443ki10v3"; + sha256 = "87d6a4f5ee1aac4284461ee3584c3ade50cb53feb3fe35abebfdfb9be18c526a"; }; propagatedBuildInputs = [ From e375e77bcf8763d64087e10259dbf36e46542202 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 11:23:42 +0100 Subject: [PATCH 395/797] python.pkgs.pyqt5: 5.9.2 -> 5.10 --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 053824ef8e9..54471f64e30 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -6,7 +6,7 @@ let pname = "PyQt"; - version = "5.9.2"; + version = "5.10"; inherit (pythonPackages) buildPythonPackage python dbus-python sip; in buildPythonPackage { @@ -25,7 +25,7 @@ in buildPythonPackage { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "15439gxari6azbfql20ksz8h4gv23k3kfyjyr89h2yy9k32xm461"; + sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; }; nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; From 40aff3b91255bf6bc35927bb64e4be912c5003f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 11:35:57 +0100 Subject: [PATCH 396/797] python.pkgs.cryptography_vectors: move expression --- .../cryptography_vectors/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +-------------- 2 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/cryptography_vectors/default.nix diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix new file mode 100644 index 00000000000..5c04bd8ba93 --- /dev/null +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage +, fetchPypi +, cryptography +}: + +buildPythonPackage rec { + # also bump cryptography + pname = "cryptography_vectors"; + version = cryptography.version; + + src = fetchPypi { + inherit pname version; + sha256 = "beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1"; + }; + + # No tests included + doCheck = false; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87c96d56e9b..e8f4baeb953 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2841,20 +2841,7 @@ in { __impureHostDeps = [ "/usr/lib" ]; }; - cryptography_vectors = buildPythonPackage rec { - # also bump cryptography - pname = "cryptography_vectors"; - version = self.cryptography.version; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1"; - }; - - # No tests included - doCheck = false; - }; + cryptography_vectors = callPackage ../development/python-modules/cryptography_vectors { }; curtsies = callPackage ../development/python-modules/curtsies { }; From bba13933612d3ebecc5942ba1ed38bcb7fae5d3f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 11:36:14 +0100 Subject: [PATCH 397/797] python.pkgs.cryptography: move expression --- .../python-modules/cryptography/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 45 +------------ 2 files changed, 66 insertions(+), 44 deletions(-) create mode 100644 pkgs/development/python-modules/cryptography/default.nix diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix new file mode 100644 index 00000000000..4933bbd500c --- /dev/null +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, openssl +, cryptography_vectors +, darwin +, idna +, asn1crypto +, packaging +, six +, pythonOlder +, enum34 +, ipaddress +, isPyPy +, cffi +, pytest +, pretend +, iso8601 +, pytz +, hypothesis +}: + +buildPythonPackage rec { + # also bump cryptography_vectors + pname = "cryptography"; + version = "2.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a"; + }; + + outputs = [ "out" "dev" ]; + + buildInputs = [ openssl cryptography_vectors ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + propagatedBuildInputs = [ + idna + asn1crypto + packaging + six + ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 + ++ stdenv.lib.optional (pythonOlder "3.3") ipaddress + ++ stdenv.lib.optional (!isPyPy) cffi; + + checkInputs = [ + pytest + pretend + iso8601 + pytz + hypothesis + ]; + + # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary + # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't + # use it. This boils down to them checking compatibility with `getentropy` in two different places, + # so let's neuter the second test. + postPatch = '' + substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"' + ''; + + # IOKit's dependencies are inconsistent between OSX versions, so this is the best we + # can do until nix 1.11's release + __impureHostDeps = [ "/usr/lib" ]; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8f4baeb953..b218b012c75 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2796,50 +2796,7 @@ in { }; }; - cryptography = buildPythonPackage rec { - # also bump cryptography_vectors - pname = "cryptography"; - name = "${pname}-${version}"; - version = "2.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a"; - }; - - outputs = [ "out" "dev" ]; - - buildInputs = [ pkgs.openssl self.cryptography_vectors ] - ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; - propagatedBuildInputs = with self; [ - idna - asn1crypto - packaging - six - ] ++ optional (pythonOlder "3.4") enum34 - ++ optional (pythonOlder "3.3") ipaddress - ++ optional (!isPyPy) cffi; - - checkInputs = with self; [ - pytest - pretend - iso8601 - pytz - hypothesis - ]; - - # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary - # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't - # use it. This boils down to them checking compatibility with `getentropy` in two different places, - # so let's neuter the second test. - postPatch = '' - substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"' - ''; - - # IOKit's dependencies are inconsistent between OSX versions, so this is the best we - # can do until nix 1.11's release - __impureHostDeps = [ "/usr/lib" ]; - }; + cryptography = callPackage ../development/python-modules/cryptography { }; cryptography_vectors = callPackage ../development/python-modules/cryptography_vectors { }; From 796a7d66b8af7537a5d752b0c01ce4cbd099b614 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 11:39:11 +0100 Subject: [PATCH 398/797] python: cryptography: 2.0.3 -> 2.1.4 --- pkgs/development/python-modules/cryptography/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 4933bbd500c..606b174a514 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -20,14 +20,16 @@ , hypothesis }: -buildPythonPackage rec { +let + version = "2.1.4"; +in assert version == cryptography_vectors.version; buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; - version = "2.0.3"; + inherit version; src = fetchPypi { inherit pname version; - sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a"; + sha256 = "e4d967371c5b6b2e67855066471d844c5d52d210c36c28d49a8507b96e2c5291"; }; outputs = [ "out" "dev" ]; From dbb5b599ed69c0bdda7f30b2287a8d4b66e15fe7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 11:43:15 +0100 Subject: [PATCH 399/797] python.pkgs.cryptography_vectors: 2.0.3 -> 2.1.4 --- .../python-modules/cryptography_vectors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index 5c04bd8ba93..ce272d29ca1 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - version = cryptography.version; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1"; + sha256 = "78c4b4f3f84853ea5d038e2f53d355229dd8119fe9cf949c3e497c85c760a5ca"; }; # No tests included From 7953e05672da4224c486e3ebf98b36adc50030ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2018 12:12:06 +0100 Subject: [PATCH 400/797] pythonPackages.pyyaml: move derivation --- .../python-modules/pyyaml/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +---------------- 2 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pyyaml/default.nix diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix new file mode 100644 index 00000000000..a4918bf352d --- /dev/null +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, libyaml }: + +buildPythonPackage rec { + pname = "PyYAML"; + version = "3.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"; + }; + + propagatedBuildInputs = [ libyaml ]; + + meta = with lib; { + description = "The next generation YAML parser and emitter for Python"; + homepage = https://github.com/yaml/pyyaml; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b218b012c75..57ef50e7e27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14946,23 +14946,7 @@ in { pyaml = callPackage ../development/python-modules/pyaml { }; - pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.12"; - - src = pkgs.fetchurl { - url = "http://pyyaml.org/download/pyyaml/${name}.zip"; - sha256 = "19s1lxi0idq4a0bpvld866pv5b16lqxypyswmsdi5ys4210jxj2s"; - }; - - buildInputs = with self; [ pkgs.pyrex ]; - propagatedBuildInputs = with self; [ pkgs.libyaml ]; - - meta = { - description = "The next generation YAML parser and emitter for Python"; - homepage = http://pyyaml.org; - license = licenses.free; # !? - }; - }); + pyyaml = callPackage ../development/python-modules/pyyaml { }; rabbitpy = buildPythonPackage rec { version = "0.26.2"; From 330cad0d36886650efd8aadb509be91b37bf7274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2018 12:48:47 +0100 Subject: [PATCH 401/797] python: pytz: 2017.2 -> 2017.3 --- .../python-modules/pytz/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +----------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/pytz/default.nix diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix new file mode 100644 index 00000000000..96f0ad136a0 --- /dev/null +++ b/pkgs/development/python-modules/pytz/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, python }: + +buildPythonPackage rec { + pname = "pytz"; + version = "2017.3"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "fae4cffc040921b8a2d60c6cf0b5d662c1190fe54d718271db4eb17d44a185b7"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s pytz/tests + ''; + + meta = with lib; { + description = "World timezone definitions, modern and historical"; + homepage = "http://pythonhosted.org/pytz"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57ef50e7e27..6ae7f55d97b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14855,27 +14855,7 @@ in { }; }; - pytz = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytz"; - version = "2017.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "12cmd3j46d2gcw08bspvp6s9icfcvx88zjz52n1bli9dyvl5dh7m"; - extension = "zip"; - }; - - checkPhase = '' - python -m unittest discover -s pytz/tests - ''; - - meta = { - description = "World timezone definitions, modern and historical"; - homepage = "http://pythonhosted.org/pytz"; - license = licenses.mit; - }; - }; + pytz = callPackage ../development/python-modules/pytz { }; pytzdata = callPackage ../development/python-modules/pytzdata { }; From b18a0f416daa722be6e7374ff09f479cff5fd3ff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 12:55:24 +0100 Subject: [PATCH 402/797] python.pkgs.simplegeneric: move expression --- .../python-modules/simplegeneric/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +-------------- 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/simplegeneric/default.nix diff --git a/pkgs/development/python-modules/simplegeneric/default.nix b/pkgs/development/python-modules/simplegeneric/default.nix new file mode 100644 index 00000000000..491e218154c --- /dev/null +++ b/pkgs/development/python-modules/simplegeneric/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "simplegeneric"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"; + }; + + meta = { + description = "Simple generic functions"; + homepage = http://cheeseshop.python.org/pypi/simplegeneric; + license = lib.licenses.zpl21; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ae7f55d97b..6c6126d3adc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15846,22 +15846,7 @@ in { }; }; - simplegeneric = buildPythonPackage rec { - version = "0.8.1"; - name = "simplegeneric-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/simplegeneric/${name}.zip"; - sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"; - }; - - meta = { - description = "Simple generic functions"; - homepage = http://cheeseshop.python.org/pypi/simplegeneric; - license = licenses.zpl21; - }; - }; - + simplegeneric = callPackage ../development/python-modules/simplegeneric { }; shortuuid = buildPythonPackage rec { name = "shortuuid-${version}"; From 8e0a2b7a21617440aaf8dad0ed642c28d6230e54 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 13:00:50 +0100 Subject: [PATCH 403/797] python.pkgs.sympy: move expression --- .../python-modules/sympy/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +-------------- 2 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/sympy/default.nix diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix new file mode 100644 index 00000000000..5190ff7b021 --- /dev/null +++ b/pkgs/development/python-modules/sympy/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, mpmath +}: + +buildPythonPackage rec { + pname = "sympy"; + version = "1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bpzjwr9hrr7w88v4vgnj9lr6vxcldc94si13n8xpr1rv08d5b1y"; + }; + + checkInputs = [ glibcLocales ]; + + propagatedBuildInputs = [ mpmath ]; + + # Bunch of failures including transients. + doCheck = false; + + preCheck = '' + export LANG="en_US.UTF-8" + ''; + + meta = { + description = "A Python library for symbolic mathematics"; + homepage = http://www.sympy.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lovek323 ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c6126d3adc..d7aa84b896d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16328,33 +16328,7 @@ in { }; }; - sympy = buildPythonPackage rec { - name = "sympy-1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sympy/${name}.tar.gz"; - sha256 = "1bpzjwr9hrr7w88v4vgnj9lr6vxcldc94si13n8xpr1rv08d5b1y"; - }; - - buildInputs = [ pkgs.glibcLocales ]; - - propagatedBuildInputs = with self; [ mpmath ]; - - # Bunch of failures including transients. - doCheck = false; - - preCheck = '' - export LANG="en_US.UTF-8" - ''; - - meta = { - description = "A Python library for symbolic mathematics"; - homepage = http://www.sympy.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - }; + sympy = callPackage ../development/python-modules/sympy { }; pilkit = buildPythonPackage rec { name = "pilkit-1.1.4"; From 84fe4095b8b2b0737bc07721b0de281869a0ad10 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 13:04:09 +0100 Subject: [PATCH 404/797] python.pkgs.sympy: 1.0 -> 1.1.1 --- pkgs/development/python-modules/sympy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 5190ff7b021..67c799e554e 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1bpzjwr9hrr7w88v4vgnj9lr6vxcldc94si13n8xpr1rv08d5b1y"; + sha256 = "ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4"; }; checkInputs = [ glibcLocales ]; From 29e8365d2f4538f19b320f2139b76e44d60d51c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 14:11:53 +0100 Subject: [PATCH 405/797] python.pkgs.packet-python: move expression --- .../python-modules/packet-python/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------- 2 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/packet-python/default.nix diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix new file mode 100644 index 00000000000..6d2d7f368b3 --- /dev/null +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, python +}: + +buildPythonPackage rec { + pname = "packet-python"; + version = "1.33"; + src = fetchPypi { + inherit pname version; + sha256 = "0bmvfmvjm8jx0y8sv0jf5mhv0h3v8idx0sc5myxs7ig200584dd3"; + }; + propagatedBuildInputs = [ requests ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s test + ''; + + # Not all test files are included in archive + doCheck = false; + + meta = { + description = "A Python client for the Packet API."; + homepage = "https://github.com/packethost/packet-python"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ dipinhora ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7aa84b896d..1556ea17b46 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21908,24 +21908,7 @@ EOF whoosh = callPackage ../development/python-modules/whoosh { }; - packet-python = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "packet-python"; - version = "1.33"; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/eb/82/f0506bd964501f958ac6a37e843ccb7bd9e712732886258314d55f0ec710/packet-python-1.33.tar.gz"; - sha256 = "0bmvfmvjm8jx0y8sv0jf5mhv0h3v8idx0sc5myxs7ig200584dd3"; - }; - propagatedBuildInputs = with self; [ requests ]; - - meta = { - description = "A Python client for the Packet API."; - homepage = "https://github.com/packethost/packet-python"; - license = licenses.lgpl3; - maintainers = with maintainers; [ dipinhora ]; - platforms = platforms.all; - }; - }; + packet-python = callPackage ../development/python-modules/packet-python { }; pwntools = callPackage ../development/python-modules/pwntools { }; From 7afd65aed4e6cec482e0f536e1fdb7a88bfe4646 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 14:30:17 +0100 Subject: [PATCH 406/797] python.pkgs.packet-python: 1.33 -> 1.37.1 --- .../python-modules/packet-python/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 6d2d7f368b3..5811d510dff 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -3,14 +3,15 @@ , fetchPypi , requests , python +, fetchpatch }: buildPythonPackage rec { pname = "packet-python"; - version = "1.33"; + version = "1.37.1"; src = fetchPypi { inherit pname version; - sha256 = "0bmvfmvjm8jx0y8sv0jf5mhv0h3v8idx0sc5myxs7ig200584dd3"; + sha256 = "316941d2473c0f42ac17ac89e9aa63a023bb96f35cf8eafe9e091ea424892778"; }; propagatedBuildInputs = [ requests ]; @@ -18,6 +19,13 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover -s test ''; + patches = [ + (fetchpatch { + url = https://github.com/packethost/packet-python/commit/361ad0c60d0bfce2a992eefd17e917f9dcf36400.patch; + sha256 = "1cmzyq0302y4cqmim6arnvn8n620qysq458g2w5aq4zj1vz1q9g1"; + }) + ]; + # Not all test files are included in archive doCheck = false; From 6fee9079aac8a9f7505fae69db9ff2171d458ced Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 15:03:42 +0100 Subject: [PATCH 407/797] python.pkgs.webcolors: 1.4 -> 1.7 --- .../python-modules/webcolors/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/webcolors/default.nix diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix new file mode 100644 index 00000000000..c23bffaf142 --- /dev/null +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "webcolors"; + version = "1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "e47e68644d41c0b1f1e4d939cfe4039bdf1ab31234df63c7a4f59d4766487206"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = { + description = "Library for working with color names/values defined by the HTML and CSS specifications"; + homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1556ea17b46..5f31c45848a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18164,24 +18164,7 @@ EOF }; }; - webcolors = buildPythonPackage rec { - name = "webcolors-1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/webcolors/${name}.tar.gz"; - sha256 = "304fc95dab2848c7bf64f378356766e692c2f8b4a8b15fa3509544e6412936e8"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Library for working with color names/values defined by the HTML and CSS specifications"; - homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; - license = licenses.bsd3; - platforms = platforms.unix; - }; - }; + webcolors = callPackage ../development/python-modules/webcolors { }; webencodings = callPackage ../development/python-modules/webencodings { }; From f875b1083ab5b25a19e88cbfd23c155e9ddafb24 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 15:09:21 +0100 Subject: [PATCH 408/797] python.pkgs.dicttoxml: 1.6.4 -> 1.7.4 --- .../python-modules/dicttoxml/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------ 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/dicttoxml/default.nix diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix new file mode 100644 index 00000000000..7d30aad69c4 --- /dev/null +++ b/pkgs/development/python-modules/dicttoxml/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "dicttoxml"; + version = "1.7.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45"; + }; + + # No tests in archive + doCheck = false; + + meta = { + description = "Converts a Python dictionary or other native data type into a valid XML string"; + homepage = https://github.com/quandyfactory/dicttoxml; + license = lib.licenses.gpl2; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f31c45848a..78e104951d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20370,21 +20370,7 @@ EOF }; }; - dicttoxml = buildPythonPackage rec { - name = "dicttoxml-1.6.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dicttoxml/dicttoxml-1.6.4.tar.gz"; - sha256 = "5f29e95fec56680823dc41911c04c2af08727ee53c1b60e83c489212bab71161"; - }; - - propagatedBuildInputs = with self; [ ]; - - meta = { - description = "Summary"; - homepage = https://github.com/quandyfactory/dicttoxml; - }; - }; + dicttoxml = callPackage ../development/python-modules/dicttoxml { }; markdown2 = callPackage ../development/python-modules/markdown2 { }; From 0821a22eba6fceb85544199f55f3d7b4c0487eab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 15:14:10 +0100 Subject: [PATCH 409/797] python.pkgs.ovh: 0.4.5 -> 0.4.8 --- .../python-modules/ovh/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/ovh/default.nix diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix new file mode 100644 index 00000000000..3f37940ed8a --- /dev/null +++ b/pkgs/development/python-modules/ovh/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, nose +, mock +}: + +buildPythonPackage rec { + pname = "ovh"; + version = "0.4.8"; + + # Needs yanc + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "79fa4bdc61b9953af867676a9558d9e792b9fde568c980efe848a40565a217cd"; + }; + + meta = { + description = "Thin wrapper around OVH's APIs"; + homepage = http://api.ovh.com/; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.makefu ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78e104951d6..1ce3dccb7c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20883,25 +20883,7 @@ EOF }; }; - ovh = buildPythonPackage rec { - name = "ovh-${version}"; - version = "0.4.5"; - doCheck = false; #test needs packages too explicit - buildInputs = with self; [ d2to1 ]; - propagatedBuildInputs = with self; [ requests ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/ovh/ovh-${version}.tar.gz"; - sha256 = "1wf2p1sbg34jpj97r3w5nx9pj6vp0mlprry3vw2xav3dv02qv2af"; - }; - - meta = { - description = "Thin wrapper around OVH's APIs"; - homepage = https://pypi.python.org/pypi/ovh; - license = licenses.bsd2; - maintainers = [ maintainers.makefu ]; - }; - }; + ovh = callPackage ../development/python-modules/ovh { }; willow = buildPythonPackage rec { name = "willow-${version}"; From 6a87242aebcdfeaa3933a9185114f485707077c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 15:20:20 +0100 Subject: [PATCH 410/797] python.pkgs.pybrain: remove broken and unmaintained package --- pkgs/top-level/python-packages.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ce3dccb7c3..5f65f012903 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21547,26 +21547,6 @@ EOF }; }; - pybrain = buildPythonPackage rec { - name = "pybrain-${version}"; - version = "0.3.3"; - - src = pkgs.fetchurl { - url = "https://github.com/pybrain/pybrain/archive/${version}.tar.gz"; - sha256 = "114m99vsrps2gjqfm3i3kxx4nibjhjdzphsy2bhrxa5q3h2q14dz"; - }; - - propagatedBuildInputs = with self; [ scipy ]; - - meta = { - homepage = "http://pybrain.org/"; - description = "Modular Machine Learning Library for Python"; - license = licenses.bsd3; - maintainers = with maintainers; [ NikolaMandic ]; - broken = true; # See https://github.com/NixOS/nixpkgs/pull/29198 - }; - }; - threadpool = buildPythonPackage rec { name = "threadpool-${version}"; version = "1.3.2"; From 7765bd928a60209747f520f6b74eda9bae85c6cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 15:23:32 +0100 Subject: [PATCH 411/797] python.pkgs.pygments_2_0: remove unused expression --- pkgs/top-level/python-packages.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f65f012903..e24cff2e9dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13728,17 +13728,6 @@ in { pygments = callPackage ../development/python-modules/Pygments { }; - # For Pelican 3.6.3 - pygments_2_0 = self.pygments.overrideAttrs( oldAttrs: rec { - version = "2.0.2"; - name = "Pygments-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/Pygments/${name}.tar.gz"; - sha256 = "7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51"; - }; - }); - pygpgme = callPackage ../development/python-modules/pygpgme { }; pylint = callPackage ../development/python-modules/pylint { }; From 4bd9faf2886a1b0e5a2669ff7248a2471511c101 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 15:30:51 +0100 Subject: [PATCH 412/797] python.pkgs.quantities: 0.10.1 -> 0.12.1 --- .../python-modules/quantities/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +--------- 2 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/quantities/default.nix diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix new file mode 100644 index 00000000000..e65329c1b69 --- /dev/null +++ b/pkgs/development/python-modules/quantities/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, python +}: + +buildPythonPackage rec { + pname = "quantities"; + version = "0.12.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a03e8511db603c57ca80dee851c43f08d0457f4d592bcac2e154570756cb934"; + }; + + propagatedBuildInputs = [ numpy ]; + + checkPhase = '' + ${python.interpreter} setup.py test -V 1 + ''; + + meta = { + description = "Quantities is designed to handle arithmetic and"; + homepage = http://python-quantities.readthedocs.io/; + license = lib.licenses.bsd2; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e24cff2e9dc..dc9289b83e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15086,20 +15086,7 @@ in { qtpy = callPackage ../development/python-modules/qtpy { }; - quantities = buildPythonPackage rec { - name = "quantities-0.10.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/q/quantities/quantities-0.10.1.tar.gz"; - sha256 = "2d27caf31a5e0c37130ac0c14bfa8f9412a5ff1fbf3378a1d6085594776c4315"; - }; - - meta = with pkgs.stdenv.lib; { - description = "Quantities is designed to handle arithmetic and"; - homepage = http://packages.python.org/quantities; - license = licenses.bsd2; - }; - }; + quantities = callPackage ../development/python-modules/quantities { }; qutip = buildPythonPackage rec { name = "qutip-2.2.0"; From 66dc266530d5094b86699a25dde8959259c8de84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2018 13:16:47 +0100 Subject: [PATCH 413/797] python: typing: 3.5.3.0 -> 3.6.4 --- .../python-modules/typing/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +--------- 2 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/typing/default.nix diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix new file mode 100644 index 00000000000..d1a9185d5a1 --- /dev/null +++ b/pkgs/development/python-modules/typing/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, python }: + +let + testDir = if isPy3k then "src" else "python2"; + +in buildPythonPackage rec { + pname = "typing"; + version = "3.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2"; + }; + + # Error for Python3.6: ImportError: cannot import name 'ann_module' + # See https://github.com/python/typing/pull/280 + doCheck = pythonOlder "3.6"; + + checkPhase = '' + cd ${testDir} + ${python.interpreter} -m unittest discover + ''; + + meta = with lib; { + description = "Backport of typing module to Python versions older than 3.5"; + homepage = https://docs.python.org/3/library/typing.html; + license = licenses.psfl; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc9289b83e8..fb7718a0c07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15565,21 +15565,7 @@ in { }; }; - typing = buildPythonPackage rec { - name = "typing-${version}"; - version = "3.5.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/typing/${name}.tar.gz"; - sha256 = "08gz3grrh3vph5ib1w5x1ssnpzvj077x030lx63fxs4kwg3slbfa"; - }; - - meta = { - description = "Backport of typing module to Python versions older than 3.5"; - homepage = "https://docs.python.org/3.5/library/typing.html"; - license = licenses.psfl; - }; - }; + typing = callPackage ../development/python-modules/typing { }; typeguard = callPackage ../development/python-modules/typeguard { }; From 5dbaf18b6930dbd9d73d5f39392a447c03f5b927 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 17 Oct 2017 18:22:46 +0000 Subject: [PATCH 414/797] Add mpickering to maintainers list --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 348212df095..35b565f8906 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -461,6 +461,7 @@ mounium = "Katona László "; MP2E = "Cray Elliott "; mpcsh = "Mark Cohen "; + mpickering = "Matthew Pickering "; mpscholten = "Marc Scholten "; mpsyco = "Francis St-Amour "; mrVanDalo = "Ingolf Wanger "; From 8b362957c7683571e7bdc8f0672cc5b53f704c75 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 3 Oct 2017 21:54:50 +0000 Subject: [PATCH 415/797] libroxml: init at 2.3.0 --- pkgs/development/libraries/libroxml/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/libroxml/default.nix diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix new file mode 100644 index 00000000000..3993451e19f --- /dev/null +++ b/pkgs/development/libraries/libroxml/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "libroxml-2.3.0"; + src = fetchurl { + url = "http://download.libroxml.net/pool/v2.x/libroxml-2.3.0.tar.gz"; + sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x"; + }; + meta = with stdenv.lib; { + homepage = "http://www.libroxml.net/"; + description = "This library is minimum, easy-to-use, C implementation for xml file parsing."; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ mpickering ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aea485da5e6..641e859de4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9880,6 +9880,8 @@ with pkgs; libqalculate = callPackage ../development/libraries/libqalculate { }; + libroxml = callPackage ../development/libraries/libroxml { }; + librsvg = callPackage ../development/libraries/librsvg { }; librsync = callPackage ../development/libraries/librsync { }; From 9c7c640ae4442fab7f1f67470ccfb92bf6d20529 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 3 Feb 2018 18:37:08 +0000 Subject: [PATCH 416/797] osm2xmap: init at 2.0 --- pkgs/applications/misc/osm2xmap/default.nix | 38 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++++++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/osm2xmap/default.nix diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix new file mode 100644 index 00000000000..60401c412fc --- /dev/null +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } : + +stdenv.mkDerivation rec { + name = "osm2xmap-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w"; + repo = "osm2xmap"; + owner = "sembruk"; + rev = "v${version}"; + }; + + makeFlags = [ + "GIT_VERSION=$(version)" + "GIT_TIMESTAMP=" + "SHAREDIR=$(out)/share/" + "INSTALL_BINDIR=$(out)/bin" + "INSTALL_MANDIR=$(out)/share/man/man1" + "INSTALL_SHAREDIR=$(out)/share/" + ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + buildInputs = [ libroxml proj libyamlcpp boost ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/sembruk/osm2xmap"; + description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format."; + license = licenses.gpl3; + maintainers = [ maintainers.mpickering ]; + platforms = with stdenv.lib.platforms; linux; + }; + + +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 641e859de4b..0eb4d73bcb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10101,6 +10101,13 @@ with pkgs; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec { + src = pkgs.fetchurl { + url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; + sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; + }; + }); + # interception-tools needs this. This should be removed when there is a new # release of libyamlcpp, i.e. when the version of libyamlcpp is newer than # 0.5.3. @@ -16525,6 +16532,10 @@ with pkgs; inherit (gnome3) yelp_tools; }; + osm2xmap = callPackage ../applications/misc/osm2xmap { + libyamlcpp = libyamlcpp_0_3; + }; + osmctools = callPackage ../applications/misc/osmctools { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -17463,7 +17474,7 @@ with pkgs; testssl = callPackage ../applications/networking/testssl { }; umurmur = callPackage ../applications/networking/umurmur { }; - + udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; unigine-valley = callPackage ../applications/graphics/unigine-valley { }; From c8763ddc8720251c458276ad14e5bb3b4a628a0a Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 9 Dec 2017 12:37:22 +0000 Subject: [PATCH 417/797] Remove whitespace --- pkgs/applications/misc/osm2xmap/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 60401c412fc..5787adef2a3 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -31,8 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mpickering ]; platforms = with stdenv.lib.platforms; linux; }; - - } - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0eb4d73bcb0..4f7fdba0f8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10106,7 +10106,7 @@ with pkgs; url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; }; - }); + }); # interception-tools needs this. This should be removed when there is a new # release of libyamlcpp, i.e. when the version of libyamlcpp is newer than From 9c8b87e9532327ba15e90e9e8f6beca161d94a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Feb 2018 19:51:08 +0100 Subject: [PATCH 418/797] librsvg: 2.42.0 -> 2.42.2 (maintenance) --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index da54ac9b5dc..cf43bb95192 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -6,7 +6,7 @@ # no introspection by default, it's too big let - version = "2.42.0"; + version = "2.42.2"; releaseVersion = (lib.concatStringsSep "." (lib.lists.take 2 (lib.splitString "." version))); @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/librsvg/${releaseVersion}/${name}.tar.xz"; - sha256 = "06j60hb1m96hnrp8phbqn8lfw2j8ai8dcddzc72yvrnrn8lagc4s"; + sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; From 3d74ccf5e8f9d6ac32a3104a1598203c008dc227 Mon Sep 17 00:00:00 2001 From: Venkateswara Rao Mandela Date: Fri, 2 Feb 2018 13:27:51 +0530 Subject: [PATCH 419/797] doxygen: 1.8.11 -> 1.8.14 --- pkgs/development/tools/documentation/doxygen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index c803de9e024..05418aa39a8 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "doxygen-1.8.11"; + name = "doxygen-1.8.14"; src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "0ja02pm3fpfhc5dkry00kq8mn141cqvdqqpmms373ncbwi38pl35"; + sha256 = "d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d"; }; nativeBuildInputs = [ cmake ]; From 24dff4b341fa4664806a4df9dc8a80c92b2d432e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 4 Feb 2018 03:06:12 +0800 Subject: [PATCH 420/797] libuv: 1.18.0 -> 1.19.1 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 4075505f8dd..59fd95eefee 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "0s71c2y4ll3vp463hsdk74q4hr7wprkxc2a4agw3za2hhzcb95pd"; + sha256 = "020jap4xvjns1rgb2kvpf1nib3f2d5fyqh04afgkk32hiag0kn66"; }; postPatch = let From 1177bb7a09ef711c7eb474f04536d6aaf76df098 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 4 Feb 2018 03:06:30 +0800 Subject: [PATCH 421/797] nodejs: 9.4.0 -> 9.5.0 --- pkgs/development/web/nodejs/v9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index f93dba1aec4..79f364be200 100644 --- a/pkgs/development/web/nodejs/v9.nix +++ b/pkgs/development/web/nodejs/v9.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "9.4.0"; - sha256 = "035j44xkji9dxddlqws6ykkbyphbkhwhz700arpgz20jz3qf20vm"; + version = "9.5.0"; + sha256 = "0v8lspfca820mf45dj9hb56q00syhrqw5wmqmy1vnrcb6wx4csv6"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } From 27ee0b9099e8c27d3a09de3e8489bce43f8e7624 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Fri, 2 Feb 2018 01:35:32 +0100 Subject: [PATCH 422/797] nixos/tests: add basic tests for services.rspamd --- nixos/release.nix | 1 + nixos/tests/rspamd.nix | 63 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 nixos/tests/rspamd.nix diff --git a/nixos/release.nix b/nixos/release.nix index a396eaac9a3..e443e423b1a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -332,6 +332,7 @@ in rec { # tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.radicale = callTest tests/radicale.nix {}; + tests.rspamd = callSubTests tests/rspamd.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.samba = callTest tests/samba.nix {}; tests.sddm = callSubTests tests/sddm.nix {}; diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix new file mode 100644 index 00000000000..35e534246b6 --- /dev/null +++ b/nixos/tests/rspamd.nix @@ -0,0 +1,63 @@ +{ system ? builtins.currentSystem }: +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; +let + initMachine = '' + startAll + $machine->waitForUnit("rspamd.service"); + $machine->succeed("id \"rspamd\" >/dev/null"); + ''; + checkSocket = socket: user: group: mode: '' + $machine->succeed("ls ${socket} >/dev/null"); + $machine->succeed("[[ \"\$(stat -c %U ${socket})\" == \"${user}\" ]]"); + $machine->succeed("[[ \"\$(stat -c %G ${socket})\" == \"${group}\" ]]"); + $machine->succeed("[[ \"\$(stat -c %a ${socket})\" == \"${mode}\" ]]"); + ''; + simple = name: enableIPv6: makeTest { + name = "rspamd-${name}"; + machine = { + services.rspamd = { + enable = true; + }; + networking.enableIPv6 = enableIPv6; + }; + testScript = '' + startAll + $machine->waitForUnit("multi-user.target"); + $machine->waitForOpenPort(11334); + $machine->waitForUnit("rspamd.service"); + $machine->succeed("id \"rspamd\" >/dev/null"); + ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" } + sleep 10; + $machine->log($machine->succeed("systemctl cat rspamd.service")); + $machine->log($machine->succeed("curl http://localhost:11334/auth")); + $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth")); + ${optionalString enableIPv6 '' + $machine->log($machine->succeed("curl http://[::1]:11334/auth")); + ''} + ''; + }; +in +{ + simple = simple "simple" true; + ipv4only = simple "ipv4only" false; + bindports = makeTest { + name = "rspamd-bindports"; + machine = { + services.rspamd = { + enable = true; + bindSocket = [ "/run/rspamd.sock mode=0600 user=root group=root" ]; + bindUISocket = [ "/run/rspamd-worker.sock mode=0666 user=root group=root" ]; + }; + }; + + testScript = '' + ${initMachine} + $machine->waitForFile("/run/rspamd.sock"); + ${checkSocket "/run/rspamd.sock" "root" "root" "600" } + ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); + $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + ''; + }; +} From d750b1a00822221cb58292371d8582d84b75d592 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 4 Feb 2018 03:11:47 +0800 Subject: [PATCH 423/797] firefox-beta-bin: 59.0b5 -> 59.0b6 --- .../browsers/firefox-bin/beta_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index f359cfbf79b..ccdbdabc764 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b5"; + version = "59.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ach/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ach/firefox-59.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "8378bf22714f1e687a52dd12637a566cf5239f8413cb7508259b58d557e7d8babfbf3c4251a82d3554d812c74791a4b99290a14497ebf69d91db9d8d3c5e0043"; + sha512 = "3a18ca13a211bc1b88fb37992b3aee43c6782d2fc5032c9ca469b28561e36dea81390e1c1d5c66d5c0a7c75c18c4f0cd65da6059969123d82a46ed10654dddd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/af/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/af/firefox-59.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "6df91af8a37c092c36decf7b8278674ce32d6840ef92cf658ca2803fb3744e38dc246115028af86e5e36b7ec17aba4a9b0b9d219a540b328ac9cb7753bb58262"; + sha512 = "db896d865820a91e6627a6b7ef55bd1e05858df0a57f7089b5695ee9bb259c9d611511c3f6429e1d090c0bf84c078c0f5a7539a40b34566df6692a55e49f5db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/an/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/an/firefox-59.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "09e53bfcd586eac946b372673d4c37641aae81473386d52e1b0060023760c09e5fa22c3b69484be66c6cfe51a99585c957f088eb7c04f7330622ba2f1a5e51d6"; + sha512 = "395410c7104f398d76b69af355573c150b192fc943ef3474923f67c6d82445941b8e4908af9fe77de45f091cec3924fa62d205f3c69aa40df2dc0bd4cac10782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ar/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ar/firefox-59.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "96d84c9139bfc4518e452045cf94e4e61ebca6e7a43085d18d9475dc163c8955a7995935d430d0da386ac268979b6765bccdfd1493a15606225055e7622990fc"; + sha512 = "c0b4943bd521ac1311a23f44c86d89d0a63d07aaa6e918576a6efd2d097801f1051eaa52d170bc84cb7d80869e7bbc89a3ea655436879854e9572094a91c3067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/as/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/as/firefox-59.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "13daffa3b652455957aed912c9e5f86121d99c25daef470d4b2fe1140fc04b0085a3e8f317f9b36f8c26f207ae412a8dd71f2ef7cf233c15c0552682eadf14cd"; + sha512 = "4be3a37453179f2a4784fa9df0634bd59d85dee27087d117204e6da059573c6a786a1c422ee0b7731f7fd5300b42dd42d0aaf741482f61239674ecee35e85145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ast/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ast/firefox-59.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b9d9e21fc2bdc3054a86c993be82c1e04c086db9ce8c64b40bafff75b967a7c30817aaf924fdd5464c64e05aff7004efd8607a123699ae58e163fbc3c1c3530a"; + sha512 = "9949ee9172d3004dbb28fef6216b7716568f98b4b52096479cdc4c85c12b0da6fc0774c6c169103b86cb3b60d0da36ed998058e86e473213a19977c4d2bdbf8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/az/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/az/firefox-59.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "5f0bb5796e4ee6ba8f08b18a19254b51b04b60aad93cccac21eec0e10ef1e280ebb0d4a66d053b7f3f875b4cce34b90f58cadfa7705f89f26f96e5b94316cf11"; + sha512 = "de5d19ea82dcbe4b53f78d33474249342ec659dcc263f44725ec92b491e9b43158809d6df87a9d6c86395e5e3fbd1e09b3bba7c5feff85c4b46438fce7318a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/be/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/be/firefox-59.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "736e5e0c81969107b6bc83d9212a30f027f84d646c896eaa61374c0464942bb74b3e22f94d8254cd17e0c5e9f6431a5b9b910f2b9bb6132f10f336d7e952af09"; + sha512 = "97437da34da251863b2bf1426eacaea62845f00916d81db48220dca540195d24d1d890a60ec6ca816c0fa5d22966e2095afba03ec242059ddc0e3e297a5a3084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bg/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bg/firefox-59.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b2dc4f280897b5806077e4ae527cffe8961910c114456244153edee182db969507722d1c30e5abee9f9b9034c58e22a2b54bbfb00b3e8198569892b87e84df50"; + sha512 = "a003a5c23c011c696552ed83e0672e6a066bfac9a3aa4e13feaff472cb27e0a858b0e5986022f4c7db343ab056a2fad46176be08658f0bb595deca08ec06058a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bn-BD/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bn-BD/firefox-59.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "0546005b584f504378799f359eecb11347f16a9d364deaf72a8f1094b2c6030749dbf4eb5bba1224d91965617b2d919b873fbdf4c5c3ca9996286d281af51df4"; + sha512 = "404377cff86dc5fbc8db67567565cd64ce79d1a322547c70b2a210a034c5a6a0669a82e717a21fe33340f34838da2352be7615bd7752cfbd300825f161101ef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bn-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bn-IN/firefox-59.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "cece516f3c46b1f98dd837d17533a7607401452d95b3e7611d4352f88699008bc38a95e6abea5c2c69d145e934a34116fe00bdee2b9ad404c26a20e35c5b16d1"; + sha512 = "dcea89eefbbef9a54002cdb85d2589511e00ba06b729574106f03447ebde36202ce70f8648de433337a3da8945c26c7834c240d64a7fd11b032c234c7e2fcaa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/br/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/br/firefox-59.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5aaa92650ff188d457fa9d8b7e33198b847e41b9ddb068d1bcf7015792352757e02e5b1deb36e0c20ad1ef214f523003ebdbb70273d153f4194f50514c876aa2"; + sha512 = "69dce79cf9cb72dc9f32db11932b8d542aaccdd96baf4b20cb425f395580db51382cb8c48338c292ced1df5ff0a83c80bf9b7176cbd9efef69a48f3bae01f51a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bs/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bs/firefox-59.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "1ccf76aaac7d2ff4e4a8c09e7431ef8f0d5a55cfb5bd9aed032e147e87b6d86391a927d76251b6ca1b3c21a57832f050ee818b43a5513c49d75652e62e5eaa6f"; + sha512 = "fde4ad44e5de766ad5ebcace976f134fb1cffcb99669913e7d8ecddd986637c30cab3e06cacda26eb4bcfd4c7077d7fb6fe67a2eaf8f3c06f7d74cf322f4a5a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ca/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ca/firefox-59.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "9b3d4b0abd19ff7ddb51ce1925e2f8929621b215be80f124dbcaed7b34320914c9593645bd6b1b406fabf7693016816fd27a9b66d0d577e72c659a28ecb86fed"; + sha512 = "17373f55bb22c42b9b3fd2b82a1e8cc3258e33c924f2afbcc6f881a928e96587e76a705cada437b5ab83478b48e0fdefbff226b65efe1e94a34b1019f6e8e673"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cak/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/cak/firefox-59.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "fac861443276137842c0b7ca0620d0714bd4ed391abe28ee9a377686261670301d5cd62c105ca31379d9ea97a42aba3bea0edc284bf3058da1748dfb3456cef8"; + sha512 = "a946c519d1e8f6e87da9524c3082248eb799e225ecafe61df145c315a9525fccc24495d148bbc081127735e301e70cb5f8ee7d44f54835d95cd0814e5b92fbd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cs/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/cs/firefox-59.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "3de6a8c71d2befe5ae58d1968420c72ef52eefc6f0ad2330c817baa3ce9a2160d5e332846d00cbd1b8504f806620787fd967c1970f9bea7964ea1a6000c70c3c"; + sha512 = "4eb26d3c2c4e7122aeffc7a1ffb41f2d2ac91fb10193d0bca336f2a78f635b5644caa0c63dcdf4051d6863189c157fbc755f636570348162562478e4e743b937"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cy/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/cy/firefox-59.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "71e9af6aee3e9d22a51274d8987a296b2906e8c3b1c85d3f4e0469db5c11a22f93948e78b76d1d8d12ebe22e8987781147ea5e028b97803da5f21755c5721a74"; + sha512 = "a55e9419142eefd3229835e028a05c75d10371ba079a092cf8c380c4c66aa8215825dc7959df52153c3ec90ae9fb15d94f212b5e8f5353efd887b5f21252eb25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/da/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/da/firefox-59.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "40d1325baad0050524df5a397e4d78d6f78d53a9ac34bd57188febdf8c6e291e723186c596cb634df18b5b8809d52401cca2f733de95015d658710e38fa8cb25"; + sha512 = "d0f444e429feed08b6ef4d559c158ee5ecb6dc6f6e18da5b04f31e27db0bfbb35b9b5221c8308f4ff83a9a895810198298580041397e39c8538a2306ec105bc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/de/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/de/firefox-59.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "4b1971ef58f68c2d2d8e37c2759bae6a0ddccdc14e4ab125712508885dbf7490323d568aff70702a056cdcb64c80b85cf67d2013c4efc9cb2f0063ade13ee1f8"; + sha512 = "ac8feb9d54eecc49f7091f558b64032132aa29acd3bc6936d42c376a4dbc3d5c14a7ea673d4aad0b107be7891fb17efcfb09b7696d2201c8f492519800a812ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/dsb/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/dsb/firefox-59.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "78e9f74125d27c37067a52fe33503979a998fe0e0f84e3859b75d4544ac70cd387e76088cf28b520ac6185bf0884508c399077dbe8ad74b87b4a5d01c4e1a557"; + sha512 = "70458cba5023661bc407f291df1f2d6a1134be50268e1e07c7daf3e3f8ea14dc0ffb49796d4d63855713aed4939033a3aeba6af6e526af28a37cf7f0786442fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/el/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/el/firefox-59.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "18d2bf64feb0a89f715ac8add7b46e296422c130d6afaf35edf1b4cb2a46ad5a77ed4e7c3131d0fc19750e3cd9b53e2bab835abc375daaed2a69195bf60781a7"; + sha512 = "6eef9891adaa4cdf02a986c03efde0766827cf41a988d73b9d68b40bbd4006713c250166d5b9b879da0b38830e3f65a007ee6172f8deaabaaf096ac7a17f2aa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-GB/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/en-GB/firefox-59.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "2aaa98402c21153f1419d3319db5cc0db71cf23e02be560ad8051384fb8465049500d8a3b1b7c327916435ae4da61043492ff3a51a8da65699d6b9be368aaa36"; + sha512 = "a89e247620943907c1b42c3d24c327fd68f1e6daf71f83e589baf2996c9cdeb2b28b5286d335c87d66a781e39001a76252b88206de03f8e37354fef64f756cb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-US/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/en-US/firefox-59.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "5e281d84456a7c4cad57b13af5f77d2e9ce903be0993c752e995e0b3df7c1b2453a45f322833cf1bac872d1fe4bd9209a29dd5fc9c7571baab3665b3eca874f0"; + sha512 = "d79b2292ac77f1edd7fb8c0b1d779454b7b82b97d25bb7558ac6416df2d499a97370b537d70457e7fd9096c0087c86aaca755c694b3968d081f2211837b87002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-ZA/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/en-ZA/firefox-59.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "c431628654fe39e59036ab1567749ff4f931bcf00b6b55a11a240823905a7ca6c5ccf0e1184f8f7495f3650bf0976fe2e3da2e09b0a5abbc6735235dbf4bc6cf"; + sha512 = "e6efecdd6508759d390554775ee3201eca560bb31b468b4a53a9f2e39d059656cc2aa3b23068ea376eaa9a8921f9a6532b8325be0c6b41aeaf3bff3cf6aca5f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/eo/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/eo/firefox-59.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "b3b0307e5d9db7a12a7a0fcfa75cb179a1ce91d0760ef6196ecf734ebd0aa3cbe701f3c8610dfa6faf2b5e4d8c9b73d51b526bceae7d905b17dd76224c3ed15d"; + sha512 = "eb23bde124ab1f6f169d8e7489887c4a09251ccee9b99cc0eaa6fc914c8cc239ace351245625c5cac225ee35f5c5d2839ee3286b60360c2476dbe94748f52312"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-AR/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-AR/firefox-59.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "57baa3cdc360129bc68ebccdfc51d1cecd239aef84cf5043003cf2911e2f3ba4f13302acc096aee96c603e21f4df8e7dc81521bf5de5f8c70abdb9026ece189a"; + sha512 = "1ac5abe11415d8d2525cb7552d0d42bc9cbf1d76652d315a65916fbac77c13e839fe21cffcc9aae610a9b0d8d6e183a546c43b545bf9c81f44437adda34c3a8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-CL/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-CL/firefox-59.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b385405596093d1a2fd25b290e0825110744bb702239be615809522595bbf34a1ed25e7b7abe17b078020a755a28a603823b7014a11967793e1d4597a3d6ba04"; + sha512 = "e1939280beefd553f9062c07c97196826ed910ad205a76b69fb58513b50cb98eec80e3350b5fd82208c3bf696806cbf8f99b755b08baed32f7357d4f09610c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-ES/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-ES/firefox-59.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f3921d502ed19c3c131f7aad613ccab775c173b4767f4bdbddd4aa98601ee7810254cb6f0c588809b9e0a61dacdd74a1662e83184d380830f35b7cbe326e116e"; + sha512 = "0439ba49de9bae85f3baa1849fa04a31945448371cdfab0e34432ebd9b8de9e71d73c80119b552f373c9d18ff64714d1f29fe1c8db3a60a8f81e0d2d3c3fe0c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-MX/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-MX/firefox-59.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "da072c427f2a232be0a84cb23897bfb6a93b92326b180dda491b2c9afb68afa7e798f1451a6ef5dd36f13f473fd9b667fcad96a0124490d0c89c0c5ff3887f92"; + sha512 = "bcd4626159388909d38377b593ceeb505c56a335c8967d5ec8a8871395134a77f639cb134a0295c6a07416daadd5b72f7ca4d3ef5ac6e09421c02d7d1982007a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/et/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/et/firefox-59.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e8a72113b7df9193d6044fd6e6120087422c7f2d4456d5dd24881723c77039607ce8025f5f3547b80b671409b0a2017368fff376c9ae581eef285201661cd719"; + sha512 = "d589915cae325e6a78cf75a49229819873a7451cab4e6fb82744e83e3c1a0476e61f75b7f0433745f460cce0a8588fdca113e2805554aca92fb33962468c2814"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/eu/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/eu/firefox-59.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "dfc9ff76c8e76fef732a89f29ff4d821af9190c45a02d0a56ecff9f6199b674aa6445817765eb01468b16b253aba9d4507d8750228bce74658f84f3c4daa64a4"; + sha512 = "7fcabb04d73d485287b9dfbcc5311616d6ab7a762102b7c7a7cdc241ecb304bf26c0d2f0d8c3a7bc36579ebfdcbd75d98924689995c78452c5e73f713d8066cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fa/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fa/firefox-59.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "a5d1ec23f3b7ae46b9aebbfd2e6d2f5df959a34c2df0660e3bd17fd45fdbfc696936e9fc921a783304a3bdafa548ae616c910a5e2e150fb2bf98739d52deeaeb"; + sha512 = "dc11ad29ee9cd33b6c35215151665782485801bff4fb6db73e011f6cfd3935c900380d74624b180b29cefac07fd779a316e7eb4d4c806ae4a981ad249858ac9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ff/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ff/firefox-59.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2a70a2255a029db0222098304d5fd5a0e204764f1900705dc3de97c768aa1b729610c968cf73f885c05ff6bcc95c51329c752f5d58da07ecbd9bf1fb5d7f0e0f"; + sha512 = "cb38b54caf810e8b0a85a8f51ceab3527fc5bf915a16538b6e5655b49df44dbb369d356888ae5f9c13006bfc1c641709c1f5e11cf7efe16b75676e7766b93b9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fi/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fi/firefox-59.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "c346c7e849928fde63fbae05ac91030653dbd43779ea3042f9fb202f028063f98a6060ae36b0ec394ffd5d5956d6d87af99d85ed89b9d08fe06c1c34207f20d0"; + sha512 = "d4aa61d1c0fe71cc1ae12718f7f1c3226259592ba7a3b4bebe78383b29220028816b2489d237119f94ff583bc1ace1f218c3831009122470a791a3681f804584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fr/firefox-59.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3e54e6687bae4b9c62a63d2d3749d47132939febec5be09f3e7cbb3633d2cb0662bef0c86e4df7cd678c6f6e8391548cf01d27b8eaec9d9a45434584038c76f2"; + sha512 = "de15b09970066ba64b56a01940c8c31593e5277d0b95042519bf65ef79eb1fed122dc2013a6d0de8e16832f75f9f135e0d737a6d9ffd72dfbe212965b1752d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fy-NL/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fy-NL/firefox-59.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "47e2fb7fbea44595e9e70c7739cd7666e9ddd02c822cfdab932974bebdfe542ef560a02f4708866a33828b1427a3e71c71645974481a3c7fa327af53f43c0cb8"; + sha512 = "3ba6ef5eaf244ff9f8049835366e904fe8e8e13ee42cdab5c9463a5e5f8523f9f0d5387dc64d980f3dfddca3e799461eddfecd8b12fd4674fcf45e10f385be97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ga-IE/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ga-IE/firefox-59.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "3132195d3f304fccb1df185d331b5cc883b9e3017e6165c5e87e4cbdbb35bb5bf8a7341d4fc36595fc33493a63741a32a35a2bdb8ed3f5525d8216f467fdffdb"; + sha512 = "c7e47e5d37c8cbdd96440a0247d2428f8638dd4fe2fdced93fac5222e2aefca47863957efc3a0031cd6160732e1d1f4e46a850d964dad97ac42f44422927a4c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gd/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gd/firefox-59.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "8d3603b4c237e725ea22aabf4d6cf8c28912d938836ab2b2440c12c3171f2acc27daeb143a8aaeee493471e956cb7a921213427a2302bddd46cd08ac29d73b16"; + sha512 = "58b306dab4cb1244bfdc2cd707d70fd600427e4758ed0c2373ffa296618406d814320dd4be0ee4bbdfd396d432a945e0944a9da8a9c44a189844b2f7d21d67b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gl/firefox-59.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ea4692cfaa6d3cc321ff871e415efa99521ff972c2b317249598268b52355acb8d7f19a9de2ab63a12d5cd8f36565cd7688b62712c828bbbe3b7132d13ef1998"; + sha512 = "cc71cb150df0bc38e26313224c826b089e133782b26fb903a8ac38bed15dd67d7813cce19947acdf962f7587209e26ed1d4731abfedcad07c468ff69bae94940"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gn/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gn/firefox-59.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "7e574c7664ef33ca6d922a7cb4cf65bf89e5a63358a8b3c3630aefa0687be675b19bc4aa0516e524a84a25ead6852ce435aec3645894eae8f68e58d5821efb0b"; + sha512 = "4b58193020a1d85103e3a5014f3ad9252293813f52d588392dc262c1a29ca0fc873f2397aeab62db493a97d96f26fbe8b753001dac97e33c203beea8675825e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gu-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gu-IN/firefox-59.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "b24eed7e1c5d81eb7938b7da957b7f94b735111d37510d13a14bc928477a5868aecf3c3e0b37e3422c8a8bebda6bb30bc56fdf339cc718be0f4a478c13c12eb1"; + sha512 = "d39ed52652cc39bb9fb74b469d69ac4be87aa5b220b711687032d711d5d2a245160aba305fa7b3797799e030ee31816fddcc6cdec090acdc1b894c23515aa2f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/he/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/he/firefox-59.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "10bd7ba2a8d8cc003428bf3afc710ef3e5a1fa8bbf24542dd764f622f74ba8a4f4e6f1cc0978c907f9bd9104d870f2cc38763d9a6d80b47134318d48fa0af90c"; + sha512 = "efe709b15dc4bfc5787a0ef1e3f1cd95fec8fb87dab188ea557bab6447d76f7bd4d543250b6b0583f08ad6c64ae0959ce3a18c124c4b510fcc7849a2439b5a24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hi-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hi-IN/firefox-59.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "66c3151b9b2785025c4bb70cea9f4c12d4b2549239c3a2fbd96098c72118d0ac0306458142a1cc2ddb73232620717a03ccf84e27c606769d0725ad29c2a871d6"; + sha512 = "f057052c8785839c1831f4c707bc78b4f416edcc4417527007de75f5c1bbddd3a4adbe76497e74741eee86de66870f79d5d0b716a0e149a9ce15ea912f4863ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hr/firefox-59.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "9abfb9cce29b06b0618d8d5c5ec0a91aec78b875054e1b1af522e5f05546fc861a86493c9fb026fd5e133bd38522ff8583208557ae207b94e338fa8a2b153880"; + sha512 = "e8502da3ed7d93249e75c96e82986d874c461a39ff96e0132e0ad5b479bae26ebdcff7dc9cf404dbeb253c1fd63e544f7dbc1e52cd54004b2bc840b14875d503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hsb/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hsb/firefox-59.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "65135c16685a448a374e1ef9eddda23e7a11167d72a4d66acb22f6f204112d45c2720d9f61e07bfb37e219b8d9d2264cc1bd80f75c7e3683ab69fb50a617a4ca"; + sha512 = "c854066fb4e1117b7911f3e47c38af8d674f70de42d9497ad0a3dfb602159bf81de858d70da931370386d228de54317caaa8729e356fc6fcd8bd59199a974eb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hu/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hu/firefox-59.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "edcf63cd231ca163881d6ffc61cb6b21936b30a0c05286d8bd79e20f3b89cf727832ade1e799ae3067fbc0e84593da60fc0a865233fbbd65a16c887c6f56fb72"; + sha512 = "586af0c143ce23b2eb67421651e537edd25af4ef08944f43956b93ae38a761c9aadbd8bf597fedbc059ea5d5e5c18aff0534ae14728a757cd206e035fa114945"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hy-AM/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hy-AM/firefox-59.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "30c9e552e0f5a369ea072bfa2518643199da84242f233367b2bff23c387ee18bf4b377f4539222b69885cc991410904ed2f725de99009d6c9e25f6cd560ed3dd"; + sha512 = "9238e5352cb87c738bf41306093c294bce00dffe0522cf44e3aebb5f1260b9898e8046942841fffa7fafd2400c05e7b5616c4e5196dccd46299a5b2e5ca6c040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ia/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ia/firefox-59.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "26ae62912440ffc4fc55799bbde78e2aaad0cb5bdd653fad0f7d2b7d0be479efc89750c5ff1b67f1dfb89540f8cdd16c5b3db446c06bdade2bf27e7d6d605fa8"; + sha512 = "b7bf282acfb553eff7e400b76e75b5b26ca1c727ac65d4db78fe7bea41da533e4a31f6d9d9c65d5410f738f21d0a21b6ba31dac465eea698a5871812c3ca44ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/id/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/id/firefox-59.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "b0a2c2a60550e478d8cab3e7608464411961ea4b561a9554d174165856104475432e8b2c62cf5e0dd6f9e893241f40d8479ce9bca5bb56bd2ca0206539fe50a2"; + sha512 = "50a0800c1b88ab2edd38b696f5fa47ffb68dfa0bacd566f0d43bfb3fe6e86384cd736f300520202fc2a85616c38885a5ccd9215d51f8c85bc935633615667531"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/is/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/is/firefox-59.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "63bfc964d60e59349ff1a6e9619ded97be07345cabdd95f372938500cd16ce7729c091e740bee8065f8fe43d3205f6b617d7eb90f2e9e3f956e4af59356dcb39"; + sha512 = "dd59dab53c7869d2c353c002d455ac5b30491051697f417bc8c16a9e79c2e5198394c6470d2843d4698052528ff4cf8e5dd4ed77379415471512379c2cf312c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/it/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/it/firefox-59.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a9eb83e6b82b13ea962405575f849e9fbfcead7ee704bdc2076ac6578231d075c66273cf164b222ea38ade1412a690080acd297dc58d0e993310173d2afc3e4a"; + sha512 = "2eb4c38ec5190dbfe15c671b9c8df6bc224b6a820d3cefd88c737ee1a6a20546200fa3b499a8e9670b394d7cdbc2eec6afa0505e52f503b700a1bffd1f5089c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ja/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ja/firefox-59.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "9241e09e3d13fd270165250413b8ca08e012e7ac6911fd9bca886d9a2d4d95d514f8842b6aef6654bcc1df54b7aec1b02a6a56350b56f2011e885c56540ed706"; + sha512 = "ca02dbc95eb53ca8b8e70afb539acb3d3efc339ddd0b4b4a594cf98f2330fda1bea42ba4e616ad6868cb9c1099d7fe441603b61c2d3f602d01cda9fc953504e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ka/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ka/firefox-59.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5753301f447753748b26b1ceff617a5e5efdc9723415325d131abfd17f354316345713365a5a0be31bf787c0b34ad12e9d6be0d6aad9a10409ef0c21b45283c2"; + sha512 = "81b55418121cf91f524d4b26fcc6e919de8b86cf50c283c367244b1707c389aa18f969f4d26e24d1e5a2055c4bc6aac69b0692375f63c99ca8b425922cd0ed25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kab/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/kab/firefox-59.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "67808d90c284355a0df44d9386e902264fa44e36cbf3a043e423c30939d1fb4b7501889ff4a28799a31d5330c858958f4510b77f13ff2b9f7d27e22e903f9b3d"; + sha512 = "479ea71fac233895ef1acdbaed08d5e5471d5302df06c028ee5406832d941cce2fb56eb4cfa528e07a184de1c5bd9fda91effcab4cda4e6a98ef6535600477ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/kk/firefox-59.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d7cf93cece39a033a541c44093253721de2846c5d5a1864429d009db1c6eee1351b525bdcd997a454dc551b647db6308afd5561ebd585e23c4ac528ebd47afe9"; + sha512 = "426edc66d052828485f1ca18c81bc36a8b9a9373b580fd5aff135bcafba88849b0fa45d308eef80b48b459b4a251350fa292632b1e4d8f639dada9850b3786d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/km/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/km/firefox-59.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "01b09dbc3bd6308304783c144bad3d75d119ed61a60c30aff821f28de887e05875e4718f30538dd0edba5abdc7f7cf4fe7d0592d29f60baec58d546590b9fff1"; + sha512 = "d4416cec8788b988dd854382ba2ad3d8f6a47f966fd45e9639b0756135c6d7d3067b82692c5fa190d6b9c3e7f4eb02350c63096b737cb172194f8e8246e57bf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kn/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/kn/firefox-59.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "d1aed9ef1e98f028a2827abab0f581b3957601301d60f8dbf365429b7dc228942b329f148703581a3d4556cc7b9420065f7c5b8b18b7ef6b65c661dbf7bfc3d4"; + sha512 = "6e9a27b9459ce9a11b67f8a54fc962dc8eb845270d91aaaeca6698895eb4d7ae7ff760f7b2be8506599bea62077eab7ca29c2d35118cf7631e98cfe3cc0a3b02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ko/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ko/firefox-59.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "bbf106777b4e8f41fbc84157e25f113e1703f96a1cddd63ab95bf08ad4057614318f3ffd85ab51c8191a20bce6c457d44c8f34db3484341083a8348690447217"; + sha512 = "d31646237319080c608749425fb77a70de36689e3211d4975b065ebc6a282f4a82fef2275b42e51805d1a2be1553968b64294666c11fb7c9e857af9b09397c34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lij/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/lij/firefox-59.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "618b7eaa94b81420bccd0216a6b12eebfa0934c06fd3d415bf7f49e042d2a56eb8c90c59ed58f7a459cce985d6bd1b5e1ff19c2dfc86b5824a2e909a81a90360"; + sha512 = "6cb52b9a5acd18df0aca62ac719e73cc2c4462a2501fc0f104d0181ac989bd54a2cee209cc3af41ad666b857e014d15adb9fbf00c18843962f7bd9ddbffe2c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lt/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/lt/firefox-59.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4a00c16b74e07c4b485d348f78b8b369dc1d069ca158ec8ae8cbbab416434b4129bca283c01a9880c19503bf332a12c520f266363a3212ddfb379c5a3aae74ba"; + sha512 = "64a31dec1bddb6d0355d2b30cba9b500fe12b75c8e0b43a1dc340213ed560b005c21fdc0620334935dcd1e138a9f14f1ebb03b9ccfaf007fdc823ebde0f39638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lv/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/lv/firefox-59.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c2facfdf8862c84ae1d3186d83d653982e9b0e5cbbdffa987ee83c72be8866b64bdad2ea8de7b7c7d2f301d7a3740a9ce6f0ca6facfa7552fb71956586328d10"; + sha512 = "843a3aa53f01703b848dd2774d448dfd04d4e73839117b8a1d78bd25221814182391f0bb7e3bfbbe5fb9ea4eff030fba8f7bee6730e12ca151f7ce3fc5108173"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mai/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/mai/firefox-59.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0b83cd5d65108e126408dd56124965699daad192b318a085fd5e0af77864b998606e15a21260606785bdd49602e275595ff44c0e72318d37aa0ab129c413c947"; + sha512 = "b0bd010e6ec2c6e75785efdcea348a98afb935934f346aa615a86fa488d5b824c612b4ba9a1ca75a7f4e7ef75f0b25970be193ffd81fff6bdd2b4fc7989c4a7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/mk/firefox-59.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "62cb3e3b9dcb6eb76a1f26a443286b99a5d46f0d492c0ef0c5d93d85d7c0a4659eae448b5458e859ae5a2570f8b8a15fd10c033c49b933e1ce612e5ac7305c92"; + sha512 = "f23a48ca15f3bccece9ce771a4a99049ef843a03eb21914b57424872c6ab411732da8fb2162e59c1fdb28d54a4e51d13fef0b428db3e92f5fa87497c81b917c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ml/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ml/firefox-59.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "4faf79a4cf834f51a3e0716a523b9f3b1225d32180222e357bb6ad5ab3ee3b858c7822cd5c5c9e468ff216cd5d7969b71bd18e111c89fe83eee95cb1696937bf"; + sha512 = "741bf5dd0989e7288c836ac738901e0a2b10eb75a47abb4d01eff6ee941e8bea28229b333ff59d798e781da6170343d3ec80e4c4633faf5f2b4c6898f7adfb71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/mr/firefox-59.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "608a2efaeed3225c8a3f2609afe4160fcdb5286e3777def703e172864adc9b0a76a87889a7e93cde7f118afd218b5eff38b00dee923222c3cc1a044ba0ce00d9"; + sha512 = "fbf2226029386276defe4169b2595814f69073a9fdfa5c0748dc1ff806cade2565f4821afa3cfeff4f8cb9021bed8bb29dfead4ea6bd9e524c935d88306b040e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ms/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ms/firefox-59.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ea717a9bb9a8f644e66b8b0e0f28645460c9ac3a4f49db4c9f2f87b6419901d41e358f1f90a01122a70557bbd5fb4425bceffa8262e04c02759bb15ccff91d6f"; + sha512 = "ac405b0472e4febd43e8c725a855a6b75711637dd594a3a6ed1578f2bf042396b7f4c062efe3107db4e8a255ec02fc0eaaf5a329fc5538e5638bf3289b9cab31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/my/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/my/firefox-59.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "71468ad6a258665873122759364af4bd9a9f4b9d4c02d77a02c13512482b044c2b00f4c18332560d78fa77b413e89cf1d7d6625884b4e52f48345c0b4f62d04b"; + sha512 = "a46de7ec5ea0ed1ae0551cf927a3d7b93136d7738663e2c7a3926fdbb50db128ce10520e4393ca5cf8091ef1f763e112115123953aed18f117d2db6b78e8d8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nb-NO/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/nb-NO/firefox-59.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "594054e80f00111076786e322d561cea228e0ef9879d59fcbb9c3346a10314ca35df7466e2e008ab2a866ec627cdaee005deeed8be17d85a1803c35c0c6cc989"; + sha512 = "8a21fc028964d49a85e5fd4fce5c341b154a1da99bd0d7005b6754d9da6c0c7272ac2bb5a55fe4671c92288a06b77ffebb308a659ef72d6d87de894aa580c192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ne-NP/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ne-NP/firefox-59.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "2fb3bacfc57f664423af9672ecec7ca8bc68207cfb809423120e894760fa3a4d388fed7398a6d66803707b8e0571a21eeb313b09df6275c8c3f77cdf2a39563d"; + sha512 = "237634fdd47842c26175a3b9cf0c56feccffd835cdc514fd7e3108b8ae1100e258e5297677ef1e22c112f799036223569e3ed2fc17fe21ed23d5853e4f05fa5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/nl/firefox-59.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "f1afa644f76b76c88d4607e08de50724e9dcdcd407a98e2dc1de4fe408fc6b1ac7beffd26174d1919bb4a6136c82d12c95d13c0fbdfc2cc4d7b7c5d519a6125e"; + sha512 = "839b656dc93cfd0900bae78b71b6a967838ff01aee51d7a8223ea78f5110c415624ac893d0dfe94be3827a1731b716a26bed9b07bfc158577b54d89da1aad28f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nn-NO/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/nn-NO/firefox-59.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b9a8a7ae6cb3e91c780a83219281abe84318e17906f0f4b47ca9300720141a90679a55438956050a54cf733320210bc9e60bc903fed4e4b5b6a41e0d6cc46446"; + sha512 = "f747ad8eab3a3b2bbd03788ec6104e024512d259193dadba02f4798a4933a191dafe7754fac5fa1b143c8cec35b180979ba1b7304ed4f823768ef6b0766b724f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/or/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/or/firefox-59.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "0b062d8b564442ffcee2617faf0e55ff4d23e56342c3602e6bdedb986542206486e776b701fac5ff31102e3dab3d7c68d6facb348d29476a64cda8aaefed3ba0"; + sha512 = "23ee26d90e934127d2e4647e4833ab1e0788c3eec3ef66e981de5b7fa5a98947346e07221ba6ef4718ab0eb3ac0ac14ebaf8c4dcd322a05db0c1e0ef6665a478"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pa-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pa-IN/firefox-59.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "dd8154289d9d948db4a1d91020968b1f9502dbc6cbf1477d705396fe531a8f06f8d06289c9173c799be033e5e0f44b341b5029e492a8b7c8b0f81e918198d605"; + sha512 = "f04f51e205776e552c02659c191cbbcb95b836a7a762196417d04107b7e6016d49fbafb15a9744959deee561559231fb370b51f4c583329335d350aa16d7b6f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pl/firefox-59.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f6cde5bc5bec287feb3882de991a86506f0cbee8f9ed2f02b655911a2e0d69136b615f5a7a0bc782eb3cf6f68d99fefa4ff0a47c7058f344a9a8e9aef94ae4a6"; + sha512 = "190a3b3300c97be0265e69839ab3bd160b9ec5d6705c27247eb8f4a6adef25c7654713e1e27e37367367fec87c113ed7c004816d274374a3e7975ac21fc4c769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pt-BR/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pt-BR/firefox-59.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "978dbbee8f116d9123d121d778c52e19cb95d1b7cc565b538e65e0c24257e568bc01354841ba97c642d4f832c1e5279a844c98044b5a5aee4b44e0641f7f4105"; + sha512 = "b3e36749ee3e88f698320540202552fadeb33ce8e29333a0c1842f2c0074d8d198dabf321e4135f976de9e88464a0afd8b7a2712b62277bebc051a2ed7494e0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pt-PT/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pt-PT/firefox-59.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "b634de4ef37db1b8c96a03149aef441844728b25430dcef579edc62798ea54da7d2af50573cfe7963bd19c6c758104fc8f1efe159fc096a8f0479b851239049e"; + sha512 = "69cef4d5a6ef9868f0648727a8c58fc38e137b36a87a02c55d2b46d82cbabf6b8487a13102f28ecc08b8fd082b215fca0cdd088a0706f9147f443040e77335be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/rm/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/rm/firefox-59.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "64d5e36a600dc11aef92d6a3e80688ff6f9d6fd03c17c94ccfa5cbefae3e05c2cce0ba86286861989bf1201ed05fc373de327953c944e7b3b692f4a670a3ac4a"; + sha512 = "8107c2b28d39502656e41628ee9e359b12981a53556e757011ed09c7fc53211d9974392e94d10a20301ccf3943c7147532859fe0070ced83e21f205afcd97b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ro/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ro/firefox-59.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "8a4ef1a88ed197f3fa8042faf34e234d7b7fe6cd61a54a19aa19244a2b3f56da284062861978d7711536ed7e4722a3351d31d3f73a1f8782a2748f52d7197e96"; + sha512 = "8a023f3d5c45bf2617fadde60f74aae3d3740f1069264891c6bdf98adb242d7ddb6de0eb7b6ba76f72fdab9a58a1d746a69971f25584da170b54424469d16c0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ru/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ru/firefox-59.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5b43553eb9cc67be6bc5d7b0341d8f9f7df936f6a918a5bdc229c6b1e478067eef34eb0e593c2e9dec1724283e32bc8b6ef77fa93a3b20f367d5d2445b99f439"; + sha512 = "f7a99fc43cbf30c68568e3b67b1cb93f4d243720d5ab752aa289612b090285b3438912bc2336c0d62c2ffcd8fc86a8389916d62f0ea90917242b056ab89b8b65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/si/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/si/firefox-59.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "29bc4104a50c28b2b8cb7e7d7e652bc430dd42bb719dfc6d81902a2a5c5bb0f9ec31cefdcca2c71edbf9ff1f27f91317ab04f89e910ec6cdf8d7bb93a46d80a5"; + sha512 = "3195a7feb306d2dd694fcd8fbfca12493dc485e5b5f8ed6ef1d61c36030fc13ea64587471bc6686a29ecb8d05e38b554412285722bdfd16f65d146d9f9314600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sk/firefox-59.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b84bf339d93296c3c2c6debe1bb5bdd6dd1873c21f2345f81beeede0f6c68f5853e6ab092c63d973010798aa0f74afc81b1c4a3433ad02419d81475e73951ad7"; + sha512 = "c7279949739e3d35277e671245e94c77507096e1a8d0f25718787363bb5801912adfc2ad92ee4a6b4626bc919e1a9ecd52da4ef61f91dff3c36a3af79c88c813"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sl/firefox-59.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "0fb0878e5addb1a66530238ace042dc5821e89ae23ca2e9404b2c41b66bd56b9764bf3babaf9cb21c7259bc32cbabdc52372fba84fabf1415e783b06dd9935e5"; + sha512 = "2c114b10ace20f92eeca48ef667532261659d9e604e8394d885eb75ad6885839c895311d4766969f6f9b32c689df68dbd3780049e05a086dde7cf956d92cb81f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/son/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/son/firefox-59.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "5edad9a53752a63484b3256eaac74832fa34d46182d54c5dfc71a5e7c0d7b0e2308209e03f5ac118e9870913d02815f25a3124b15cb98c2d9df190d5c6ec9f6e"; + sha512 = "bf98308718a80c3f333463ffa41924969dd6dddc6123132b23fe2298bfa7e01704af56eab400c12c65975c092cd4f4d88df071cb5c71c0f47b849434f1182be8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sq/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sq/firefox-59.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "53eb9336acd2759e5d4022dc5924010b73d0152342931dcf8bc97d2b9f6bb8f3c1f6512a004796558b74144781a9785a380ac3d1786b66f95fe0b0394f474663"; + sha512 = "ede1bd64c9109a6bf75eb0d8881935c30d8a14d3ebd074e9f0b8aa300f6287fb27826821ef49175b8a1605ec9e58b14639a6738748bc6e33acbdb95c73c82823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sr/firefox-59.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "60fb87b0d71f879be495827fae12987de865863e88dcc623642093b287a8a7dd959274760f78c1b824b8a9e5282badad49811369a5b575fa29e993f5f960d1e4"; + sha512 = "d2786f91ed17b225cbba148d7f54c348a6d6034700b9f6d2dd1b372805287c4d7f82b15ae9b907f035589f8fd29f2532003dba15b4de7eae31c26f06be7e829f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sv-SE/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sv-SE/firefox-59.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "8314d679716002e4bd162a5408a2d6286b325ff1b08f92a455bd33399870acea023bd31693d7c10469d853c134e283a87bb5cf0dad2f525266f882581ba93ab0"; + sha512 = "5ce5f0abc1abd8bab2a1a22d9ff49957d258efd40f2c8e3b57eea85dd061cb1fe84377fcb108d8edf1cac0b2b450d082553f60fc1f33636c164064ceea584141"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ta/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ta/firefox-59.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "4ac7867c2e6c0e3bbbdeb38254e8c425b9630f314ab78a177a9dd83d2aa7495a7720400ba4095301fdace8179e30b5b15ab6f67d0beed7b026f581b2d0143bb4"; + sha512 = "cb7ae41b395cc80010f9f327e38caa479308a1e09290eb96382b4bd9f2412aab661c5385a080106a47ee0e7cd5476baec7889b58463488fb912b827efeb00264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/te/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/te/firefox-59.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "717c6489dd2863e39a9148b3394c81e855cdfaabb01aaaa90729797cf53760b8003c354eb9e1b98a453f23f2d2173bb5a37116eadcf03ed470d5670e562f422a"; + sha512 = "aaf074a19ef45b6d0d126e285796587863c8944daa79a713fe79fa157cf6d77e25a0c1db138f5481b379cb0269e70c1654515ad38e5a88398641917772a3e199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/th/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/th/firefox-59.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "a2d6fa4f9bc9327afce0aa74d8fdf6a632bd40158b3b9dff3d553e18a79fc893bce74b45e78ddb42ff913c3338d918a552058a69a313975fc04ecd832595062a"; + sha512 = "0dd9562d385df65c50f68a639b3e0f3a6dfc8108645d6d9c7a2c872b42cb33d8510ff182a0c2693d31837348fe0017be190bdb3979919dacf4bcf2516eaedbd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/tr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/tr/firefox-59.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "65a01e7b7777f4e96b8fc195d17ec433bad492918e3fc2978e945c6d5c8125f10e4d7ef1356fb003381b5bd41a1c2930b249065822d1f461a185c70b11455844"; + sha512 = "e714ad21aaa8807167e7d114971458783db6903cf0969fc3408b746b5b5f82fc46c7bbf1dd93e65f9cce60db3bc22d466109ab01ef7549a36b7e8c12901929e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/uk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/uk/firefox-59.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "38fccfbcac23f03f3801064d4cbd10fac73aa1f14b622f6d0cf01582a2fe4e5b18350b1fe6d338266604823af61131d830d2d673ddadd51b45e2beb2d201e18c"; + sha512 = "5c7dafdf0639b1e491e219543993fe66230f8dfb02eea5735a6933ed09369c53b3690a3bff9e0976f534333f2cb81a176791760d35c981ea21a8dac980dc0ea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ur/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ur/firefox-59.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "5e8becb32d19c51673cfa6ba87fff0790fc4bef9a885195e15b7f42272c486b1d27de4f3e1d09ec9817184620d66adf8c42e61692c80181ff497cfdca06ae584"; + sha512 = "2243cc3523bcaa9d6500ef1e32ab5947df3c5b233e9ffd15cf8aebbede666144dbcef7e41c997e2773786313fa05a580ee3db44cbd3eef180367ad6586f9d19b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/uz/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/uz/firefox-59.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "2076ef96b2a4dc236234f33e400b7c3406d0fba417c7e1d9af5dc1f005ad2bf09673b3420cd885a23a7e0113b6fbc4e569a655f8cae6052448d7c7118d46ce41"; + sha512 = "35cba02319ea1831c8a09d403f2613d6eb5ad0a59873a12ca072ec543dd85482e6979991b9b329568db65552d923800858b1218aa1f90512a243c22cddcb9a68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/vi/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/vi/firefox-59.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "bad0038493b166255cd25e500c6a751fd6fa9dccb72dfc6161660d5bae2267039ea8a7fee4c54e58cffb5a2cc819623a3239a5a49a07933e4e76340cfc13960d"; + sha512 = "af3f387f85604d3a6d4cc756d2bc9f0fbfaaf2ab986a56be9fa96c6a49e23fda07a3586dc45ddec88b334d0150aa8338beb38b78c3b2a78563cf33fd2da20655"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/xh/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/xh/firefox-59.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "d3b9cd39b1f558e63c34ec9cfea0348e4aae20789fb11059a6d9bc39b47dbd66fb79b24d7d296d665aaf3d42cdf672ad73e832b39b4bd5f62869a3d8c693c0d2"; + sha512 = "607763b3ae4e17c346ba203c0c23374f698e96a43728d7aa2e5d4736555199f2db2d06ea8e5db41892b6dea2618f3e1e72ed6e5dc24e524bfc8a1d118ea4e781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/zh-CN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/zh-CN/firefox-59.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "150fe754440b8fad0b372539875261de4bfa46dacb5711a672fb1016b9909929378a5465b2500c79fd6d5babe5084050044d9bf1722c8ab5752549b081245bc0"; + sha512 = "62f570593c7f83169f1739ae4b03fddd2fcca5721e6cbe1c3f5220a57ac7e12d464bcf2bb3f4584f72e0fe8e9d0b540b0d5e0fa99d808d5673c8eb98c60753e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/zh-TW/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/zh-TW/firefox-59.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b0a6f82e4f4118087a97daf4e8772b9ceeed0fe537510df600e88abe5a9d6c6b81c85813cc64b19df9d2bf799c042bf1aeb9e2a014adff0eb08c937ec113b9a2"; + sha512 = "c19b81134c15e7849e3b389f05f98f5f75938a3b4ee2d347ac6ede35dfbcf606a716e80c26e14bdb12bac3a5fa0554d74e9e93cba9ee610951bb90723cbf0330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ach/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ach/firefox-59.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "7c9a45c296acf084fd8c4ae9203f6c09125dffde389f5cdad903c4beea09e379a4e2f55fbc292fffd6242cd5124bb9fd865fc73c4d738671f6dce27e2fceb38c"; + sha512 = "50af4a771523571e0f2567c28522a36018f8a53d80a01648d2af7c2e3924d3feb2cfdfecf85036c38aa48bd33cae7470281010c73cbabe020d9fc6efe7c6f5bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/af/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/af/firefox-59.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3964d406c54fd20c93fba2a6fa967670a0e866c2d05e1ce6e4a0279ef355ebd65b1bd9b730d0c2d4e6bcf56bd72d5d543e3ac8c2824deec503159c96ef434227"; + sha512 = "2f80f8ba2adc1d3a8a30a05d549335f160321400ebfbc5576901a544a6dde7c19152b8a5fab66e23c6083942e982fe6c236ff8545a7f0457c0e3700067d3c61c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/an/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/an/firefox-59.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b6c5873a0e42d171b46615c751b3ab2fd8b668aac0d95da0d4c8f5f64514780221ce373421f5ac3edc44bb185a319f34f8d970703b0e44ec413512c6a337955d"; + sha512 = "4473c1437b7f07c8917d0b40e0b214baf649262531c329c5bf7f1434693070cf8b6bff39169dd40d5394ef59dcb106f0023c76e69e7b48103012de4fa7f7e1f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ar/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ar/firefox-59.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "9f3812eb426ff05eadbdf38a67044365de649e4954f33642947222ae05e273d650b54ff3d4fee6d4fbdf6b7145df86d3bfd45de2d9055cf7b1555c3d903c7f3d"; + sha512 = "f8f9626ace5bb47f7f4815cf5360e9e55b73e2ee8472c4f24e4c6d26cac2985f5ff56473561981354b0202309b37e2210c7bd14f8b50fe11cd9f27aa144ab331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/as/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/as/firefox-59.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "c32997341f7280d3481a586747cf74efa2d136b25881d5cb1b8efdea51884dbc82524ecc856b14f21c8d70a95bbe1957637c3d74c7a22adf7f595a8af90b05b2"; + sha512 = "9f54057fa5e4307bb4e54e600528d6207a8fe63690fef4b101e9f1d73ee6efa91ffc808e2adf7883a6a77dd4458967ae736de561c251181b8586638bde29b1ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ast/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ast/firefox-59.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "991cd6ed0e8470d3896a103fd96faf945dc73357d804552fb6ecb15144aa7a75a0154974be0a41997343b2c7e55eed16f1c6d864f1d556101a9eab8436aaba8e"; + sha512 = "3055bdd5a77f86aaf34ae618200834fc0b63469fe2c5f0c35b66a549c58e15d5d1e66e2ba772fc2ef9f7c8285ce3b642913ab40bf9a2bc0f9bdf42dc70daa5c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/az/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/az/firefox-59.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "0ca184beb54fcd0a494ffef3bea069db2bd2d834ae09d1d30073b951d0ed7556d805bd9d2c90b1343e3522872d6be4a2f913f17a7682e16fd88dc3d33c9892c6"; + sha512 = "8e025def60a934711f4e41246d8f1fe5dc3406df1ab2e3b6495a29d9a76519fb7cfe1b43b5d8cfb8f7c8546d3ebf66298502e44aadc28d001ceffd6439ff2299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/be/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/be/firefox-59.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "5ba9d89726e051a3d2b620bdda0dde16d79c3dd8fe8bf3d2518c4203d3c5109052560ee41e288dccb23bcae8a20319165274009503931d9fce04085376b44d4a"; + sha512 = "b581ff43eb98fcc606e8f70e1eb794ef63f22be03f2495507b0a08210a672040d9db8ab87c52073de099666e828a65bce91aa86f3722ab5c3230f00f5fd52556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bg/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bg/firefox-59.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "3e118566762363f5a28acf0db68f2579dbcd8671bf6422583e868c50e70c8b59f7bbf847d4ee2a2b01fe199d0f0b7d2ddb3f0648a4726e39320744dd097cdfa3"; + sha512 = "5272200ae8c27912783f5fa81188fc5bf8439bc57fd72c560e798f679f679ac8e21a8fc0d1e00a89f1b82125be100308b65d2fd5dee3e5d93353596a11869bcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bn-BD/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bn-BD/firefox-59.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "80e0d0b8199bd4ce35d2b9e88fd7602fd0c1f232251fbde89376c77cafc96cc75833d9d0b3756dbbe6b538bf237d57fb717b8ee6da4ec000540288344fa059f9"; + sha512 = "ac3f2322889dc4f6a8fd73c8b627a616295c00ec18924636b2ae2efdfebacac614a21acdfcc7874ea760eb356363d46a3f081aadc21426a45b298bde2981d494"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bn-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bn-IN/firefox-59.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "f887684ad0ab676a063bff238bdba8e0a05e6dd57d7472b7a834c6443f5c5697788cb408ba11399f38b949da0d57b4a9e90bcedd032b3d5fd9f6e1029b6657d1"; + sha512 = "9944a84d0af70dce2d0ad45201daba1c76984fab4f0ae1ce538d1be2d70428fd09212b41541ddfbcd0f0173ba8e57cce033ab657a87747000511cec593bb692a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/br/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/br/firefox-59.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "50d422b2863e3384de0c7fdf5bb10abbaf878c047532865226d6af5089e8a87c1515856e3ad294762f2de0335d18fdaf9efaaa7bd95245ac29a0c663aa73bb57"; + sha512 = "cf600ee3b064459a932e2fe4cb46fd15243e9770b90426e579f5042feb0946a6af77647925b3c90c5185570ae686e8d9fb8e33573e8d464b0c67b15c1e178f41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bs/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bs/firefox-59.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2de27aba569a25b1f45a328b255c5bb7933fce48b0ed1c006d9befd164b6ad7af26b255c9688dcb86dc92a36b35d12c0be4bdd91e4ef08a398259eed2ae6d9ba"; + sha512 = "3d7beb15a28b46d50f6c5ec7058519acc50ff37a1a806f3ec19dc45212c970a25a2c6912cfd6f10bec3ba9868cb36756557d01e97be46227f7aeb5a49218ae70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ca/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ca/firefox-59.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "70ec71c259b8f5935d0b603d586e5a71d28382e848543d81eb7a004d38530b6107be6ac63be2d908b47110110ec93331fadf33397ee5af057df35991909c5f36"; + sha512 = "bd980ce8afa64cdd8eede8c183bb286d4c799663007e4f9bae99545bfbbc22a1f6e7fdd52ed8364f97ec1eb178ecfd703726a03f8af7e3450ee112c49d1f3d76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cak/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/cak/firefox-59.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ae1ee282f71c133fdd3cab09bf44da6f1613ac4eb6679747ba3922b4233f76879aac57cb88a976b0c1135c08914d8aeb024a88cd9e6636a79e5010bba1d2221c"; + sha512 = "2232425a6a80c4248c0ef47c16a47af60c319e3e63b3607f25f11f884c63d21710233b048ce9a34df248e8d33bc35e188752a0ffd2f834bf5c87dbe5bd44191f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cs/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/cs/firefox-59.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d9f5f4dc2117c98d08d28098221356bdb7a86f2c48a9f2fa5826618a861f013d72455d14706e05784c19e61864241a923c7987d3ce5fc9703502b80645e81546"; + sha512 = "0826a880a40291fd9648fa01129a134945b146b5a50c841ecad8eab4615c0e4674e6d81cd8990f0732b5d830bbc5fffbb54febdd43cc9050a35e99b133587b79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cy/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/cy/firefox-59.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b05a5ed0231a7c36f179112318e00a4905120f4174cddabdd15e7425b669d7d9af319cf4fd81d87865afa7a9c18ef4fbdf16b271133884ef4d30951b19e9c266"; + sha512 = "802643ddc521e3898de3813a1fe489682d129147dcb9c3ef0b4e2bae1b80bfbc80ead1de49bdf1c6eddb7cc0e012505915184957ea55a750a7a0874278e316e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/da/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/da/firefox-59.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "280a4a86b21c66757b0b21c5a1620720a8d395052e1b36c7f4968a628c2b44d6131e93eafa17c33ca5e02a002ddcd21304983f02768e3f03b854f31fe9ecc509"; + sha512 = "a49d1e583d78692ffc2510912eb30a78169809034aeef77442d830b3237173b9ed915de7b642aa3b9f36866deed1ed336ef0f90cab5c0253e1a20221599edf5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/de/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/de/firefox-59.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "48b782b1e1dfcd68cb5a0529a3cff471178ef219d622db1d217adccb4aeb80d0574e10fe07eeaac4d709e8ff8425b60892a9ddd5dfa090292fbaafa047fc420a"; + sha512 = "2d67605da7337dbffda4cde7e4390aa194e1639f657f5b1e27fd857d7643f5b87e930823f337dd87c40601ebc07aa8111f2b98d273a105f20831a5a6d6189656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/dsb/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/dsb/firefox-59.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b2e9c73317460bdca82d08754c591c18a6b078b14f8f0a1f0544040ab618d22215d014d8275dc1a4d9ca4e36201a26404006dcf8ac9443b383afcb6983c07005"; + sha512 = "59d28e4f25b287757d21ab27b057758b93d5b2138303cdc5d64050ffd56809f1063423182c1e523123d24379019cbd4f8f1e7ad7b5afe4f86fb512bca172921b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/el/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/el/firefox-59.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "2bc5f65d92b3dfa86485809fd92fcbd61bfe6fddb28a928385ec54527a4b1beed9d6db6db987dadaedc17639d1d1e2a3e5d8f1cb96f55f20b203c6e537749159"; + sha512 = "09efb6532ccaa2e18be96fa3bd284d8f9b707c388cc8c37a149cd08b427a93dcac8f1d95fd554bfdf594d0ea58a216b938153d0078999f475b80cdcd4be0c7c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-GB/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/en-GB/firefox-59.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "6f85e6e2590f181f52fa79fae12bc59a1d53c44a8df75e360dbc7dcdf4078d02e6d34b904c47b214f7c23a978092b995cdab92093b85432907d28dd0ef054bd7"; + sha512 = "d1f3c7634e4cfac8e4d59bd5a68acfd272f4f4d7b6a9b300d635b8bbe4eb168eca5f7fe07d49aba5fb1695c11be45cefc33349444a49029fc42d9975baa3ebab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-US/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/en-US/firefox-59.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "2d84381da9042b0682377660f8d524f503c4e71e2002a98d2f443d00d0761ea8aac59464a54b7807e6c133e7aa9f983d00c6fee09c4020dfa15377a1d662dc1f"; + sha512 = "82b9c2639a38642e9e6a573a23b8d4f104254006bcac51d8583981baf685c4e2afe2da71783fcc8c6396788b8d0b27c6cebd016894efe5e5deea80a616552c04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-ZA/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/en-ZA/firefox-59.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d38ebe9d512e64bddba19d4ededa6a9df596b43d61ee7b8d06c183884639d693a1ed7f1b2086027f30cbeb8eb5aadc7f8a902802c827a31751985509067ecd6b"; + sha512 = "d3d59ca990a5b2797aed4a8b69aba6ffcfc93ae56fd7ead3e66fa6c4aea89d9417eb15099afd9725ab1b347670a67b8ac4c9e10a717fb5648b11fe1fe17c1e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/eo/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/eo/firefox-59.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "8f7d50d14c75137d61156a360330e8e086da96fd13e1a32bc956f93f5c3361943b8011ec7ce95ff1c45194b0adcb980d123d0f58e67fc7e1b881571d81e68adb"; + sha512 = "f7070f4af84c7077c9c64f7ce9ca4da8106e46b0061cd2f18bf477a196c323cf0a0561bb4ae592a418a899d1091f70e8510157d16fe5ef06cf108930b7187c7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-AR/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-AR/firefox-59.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "fd3bf685c7ef048b29fd10131b1f06ee4de9f5af5704ec1b3ed657678ffab6aeb901fc64a6a9461ffad4ae6fa8f04535ff91276cf15a886642821ef5f739217b"; + sha512 = "e29b8c845eefb189afe33767b413d5fccaf38db71e8abfeb8e5b4877e54729e816cdf5d5a1458dada961636accc079c13cac01625a8ca7b722f0defaf85bfaf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-CL/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-CL/firefox-59.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e6711cf4073c120228afc230aaa4ba45da0b93fb7bfc10eb48f0cf8194ac9022aca243fc9457af208c5dc8ad2702eadce88fe1e598b86ba6c2f34eab426eaaac"; + sha512 = "1ca0c7a0d768f48f214f053baff7f10f96c17687cb61cc2f0a78b9214f0dcafed1d2cfed5c086465f99c6e0cec092aa1d617f311e1021a258aaa5eba9f9981e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-ES/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-ES/firefox-59.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "939eb996a025362181e89e1a978b6cbca4157a84f314c3f75e43e5f041738548a467ff2d8346ec6bb76305f40856b8530803784a8feffbbd8cd3d77cc0a28b51"; + sha512 = "c0a12ca65e1e1c023092fd9a75dc6c959094364047d6e627ff33ccd8f613d005cb2fc08dc22687dd9f52998cae6191c5a7ab8ea75009b6c9f0fedd88c7db740c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-MX/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-MX/firefox-59.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "f2e13cc14f3356ea205b0553de6a856cc5ca65b3ac2ad64026137e4fd018df71dbc308473fbbe8c5d77f63c813351fe5f8392acc14a90ff89fd0c0f971c4ad7e"; + sha512 = "7341c24a0bfcd29ad57108be3ab535db79fdb65e43de92d87b867b65e122c4ae25bdded92469697d9b0656e6a4517c01b98318f8bc31fc265b66a77428fd5c7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/et/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/et/firefox-59.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "305dc29de3ba9f73deae066963c6d1c687128aa2f132ca1405d09da04b6a0a112d9b0353f9b59fe0503769301fe8cb14fb469e64de8d1e313ff3d415c032e33f"; + sha512 = "19af1a005fe57fb038525e98b5b73a9024ba79c0027c56b55df085a4036c9010d14c268ddd09b6f3db81841440538421324195f2eb44e1931c41e530da93b978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/eu/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/eu/firefox-59.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "61134d922d05bb5599f70106128911e1e7beb8430f1f9a100a5a32f02b6144d6313010e6fe29f7c422af4210c510edb55ffeafe4858ee7f1202f41941982f784"; + sha512 = "1d78b098217b562f2c9b6b6ccb06d0658e6c183e336b47d3ebcd4bce8f6859aa7767258f612454ba0bbf6087e7c3b536944606ea0add7a7cd5467cdbbeb6bc29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fa/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fa/firefox-59.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "83f3ec87151cfe565a3e350ad98558741a6b4e8c72b5f36e0aab07d4ac26ae2b4d6622f0faafff8ee1a6f851c723349bbfbaf175f209bd97ae8bea2c4ba811e1"; + sha512 = "7b587961e1bf0cb84c80fbbadcda8f058168729e1c6daf9ad3b30753414a29462c82aec6217a3fef130e59acb4c6b7b65d29d1ccda2f50cf53b510e53580e68b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ff/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ff/firefox-59.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "99f781590e7bc8ea63cfe13e3fe56e1f14346caa4b3e32d23d53600c0d4ea8f55bfded6ec422ad8b41eaa47313dd3726c952e547ddde6cdb17f6515308791bc4"; + sha512 = "aa7caf7b0d54fcdf84a3a493293a9ab84646d3337d6b1032598f27aa3affc340446bd7f1fa69cbd613be003edc17cffdfeebbf7cf3c11b68239a77a46e25ec0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fi/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fi/firefox-59.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "27de47eb3ec0ed3517ef6a3cb00933a8b891f8f1c1cc0e9c4a7ae2b732141c8872dd35c8a54bf6c5ceaa054360e053f5e52dd2c5cbe2f5ca4156ccc8ea337c84"; + sha512 = "de9eb2145a68b693995424335c3e96eecd4ae6716cb366ff341282d8e6fac9d1506018c87ad285637b29b2d607d73a44bb15e024866150f5ab99b57affb761d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fr/firefox-59.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "25fbf0d23dff1f37d069e34afa3b8249da51e33522013608b4e623b0334ca63dafeebbc6db5718ef829282a78d0fd06bf00d6233123e0f405773dc1188dd4615"; + sha512 = "6880f1207359bfd7d2be69416aa6a668355f6b9776eb69a8f93f8efef804d8a5aac984fedb553c8564498c0a22dd4d9011ef968502c7c5f142f14c038be7b8c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fy-NL/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fy-NL/firefox-59.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "e82bdef3a02f356eab85facddb6a643a0059de873782691bd663d741f29f06b223acc6e1d1058a5f8a0692262a764ad019abd1b77b1d5bd5610eb9a338e2fb43"; + sha512 = "bac16eac70b8d92487627a11a915fc6f111d1942bddc45fb746fcc04b76e199335adba858f599a8acf0e5cd90384f5f814c49242cc2bc8903ac769acb6440356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ga-IE/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ga-IE/firefox-59.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "36e2a43da67b1f6e941ddc5a68db953186af1ea0f505bf4a1affb70aadf3ee5f9a61562d66fb87007ceeff87ff33fe5244ba1337f83ee187cb004b9859b4f2c0"; + sha512 = "7017d19904f1a534d51bc527b496df5a11d913fc50f506af9202cb51e73adefd72bafc0cbdb6c5582cd7479042d5b40a5b73ee19466eae98758f626735b58e43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gd/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gd/firefox-59.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "45bdb9aa59647238d457ee1eb61ce31777734b1054a7045b0ab917cac82ee0636aa033a578492966ed2c405890743334b942c962cddf00c7aab7cc8a2868faa7"; + sha512 = "501af97549bfb5ddfb6df26cfa3336d6b2391d943eea4953638aa38650c58408fd554c22d17fbfd9db1675871eb77af8c409e68e415bc7c3b943497e51e38a70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gl/firefox-59.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "cbee32deb9cf59e94f6144d88f8b78d053fca294f050cca739e81c5cceb33d6c34153a082413317353bf5e792c8ad1c34a3db34fe2bd5cdf9c7f59d70d050d73"; + sha512 = "ea02e0ff19b20401f62f2b65d023c3337f876fd3d1906d7a1cba8c353a16b4fbab2c135daa449b5020ba332fc98e0dc6045171f3db94f7ab9f7a65cee81fd0e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gn/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gn/firefox-59.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "f824fe5a4cc0b56e7d479f3f54f33ad939e93c9911c4a133e567607b325c75b36e0ae40b2c4ee52eb90ede34f64fc9ef83e56d86000194e453c76c8cd505e43b"; + sha512 = "8fbccb828fde85404cfe8980e7620ea2c9f9378d30656c2c75b9b4d50f5769bb888fb4f36465ccc2e291a2e92b57e53bb88e8ba7123b27b9347ebb37bc6f764f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gu-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gu-IN/firefox-59.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "2706befded2f4ce9c7bcbc907dd634ae90309dc3e55849b2862498323fe854d563f7445701e652d7205e41f3bf23f17bbf7e7c43ef8e9808cb63f873d3a5b343"; + sha512 = "2816e1d9b7a3c75c14427049023b203ef3f183f69cff30cd0543f0993814b58429a6d3d062b991a06dd021435f97de17e85cf797423cf69fb8bbff2818907881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/he/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/he/firefox-59.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "572c907f6c8d8de9da98a68d74b50a17f073aa2af45d7c6d3af1e637ef9bb7192804ac89bc77b10a9e99dd0ecfd1eeb8b5594473125b1265e41ae91da1fdc3ee"; + sha512 = "23a965bb88e207d63db79e9bc4b49943d4db1062a5f9947bf5ba6941e4c309bbd2acb7c6e53a258ae8984a1976a28e08e325fedc786d5930095411ad7c0acc90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hi-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hi-IN/firefox-59.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "48d3b243d4b656f6ffaf18d63c549c71a530f4a252f368d879f5c854ea8107674b50b4ed4bddb5c36d937b7652bdfc6150672dbaf639eb1efb1f2982f2b8622a"; + sha512 = "5d2e1099ba22062884a590dc3218fa94ceeb111e16ea9441b7b73911b8c93fb1f5cf4c1576699a48dd3d55e0ae460c430d388347b72de449cce851ddbc94cc7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hr/firefox-59.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "18d4d5e1892fdb647b4decc13e4e48b74195f924533a32c1e7a8387e94b51d02da2f7accee7420d8112093951a311a7e871c8547ebcdda4c3226f4fa5ce294a3"; + sha512 = "b196238fc825486f377b5f82fa8df76fa0d958d7b7185f9770dcd66b8bef30b8b0f2eaa975ab0fb1dabf5e6d7be8d8068873108fe2b7ef914920177a727aee91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hsb/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hsb/firefox-59.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "ef3cdf002efcc9fc2c3fad7c0ee0e098b0a967f610066d7efc180dbadb30dcd3d0696136391f15a9304758fb610a96cb84321d9e40bfe28c36e7f43a96e1d7df"; + sha512 = "15c26b9d93cc78d37059b14768173b8b55d379e48d0d134e8d33d357575062afb70614b0ed268c3aa3ca992a893abdc0dd820a22667511ff5b9d91d1718cadfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hu/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hu/firefox-59.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4bbc24ab9700af5449709fc2fdc612955e3b75e5973765c698ade3ac9f041510999033edf5a587983ad62574fd45eac467043b1a1671133cf5b9ac07834e0ae7"; + sha512 = "8a50a6c20791dca3226d612c39bc65d51631c07ec12210359c2fe449e4bb6340a307ff82e174094a410f163bbbbc9102f04b8c88f09e02821f06250fe34c3853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hy-AM/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hy-AM/firefox-59.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "987ee31ec5ae384c6f6dffab7583a246f1d67fb94aed09ae3d389eff8e3f6d898fecb2afb0db41ef7521ca5c8d8ae5f525071fa7931f83524462634c3b3d049c"; + sha512 = "255a3f1624278bd0956047a8f58ff2c5509c8dc05c9b1be666742747d7262a34d492351baaf2bae69ad60343e5f843be07456d8de2901e10726b736704faf7d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ia/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ia/firefox-59.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e419094a4bffba6e1ed263a14a92039d861832bceaa1da6eb91fd2ac07f625736bcfa483434f303c6370a8c4212f32365bcfb469cf8183c6a6bdae59643ba42d"; + sha512 = "8f32345861f5c6a4e719326bc7d6f3af2f179bb6b3e97f98b1d9f7d77dd4eea2276cd590d7fb4f2742441dcb507971165655cefa4b34f9bd99dd98b2845f2b78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/id/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/id/firefox-59.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "c65d19533e0e9174a5a290dfe932284109308f3a9a227a59b533ca5d68eeeffcb064d52bf407baafa497b1b569cbf03ea4f5565d6e39b2886496d2bae9aef2dd"; + sha512 = "9be74f1f2990c0116f74e60454d0912e4ef352a3990b421a849717067c8d2000e6a2f7455c2dc3e40dcf295216ebcc3ebd3e544e185d099a52767002a08869fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/is/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/is/firefox-59.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "19452bc2f73d53ba8eb6d5d5b5a67540f2130a43508c7841b1e724e143783f973458ae1948e71263fd1bd9ff12dd717f02a6c6e57ef7b165d189a7428bc00007"; + sha512 = "b6f80571985184ab274857caf365210112d244a50387179c7876560c4994c155c09c73ef6c790d1ce11c3ecadc8f78dc65d3bd2781fc25469d6b4d935d647203"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/it/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/it/firefox-59.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "577bba4202831b92ecf74484016c5ea0cd9161ee64d6df2bf0f81f6ca88ae718e64ada78d8d3e190dc3a54aa9ae15881b34e04949f6c6376bbbcf59225a9b6ff"; + sha512 = "2a2d9414242382e5b057f87afcce742ce7e1be6c5688cfbf6a24805dae87212958ede18e4572f820c4b459449dbcdd6ff865152e905ca670f2c748c080758013"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ja/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ja/firefox-59.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "80ff213322a015c906adf43f278f0ed7691964692b036e8bd03fa9417f46bd7d2604b1fcb7f6d1038741c592b1ca63a1accdbef1b9e8e40e150230f6ccb350ce"; + sha512 = "8ca32678624f811754549dabd6482c4ce09e9733f0679fbb8f44ca3222972d702f1c1f2aaaae75fede073c21e4f457b2e4974c0eb70519f612b2ed43a54ff0a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ka/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ka/firefox-59.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "542a019b300edbee543e86b265b80f899dcd646423b367957c255be864a4c25f1cd7a5e566368492f83c0b76854d48563764e01cf660d41666420c3d959f4505"; + sha512 = "330dfada0f80a3b762dcacf1bfcefc5eda492617547dda4360eb8ed5833532988ed0d64d803ba1a0d5f37e867250704e38d1d5c84182975bc2de6c286afe0034"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kab/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/kab/firefox-59.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "b2f158e86a62c345cb82fbd7be2d3f4888c0a39d239b1973083ea7f710da755b160ad5b7b0c2c15a11ec4c7f707df9aa5fa1f9c479821bc7bdb71e5732410721"; + sha512 = "7c264bbfc2f898174dabb33d540ae1bc5c0d3de9f4792d734634c0360d3e9415fe31968a5a1749316f98bfff15b3380887d8e550e03b2ef8a07b67ebc65222db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/kk/firefox-59.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f78ca53fe7fb3a74b46cabc079f5ed837f76196a0253b7525fa7f0e9b0e96c21f0c93f04da3e6b50393c262a34cc399d3c6a2f02fd5e75b9b05ae99a1237ee18"; + sha512 = "eb39b7099cba0ab95ea57d5652737e0d911a06a7ccbe8f134d1e165bd0e275bfd2b9b5f5a7b8e2dcb8efca52d797b5ebfe88ce424a8d4ca5153b0e14d1196b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/km/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/km/firefox-59.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "9a63de9bb32eecfd7cdebbdcd43ecf8977a96a73199dac06561964fc874d785e67db5583b7300023048524208d7ea6d4d83df68d713ed3227fe3371269d54951"; + sha512 = "fee1e73f4a550409f13b1e6ede1f18cef99f8b16dc62f294c9450e4e55b5f478b3bc6714ed8da7610eaf213e3180e4c95ef81ad97621c5127c2cec5d0ac1fe84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kn/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/kn/firefox-59.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0500919759971c60007c9766d4c719ccb3f794859aee0d06ec46b552cea6186b0c49a3e0ae7439c48326e6562a50cadccc138a1ed425d677aab070d15e53ef89"; + sha512 = "9b7807a6c0b7cd89e402ec6b972879b08b714002d1f105b937926175d15496a4e3aed588cc247dee2de05ed36757f1de13691742654c5621c60b3755eab46ccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ko/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ko/firefox-59.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "96043eca2dc79f2ba635b7fa930219e1e8995f7983c9aaca73d700153002cd05375feffd9c501681ae73caebb060ec7c6ccfb2a3666f8b6424575728f1975f82"; + sha512 = "84208107bbd8fffe856165da5db41cfd0ef05a683253a11cc0c0f043a5034a6477eb5f7e2a7513a319344b43dde11f2ac3ef5eb14ecce4f965420674397d62cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lij/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/lij/firefox-59.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "603b9d3764d92f3fc66f89e451526749ae11c5329e4052e81d1949bb17171e0d1536b6824a9b0fc9017b98ce5a7ae31adfbc51583b275a770f361b77d6dfe742"; + sha512 = "b7e4daec2720f2163522f4257c3622d9a424807e2997452f50853a8c227d6672d538d03d44a59274ff1a58d6b6efecdf3cb817963adde039fadca73c41decb08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lt/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/lt/firefox-59.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "dc7447ec483b1419d8b752045bd8380f2678bf976368734800daae02085d99323a931954aface4e1f701f970a3ad70e07107812fe930eb300a1458a14ff88b3e"; + sha512 = "5085f82bb167ea2f9bd50e7e78b1a26a490f559134ca049e1edff7ec4797c622360fcca726229b52320744ae88f15a6d728ce50e257d0cf999d0179b2718a220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lv/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/lv/firefox-59.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f63e391b4c490ecd76d3b2806f4413817d0ed8da5298cdf2e9da7abe0499ff3fe612474f8f040d35f186a9a4cc0c989074affb26b8ee0f25e774fffcce049f78"; + sha512 = "662fb0a02e1e8ba8a28d8eb2dffda77ecfd3c4da75873b5cdad8bb6d85206b82f5acb2f55ae5bcdce75ef1427969e2dd2b3f58b86017c13e2ae0afa06e5d52c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mai/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/mai/firefox-59.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ceb3d5005b5e7b2edef0447ab9372feb14dea49bd0a3d2946cc7852f30aa0c174a0535c8edcc1e5164faa3c7829f5016daaa3641203dc2690984cb2a72cee626"; + sha512 = "b97ad4d8093a402c957e27691b29baef01cd587f3fa2210f47707c6f846f46916d92eed3ba0208c8a659a7931aad7ed63dafcb7d41451a08561f74a62c057696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/mk/firefox-59.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a2d4ba92c6971e99521617ffa1ae2f047c63d106f2644ad22a09eb76aab516f1468fe6e2aebdfa71b51a9d92379140e19f5ad968a11b61cee027cebcc84d0552"; + sha512 = "f44ddf9d274a2e095ce3ae56edd23b379bb47502f1c9ee8e66aaac385a25ee05e6c442c173a77e9a75749d3785aa6402a76dfff8255c101aebd178de0ed43d2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ml/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ml/firefox-59.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "00b6358ca10bd1728f80954d2a2660888e1c73dd2892855c72ab3ec0ba746786dde29e6b7fd4d559eac704fefd2c87a05ebfee1c226eb46440ef8ec354c08fa6"; + sha512 = "a449e12812850153caa7edfe64d58132d47690df7825b9dd732b55792a6e7842f51361dbb8e5792855336f4267cbf30a6c12c69375b0c1368155a3deb06e80f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/mr/firefox-59.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "2b3c154a9ffe91e0882e4ac7b42fb2b332e9cbce726a68522f9a99d159ab11d2aa75ffd017d8d0ed73ba700c4612e4802ac9a7767e2751b2833d48c850536b2b"; + sha512 = "585ce21eee30af73b1d23804158490d3189e7e1b8dac0b27832fb4e9149ed62bae28b9f38141de2dfd131e4c65a2ace93d944ad0e3cdffd96a3673f69ed66c11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ms/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ms/firefox-59.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "71c16d638faa108c26419913f3bd7ed5aa65774a4a1b6de4b89f1613290ffb321ad85cde2a423573bfc0fcac2a6d26d2235318e87f4a534919e5726bbeecf910"; + sha512 = "d300051710a6a4a25407e36aa0326609939fbe6561fd3dead01bdf9f7987c7604089302b9343b946a896f7693deb7b1999f35a6c8146d9558ca085c602ea7555"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/my/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/my/firefox-59.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f45356d2b746928c1a210489a8936ad267905c192c9bdb8c703c86cdf52a9db0cb118512649803c5f64a7f7b5c5e9bad1480284d09ce16f27d1630ce16326f36"; + sha512 = "82d789949ddd47a038e271e38ff3951047ba054a318eb072708acc6b39e34ee878b350f87e491b8aafe9429a7889f41bb03982156fe8bbae66dd0f7231560dfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nb-NO/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/nb-NO/firefox-59.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "64310a4d25756915efd8a586861419a3daf6b85ec3c5fcf52dcfe0446267f217fcc11f375e67e917f37177ebf8edd5da9e945afcfc114ab90102282e94e39d14"; + sha512 = "6e17057590b82690d7078f07b87242307b4579008a6f6b4b3c22afb05df7cc70af96c75b639e0852a1fd94b08bdf33849ddc7250cce80f9d0b6d5bea6e000efa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ne-NP/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ne-NP/firefox-59.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "87e5586928918b8b8c294f3a3c229c393abd116ebc27ce64f641671a5cbc10a0165ec62f8b4f9fc8fee084feb51fd16a43db6288dd62abf6f4319cf58a3fc0fc"; + sha512 = "6d0d4952b2b926d32d2b20ec6703bf989d31f44921cb7f4cedeaaf1fe7220ae82059b0412354e3520ba77c5d72cc0354d57e3ed87d61bd37e01d89cb572b46fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/nl/firefox-59.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "fa96336f5db42925016592845cece77d369775ad8463aaf72090a759bac0c69032e1b7379b1be3dbb2a131d5f3dae3317d5b0dcd9e36f5a91fe7a2dfdbc9d5fd"; + sha512 = "4f01f262f66f14822c1f506d57ed5acae783e4108f9201e29b34b2114f1ee502c1d8cee8021cd09ccb2ee8181448a9727e04f6cf69ffb769f949a95108b52d70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nn-NO/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/nn-NO/firefox-59.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7ddd0ace9adb84cde7910c0b247468e47b802d90cd00307f9e660110d5fd80d79dd6dbbd9efc1baae632812742c977a58d0d8f951f1c1e70648a2b2054bc63a4"; + sha512 = "408c006e374b3d8d4123aef1667f80c831dd764bf0b1747addace652b01bd8d66d5cd5be1ad0cd3c29704049e253e1aae69f4dde05ba9f11011a5c9537168bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/or/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/or/firefox-59.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a4a1eec3e2e62ba617cf6a921f125522a6ac49a2f5deff0855dcbee3037f17f6d5e32180a215893028f933dcdd879c95cdcf4f133c6c952db073a7543012e474"; + sha512 = "35ec6f9200e52262f8320237f006b24b4be290b303d5d3222338fac1d6adc91c3c86417d808d33929ead01890681a4335b75801d9c5b44adc70be85c9f41e18c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pa-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pa-IN/firefox-59.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "71fc1b5f4a1525e3358783498232db6df0b92b52d6ac2420051b5f15191c40e94ce3c7409b917ba171e1b8c65b316e771b56e46812b5e9421163c9e6267adc2e"; + sha512 = "0abf82d1f4fd3a1da22ce0341c57d3c2fcf46d6f051f8d76da6685e32614eefce105565cc72b019934d6cce624968dbe8f2ff47a4d8bf344f317fbce11dfa833"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pl/firefox-59.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "8ab57e4bbf78abc9e6ead70fb579d0c5c0066ee8297941e6030a6132c74cd965d23775029c7c4357dc80b24223473311b13f0a826ce7a763a4fb87b80de81f9e"; + sha512 = "96d61e9be18cccad5f92d049afa1c0e034c5ed7c80b6618db1566127a12aa77da156c1a8a65e381f12a6be261c479c66d5cf4b0697bddc507eb4a507cd5b33f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pt-BR/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pt-BR/firefox-59.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3ef11e84ac83cb2c38b029342b4e7782554af6831e8c18c27e12efc97243e2b84e041633b43ce8d4162d451ad0df6109481d94c3bc4c9bbcea27807427c9e830"; + sha512 = "fc57bc34db3fde2ab4c2521a70db33418b96c1bffa025d6cf7841048a50f9d959bbd0da5adcc8b68cd72f28bb97930984634231623ce78860b086c4e2884715f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pt-PT/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pt-PT/firefox-59.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "a795e111da79b03dcf73c90cfacb58d56fcd866ba1a7d5d70474844d91586eb98191cde4c18cdceb481cf5be3fdf7ab2fe98f22690421877b9c9f87afa8c5bd4"; + sha512 = "ff89521bafa15aa8990598ae1985ef53c9a5a401281f04b6c0a0270e9f6d394a09e2c5df69cd47ff602c7b6f3fcb8565932d0c59bd8f2707219e06dc1be8ae2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/rm/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/rm/firefox-59.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "8dec0be4a506c750c6c6cc3a52964b6d3cf072ea6a37c9d5a6ef855eaadd3b715ff48fe9ee320716ed23ec56889e3585c729f1f8c22683d45fb1a04a344475ee"; + sha512 = "b259e19fab6bf234bf7df2a17f2ee12c7d04e8e8cf64e1fe22ec67e26a6e0ba1115ad7bffb410a1c11d9f17414123c4e856706b0a8f443136bae9192be87c63d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ro/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ro/firefox-59.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e9adb45a8e22243de0113007a3b6f4f2eeed119cd326a0024e3b7e42abbbeccf0be26c8ea80c951e50e857fb773cfaca6532b6ae32df0f6516421b1d1683d98b"; + sha512 = "2131c7ac80966498fd673c04432d6fdaac0da9a061d9181dcca8e9b86229764a4872d39d1dab48a7e5f2c4ff1f085adab19dc961cf62813e8f3145909971369b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ru/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ru/firefox-59.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "dece61a88d1a3fa706a26a847601bd633c06dab512afcc4815c1a379a56589b6afaf2877658f9745d328657803e248f5c22d5e611db79c46b7d78d38f3819778"; + sha512 = "8f4bd39ccd6e71ae33c616da55307b8ce718842f3e451fe79d3a7517a6ea211a6a87aa0755e2d916e3e3b74bbf5f4935418cab4eabb397fea31552b1e758acc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/si/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/si/firefox-59.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "63a57a44e92e2dff5e24dc720aa1e2c5f469ff670b839ffac11ed27e242afb8fd30f5472d6a120c0d9a75553242e4017566460f0a374ba71e08cdb967bef198a"; + sha512 = "78bd2a0ee4ca72e709ed227640b85818a762f836798c38cc327ad31d1677eb0308f01232580b4c94aafa7c19482eaae36af1bdf9cbbd1c477be743f0f08b12be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sk/firefox-59.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f4d2d08315d00374bf1bd5f9b0aa156df9fa27676c191bb11a8add1396f506651298ccc6e35f6a260c1d1ae36deee51c0aba39dd0a996bf532f6c627db07d52f"; + sha512 = "60735bd53c852cb3517434ebcf0565ae7ecd175277e1e9095ad1e017b9b39ef42bf9cd88008fbfe9db457d82f5e27d6b927362766b115af5dd2bb8bd4966cb79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sl/firefox-59.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bd067c5ce137d3d60c2646c6121823c5b2d466b1d5e6ea8b97e3a341ac66088f6d7cd86d1530fdffaeb5a9298972b6823596940ed8133712e4ea2420df337f40"; + sha512 = "bcc903cd0c1cadaa91b515d6f744122bc76173b1c526d7e534e2abe1c32776649e003911c87473837a3f50459801d7a99c3ca99dd46c06559c8903db03f5a115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/son/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/son/firefox-59.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "60dcea372bc427733d1939ba10e476545ea2545ab63358152947d7aa92581800384e4f9812945651db911523c48b7b8279248d01dcd6e331dec8457bd6eb68df"; + sha512 = "f4ee6fab131300dc12c4ff04d211f405b09f952070ba833da8298424a505cb1b878061d13696db55f7e598a42c92698cf474819db7ac7885fc9b54529ab233cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sq/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sq/firefox-59.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ee0120540d500cb9e23843a970c9d0a7c4c59d93dce098580e0e26a1de789d82f86252767553f42b58146c8c9bade95de4aa0b0834c8c73a9654bc646e241ec4"; + sha512 = "3bf50ed9c0a5a056650cb23aa4c4b598b56cce144ed1f3801e5024ffdb1f5a976614a876632ad0c4bc75e85e781be3d941496b2047e92405cab03abd5aab2bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sr/firefox-59.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "572949804891307635ea3edeaa3f8a2a5fd9417491b73c3314785749889b32a89ea454d84b87e26af78f06bd65a9b40069e7015e12de702c68e1600f1ff55291"; + sha512 = "47a1e0fd0e9fa4eff50cdd480cfbd74e1afa50cf5c5da01f38def27ad84c0c69ccca70ef3fa5fe93116154fa045e14f437220970930169ba73a376b6a9a85bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sv-SE/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sv-SE/firefox-59.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "30320faa886b39827eb6a167e133b205e0628570c29013c123f30919fd6f08c9eee13d9a989d518ffd5a7115c07b0c4144ae7ec1d4a78a6abe130ad1b6ecc3fe"; + sha512 = "a605236ce010d83913db4ad8061e8b3993b6cedcc3f54044796e0a0d3f073e5ce5d7587081428544efd7938eccf302190313f895f2603785cc60284c16dd7b08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ta/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ta/firefox-59.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d8caab89ce3d95f432f5e05415fdd2bfabd8ccc4019312df87d56aae9cbd991baadcdf4d7bccd2c549f01f4fbaa3bdc08e48de36258ad1dac6cc91e7983c4736"; + sha512 = "9b5e7e42570272989156f48dbb22b26f3dc4dfe2298c97b1ad1ed60f0def7a886c32a7260d450776653b72793dbdaf774c05198dcdb0b1a7812be9563e0666c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/te/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/te/firefox-59.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "f1f063ab4115fb66fb3c16330748be402dce101fca5139ac62174c4efaa877282390a435a1998d28950f8c2d37267a930f8b5c72ff86ff88c3fd472075ea0794"; + sha512 = "82dd8b225f1eb515ac4ff5b2fba68028233f773d04f119bf9e4181017692b72557c46a73a463834e8ed52a81b02f5501f5bc3af8d9eec84aedffb361b8ddbc39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/th/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/th/firefox-59.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "dc35e94d5329de50ee8a6d49bbf7c1a21163e6e93d94ba42cb9e6f15e7b173d21df218388130d9033afb6dc4d4af402c42614841b22c97d98ce8a68c8a1b02a2"; + sha512 = "8b29b3b7157624d304a00238f3f49ebc9a202a818c4e6bd87596256926d0ee9047ae48db734bc6040ce6f2c94f800fc88b06a6f96788933482275c0bc1d01bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/tr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/tr/firefox-59.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "295f600dd18fb684534ec301541f144bf21bdc245d812507cb8b7425c46337af4100e8cd9265c5e9b3bd76e65fa2d6ac48619d1253a4458b7d2a5d003366c694"; + sha512 = "727405e1d1fb9e4c84b9ddac65bd7a95c837f2ba9239220e5f4684161a2a0e25cf8fa87c5cf0d924fe0f7ed4286e7ff6ccb05fb2041796226b346066831de618"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/uk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/uk/firefox-59.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "77aa3e08489d5c2fa15c793ef1cb514c7f210eae4e24a331513e7d40a729f58b92b339ec05ce646c9861c8524bcb6e312af267e4db7586ef058aef0e53e3f5bd"; + sha512 = "3ae3e87414e521332856a9be9b6f9a7f1df08e48779693dd4494cf950eeb89aaeb552d2819cd2c71f19f08a17fa01b092b66fa79930d9de6551161adef7391ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ur/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ur/firefox-59.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "4da69920ffbc3120a6ca75da79252e6bf1ca97b4540315683599cc702b6c3db4c996b0cf0565a9c97ffcf316f3519a8fc16529350aa9e22fd6b4ca48f734a289"; + sha512 = "3984c7f849dd16298360ee2071568dfc9a77b2650fb4cb1c6092038144a12726d912ba28eb64f4a3e3e65b8d1221044eef66aac066f66d097b63bce6f85d2b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/uz/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/uz/firefox-59.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "12639e719842e98181c4c0fed1ba284da143e49d42950dc350c7ae996bbe07154979a2377cf59b2979e91f8b75a64b9e7ba20cc64388de94329488d1151ddeca"; + sha512 = "6e8ab925ac86895b870797dc5ec52019f0248a7629a22838a053f9442e120e95e16007a35063e71cd30f64b1678c6542f1b2ac96504183a1ebac2843cb455d74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/vi/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/vi/firefox-59.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "946a0b00c94a030ab0547a0529b2639d880795c821952a71b467f199332424e42de4fa06c015208d58be12e52ff5044c8ca40dcb57480a838b4688917e9d527f"; + sha512 = "caf650ee27dbaddfd098288db30541392d9f54e4818775f9a63da86db1811b3ff0f4e8547b77ac428f774fa28e6b3d873f04ae196c72df5a08dea0655f26060b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/xh/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/xh/firefox-59.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "7f71bb5dc8af9733b3cf14b72e74034942b46f06945870b550489e178f21c348da4b67fd4c7e51c601c59caad9868d1b64dd8e7d5ae5976525d57b739a847308"; + sha512 = "655eedc85fa84d37dfaec42d53088c811c6c5c4703591e3ee5b67e6dc590d5a8c4553bd460908a004cb3d287c10c1929b528867b5b0b7d99bfb7d705d1797827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/zh-CN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/zh-CN/firefox-59.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "79ecb68f4b4da883e7238ded7a40fa9e61e830926e5943e7c70d7fde63d9757963e3ca7c763df12a929615a1817580074f661f03fa02712479d1b677578ffada"; + sha512 = "1c60d2929783eaadcb02e5ac30fff179a5aca67e6a8c618dda4a0696ea70a7f82b035db2b94134fa701c4f1ec1861cac664dd7ca2a4a05305f9337cf6c602146"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/zh-TW/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/zh-TW/firefox-59.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c41ced6025916634099a01dfe9213472b936b89e4719cde0a1a06404140fc564d93b2a0188b7cd74afc90dba4777d0919e64ee496ad9fcf76966f3392f434592"; + sha512 = "110a2e0e50e41646ebb9f601905ccacae7ca1a7028e063a671cef97828ac9637eab741fef10254aa121062fc33bb6d75f907ae7e306fe755d4f199516d1ac7ae"; } ]; } From 93be6c41aa742b045a3d823814f72378a2f37d2a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 4 Feb 2018 03:12:06 +0800 Subject: [PATCH 424/797] firefox-devedition-bin: 59.0b5 -> 59.0b6 --- .../firefox-bin/devedition_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 23ea0b80267..889f19994c4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b5"; + version = "59.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ach/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ach/firefox-59.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "6de09f1ba2bdfb652ed32a7cb64bcea7afb52f29eeed965c02643dbe032083c7c37e5151aa03033fb93c6b29fc1f2dac03575af8e03887f74fa0e3161294eea0"; + sha512 = "595b5d322cf2472f3e6e7849a70007f501e7e4de0bf1395518c484b4e6494333949574392655ea2df9f4f00ec6b2accc95564a76791844b2ac2a3c366e2500e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/af/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/af/firefox-59.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "44d2b1de47ed25b0fc363b310046532739cbe16281ffa43715ff2e0cab090dec91bd21d237c06eb364f0fe015258fbb2366015a6f9be12fbf6ebfaa1bde165bb"; + sha512 = "fa60ceb7ecf2d84211b763313a7491e5514f78f9765c55b95a213604b686e9da2d8b10c1b6d18e27553353303e00a04e5ae01365e2ca9be98fb7c6b45f531798"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/an/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/an/firefox-59.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "2c58f4eb227b58ac804d98cd6388fe2f9630d423a2ab45c5c4cee448aa6a07aeb5f7e54f373a39dc280557d0e2400e233100b5721465f96f5cb53c28289aaa60"; + sha512 = "c9baf0badc2ec9677be906a9bd2b457987589f82f6efee189f692adc3ffc602dc961d8c539304fb63c3330064751a4bf9da7d732629181ee3ed916a656202a11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ar/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ar/firefox-59.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1bc623e6eb796a679aa3e60acb418a49dad24267849db4e54c962b54bd3d2193444bf39912075dc3687b83f5d579c23d4ced940102a046608cea744ecf0fc9f7"; + sha512 = "5c5b7762e2194b87c4b7f0fda75fe3975fbcfc28e1cc6aa5a242f319aeb95ca0da8297ad7d1c075c59cf580cca246712e88fe0b0465e09780b3a571a0ce02583"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/as/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/as/firefox-59.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b40d5955835c7370553967ac32870c47625c493992e1f1672be363ded1a5a2b3637cc3b2756530f324aad0149a84fc90df5a0992f16aa1b6939c15f6c8ef9d14"; + sha512 = "68ff3acc5022156676200acf9c4497c63aa5b678d7d0907207fe1171b1e0ed48da929338ceccbe841866c9e3a17d156f7da55bb2ae65d47774dad5044de4f3a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ast/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ast/firefox-59.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e9be9a5b55504784cc6531f90356a2a256a27ad20faf5880b5eae58b326163d43bff138feb48f23993e6d9715cfca8bd48c601cb6786129ed814c5c9d8e97261"; + sha512 = "dd5e47f5477a4024ecf501e74175224c9494fd28aee3fa15dff5e04db6f72bfbcbd7514085def809481cd26e0d158de03bd02dc59c2c054ab82d8e0b18409642"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/az/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/az/firefox-59.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "f067b3e1f4482dd32f7dbb1611f33052d55f835f164e7fb23bbc7244ecee3eb11b49b49447cae2c2d29b29c3769296ff98fa716a9171c8083825f6403d2c7fbf"; + sha512 = "2f78b1459d80543b7bdbd402498fd401394785dbe7d8e11bbbb04c96dea25990565b95786b2204941628f15fc8105f6ded439a00b1a0ff1d010df2e86985df87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/be/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/be/firefox-59.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "489f7df280844c60e5badea653c51c9649dc484ca7e8d114309a4849afe3cf20c4f3dde58e041500d654d40fdd7452cddcafc971976e0aa163fce3bc1815930d"; + sha512 = "b1f13f7fca082ac33fb64e177089228864a8d19e0eb02e21915126213039fa8ec6396ba514fbfa0029fdad9481dd26d513fa106553aab7be69879c93bfaa7783"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bg/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bg/firefox-59.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "8e563ec2b7640369134c1490b753a39de957b326042547805d99fefb24c5d35aed09f6dc66a93077d09d367542a64200e19729ab3e7f86cf30d7444054f3f931"; + sha512 = "73c15deb8b3f9beb26c446465388fce708b610de2735036ab6fc80cf104e9fb440c6745b497e72bccaa5a61e2dce6edbd0c69d841528d0ab4678bbba5adb296c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bn-BD/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bn-BD/firefox-59.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "08ecdc5d4da416d6b2119f328137db2f707ed6dd9fb49084b8b4052bcfe7d221ad3e9b65ebca8b2f72e728603a30e66c5ea21066b7ce7a97c8b5c2aafa2eabe0"; + sha512 = "f2ba031b25cf93c7da7048c58d8bdf4d8430c42dcb082627b9b45b37ed2ef924110edb2864d876dece6a1326a3e24ff0502f51077dd96140e760ad63f858e9f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bn-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bn-IN/firefox-59.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "981881c012a33e3b63bba012d4c692cccde51590b1ba75367ffad3d26b75499d6e5acfd8a532991f1901ec8a1950d58d6f3c629d48b2f8cc6559799c1792f76a"; + sha512 = "defa9a78675a42778b18f38ff447ef5b81d09ba54f174133913a072347d96b05c9bc637c7fa0a81014fabe7f11a49d6a366437fef37459276bcca764487c7cf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/br/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/br/firefox-59.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ff6f6ef5d457b4df00366bc872dbcf605568b6161b0ac74da9b1bde2c4e9900aecd62448e2bc3dc4923c4f62a760e15ca351ed69490213f7db31e62a0aa8874e"; + sha512 = "26fd5ae4427c44565f31ceee81fab2a6d930afd603cf60342d8400133e53357f5c1b1b718ae8d8a1856aa67d1bd503a1b4527c2a1aff0d089d941f30071db251"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bs/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bs/firefox-59.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "19e98369d4c0add670870fff37d9eee743a6ccffc56d173d539c4a0bf59525969fa77f3e9f36a4d130ca8c8bfe817c0d9a3f4d3b9acec4abf6e7e2e2cd739c46"; + sha512 = "9855150263394d24dc25f40384b756906664491c84538572d467304dbbfe9151a82a0d7aca0ac07e952ba82765c2042ee5fc4a47d541b4a8f7efd5879c4ee75b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ca/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ca/firefox-59.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "14a226c60421c441c835e68cf23d0754f0bc5639ca034e9a0e5aad766faadc57feff03b0174df87c1dee0ccf66bffd4530ddad5c264f8ff6aaa5d55c0968bfaf"; + sha512 = "369eec4c1e5f56aec23538cec89b55f9706ce7adcb06777472189801c4c708cd0f38ce5741bd1b06187aa1fa71b5f8682ea8d1a2675b5404f4fec2a124f3ec7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cak/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/cak/firefox-59.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5ec83245a40eebe7fc7eb43058149816ce2b54d35fb4b413a86f1509d59b467c0ee77a0f5cac3f5bbb4af7ef9068e30971bb00f40eb1a483d5b60e60f3d06c81"; + sha512 = "42fcab30bf9a3706270e531fa91e7e52e6a0cb6eaa05b53b718b4708da1f1014a27ae94e5bd4092197565263733feca589cd6beaaf0d47b758f337175dad2e24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cs/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/cs/firefox-59.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a0156ec17dd39619256fcc2c03722f6dee9a722b16ab1f0c8cfa0ff91c4110f471704f59eb26010d4f10f5e18facc9e4ecd1793320ec344280c5b009af3a5afb"; + sha512 = "80cd387e50ba97f387c1ee04b123436efb02aed9eb492e5a91a4a78bb70e20bc0893a4f646a339e470e830910e5c0d0c34ba09725957ef033a6c31bd6e4c2af8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cy/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/cy/firefox-59.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "32f54e38fb4a3a79b1ec63e80d4bb89c652976f9b978ade25ae9e4e4a0957ab0321054207ea9251be256637615b647d2b94499d9b9b1cbc427e7671de16a749e"; + sha512 = "4f4be4af205e9b04b9ee611bafa936d2a8f6c9bde2c5fcfb865a8e2d065321713f4a810f30dc1432b35adf736e95d3b00977e029ad5dc3e26c0a5e03ab803ee1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/da/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/da/firefox-59.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "958ab9b7a29e3a0b71425345a643b8d3ffb2f052fa8aeac80d06c4bfd549a0215dadcb6290e0975b177b1120ed299a487b1c18c58a316d681c7bb7ed9e6de9c7"; + sha512 = "912056fc39ae349a345d541ced2ae8959d02ccb10a4c7aee95a6c1ee5c854a5fb73fa44a13ef6ab51a20d882e44711d790f0f15c9b1cb07fa5b7d3d5d36631ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/de/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/de/firefox-59.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "29e11ccfecf52fd1f6636de3062382c0476cc86644d8d7d0ad05ecbdf8c1640ae4064b348504d1e86f9fedab9303c4f504bb655f01bf2ef5b6607335f5f580a2"; + sha512 = "5acf637b84ef5f98e5f8156703576e24880c8c8041bc8f5474cfd4331c4de8a104adcce4d127c13720f17105bf2635facec4b5609ca88a7fbf2ae662ca3d3343"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/dsb/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/dsb/firefox-59.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "7b2542d0c4737f5665be10f540895b1af9fe5320dc5c40ab24feb523588925b159862cdeb18c9a4f14dc78715703c048ea56ca53d1fcec7fbcc9d3f9bf256cfe"; + sha512 = "33c88b9286dfacdcbd2eef4e2ed380263bcac4ceead661a3f49f16610f19f2dcbef0b4ca53cf54ef898b807568eb2a72a157477b134764f767d1ae64567bfa13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/el/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/el/firefox-59.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "233ebd6c09a91521ff69f947ade1539ad136e284e539d06df08552c9bfb0efe4fb755484d6038e2161865e0997aeff93002f613fde3e93b6eb9c205f63a5191f"; + sha512 = "f7e26ff1e985f33ea23fa10b7917ad5ac25992653050e3708801d0aa1949fe5a9c8829a82f5df061dbfa0cc642baa65bac3a1d1b52dc888f72aecbfabbb51b6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-GB/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/en-GB/firefox-59.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "1bb4e2b3db6291c74769e2d335553cff68bd426fd3aec20e858d2db29d558b327f316e25b73ae0131e2cbee7a58ad337d85b05b347a2a0abe442473e94cf29ec"; + sha512 = "769a867c351673c95ca1b57a72eb1138be5429194f37c40d741cd839896124f9272a835edb1801e1301c6a384619974317ceee4ac3a1f7c710a388420b0ac8d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-US/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/en-US/firefox-59.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "72db0fb93a0a58f0ecbefcf27808439e5488df47851ea584101e1308e0569297a32f6ad7fe2a523af099ddd197845a3582f12a1c0381e080f31253a5334cf767"; + sha512 = "7a843b23ef5bd8fbfb12ede433ecde84e7dc12c212e1eba4cc6180b7794e7436829096ff7dcaa22d44496898240769ddfdf590ae846b6501fa4476b33ee8614e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-ZA/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/en-ZA/firefox-59.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "58b0dc3614f56570556ccc20407d9070f8aeca22308b0e3975e44108b9c21a95546a9625a41aff6cd887aecd6119390d32769295e08e88de76ad0b5c48a57ee5"; + sha512 = "8499792422ba7561e28c5841b4b78c63ce77125a2ca4ba961e50144173f00e36c506521ef2fb961d6bbc79b6f7b0f5ea8295da455d3c6e9eac371541362bf794"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/eo/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/eo/firefox-59.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "6b2b1653e3cd3c6858e4259f51dcf7cd8e34cc38445d995f5aa08461ddecf9d961502500e0e43f6059c7255216917305ce40bcaa6e208b027f22dab035b5dc19"; + sha512 = "29db43bb944e5273c8a0b20329e6690a79d244c963f3da2074293f18cf3e0cd0944cbde10ee4f103a7d3f1a6ce0333d999b2307d14270c0fdea1b2ed584aee6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-AR/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-AR/firefox-59.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e884adf45c7b5897722ea80052de616cce2fe45dbb6e4af6c20f74294e9becbf5d2e15804772f23ee697adb66af2d230b2d3834785ce40f3989cef22d28f8714"; + sha512 = "9171f4e4cc61b6515769b38d6e0e8a2de883fc3d132ab9e51f75f25cda47c16cc677a5f4ef4806c00f1513c19633358f6d4e47c219a56955923e045918fba41c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-CL/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-CL/firefox-59.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "31e7bc4a6b6151a9411acce7ec713f12ce4fd00651f757d2ba989ee5c870c78c5bbf4453333a5063edfb0a6a58d533dec738bc1b93020855e38911fa29eaed6e"; + sha512 = "5c9f4059f809273a35e039b1bc439c22623b1340f148469e878590a95caef6efbbc37910afb1b6c203b4f0f6f757aee98f9bbae92a777be88d8974e71c6561cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-ES/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-ES/firefox-59.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "63b17939a194b1042d350c5a793262d674d41d6ee2e2c0cf92d6f8ed35f0f05457bfe4de61fd97c5d1bd2b256386140d26c31e8db6b53f6a04d0ddd0bbaf34d0"; + sha512 = "bf95d16a2cd20732b99c31c72021b1a33d363bb6236eeda3ce39a6034db85dc20706f10fa9f5b99a59344919476018ce00e85b038e6675b21b8d88e65df37a29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-MX/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-MX/firefox-59.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "d03c6a6b2bf9cb62b3fd44d8ad43b619e14489ffe163de376226f3c720aff84dcfbffeacb2590b11565f094f6b1c20e899d65d0457ae3889e054f74184ad5c37"; + sha512 = "3746486e435831eaf82fbebaa6e25a8a9fd1fb65660107cc9c9b3818b746cbc640c30cd0a793d3dcb86382c522d912bd8758ccaab9c9aadf56485372a00cdd18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/et/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/et/firefox-59.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e7b0023505781e0ec8098ab98d2797a4341238c763aa5a0872fa4334e0116dc8bc74aa989522f7b2cb135c2c20bb580c8510e9e57f4363cac69d55b6b6d88d9f"; + sha512 = "5065889bf032c85070c5f1a426a0914568266206464ff60841fb0f08efed7c52ce2770ddcc9d486bb9395231e332691910816f0bcbbc49724be346e6ffbcce75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/eu/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/eu/firefox-59.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "aeb87fa12ea9b5fb4e6e91d83df47f51a1e6c75f020202be6f0604854f8aa011820698328b92b3fb871599f9a94bf7f1ca2c0ebf0abccf84485e610cf5153ea6"; + sha512 = "12790d229217a9cdd66fdc03b460dc409c3fab9a12e6492491a5aac115fb396901f7b6ea0b48ad3f667239d3cb6dd5d3726fcd9ecf2eaf2b9d69ec47f7813d3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fa/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fa/firefox-59.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e8718666948beac9709fabc9505e8963fd3f00b09342193fe455c7e56265402922cb4151be0bfce0269297a14304ac966aec8ac696b18e3d7227e5dccae0c1c6"; + sha512 = "6209e9b4bbb29e783ef0817be91e32c6d31fa0407e5d78a1466e3dc32ea8058261bedce370b8e5e647bd89b7ef6c1e6064cb8cc786643adc405a50768fcc124e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ff/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ff/firefox-59.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "b13f2b8a6522caa16c797c37bba806742a93addf1e1a88e31294c0667115f57d72744daa0af3fed160f02997409d4bd6f7c9170cdff75eae71f5427ff4fc98ef"; + sha512 = "5f3fc2665b6b5cf63999a1cb47e30ad266907276910446069dfe5c7cb944b5131ead06bbacd2fdf2f2843ce55cb360aa6c17509bc9f8fc3f94cd1debfeee97a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fi/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fi/firefox-59.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "4951e56f9295dd6bff569c0d76fe082bcf498af4b675041d78dccc3725be0294db5cfd62e49ad8c08fad81d6a53236f56519bdf7b4f4177a69e824df0054efc7"; + sha512 = "532c2715c67531508875307264d03ae65fb168463b82be507550136b61250e0c9031894dfdd0662bba0de9d7de703c289806166d9292737fcbdbaec41f7a6276"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fr/firefox-59.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "be5388a199d18b85347caf3f3691149970b614a1f9ca4da7e379e2b8a49e37c6a70953e7342c6621fe3534fe8a1e7a9fd6b1c05c1769ea33f7a51b61c5803134"; + sha512 = "ee337c590300b765b41d55e8227409eb62b80b233a4576a838e9572a952addbf76ad1267b2aa5e9fdf0da2c22797e754eb0c13dc51e4b8220f8d53e95f49e601"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fy-NL/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fy-NL/firefox-59.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "6468b03d724ad585d8d31c17c75917eafe908d155a4e4544b6f2a3f6ca467c6ec34c2c0a5d7ffbcec17faf8cbd00c5bbbf4f71660e7dc04adc337295eadd4ed9"; + sha512 = "ba5cbda964b89d6c2752f5a69218bf907a5d79438afd50bf6ff465c97f2e59bb0afab88662f69d656fde8776584287edb1f931ded4e8462f4d1a6bf6067dbc1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ga-IE/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ga-IE/firefox-59.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "531b36471ce64e3e9b1693081bd028b6d417b5c60543b9d1a192c67a20708a898595b80e7a2862f3f984e3c776bbb2b97870e6c88d4f474a215b31901ecf508d"; + sha512 = "6ef1c7b0d4607a01a6b96fc85c7438ecca85b1171a4c06049282a0670c00755b4dacd42b64d46553a0002fcfe4e9ac8a6f57f89e025b291ac3a39ff52a22bc39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gd/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gd/firefox-59.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4b0df4896516396ba7593c579b528b5010d3be1c2db019a191263f28309a62d54bad9bdb013c8dbedd3094b22d31cd2a97c76bcb0045532b309aef3fa45b3260"; + sha512 = "86f1b629e99cf4e3ac00317a3c92e734ad7385cf9ed5016330d08eed80ffec8d516ca05ec843a029a8478949d989b38a65bb47e93c9f3bf47144cd9f128b1a00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gl/firefox-59.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "c8c15bb5df2798ed16d97849c620002747554f46f1c89de665df151581f6832a445e2e969f3cc25ce4bb97833894fbf06fe4e48c4a2bc89c436443101b2a8a6a"; + sha512 = "245fa4ac9b37c9fc2e903e4eeb7ed5e4c992730dd6d32a21ec32370b4c1cdf1ba796ac9699f96fa94efd687ba06492d4bf3cb8d2db23226660f041e4f5ffedc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gn/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gn/firefox-59.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "7bdc09008f5171515e63ee2625cafc2a2eaa14f2f7586ba977a890f2304ead1781a913e959508d277c93995ee5be9f519eb69782dc7c48244547a0fa6a36f5ef"; + sha512 = "9a9a34cd51fcb104fe4f59a1dad2b0641be345e24794facbc37fc9139fd7574c818c48d66b37179bf41fb42918ccd174407f4e651a59a1055dbbfe3aa48ea9e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gu-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gu-IN/firefox-59.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c29a89728ff91d3b8ea6c83d276122af2cea578ca36deeb56619fb03949b5efab37210d7bcbe4c248e01996e9feee83eb0bc88b72575a963131b17be956d7d56"; + sha512 = "60d8de8eef96240bcb19ef862efe6be7b502d263edc543e927707f7fed3fd37f863f6e177a020eefc96071e6cf9363af052a053cc449204c57b990607a835e16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/he/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/he/firefox-59.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a8dfa6ff14c74e5c9df282e97e1f3fa719dac2d440531d6d34e065a4cf8ed54153153f9615ffb89fc8fe84131fb008ab27490ff8152e8a048d00a0e5ccc02c55"; + sha512 = "622cc6eee35804c5aba73c88328c98c92166b84520f4d38f0168118abc979b23b8d99955251da1861178ac43c25d97688c6890251d206342f15f21e692ab4689"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hi-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hi-IN/firefox-59.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "1fd289c95ccc3aa5156489931171abc98a731a4faecac0fec605991f94b7ea001480ce1e623e2721376f221390eb7ea5555d8d982fdfefc8726d825bcab6fd2e"; + sha512 = "2bfb9fce937f5972a5a85a627f05b5321517f94a55bf39f162444857e4db6dddf3c7758d8147d2f0da75f140aa8061e9afe08451ef3b9a3701fc75c3408a26f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hr/firefox-59.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "2e26d9b4e4a994b0334ba7634152fa03d8de19d20ad0fd34c23a9c21d705bda57d328b6f9fdb7874aeada9bbd3c2b4468031630d7b3d49cfb78deefc67173b27"; + sha512 = "3c9cea617d8e9814e7662a6aa8add1315639c9ef09224b03d516942ca8a244ce1bc84539b4b103d12385f7aa156062e5915c285c4eace96896a098352228162c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hsb/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hsb/firefox-59.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "be5ad1cc7c389a6e11f368bde8395284eec98c4a7db4d450998d377a937c727b3318404610dd4c1de8b679e9064ad67a48957767121d5dd3e449447e448bf362"; + sha512 = "1b341021ac94c4d673c0ad62c031d0c2021d275faa32da7607aa93ed036bb90c6e591cca8aeb7ca0a0d3a1958c3070d5637ed695a25cf775302db0bd5d24a921"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hu/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hu/firefox-59.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "76aa9e09601f62bef027fdd35e473bff89af5cb026dea145480d321b6aa2b31bba4fd9960c48ff2abf464474f9884c2b1cca9563d1a0d8df4aba9ce73945ee8b"; + sha512 = "898a792eb5eea12bb196f8f930787e0bed085bb49e93cddb08415d6b9e5ea63a28f6a5b48a2075d6ca595fca3dba69a91fdcb0f031eeadf14bd9f8da477245b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hy-AM/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hy-AM/firefox-59.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "720e0c135a04f3af595c1e01d6e1241624df45d3494b08ba777ddad1b0784bab62854f581ff614a576d30a12cdd495ba5a53766976783e0169bd288d285c8187"; + sha512 = "8d83670cc2451f866030948f888dae2edd6badcbd557b077893b145949f7958b2635c644b7fa5dbe7bc4a82ef07dcd871f3f91b530bb19a576af62a80c4c0120"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ia/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ia/firefox-59.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5d19d1e1cbc7994dbb5c4c4d9dbfbc7a6514561659f737bb2f24f75a44c1b118293059f8e5276d6eac5418bdfbbb4020d8fb886f839450449bd2ac5c95e9c55e"; + sha512 = "a7745e00279e8fa9ef39f9f5d16ebfd3a0fc20f208e4aeab80e60e9fa07ca22d32a4c88238c05aa25ac2149df93e7bb3ec639ca2c2b99128c8cdbe65c350b6ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/id/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/id/firefox-59.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "2e30628640f68e78154331572c860c96400a7ed84b89a37f03520135b0bdd3c966b14a25fd0ab5467e4114fcc24a35a69c575b28e2fd213c2df338d7b26ae111"; + sha512 = "c35fcf5b0b7449a2ded6811f1f85604ee0e99ea0df9350cc429c5c3b673cd46ddf075ce2e270e3195cf42c93bf7a81fc55db08edf57874e961e037149fc4afc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/is/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/is/firefox-59.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "c801600e229105f50d6343c7f2c912e94fe918e566f28e6d39da4df112d94d315db29abbd9854e5b39eb875364483f8ac65131b73d4574099c5cbee6fcfcedec"; + sha512 = "da8877007e3404b4a66de56194b34b77dd481e223074f528d0cb8a15071b78ed2a9f73f653775e30c84c77a042dedf142a771621468580fecfbf6fb134bf691f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/it/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/it/firefox-59.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "83556862e82dd1f96a261e433e136f9ed30e0aaae28af6a3c5b4a3a9b68477e82e6b34d54cfde0c9aa8e694ec9df79405e6b8f0841096b46c09ccfdec0637ee4"; + sha512 = "7c0e8dc1bfd60233f2b5079f25bbcb0268f2d512e1e4b3cdcdb1edb9f54ee45897b2806cde424537da7c4557e744401078cb4c53f84996408d2ac3f1d8d29d86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ja/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ja/firefox-59.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "cc0a5e22cded43e999eeda350cc8e7adc11c7e6dcb8eef3eee209e0f663fa4b1e7e57fda928d163a27421195a233690c939385544e6293305c33fb3fc6f56c00"; + sha512 = "0d0018b47da9d99c1ddd902b4aeb00fcd454ddf159d40528d8219ed5409ada1e307e1faacc14a52e9102233c7ae87692096e0c5195ca56a925843c2af10c56e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ka/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ka/firefox-59.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c2c5609a180033b41866f4acd356a7830fe5204f81e1eb0702c5e1a7f228f46846012bbef7fcabc02d76f7d79a0079ea580a602f381672a75230b2f8f66e53a8"; + sha512 = "3ddc19fe92dd64ba4c49eee37b74f6a8a64555635b2484a64de949782a3ad22ce9fcd133f415a2cb0f10be07121f73b09556f4088b32e6cb5df0b9578657cadb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kab/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/kab/firefox-59.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "567a0ba23f39fa88cb5c242adc372016fb771dc562fc086597a48e6a28e329403d4eda194726a181d1ca4b45ea55e721fd02c2c1cf013f8dd7b15d9a525cafc9"; + sha512 = "d90b759fe466dbd421f4931c086e2240f4d0f478914acd2de95da7b09288b386b880cac2cf8756993dc3502c0adbc7b3c54bf056dcd1248650648fc8ad139e6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/kk/firefox-59.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "5d5367d2e60de1577aac257137d8449028f30b75cd278d378dcd213acdac31ebb6fdd86082b387404aeb68a1d41552c96221bb647be62f4b968c433caf6a5dad"; + sha512 = "ada95551bca162ee09233c0b69bd9216a9f91a1621964e758ce37792d87b3244842a330c09f46a4bc83c91fb683c49d4f8ca7a982053ec1b08e8d361e7aaa00d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/km/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/km/firefox-59.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "8540ba0245932a3de10985fdc4f99db61700af56a3529c412e30a960fe05ac2ed1e9511355f6a2d1022b99ceabb16448adf0468b94ecc4aa3d5b91ea63b59be6"; + sha512 = "6701c09a3cf14d7de5f2843a944116746a5626b43eddcdcb3aa7949c7b5414d1860d1650e349ee4fbc8ae5628c112d9bc57d0203901913c5112e701d0ab03e8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kn/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/kn/firefox-59.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "0f860427adc1b5f40dc44663124363e69415a8daf1551aa8671282a717cd7443dc47fbf5dd75c961ac9973833c255dcea212bb9457297f9eab28df8db5c2db26"; + sha512 = "e315e704d2228bc02ab0054bd205d2cb0d11b1ffb292dfe1f04f0590778a94981dbf7f9d0c137c4d515d6f1616925c61668a5ebde8b408e6bb5d0111e243e1de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ko/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ko/firefox-59.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "79e997f5506e55a0685d26988052df7404f0e91f8c3a3eec0ec894c6a40a8e2483dde0b47b43fbaf8ced5fbc8aaebc13bbf487e079ad10cded9ebe6450d7a9ac"; + sha512 = "ea81ef5c69a5e89aae22d538c6105cc72b4ead95129ebdeea47e58039a1f949196e96a90858300440f0eec5344044df71e522d2b37b98281d7ce461bfb2fcf1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lij/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/lij/firefox-59.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "1779bd366a6c9b36e3dd7f069baf07a383c0a9f863427f325ff3d9d60ac96d25aa6b70c069bd0419f412243adfafe21dbd9c232dbf4dc8e6bf7fb02d6761290d"; + sha512 = "74f531103b8de8ff7e2c6efd7d3ae18e9a6929f3ccdee7ff10d0e6d608035185d5e74e64bacc3b191e719b0533fb3ed78828cdf081141e9db30c2f7043264223"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lt/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/lt/firefox-59.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7531d092f9b47d6d5eb0a5c21f9a47d60d9790b8db93a36179c4a333afdffc89408ffd49a7ef664097ade6d741131912846d52ee0077c834010fcdb438d07045"; + sha512 = "c7ff5a95f3ce857c64625e9e5f841eaee9473edd570da6958aadb92496c44827e0c8a9aaa7895afb17bf00752e65d9024693d7e4e28c38cc8e0c07e00d2037aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lv/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/lv/firefox-59.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "acd88bad84d7c1280298f968139878d1dcfb9851266666c59a0fc830d61c46a2feb95f34c0fc7bc81874d6f393175ad1c48d317cdc475149b06ac11824f4d1ea"; + sha512 = "0aa35ff6dae6ab41e5ee8ce8865e652d4e849f1a36d831090f3f48087bbfab97a4d2d5e09819ee15cd603056230d4512ce957f42115f23135f49b732252c8ea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mai/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/mai/firefox-59.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "c4612d9b2aa2bada63a484f705788a97bf7895c2d92f32eb88684374f8fc10bc6e99514084568d4ca1e142f06208e8f4bd0135a8c4f4b7f6941e993cb12b88ba"; + sha512 = "3fdf9ea7ab6bad0a4d50b050641fa28ebb4136ad18d200ae6563de7a398cf4231465a72aff7418b401a291263c23758cf9a42ef3a249c62f2888c8cab63f321d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/mk/firefox-59.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "6bb1ad34746943553e22d9424e015c698bcace10e16487c854d4ecfea05ba47e6d2f1bb68fce244b7c8ad9b5ead69cefd20b39eadc77433a5084abca4a5edd69"; + sha512 = "73448b1c969f869d56a068b48c7d91f1b2ac16a3a5cb4ae8aed099d6792c230c9d818b962b3be04141ff0c561fe7f9a50a7f36340fae793faf4edfb2177082a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ml/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ml/firefox-59.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "97656ea9ae3f252c012f2b6946768226cc8fce1a5ad44fede8fb436bb439681c8183cadaa16bb17e7529865b8991ed1856bd90f884fdabe87aa4973d75b451f1"; + sha512 = "fee8a3b301a302268dce12ddbcce3e778c138074da7a29030ecc886d3bb39623da75b75078a9c9a1756344c85aaad4e73e936e54a0509d96370548bb0daff551"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/mr/firefox-59.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f90820153d06ffcb98e881bdf3ea761d1548e0b54f91cd734a5d6fcd86439c1aebdb695ed0a73cab1cf03e3f26aa4833b85845dfc9bc5394c07da51db70a6022"; + sha512 = "00231d12298e856126b8e6a7df2bf57689c4c705edc4e03868ff06b0d11b58a38ad312b7bde8d60dcb505b1726e82f98c124150be08246f97f7087cca3d5d7bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ms/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ms/firefox-59.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7dd3bc7b383015d437d9f8cfcb2288b40fbeb00caf562cd4127c85e4324f7c0bb18c34e37eb5472fc7082f9d4101393315ab50a9af016d6d56d6df022d8cc912"; + sha512 = "74cbd7e895aafc688a696c56d4a8d572a62dfc6761f8092b90fb6f7bbfdc54c9a17bb1ad373b193e745080b2609575672f023d9862bff4cbae3ae975aeaf470c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/my/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/my/firefox-59.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "fd69a6880d932b1957a2da3a457cecb1cf0350144044777155f59ec09969e8e0977f12b5980b180a086b4a75c1d94b74aec11113b683bdb58722e745fd4dfefe"; + sha512 = "1dc1ff38282d7c2ff1bc9c7725d02394d2d35a3cb976f3cd59d8c64cc3001ba6c8af6171fbdef7835a86f9c234cc51be7d8e955119b531adfaf67b0681bbecc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nb-NO/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/nb-NO/firefox-59.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "dae68bdf96119efea5820e281bae73cebfb857a26fb7f3e308b6fc5a89ce9ec409cf73d6f8360ea63de849e46ccbc9299fd941c3bb1d18100692aaa55215782a"; + sha512 = "ce23f71118c2fee3e4fa6218a0cf14fb34088fde93f9cbe97205fe547541c96fe78784d6b18c50b800dc4882ae7e056095cabf57819cc60c8171203f8052b2fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ne-NP/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ne-NP/firefox-59.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "6dae447690cbfe761ac805b2a006b09d5bbeebd4ccb65b71f9ac7d6873f416c59f84bd1146ca3950fb44f926447d603f262f78b2ee4ce06119c729bacf5ee8d9"; + sha512 = "fdc930a0edd60e243079ed15354aa2783c9cf668fe3eaa2e19ac0846e3a100f7fc745d23001c450321cfc7b76847a5ce0a0e1e09885096d29bd838e730d9a2e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/nl/firefox-59.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "931e2a9e95c8aece76c7b7cf8c9ab7da8ec50868157bfa18eefdca40fce33d2d8deafd26e177b8c6d880d17a81abbc4fd53d77928bed7e8378652033d35e4d45"; + sha512 = "1372c266828bef521ea932e147fdc8315a68cf93fca386e8f2607823efd6c62d96169d86d4bcfbd0b2fd21c2223efb780f425607aa603f16326ac7b43517c5bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nn-NO/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/nn-NO/firefox-59.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "926f3ef2cb66b816ef12969f5841aae4662a495cc9f7a69d4ffe6a9e53f7286122416dab24550e93cdfdb1a9523f989dd6949aaa9a43b9f9128e9db4d5886482"; + sha512 = "fd439410e60ea25bc622831678939aca419edd24d4b5077f5233be44e1aa0207d8112c7415155a7f96ac9aabe65d7114e2c8b461c1870613006a381e233e6285"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/or/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/or/firefox-59.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "4a432b203baf674acb654ba8efbfd5f18f40bc3a03ab31f627783dfd3e13797e45de8a115e08b73afdd440f3e7a3cafa695969c8225593a55d09c58a1c5f6971"; + sha512 = "775edede88b773d07a70e6743994c6cb1c864a3695a57c482535fee8a8a25eea2bf4559c9bd66a7b599fc1d780cc8ea89d71ee37a04c28718ba6cd8d0d3d941f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pa-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pa-IN/firefox-59.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "1036eb53799852063433ed2b9e85e964f6073da7a384759e740385602ebbb20bf5101d2317663c56933eef13fd963e8299ea3166cdf61b94b5efbab614067553"; + sha512 = "d4a06a885d3d898b046b994e95ef23a92d5c35e47d341ddc93bc504eec54123993721800f7b43c3739ec09238d158671b8af0e06085a318436d4b8bb622868ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pl/firefox-59.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "4038ac928a5ab61c47a6de53e5563f84995480e19f846e67c7cfbc9137736191010d605647f0e95d3c19c3abd7095d935c6afde9719c71df802ffd1236915066"; + sha512 = "da0d744b94d05520cfad3c6bc48225cea76be9e402ad13e59b7e0e24cc96a3a5ce02a1512f394c62d911b7b41283a7d33d397ac49d37bb9b5bb986c6959f9d90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pt-BR/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pt-BR/firefox-59.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7de41f598b616c7e1144410a2f25f105ae307d7d6d9099d48f8f6044a9eeb65f4652b80371d4d61065cb7b48a9190087dfdc55b7118d0ff4246255ba3f1f90f8"; + sha512 = "84a642792eafc5fcfb4b89953f0d7f2480043c413ecc7629ce7f9db759f9a0d58017f4b19f5fd099ab0a8e0c7e1136dc0e4dbe94de5b6d2a48368e9a57ae1e88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pt-PT/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pt-PT/firefox-59.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "1508f24a9f3bb206dc33fb7182c203ead18261cce765605e2460341dafae5d6b908923d2611b93157e8f437427f93051d8400f50da36cb3cc155fb97a11b79f3"; + sha512 = "282cd700e10069da00df6b95e1d497383c23a6b0a6f0f3ea02738eb3a3ebca07f7757aeb11baf1373fedb4d6975e85ff2d45d607c42a939ccf43bb80b735ea29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/rm/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/rm/firefox-59.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "6ea10d8335c2011b3e413e2e0a9e9d7f1471509cc6238f44251183318ab3d80c87050e15329ac5df5643304325cdeb32c821028cf994784b2d4ef719d7a2afaf"; + sha512 = "c56721b5d1080f605769f190c26ff734de9067d028ca1bf8b48b216e4d9e87009d856f4652dc5a654508738d3983ed350cad0cfcf91544a6a5c2120c497a6e21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ro/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ro/firefox-59.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "8f052d48a41f43527b7eafffbbfddfa9e7e5d38ee9066e279fda3e714f3f29bcaa2b2808f4090df49210171e9d337ceea60589203a57d49bf2c3fd1c1c45f3d4"; + sha512 = "856f7f48133f78f18b5834e7faa3ae30b000b20b137f935a5783c042533cdcd481fde575541752116cdf86c32e645be667f77d5f886573852d1ebce2bf4e230f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ru/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ru/firefox-59.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "71cf09dc451dd58eff03a90610e8507a5084833500d7b29671051a1202274f59fcfb237d47a33d07b26eb5cb8b9130cd8126c4eb546200fdafb56aa86bf885f2"; + sha512 = "204068402e15071585efc1ceeca07bd253723b53e9bd1ca14642a5c5fecafe1c325e6bf12b4f3a51d8e8590a46d930f337ac6fb2839ec92d2d4cafd9e67f16df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/si/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/si/firefox-59.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "edd4764173bd0db3eabe024260d1630385bb40736092a2dd2eef2d53652f31c0cc7d919e99c938d1ad1a76d2b1dab43482c011c1bc1608a2f0589508ef6d082b"; + sha512 = "b905b59403aeb3d863904b552ccf5597cce6c333c1acd46a20742eed8518b60eb96e39a47d7cdb43f50995c017bcfda52e152f2ff5d4952cbec5f641ba45c565"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sk/firefox-59.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6004642d3b2a5c81e82473c8ce36d1154165f7690959ee2ccf5e26387cbce3aa5081dc01a441f90bf13f4b95ed4456daa1026f76a4634bd2a076db84f72f9ae6"; + sha512 = "7f512292aca54210c16cbfbebe8b093d5a26293aaaba39dafc226d67a7999b0f9ba03168e3aaac7045e51b3ba2dd03657f0b121fd4cc6612849d245561c5e5f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sl/firefox-59.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7c34ba23fdc3999717928cd4465d88ffb77551bfe6e1d142a4675719fec1976094a5afa6117ce5240fc52741bc1fc616338f30227fddbf08be253d9e9e15a632"; + sha512 = "e40500d7cc1bc2b429917bdab687025d77bc530c77081d8289a65d00b7f29b6bf8181d13c8f5959c81031c7355096aaa05aa105cc511c8eef1f71f6418bd9c44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/son/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/son/firefox-59.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c15314dc5063751a291b50b1f319eb8bc99ec8f5dfadfe6e6c2c87fa6c9c97b2be9ad4836ec16954a6785ff18259c3c77806d09d9b2aa62318fe8acacdec6149"; + sha512 = "e3b59a646edfa4cfc99eaa66cc540c374ddb1c5424e1aad7f158efda317f4a8c1edd7f36f6ce54b937e7c5d3801b53446580cf90344f35846d437a0c245d978d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sq/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sq/firefox-59.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4d6b82218287c243a9bf15a95b7abbf38fd733042f33bde959d16452a8a15c10e4a999397c71624bc4b4234e3128b73875fc467992fe9ffc6a859fff7d328572"; + sha512 = "9dbf9e77d61e7ce26bdcaa8536b725fec8c57d3c5e3e7e6870bb686520e3af55cb0bcf2f5b8525fc24cb72fd7976d3d8b466adf18f2e7fdc29f586d912cd7bd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sr/firefox-59.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "18e152bf426300ea964cbc539740883b8a62dc12ea8a48cb5ff8171fd3499a4dc6b8a824eab8e711762a5146899d62f4bfcfd03b3878f16aa997a8583b004643"; + sha512 = "d6e0f12dace67c6260e3b766393e898e7fbe394d34e14366594050294fa2cc6931886d4cecfc23f4d921fdff961c38c6d6356760d5887a5570d5039912e193d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sv-SE/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sv-SE/firefox-59.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "53a3ca59a8535a3b7a69b5116ce0906f8162611a14b877dc56a86946b1ba7b55885fe822309d00b12d8855a3ac7dc515bd8bc396c71b4055fdb2203f119d7fb4"; + sha512 = "388fdc10907befedb9a3a871be53799aa1cb1f9662b2e18e5fef1de8d6805ea6ef01d95c5225f06fe009c4800b7a5214a24db3529fe53a60be56f724dca12086"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ta/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ta/firefox-59.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "922f626af6df624d4154dfb074627bad3a7e6ccb95e1e607bfdca0a3c0823a68720614a52d5dd51a2773f8214695803899a3b160c1220fab3d43351d4c41d3a1"; + sha512 = "d52d69694a2ac1cfba8d568342c3da47932f9d5744eb03ed20b1a5c8b4739e3daefce25146180b39e360e3c90b2dac99e7c9ae9740b2abf580120149db2aeca1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/te/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/te/firefox-59.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "2138095dc31f49b6266c8b8789ce7ffd674d9d3888eb0f2255a04f15b884d3f076d4e7f00331f6b4782e0bb5f32db9fd923679c19b07da029b691283ad9cfcf5"; + sha512 = "19f82aefeb7ef6281278ecfe55c052b4ee24ee0d4d16ef6bd06b3e192e801ee22f034406ff224acab92117e4b4e63e98d7a636513012dd625de5a5d77615ad91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/th/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/th/firefox-59.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "cbe73835e029354327ae3ab08617508750252056b1ce5d6bae244e12e0141eb284fac068670afa40abd7da568c50f0d278f12c9650d605d785feb040d911e53f"; + sha512 = "3fc491d1f70adcd5ea0c479bfc32400c898f2709674a1ed59da76521cc006a1683c31af260155ec008f1f8ec08ea971e91465574c7060e9568313433d2b7e372"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/tr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/tr/firefox-59.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c02b011ef67bd32c07140e2a994de8751eeb48594f872ee7f4e2e886f3e0c80821a9a2937bf1dedf673561b0a18961953699116ae3a3b409a47ef1c9bf56159d"; + sha512 = "7fbc87f38b07bbedd644c89ac5b42d9e00114ff79dd0b02f25c227c4944e32c353ed9c4491ef9f3981f4c565e03afd175907cfec5243832a1c82a12dc4f96b90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/uk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/uk/firefox-59.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "929b9c653d9d4fb0b930256638238a70ac6b000b688cabccba5dd408742756a54fe08857ac43d4c18ac638ecd2b4219d5b885897aad4f2c665cfc7f3a8250128"; + sha512 = "e0ebdb71ad23527be68a3cc0e70291b803bbb5d43ecbc334ba92c48215ae8017ad79e78692eb39da8d5403b64a9b17e127c73bffd2592df8a5d4cf6ad46710c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ur/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ur/firefox-59.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "349d6c15c211b1b764797e46a6275a4ad6d50d17c50968e91e23d9d3f185180436c63eb3d5c98eba1d7ac48844ba296de15c4cf22be26a169e38cd9c9682343a"; + sha512 = "e8bce7cba9c56db4a74b00d9f149704ef0eb308441e70a4f6ff4919b4d54c5dbcd0e7446fc0a23fcaccc5cf44f1a6238e7012f2e3acfb4c1f26a5f8724eeb4e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/uz/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/uz/firefox-59.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "19a7fccc33c0b71af6ffa2a699041bd0f04e2aeed3d22db11354250e3d5ac50149e38c23fcc7b2fb61ab7edc4cae30bbb34b7c0331e22e35652eb3f0a6d20c65"; + sha512 = "def047a3437914a7ea7e0e8680fc12a198181f2adcf6000879ef63eaa061fad85db8a1f64fb6dfe6d44c063accfca4e846b5624339e52dc2663ef0cbeff03787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/vi/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/vi/firefox-59.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "d1ed26f2c38e6918bb58d9284f1e190f1d644014b567d71603ef06d181d550e10cad198efc1758a0f84ae91edd272f7ea2cb96c79c32dbc8dd4124977d984348"; + sha512 = "dc534f00d41b4e11f7e620c3568cde029784d86a11bef65b629d5d32bae62df9d1d45043d0be0e511e8be735e7478857bb5be0c4afb47a2aafb5c75e6a32831c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/xh/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/xh/firefox-59.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "dde88337bd1aecd728234f4a868d7fd32087b863c193d8ba87875b2dd7acf6c3bf72ac2fe3b0283929e64320b7fd481a898637b7860e58303f41c59e6adcafb9"; + sha512 = "6275723b0ff3f66f6631f7b5fed7ce73a2a72c77fa4229ec21b7609e43490c8619f099a20706658fffe693330919dcd65eb52b83328614b4c25000b97cea807e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/zh-CN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/zh-CN/firefox-59.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "dd659b712c7c5f36eaecf62a382cfd45fb70dff95fe9f1bd162d9cafae860de71fb64dc5d6dc3eaaa19af3ba7df714aacc63fa471ca29afd7616f80038e65b35"; + sha512 = "e511d5091cc89560c213ffba002f55a25271fd36b436c35e2a90ef84ed1e6a20371d9aa2e61446787be7e4f611686071ef9309a8646f1c4123bdb8d256a5edf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/zh-TW/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/zh-TW/firefox-59.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "9b3ebec8f372ce750ec17dec78013e910f8b05bbbf8b270aa7e9be84f627719190c2dd8525c82c04a4f6e957ef71dfd4bd0aaee1e92fd019cba9a297802a49ac"; + sha512 = "c2bc92e48d464211f2a936983f2016d4c155a8dbc5f636876303615643096a5dbc3f7ecd674586e51b56aa28f4ed8f41e1708a5997047ef13f8ee6e7362f5414"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ach/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ach/firefox-59.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "666100224cb7c90409b86921ef4f01eac685187bcbe306077909f4822691935d77c72f7685483e76ae7eb830d57d3fa2e404bcb542247564114239e3933c0497"; + sha512 = "4499d6425f3d16788d829575772435ac0c2a3e2ace072012624492e0398292cc5e7641dd36e0b2d58e1e6b796d3fac7fd8a57eff4a9e48adf3c093b6328b4595"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/af/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/af/firefox-59.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "32024e9c4870efa6576b35559ee04ee5130d90ed5e9931e0b6665b65d202314bb343d197f5d1ce3bd5d0a2e3136b18beaea033825f225b157a5a47ec78e9c35f"; + sha512 = "fffac356b873b58d275e04ed508ea501e43f20be51b6967637d49d4a4a14788c04c9865aadaf0c1c4ecf4a3707bdeb460adbe40226f13916faa748bc773f7336"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/an/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/an/firefox-59.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "5291bd5d28a1d3f28473731bf916e8a2d2f0e1fa521423f588b35155c889d1784c986ee6fc40faee0b6c879088bdc04987037ae5b34585cc981611ab2d1c2bb8"; + sha512 = "05b688f115a9c324fb92a1234cd3138af1068e6dbb89a4aade27af830fd5b897e58d07f9876f9f9688bcee2a98ea1c4158a585755169ffdab9ed8a9927a2e108"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ar/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ar/firefox-59.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "b8c744f892dfcfbbeaea16e137b37860f447235f7a6842a1e5164030253974aa713cab0e9ec4646b15bd62e23794c6d69065457cb7aeab18214dfd898062995a"; + sha512 = "2bfc35a015148d04968b1f0f5e8d4ece02f448590ca45fde0cca37b31357f4bb58e0f0f4f5542c77ebf2632c3ac3340de5514d5c999d97b95abfc548486d666b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/as/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/as/firefox-59.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "4964447e37193809decfc09a47ed96133560dbada6178dbb2b6f2cf974f2b2daa62b3eff0d015f890dd651bf9f2432cb47bbfabdedc75315af97b2158ef5046b"; + sha512 = "baed84fa6256bb002dda19a46a32d9b46ba64f30c466d5ae31dbaf87feaec051595164dfc355d4433403485cfbfef8533a55e2291fe940f2343d9f30bcb373c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ast/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ast/firefox-59.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "e34a66027afdd4191a11888a9e0c9cb5b35996f57255caf1fa8eb2b7effcc373fd96a253ec8067a1b6c36e5cd4d6071d04cc94071ca4212ca49308200d09545e"; + sha512 = "08f3957c23dcfef80f89fbfe4bd4314254b74fd998741358f5d03ff16728b260768185968e5f9645f54a3d77bda95ca4122e7ac80f6a00f95409b3fea8205a74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/az/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/az/firefox-59.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "83ac6d10d9e5606011e6addc54b02026d1ca272a87813e84756fa3e8015c7070e3f617c9d9f17a673b161af1cda86a418ed96bca46c8397d7950bb40f1255825"; + sha512 = "b443e25e0c2fed05b5ea32416d3808f2236a7c37c15d755612f394dab17d849bd3c93d3b2272b422a7cdba7bb4f7de2cb37cf19b507904360ceb4e6beb522844"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/be/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/be/firefox-59.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "482a0ea33bcac3a760b6d8ae3ac7d52e514654ae340c22f8db17fb39b92d5db5796821bf8c658435624550adc92ec9f1d3567bc6c277ad182820756cf41ea19c"; + sha512 = "52da8342a683f875334a1fdf493700019992162fbd983efb6484dfe3af8918def29746164c93445bfc0c306431ae252a16f5cb0fb525e5381184221b80f4a7bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bg/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bg/firefox-59.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "e57d29c139f43d42bac98434ce0285405c16ad48141485ac9d0fb15ce3b1ee920bdbc5ff1f763faf45c71553086b9001d5e24e2940635ed6caa6bfbbebefabc1"; + sha512 = "303b784f519eb9b2370b9b06d523f2554ac2c326d024d0812228193268f8778bd0036d572fc57574a3ed5270edb64f09253aca9cbf90322bbb3ccab54c62e638"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bn-BD/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bn-BD/firefox-59.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "4e145b1a7a5681d43178a210981785ee3a44d9c8b7a1e166b44331daf99bcd4d0413e2ddc6e323d228ef6c26f0bfc5cdbcac82a34d71a7964b4a67bb5348356d"; + sha512 = "8e902ce41ab242c081c5593f9f27912721d358e78006b364c74e0ab718260825c98214db4a65f35bbb0717326f0608aad5089703b74a964523f3230675ad77e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bn-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bn-IN/firefox-59.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "fc33f3661e98cdcdedff6a5bef544ff059861389f14cf7854044e6ee32950f53a1cb74339599e407f60d92dd82ca8a6df77b877501a323a67186100da640267e"; + sha512 = "037400dd174f16f7a34074dfdb49e88f0892092dcad6c27581321295023c9ce564b56a22eefa5b35381a8a01f42b26826c1a376bf05be3e34feb4eb5b02f9231"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/br/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/br/firefox-59.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "af31f2571a2cf85598412f7921a286f44c2f78ecf46f94f76626de29e2b5a7278963757a47746d974c085297ecda8b42d7ba02b0613091a1eaa116c5cf36876d"; + sha512 = "f9b49aefa070204f8b95094a6e8793b6ab00fd8fb4f400075516cd697cf4ca5ea89fe267eaa477984ae82d966368027cadff04d0efc1be81b63a399413ae83c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bs/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bs/firefox-59.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "c1016709138e985608d6edba3edaff43f46af60bad19247cb1f7942fc609d2ff845341b2aad38336456dfa1d74783cede88eeef3abb97dfeb1c3c2ebdc4be1ea"; + sha512 = "35538a5a5ded9568a2dbe09cd5ecda77226584a5f9b7eb7b9356c720a9b784767c5a69ee74990a7ecd72ef660833236d2d6b4267c091ae89a2f9750ca1332753"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ca/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ca/firefox-59.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "d862326e3d3045bc0939d444b12399f89392a1b91972b27c93f475d1a8432272bab3b9c568a3f597abc540e2a085d1538906e8c3a8dd79ecd5afdb0891a07c81"; + sha512 = "71cea9ff69b435419c1ee8ab0ec121de13686a7f0d29f10bd308cd5c6681115d1afe035a50f25180daf6067da9fc6edc1ee31980bbf102f8e654b79f62aae1f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cak/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/cak/firefox-59.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "10d2d073868fbdd8b8b9c49d10368948e9d24e641b3c86d2629fb513077ddd1c364aeefedadd47f6d8709df4372b26624b3211f09816bbe60fd02be7ea7a59ca"; + sha512 = "ffaab8ef22b584c4b147358b39999632ae9ffc0eab6d46ec5f2d705264c11cec7051d42ff2ed8ba46fd1c977d4df4fb4fbf28d970bdd0e8abd9038a59bc139be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cs/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/cs/firefox-59.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "488d65b5c33faf6de23f922f8456f14ed4dda2db7fcd307b3b34b01fe22ee7abc679cf0ca009917fd00bf71383965239320011b0e275a103c45c6e22056816c5"; + sha512 = "065eb584812b3c66a31920e0efbb31b900b101fb84613bc8b7e6b18cd544133199deabfc5773823cc7c7a3be03c3a8dae41204a65421e18e1ed0c8ccc6c7fa99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cy/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/cy/firefox-59.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "03450045a45114d7228d3534c3488e34a8c1a163396592a8194db6d599aaf7542843123bfc136cb8b9b2a7e5f58ae8b8187717a0c05aad7bd0f3051c0ec0876c"; + sha512 = "7176e87ad5d6551ce67e2b158647599b67e322a1a8cc35457cd8b682b132f25f4dcf4be187dcfed4e0d304e6dd8ed24a9cafbe0dc4fef261445bacae50a2feaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/da/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/da/firefox-59.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f91d643d5e90bfee170437c990e01744bc5e4fffccfe16c3b806cd4c299c9601b651645ea8c52bef6fde3c1b4a4509e1bba433a315671cd4c614fe0462af4ced"; + sha512 = "1c02a54a801080d6d8f770ca17db139d2ec1911f9e93283714d01b5bb7230dfc84623a2737344ee46c06fb2c3e68c0b863624293c48da71a6e0fa702f0060ed5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/de/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/de/firefox-59.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "224a65f6a82c8a50d9a1349e88879dd93e7bd5f958ad0208d5f7264d6e5deef0b76659627ffdb21bbbdedd6853050d7a0a3ae1a86c5f6713418c6447eba00ea8"; + sha512 = "a9fdce31be17eba18388eab51241fa2afe71557ebec8ec8e7fe27daf405c20676d3b9baa7826a5d9a7e6a113823d7ed50ae958df6b2412ed712f00e0bfd99dbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/dsb/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/dsb/firefox-59.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c5639b8c3c002d79992deeb2d6156f82cb04e11e646fcd0f41437faeb8b49fd7e08ff89c00eb5a9aff80e70c5b90ccf62498865fccd08c1e4db64f4b27633fcb"; + sha512 = "0a962b8ddb4698ecbd979d48fa21f91c7d39f7d55096473e6557296fb8e849f27417060751034e9906270c771918b956755082d23c5fa73c06128766a706763b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/el/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/el/firefox-59.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "6175fde499171372212d088882203c62cd75addb138946ef7dc0a61d1ba4cda71dda6e3070688b5b4075ac602073a001999ddc0be52ca41f23899b23d053e659"; + sha512 = "fc14290342ef91d29a93707cf672d362ef0790641783b7d7187d7db71bc774bee20d506d7f42b704abd101b040eec95b8aff5caa572e20ce18c0dc56103d0c42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-GB/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/en-GB/firefox-59.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "a694c3260358baadf3eab7b0feadab53facceef72ce1c760e845183ca0309fc67ea02581d977f0b45d64742c48792f8b07658c83f4ec9cc9aef6e5fc126f8842"; + sha512 = "abd3837fb2e1e69c8ec2bbe59647116d45942f4de1dea7fc437f73e609d9296a3bbb0790fd92d41f9771c71cb466f3aee96f30a1163fa986e72ad0db43301ae2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-US/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/en-US/firefox-59.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c2f2a3599280f0a44053879ed5fdce337c15a78952e93d93d3138b550e31b5ffb62403ddc0092c4ac82d04908d2b0aaa6a7698fe2dd94cf78ebab066dc40585c"; + sha512 = "080b12824d252875c5c62692d652d3dc4dc908937e833c3e99cac58e0347a3bcc2cb9ce2a12d1419f22cdf2545d5fca947d35504e89f7a05f67b7988304cecf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-ZA/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/en-ZA/firefox-59.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "bd6e7c2732503ff2ed9b4e0b399bd4f98e02e1fa1d43637ea1deaff00d1916fbdb5951430ae06296370a4959c2364a7473ecaff145eacb304a9ea888a0d5af53"; + sha512 = "6f9b9f66e79d39b57c05c2fda451be7390321d847bcd19bde3b3fa5f80cbe38f25ea0aeb971dd7122313761878bc297061881fef43cfc068d28c33f11ddcd774"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/eo/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/eo/firefox-59.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e737792c3ae820aaa9e01ebb5dc6ed508fcc25fbf1b873942f5dba8e99c4ada0320b7924de31813794b76998c1ea8ef555e9a8ea98f394a455eea5614a1c2a60"; + sha512 = "a5cc94f8abd0dec22825e3bf242abd452440793958e35ed547a01c8a7987061889e219a59341ab8d7faa7335ff0b35aa80a61e5bd6dc2b3c0e4c202edf262d00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-AR/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-AR/firefox-59.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "3043e15fc4e6b4cc19f2e0c74ac87cab1ce4ddf79b7227bbf986c6e325d60edc33924909939def86092368f7158a5f12d725ac20b71f53ac038e2f3ca7709f8c"; + sha512 = "25f24c1de811fb2371f9aadaa9f8b2dfdb542000914124d82610fa77556e01aa93c491d0c1bd6a1f5164efcc0c7e90832d36b6b8c7706e61f36b3359e756f6ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-CL/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-CL/firefox-59.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "396a832f795c20eca7adc9147cacad5a90a56bf4008699f96cd8180d9fc52f1d318656a8729c82052a985444ef3a3ba4bdeaf2caa279b2a1c9d6618c94a2c517"; + sha512 = "602b58f4abb6c021a6b0b286eed2d5b8ef007e158f63dcefd107e3bfa8978b6127bbc167a36e4b7758ff13a482aeda8a70ae69a84a9ef78eb96a3dac08eb7d86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-ES/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-ES/firefox-59.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c7101edd19e9a1106d586ae79e9678e3526beb1c90f1d0922b898ebb986236338cae2c93121b3186b9e9084fb293f7725b769586059b2dfff5ad7646d294b3f3"; + sha512 = "171d14ac46f598e40864dc51ffa8d46b0fa72d722c388c1341895c7492f1f984f169e511c3940a1216406ab131ce7e371943ef8d055704019dfe57e39e84b282"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-MX/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-MX/firefox-59.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "859be5955ea7066be34c8436ad79e8a19add4794be5fe8822df5c5b418f63d675f5a22e0608aca1b872873289288cfb5bd3e98a18774ff23afa0a66af5dbe0a3"; + sha512 = "be66bc35b023ee9236b4bddbf7d00299cc99aac0bbfcb05c900fd8b34d024fb29079ab3012c045431c887edf5b5424bd7373b13c8cc2ee4e4d2a58c4d2136740"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/et/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/et/firefox-59.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "10e1085be63d4baa19391b54e8960344d70f901d07f67f5c1eaaf8f2bf8fb2b90635da1e5c423aab6ccc6368a7d4bf27ce5dfd3693ffdcf7311f9c1bd888e1f3"; + sha512 = "46adfdc992b1c445f1aca0ed8e3c0852a44875da4f09d365f104598b71e070cd671ff637d9804fbae2cf04f1eb43578e3b22c0e55bec39d9f581937d503af420"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/eu/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/eu/firefox-59.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ce1c796b1bb419c27d949fc268d5eaa0e1baa9fe93cd10603bf1a4ae60f66f6fdb8a29e14255859c45adc37e000dc65a9887f9eeb5ebd3e05d46a0f0f73dbdf9"; + sha512 = "b602ab66829a98fc1ad342f1b7d646e4e0ccf39d898c0cb1f8dc20eb55f1da9c086ca47783abd658dc73aafe2d8b0557a3a59de5aa772ff76312ec93a6aff8da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fa/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fa/firefox-59.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "5ccf9dbfcb55b67658611c049d6ec5e859493c45015ff9f424cff8dab45b69be5426c1905006b04f79762ec7be5e63dd8bfb19e0d5cc59e02f31033b1529d57f"; + sha512 = "b78a501a3130928de22bb06261c361fc07646024511081dd034204d1529e758b81b4bf31a05e20eeeca649a089a20947caa7ae08e6f61a996186d18067cd6030"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ff/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ff/firefox-59.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f2ddf1065e5e848bc99e2fcf8ee9c6e5049070380c9414e675581bb842c98ed7e9e1fa3958662282bffb9ba41d52dac0a66c1376d094573019cdb101401b4e5f"; + sha512 = "825e9f87019ed6f7c77c059292736eaf2ffc96d7029da168f02953cfd0d30eaca1bb193eacc81a49fd5e094d88ed8daa36db8562680977187458db5e36192ed3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fi/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fi/firefox-59.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "4fb98ca5bd53beed2dd33f3f3d1bc802690a7e856c8cab0e830f062c0f115a964c60117392cc9b24b75adbc564c9196fc951174bb2da72b76941ec2148895393"; + sha512 = "08b94b2c2fe976bc8eecd8a92a5cbcd6645883e27c4ac807c961e204b59412a55a359207fe1553e66e48846a1dc1fa999f2992f5489292b2f0dd2d650734bddd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fr/firefox-59.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "6a2c6c1f0f4e72db4125e613c9c9c3c91b0bea8945bf4e12f3e2682cb50f7cecfcb0fddd63c9591bc39fd31e9eea575b159fc65bd3fb8326e24bd315ad1fbd40"; + sha512 = "6f327a4688107610f89db61dfd61a0ad4186e21e9fdbd8daef48d7d6ca9a97b905f27695e37dcad888495c1d38532546afaab85e9d39250f69f961f06fc7f3d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fy-NL/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fy-NL/firefox-59.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "3d1de44f6c0b01951777ae913dd25b89ea0c0fed1d12eb8571aa4c79769cc2222f4c417c29a81cef908def319482eaa09c3c09549bf388841806b2ec27edcffa"; + sha512 = "97f65158c6fc3b885194c4c94022f43f1adcab609b1e6168991e3fed1edc23eb2de5692d353173d73533d2428cea9898c2c907f85ad7e2c344e34548620c977a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ga-IE/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ga-IE/firefox-59.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "3bf2882d814b539ecd3f7445fd48983d585d40e530693160b39342215ba5a65623985d1b189ad76b07c1c0c39cbb4ea1b2f45234182766e4bd9f13ef1707d009"; + sha512 = "56b71aa21687b6ff108b2dcf1c4853115a29209ac5b9b228f3041385bbd6e0abeb170d13a7bd3d5001cc83f58fc4bc872707d6e9e086abe6d73ff288f93f5fcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gd/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gd/firefox-59.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "547f62c2cd0105e4328171b30b2747e4d75424e42866b19fc600206d90208c9e21b484df2455f5c2354be493ae22f7c8ccbc5c26a4c17a7d4c55f5b177d77f56"; + sha512 = "5727a4de97cf52fcd69fe7260460c1fa2cc208bb53c52d7d9efebc9bd9d115b4fb33149372a4a79ad51511c13a9ba8ae1ff83356c65ed566d6e4894dad555f3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gl/firefox-59.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "90676f1f7ea1cb0fbeef5a3bb8ec28acf389ab755cfeaa1484639fe44add3fa89ec994f93dc7eede2cb71f76bb085a3351dca6a0a8374997db855f921aea889c"; + sha512 = "2481ff0b2095b8787cc9b5c00f59b027fa1ba0d0ce94010d38f07ddfaf23bb0bff74bceb989fcd4cfd5969cc705191c4ec37b0a47b17f46736df0f7f7354f1e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gn/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gn/firefox-59.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "43b55fb395cf9cb2b9705f4986b95cd323c26bf1c6fe47d6548f58fa03084e5213b1be99ce843d0af7947b94cd8891fb0431a1c80cbfb42bf09e69eff3b9998d"; + sha512 = "4e8bbbea63db7e39c421f8a6d9ab7c8459331995010c2bbbf45ca74154ca9919d9591a5a7c8f1266205abbe04818a7763ddade1972ba45b678b0e65e76092830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gu-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gu-IN/firefox-59.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "c294b70d51d0ef31d8db3fce36ecaa0d50b79efa272731a473d8eb7502ec9461ee6a5acceae6e6f46ecc008713e28f943817153c458664238be01c21fcd1952e"; + sha512 = "eb7dee2ec3cce8e2ca965e6bf5f0c6db8f777f771b04188f150f53bbd79a187fa2cbff3a5639a14275c19262c684177262c130523f52b44539cd0d7f826e8eae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/he/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/he/firefox-59.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "872384072f61046c18169ec399c7a72f9231b58d05fef6b41b5591ae0b28c8f496bf9210738c56249e682b451f257cb220204aab74e7f3fcf6e998b5350f7665"; + sha512 = "6a33ffc534a2d740a60a104a680a200c5fd056f11d53db22d8ccde52a28b9686600a03a4a030c2c90233ffba1241d4ae9599b1688fcad96450951417c5b86f48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hi-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hi-IN/firefox-59.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "6adff5467cc9a2514a456ca84de2bf91dfeb8d528e1296a636fac7048a353c4373270d551902cbcaf62567af53df3d4db0abb2788d28c24b014aa73cc515be69"; + sha512 = "64fe64b3c5f8178f9e534aead47bfa044407216d3daf7fcb1a135f72d72eae327dba5b235a724491aa16bb7dbb2e5bcaedc49ed4219f06796fd5f8a9fbe84fcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hr/firefox-59.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "09694e46fd369ce0c8b6b11c04916032880056529a4fa5d7acdcc2d46b1a47f01efdcccdae8f569e597a52acf45198b132654dd3fac094031ba729101cd36aed"; + sha512 = "0791d6fafec7769966c9aa2233d0580ccd203a1baf851fd8567defd58bb43403bbce5763ab27cccd22d67dbb6afe2fa795557376182588a1d00bba6c9462fe30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hsb/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hsb/firefox-59.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7eeb065f6c7b971a9a9f9f94e1eac6cfb45b2c7c32b9770cdd49d50162a5b409abeb349e676568f3c63e973311791dd8ce6b9df340a8f13cf5afa19df780dad6"; + sha512 = "fbc6143334fd5f5b8b44d7927396b83aea34be5d783b948eece034168298aa046eab1131e38f7b71c022ab1f200c3d0182c854ca6bd45f5c835d0eb2632234a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hu/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hu/firefox-59.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "da930d401adcad3c1648cbbbfb7148e8ee7255b937a4503f9e8c686504ce7b1c40cd5aae54dd5084669a153c449807414eaf689804b56c06a0f453a998aecd40"; + sha512 = "3b0a8fefc165ba016b6666da429aea75d3c19c40db87847ae782f9412ac98d0f06e834a7a83d3a3bd38a410a4e32b38f8c7a310275950a8676b64f9bc1991022"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hy-AM/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hy-AM/firefox-59.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "e5686af9acdf7d11f0cbf80492e9288570d358ed8b4db9567b943f3e2de5f44715caa2fee8da5e11affda917a896a8822658c8a55f0085a93e73fe9540cfb09f"; + sha512 = "fd706b556a9691708d65d1b3a6926f7294341966ab8f9cea3175334459dd230e0d9d6b4d18b965a39bc60de467ec3719672a65985804ee56e9dac0660903f231"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ia/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ia/firefox-59.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "bc7600040fc001e39fb654946ffee9317983729391767b91793711bd1083d7cdc16af7c1fbb91fc3bb8bc903529da3c398de9da4a3e4b0d3ecfea6e1ba8904ca"; + sha512 = "508ef8e011e201b74362770a03c40adb39648fbfe5fa099f3f0605beea0904b5e10bf6c2b66eb5ff1e061ec214add46372d6409d2f29f6d7b5a3e6bd0db9dc19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/id/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/id/firefox-59.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0b3e845a2f346f21ec90e0e423c7d3f1b635fa0ab1cebeeb7cffdb4f4c849ac100f17f370ab4902b18997a8f883ad71f651d397fcc8b7ad3ade7b643f2e75a79"; + sha512 = "871188e46c62523b5fccc4400930c15b1616fb02eb9becffa305f5964644ad749792b95d59df3324ccea38393ab3695d93135cc93ab720a29bb4fd1ede9d5459"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/is/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/is/firefox-59.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f345579826a039d7008a86e04f437fa112579f6b21e2032e8120f9444fd86d38831629683c9441d7f1f5010c02f18a0b7232e7c0db0ebfa82012fc38d7f90165"; + sha512 = "9006ecb02cbdacaa5fb156b774ede6991be42c09fb32039f41497d83ec4337fac4ceff1a9597f14b50c5385919462c11d117486fe4eb5a706910f0ab12b8e95d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/it/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/it/firefox-59.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "27e4ebb4674c0ce189f649d5dca273787386103f9b2274600fcdbff10b78bcd5ce39e7d530e5438e2c3127ff2ad15ea82bfbe07a9118baa2d1b722ba8ec2be18"; + sha512 = "d2f1525225cbc4201b25776821b45362cf3de58ba66b8ffe70ee9c1f2d06b87fd80269fe775ab50e64f02bd6aa95d88085d17e003f59de578868c0b3f34548b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ja/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ja/firefox-59.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "30ba80bf62edbc26314b10ae2bf0caa41c69f92d6fa04fb086471b5d7b9f439f74d37b0c9265f8de888c599e8efd074f284a085fc22251599753c65fba7bbca7"; + sha512 = "e6a2c7993933101ae2ed4f6222ffeb5750bf012b593c80cb96de99bb2911c7736e42b3e67c085591b89f0fe635119204aabc43148f24a16c7a24e1d2fc83fc84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ka/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ka/firefox-59.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "fe305ca5165d693841e151e3356068e797c2058a017f8108cdf2e9959a13055fdd77091c206bbfbbf92971b0bc3141821159add88c031053370da266883c887e"; + sha512 = "cc6350ac1b36ecbf71b82fb2cb12745fc11e3ffda92ce32be6568e0175e0e563073502381837b1bc48176033637e8ecaacbfe380badeb9beb45d03707fb1a3d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kab/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/kab/firefox-59.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3413725d76686e50a4bc8125efa0160ac0ce89c92ae1afc41e9977dd2212a59042e4c02c75e2a48c9b09d1ea2da7fd8683a524f90f8217e58292b0abbd0a3242"; + sha512 = "529130c7ef17259485887db4e63efd99dd99bf1863ebddb4f23d046cf5f7d44554ff35905665d5426a7961403402095e0e50208fbb3f51200820621907cadfc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/kk/firefox-59.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "12dbec279fceef28b199510175a18455e2db411beff26d6593dd5ed4deac509be50ecd55f9c4e31e65eccec59a8bef6fc02dd054ec9644505166d4a0de672cf2"; + sha512 = "19789148defa05a2707c30d53356d918b0a1629ac5dea1e04d78680f2cfaa307a147484b0ca8c6a72147768184a0097e288e3261c4322960c85c05f5495f8eca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/km/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/km/firefox-59.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "e69c4aad3b2fda0249dc5840af8f48b2420a213f0801397c434ecf17d096773f235817bd9f6205a06fc22529fc289417fc3ebb292cc7932ffff9e7de07ab0c4d"; + sha512 = "65bd3e500d3f0c1a0f728fdea563563ac1729f101945fba6cb453a2d0d40d6a7291244a6dff81d708db230fbe478dbaf8c9cc410f075f7d71bf316703206c66a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kn/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/kn/firefox-59.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7748d7f3666684021affd3d50fe3005ca5bb47e0eede9aa4379de60a0d6fab292753e577ced60c117ae6225517828bf750e05cb24a0406a9f5b4aef7f09aaf2c"; + sha512 = "fbefba8c9313a15f0003b646df86a44924589bc168df68f128bc7773a97cf14c0bf5fe36f953b32dd2d154ce899db7d0a28ceb6d97114d89143f0e872bf314ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ko/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ko/firefox-59.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "04de73ca7c1ab3611baf8192b108aa5cd56582804e17a822f3fb39595cfc155538ffabe38324a1475d95605ff7c702988cb9f4b6e086813b5c661428774c2fa4"; + sha512 = "91e62f8789efb1d147b923800a2f4aed54bda2882089d3d9eb8fcc309ee0ecf82efb017ff4de577ee7b3db24c600650428858d7f2ba89c52d6758e010f657b24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lij/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/lij/firefox-59.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d35f733597a2faff1ca54fc4fecd97ac03576443b1c2ed8114e14f59bcc71e58e3a828451146a592222d406b631b6c55cb554c5900593a8cfce83ea68d29f88c"; + sha512 = "a5f25adfc9b5b8708d8188ba2fc7ebaf001b8daa1ba3478f1fa757c3c4bb7079581a86d32c2a99af58f46579e347327ab5b0f40b5d716f88004577b317ff80a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lt/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/lt/firefox-59.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "594d93a8537b9d4ada5b87d74f12902580c8488f9e0dca9b5a8be109025006c27d6b92ab45b76f177cc15bc0b7e95d2544c0d2acad5a7ac64119b008c8304703"; + sha512 = "29f4a6dd33a6f3667ede1448e7375124037767417cba73cf35c0d35e546e26b0d31eab1640a897eece8e752bdf8fea931023fef8c0f25263dfc7893712aaac6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lv/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/lv/firefox-59.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f904004e0bf94ee2cfb9fa22c020f6e3a4c0377522f6ccc00ac69df1133717b57bfd5403ce97ba8b69775c3caec9c730513c53db262e8b62f8b8360a0e340c7e"; + sha512 = "740ef5034f0609c1060a2ed154318d33e017bc6247e3195b61420e50db7994bd247e1ae3c7367c96b0b325d7bf11d90c2f3e66d199a1d8914f068a33e1b6c2cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mai/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/mai/firefox-59.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "47fc45930445344210762116c56004c8e6dab52e70926ea9837852faff9d717a4d6f5d04df66026fb33487051776bdbbf07d4faa2a3eddae23faae3c88df7618"; + sha512 = "7a0504265fdc7b8e9dd8e02bb7dbb51bc6a8baf7d1b4263f8d174da277f87c9579451ce4e50ab5aee21969de1aadbe4c1bd6e1262ab925091d516ede981fdfa6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/mk/firefox-59.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8747d1626b54a83da79780ae9919aa75a6828fa94b5eabeb299b0bacb1fe5f44f2540a223206df3c3a3cb3ddc890e87a062b7acdbc890e19cb5d957d29a28fc6"; + sha512 = "1f08eb3edfcdd0b0b2aa40e3e9ac59256d8b0e7c10043a8847e5880369717ac61abd289356edcf5388a2fb3e41543561ebe85c9767fe4dda860e00c113220994"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ml/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ml/firefox-59.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "9388c5f3b3a12f72149899d4f13ef305396f5d3d4e838bd909050cf24a0c72b4b26017ed5057f30b42d59d8bb27532f71d174ce7285fef82672d12e50297d283"; + sha512 = "507498b1f30bceb26e9cf65dab1e06f64178353587e32257ee7cd57395eb8c62034f272dffd35ff46d87844b74c73ac3b9a0ce39bb0866ea5b9b9a923e839be5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/mr/firefox-59.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "2db6f9628f9cbb533ec2575cd95c54423cfffd185251b65cffe8233b9af92a6000a371f1ac1efe5fa2e7939e3cff36da5a8f0d7ae1bbc8354a3b3ecd3a0eb7ef"; + sha512 = "5093a2a5b7cfe9b2c5b8dc93522aee7d14d60c07e6a80a032cf69cee775d4dfa537a119f931741b7ea86e94aec18bc868f894c017cde4e2cd7ec1397b8395adc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ms/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ms/firefox-59.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "1513aa8958e26c1b8c618151ba88c7a0279fbd42f1a8e3ae6616cf069657337647cb180bc9d42f88a53d8d1f71e6515412f0da2cba16fa177f87a048988024f9"; + sha512 = "12b1fdd4bce5aaf8f488777556c958bb07cc00ed0370651f198f87b495b2b036e9ae337031c7230a083ab4d067e4c325ce3529f2ee751f4c05e6738ccfe4c8ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/my/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/my/firefox-59.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "200d0ca08a7a2215f56b71e73ddc37c6b57188aed3926b1852d53253327ff631274442536cfcebedf2e78e4bdee6e431fbf4e722f867819484707ffb882a2e3d"; + sha512 = "684eca0739d3f186edfc0b3bab57fb4b4fa8696619fcefee2f46b453227c543f3b5775615b6983be134410030bde01850e339ee54026bbe898202ba42c91bdaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nb-NO/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/nb-NO/firefox-59.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "dcb391720e9b2d51f10346fae4d46396e47ab391ec80c57d9ce4a3c96a631e61c94b23e1e7bcf00360822ab32a803732e686f7f54bcb60207b190dcc271ca8b3"; + sha512 = "5173a44c41092d29fff5468d3133a2791977f079f82e1a82ef424cbdeae7198e7e7382cf16715c5a67916a06ac865ff8a2bb1707fceebb0b4d60e2232e34c351"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ne-NP/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ne-NP/firefox-59.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c977b42a401be633b40435ef25dd0b3faf362cda71f02f1991d41ab43d8b465497792a6b80c0d57ad693a5fd542832c98057a915f64fe9a75181d91bdbc7df87"; + sha512 = "73d5c22d8af86f93dedc037978fc3096f0ac453eeb7cdc16d108c24f3a889df7c600da9c1a998af19d2023d9f33f3b93bc1dfe7fd10a1737bc8252c162240182"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/nl/firefox-59.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9b91c4663f12df7c1bed18d928b41ab7f767f751b33b83aac9655bcfdbd6385e26cd72564f422e79060740d03ff512bdbc03df75603016dab6651520d2c83c4c"; + sha512 = "c77b8b70acfab1aa5f96e3ff1919b04a05d961cde124925722213cbb51c3defecbabc73a937d3ac703dd7367f6d2133534419aa846bc50b6a0785b76283541a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nn-NO/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/nn-NO/firefox-59.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "66a72b57845cf85362756b9abdeedaa754a82ba792b9d736419a80ea6bc2214f01b875b3307156c73a5f58a858b18bc11cb9adc04fa71d19e2aadecfd2ae4e10"; + sha512 = "79d725afdefe19ce53b44d658867febdb6127564b85fdb048690fa917caf87ddd4cd43a2fc4fdb40276831a176ae07c47765746b3c50589c5e4b9032493ca55e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/or/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/or/firefox-59.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "b821114749a241c9c68c0d8a19aaeebcc72b89eae1ce9ec141c06ea4c09432a8d26426092a35d5daa2886bb4b129e74e2254e6aa6b795ea537413cd31f1f738a"; + sha512 = "3af4761495ccd1457b1ae9864bbe1fd4903e6c38e3df9ea9571074998968365deb5ac3b738e5cee24aed2c42a36c8fef3f959f370b2fa42295179110be85a165"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pa-IN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pa-IN/firefox-59.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "211e65d8a4d681be39f6b1d47210f07ecb357c6e3c51d078d21827681f8a168489ce4c01d251f5f711063dd3ff9ccf0585b2bc11c3f1399f06761678541ed911"; + sha512 = "1aafdc04b1c4ca43dbd9e89f09afb48ccd0e799f669d6cb2526a9ef5858bdd548a40b53da695ba1246b18d86ac1c3c5a4b8989ff2c840d465e19f6505229c70d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pl/firefox-59.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "310d890061a823e9cb2014b8555dd29d201bd80d1e846ae7a457ae7bfe0df06b0a331ff1dcea09cf159d7d969454a2f730304254bb7775b995414f0f20617806"; + sha512 = "16d3cc9cfd18d19bfdb4451b489f921e8c4904d2c47362f9e66e689daba6635204a692a227b8fbc397555671fa40e1195d5c48a1630695e7de5bf0810c00d0f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pt-BR/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pt-BR/firefox-59.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "f39ec82806e5a83eb997d2c16f93238d417d39a3ddc62d591d153da16a7b71e7d916220ce7721307589dfc671239fec15b0a15b8387620eca6478452e0605d41"; + sha512 = "3fcfa87d8bcec7e6b0c09883a81bee06e56cb5728be74c9e82dfd8db89cf7e18e06e3c8d037a86be63bec3b517425460c2446ed1ee50a98f28cea2699e9b93ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pt-PT/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pt-PT/firefox-59.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "8463135fe439ba1e8796ebf626dac84c3672296a84ad8217ae90e104260ac4c89d036c7c87c496f2bc45b259f98e10af99d3ac2a370b2a6ba04223a9b71a9029"; + sha512 = "4dc9f130aeb8fcdd4861ef4e737c0ba1ab58eb58298c44227c5e7c8d0ff51e307c20bf066f88950bac28a75171251cd3366fd144da4bf11c8e2d12a1cfd9c355"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/rm/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/rm/firefox-59.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "8b5b601e3b458e75b1cc27fd6f6be45c503c52d3f70be5a2a0fbed0aa8e1badb2d88cf8011d852a4f39caa87d894c3c412ba7b2351049dccd34eaa5f8d493c6c"; + sha512 = "fb805da4320ea91c219122e184542a32011e3eb08bab42be173308b0fb3098d2fa0d8adbf4b874ee05f336f1894a24c7ebb9a23ab4b6c50de8b9766964b4b9b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ro/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ro/firefox-59.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4dcf71bdf2fb5cdb238230b5ef33a01db062bfbfc29cf0a6ace929e5fb84e6d0aa7598faf5b040a4b7ac899fd3024f5d91a1838098b91135bf2f3351f48678d3"; + sha512 = "5d21af81884cd02cfe18f42bfa1c19b4772274885215aa12902b86dde4f4daa1e1c6f565bfdff64cd8d60014641e5abcc6b7fb9caede2c2c77f01044c44fb504"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ru/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ru/firefox-59.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "0dbc609a7d10351772f807b78f1fb68dca4df80dcbbcfc48a3872fef07fbf0179bfaa53b08d58f54751e2648e792547d314d39c29c37ea036d8ba501cd2f5670"; + sha512 = "f8e2469d3e5e0702b82bfa9528ca3811a3223c5a753d2952c8a61ef36b1997d1fb4f19ab829ce41485a75fc6fd5f1665409324706b7b1678e7191423dc2966b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/si/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/si/firefox-59.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "66c1e12658008c762ab66cdb617e04ec6c6cd1d950ff81a3e278f5473b7e552d27e5906b01419c954081372ff02a06195d3daaf513ac83cd40c71b4f4cab5385"; + sha512 = "d33d4ad60d2aa0e6aa0751407348c22f4975ee05ae788809acc2cbb7d23f19324138509dbd77a7fc7d4798de265f0fa4117bf4eb896204cae3695cc8c3762213"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sk/firefox-59.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "11383a0760432febf961e2342dc5ab4d1bfe89732be71f776d313f14443caf8e2673cd81476979465f333dd6e338db9368d969c736234195b5bce4f57db4ab10"; + sha512 = "859e5be2c7c383b02a296573e0c4f597de5c7f456febe63cef5a433a3ae7174264032d751ba39b353a4783658ba8bf382453631252579ae0259dc0d95c777b2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sl/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sl/firefox-59.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "c137a8f2e5932cf1eb07b3d374dfabc5d3465fc9496a6e8932de12f8b166bd2647071ba64918f42df38af9becb574ec5c4fccf7e9fd323a64488f057aef0f06e"; + sha512 = "22aa6cacf170b34e12e84f23de8a91f86c64a5e257affb47ad48dbb150c07fb704c06b87f147b272ea0ba706d2355f1237b7e8df882b0f31eb0f8af4a40d1f04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/son/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/son/firefox-59.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "29865376c3dd16a0c54c4b1c47685ce862d0455351f6c22acb118a987f8258fe5ba0ddfc62d904a9e11b787d34bd8d22414acc2b95a6f9d6d051621a990497b2"; + sha512 = "d5a1f99c78eca9edb4ce9f5d3c8cc052e013c11088f4b1de42f4af60ecf8e6ecd590318d3cb735c4042eaf4456a8218d8ba479b8164515067a917d9afd7e07e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sq/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sq/firefox-59.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "1a52f547683a7380d605b43ee3eee9d2a34efe42adf68bc74905adf168d30ea4bb23ff33e3e954a8ebd580920aaab70473c001562b0c77e983aa5f365f8bd238"; + sha512 = "ce2162089d87c0ed484670f15c8692b9f748bc9c8b5eacd1883c1930a9d1635ccd3228ab6402957563708fd31d13d509c0037a502b51628dc381a6afa787ab97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sr/firefox-59.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c1ca752f999d54a6c2c9c37b78d98e9fe87bdd82e3769c6312a74b63dd402f874c1e9e708b88945745f2ab1f8309b7c9955104e4e2981a9e7b53fb196b01ebbe"; + sha512 = "36a552b06f5f0e6ed2f60f40f63673706b84da9d2a6fdece3066da5497a0fb93e48d3997ead07c981cce37d59f2a3857350e3de2ef013afd8613368afe9e687d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sv-SE/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sv-SE/firefox-59.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "31b94482b5a2c7627a08f40b67480c26d685eea350b6ac6e22d6e8014375e9d45fe74d81782cc2056ee69e27a06dc36f78898f9b7419a4745987b162fe34c6c6"; + sha512 = "f75061addb23de8c846dd4a406392c05d955b161031dbc350bfa9258e0441b53d17400059c8eceff7afd646620923d50a74a46c30bac9a6dcbaaa4b438c65ed7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ta/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ta/firefox-59.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "254a0b805ea3b24d05248a6abca647dff6a95a28c939acaf6e01b68646a94643123e7ff49977ad6d7bc54ba0aca71b2b4d3d147ad02ca84173ff15c21464d271"; + sha512 = "0a9a047a8985d8bf9c215d08b19be055772f7ca862141f01df78eb8cee4e9d21f39b6640c2031dab9b74c97417c13e69499bb38f3a6dcf5d57aa74b0163e82d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/te/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/te/firefox-59.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "32c86b921324e81ee8bb1c2e64b8c9a9815006ce29b19a2269066ec13d6c6ceb3c45e3c83a22dc8f1dcc78ee13845bdf5a9d9776ea84c8a9a2128a0b45f7c074"; + sha512 = "8a74ab67a8473140a7d54f6eeed871aef3dafe98cea1f983c8dc6f0193b2ab87c6188c276299ad8c9703d35afe6d99c2da3314d764ddfb24b19ea792adf06d92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/th/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/th/firefox-59.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9d2f979e7bfa97b6b6705f77a38948de80327fc657e43e574a2ab7bcb100aa58c7450c1bcb30d3894e150323e1c8e1c4fde91877be782c67996a95987a61bbad"; + sha512 = "0c0250960e85cb1521dccb9cc1dcab81a69b8979822acb425fcbfb6b891ed10eab377180fd2bb992da9612803f90e5238e009be9bd8704782e315f4778e3224a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/tr/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/tr/firefox-59.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "672136b49e6805960e209c7b743fb7b8428a7bb78474f355efe01830e253888c5939714ff72a7fa0e87c848557002bd45cfcd2d502f9a703193ce1c42db5d13e"; + sha512 = "a09aa8abf7cd3da53b079ecb31925c0b9d29defcc79a59fa7d0d0cee7f9e2e797ad396afea73aa567a63c5a282682afb60494d96751e387fec01a271d43c02e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/uk/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/uk/firefox-59.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "d8f619b346de9c3b36d20704524b464b1dc44ad230b17048cf884cf7999996fe08c543285611b358f9afc219f7448976f9d831f4eb6cf4e965f365f17ddf3382"; + sha512 = "3ef5452b3ebeb18585780b315851a0bc666e3fd6f70ed0d12f7b2a3c1db8c4ce98c15b73491d89f600f9066d1a2cf110bc3f974efe7f8cbc44db9d00f8783654"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ur/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ur/firefox-59.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "1cfc67675838e768e7c330f1dc0b0289feb18deecfcf68b726f0636438fba5b577627e5aa9d241f510a123fc1793ac14a35a2c0d098dafa2e3a6213b6fa9be93"; + sha512 = "571235d2376472bcf4bce379fa066d6d671d21f3edf87088552be4daeae5dbd8f5674878f5bf5c8f47bbfe3bb6d0e08d53e0d683c69e655a94bf39eae10df4c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/uz/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/uz/firefox-59.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "00dca0daef262c75e3aa6ea91a0339e7716ec696d747db04b3a308efffceb908ad772abf929c190c1a6e2b8f09c64dcb6d09784bb092070c87cbfcf82dc004cb"; + sha512 = "e3e3490431e88e7ad326526f1415feeeeb1f6db788d3fd1c5788a90aea015121c62ae6aa2697e490dd39bc1c67442ecd1bae9a6cdec8162bd389b72b0cf35f75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/vi/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/vi/firefox-59.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "84cbcb02d41dab03ce9c35c9de44a73f06255fab65f5d5f3fceab968e6162add3c9fc2b6694559107625e1a9e429ab974223806899bd5fe47c9d87b38ceaf68d"; + sha512 = "d507fdbfdfde7eea5139ede5528d343bc4e993268d92f710c6bce409eb1c983ed83e2b97630b982fa525eceb020a34e7b4f63f3764fea11d3b0e8f95ce25e04f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/xh/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/xh/firefox-59.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "90648cc26f600e52b46e4e6ea2fad93550a904d762300ca3167c46a10d16c7148aa88ab807165928e6a15b91b21528b503b017d87e084386bc102574932b1326"; + sha512 = "1eec3a1e2a4d64c4f28e1145f1ea76b477bcd12e394c1bb6f9e776ef3d8fa288d7daf377945b84189f6d6def6725d4b176db54bb4132ddbb63ad20ba8227aab5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/zh-CN/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/zh-CN/firefox-59.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "33efcd6f165827b951c0e4e05fbd24a759ba4405f7148c7b78481bbc02edc87d6bcdd31c7c7acde88da8660c9178687878ef2f3a2362fec2c037f244efc335ff"; + sha512 = "7e9ca87faad561adacc86fc89fde2d16d4e68f07e88bea28bca692244045664c888c6d8ebfd8aa4d29e9c2b368dc7d5706d3f622ec720f9e5e5ef9529722f3b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/zh-TW/firefox-59.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/zh-TW/firefox-59.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e2dc8c395b5a5aed89e3231bde24550f8f6f964b02a5fbebfd199c8263aaf79e6d4cd28808be61ff65ffa281418585f066986c49c6ab94708a28d470031935ad"; + sha512 = "e9a95b406bf91651c8efb22ea569a5e2bf056a18ae7fb9a2bd472416b1e26100b3fb1fa9132cf1b96c228b585c30e3f158ffae1ef8dd272408afffa4283a18d1"; } ]; } From 0ef512fe7a24d12af7312b4877c5730ff89f2e2f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 30 Jan 2018 00:45:50 -0800 Subject: [PATCH 425/797] ditaa: 0.9 -> 0.11 (adds --svg support) --- pkgs/tools/graphics/ditaa/default.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index 56c1c976362..c8c330d80e5 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -1,27 +1,20 @@ -{ stdenv, fetchurl, unzip, jre }: +{ stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "ditaa-0.9"; + name = "ditaa-0.11.0"; src = fetchurl { - name = "${name}.zip"; - url = "mirror://sourceforge/project/ditaa/ditaa/0.9/ditaa0_9.zip"; - sha256 = "12g6k3hacvyw3s9pijli7vfnkspyp37qkr29qgbmq1hbp0ryk2fn"; + url = https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar; + sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l"; }; - buildInputs = [ unzip ]; - phases = [ "installPhase" ]; installPhase = '' - unzip "$src" - mkdir -p "$out/bin" mkdir -p "$out/lib" - mkdir -p "$out/share/ditaa" - cp dita*.jar "$out/lib/ditaa.jar" - cp COPYING HISTORY "$out/share/ditaa" + cp ${src} "$out/lib/ditaa.jar" cat > "$out/bin/ditaa" << EOF #!${stdenv.shell} @@ -33,8 +26,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert ascii art diagrams into proper bitmap graphics"; - homepage = http://ditaa.sourceforge.net/; - license = licenses.gpl2; + homepage = https://github.com/stathissideris/ditaa; + license = licenses.lgpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; From 6b834384f669a16008fdc6886e235939af206bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 15 Jan 2018 08:17:50 +0100 Subject: [PATCH 426/797] bitscope: create derivations with version info So far the store paths produced by the bitscope derivations have been version-less. Fix it. --- pkgs/applications/science/electronics/bitscope/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 90bf4dc840d..e1db7131a65 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -65,6 +65,6 @@ let runScript = target; }; in buildFHSUserEnv { - name = attrs.toolName; + name = "${attrs.toolName}-${attrs.version}"; runScript = "${pkg.outPath}/bin/${attrs.toolName}"; } // { inherit (pkg) meta name; } From be40296afe63c582e4ec1643e7b372a2e2862b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 3 Feb 2018 21:24:50 +0100 Subject: [PATCH 427/797] qmmp: 1.1.10 -> 1.2.0 Fixes build failure since recent merge of staging branch: $ nix-build -A qmmp [...] AutoMoc error ------------- Included moc files with the same name will be generated from different sources. Consider to - not include the "moc_.cpp" file - add a directory prefix to a ".moc" include (e.g "sub/.moc") - rename the source file(s) Include conflicts ----------------- "moc_hotkeymanager.cpp" included in - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager_win.cpp" - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager_x11.cpp" would be generated from - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager.h" - "/tmp/nix-build-qmmp-1.1.10.drv-0/qmmp-1.1.10/src/plugins/General/hotkey/hotkeymanager.h" make[2]: *** [src/plugins/General/hotkey/CMakeFiles/hotkey_autogen.dir/build.make:58: src/plugins/General/hotkey/CMakeFiles/hotkey_autogen] Error 1 --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 77c82f1737c..6b816cdeec1 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.1.10"; + name = "qmmp-1.2.0"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "16hb3s48filq0q18m7x9vmhpirk4fh0aqj8kwbapv8mkcnzq2mqy"; + sha256 = "17kci7srgbkk62dgxlmg3lv2y7z04jsinpgx6jmxjpnpblpcj840"; }; buildInputs = From e193d8674bc9c0a6ddea311f6d0a50b851747e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 3 Feb 2018 20:47:18 +0100 Subject: [PATCH 428/797] astyle: 2.05.1 -> 3.1 --- pkgs/development/tools/misc/astyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 9aea3510432..e66d92e34d6 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,14 +2,14 @@ let name = "astyle"; - version = "2.05.1"; + version = "3.1"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz"; - sha256 = "1b0f4wm1qmgcswmixv9mwbp86hbdqxk754hml8cjv5vajvqwdpzv"; + sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"; }; sourceRoot = if stdenv.cc.isClang From 32d4b018a7a7cb9b20b0f3cb5384c61670d0eae5 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Sat, 3 Feb 2018 22:52:20 +0100 Subject: [PATCH 429/797] grobi: init at 0.3.0 --- pkgs/tools/X11/grobi/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/X11/grobi/default.nix diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix new file mode 100644 index 00000000000..42f3bbdb019 --- /dev/null +++ b/pkgs/tools/X11/grobi/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + version = "0.3.0"; + name = "grobi-${version}"; + + goPackagePath = "github.com/fd0/grobi"; + + src = fetchFromGitHub { + rev = "78a0639ffad765933a5233a1c94d2626e24277b8"; + owner = "fd0"; + repo = "grobi"; + sha256 = "16q7vnhb1p6ds561832sfdszvlafww67bjn3lc0d18v7lyak2l3i"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/fd0/grobi; + description = "Automatically configure monitors/outputs for Xorg via RANDR"; + license = with licenses; [ bsd2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3462be10bfe..a16fc06b66a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1191,6 +1191,8 @@ with pkgs; gringo = callPackage ../tools/misc/gringo { scons = scons_2_5_1; }; + grobi = callPackage ../tools/X11/grobi { }; + gti = callPackage ../tools/misc/gti { }; heatseeker = callPackage ../tools/misc/heatseeker { }; From 88c16a63c6e4355f1e7f78e1727f19a1c8eabee0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Feb 2018 23:04:30 +0100 Subject: [PATCH 430/797] nvme-cli: 1.4 -> 1.5 --- pkgs/os-specific/linux/nvme-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 7912c67aa0b..044479c5629 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nvme-cli-${version}"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "00jrr1mya9wkapiapph3nch3kpqas6vlc8kl8dbrjjfb5hg35gqf"; + sha256 = "1nl5hl5am8djwmrw1xxnd9ahp7kyzyj0yh1nxgmx43pn3d61n0vz"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; From 411cd15e59583dd6f1519ae9848f11f43ed5bd89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2018 23:22:26 +0100 Subject: [PATCH 431/797] python3Packages.luftdaten: init at 0.1.4 --- .../python-modules/luftdaten/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/luftdaten/default.nix diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix new file mode 100644 index 00000000000..dc40101284c --- /dev/null +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, isPy3k, fetchPypi, aiohttp, async-timeout }: + +buildPythonPackage rec { + pname = "luftdaten"; + version = "0.1.4"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "d3e3af830ad2b731c36af223bbb5d47d68aa3786b2965411216917a7381e1179"; + }; + + propagatedBuildInputs = [ aiohttp async-timeout ]; + + # No tests implemented + doCheck = false; + + meta = with lib; { + description = "Python API for interacting with luftdaten.info"; + homepage = https://github.com/fabaff/python-luftdaten; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c697f3449d4..ef7dc591352 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5624,6 +5624,8 @@ in { }; }; + luftdaten = callPackage ../development/python-modules/luftdaten { }; + m2r = callPackage ../development/python-modules/m2r { }; mailchimp = buildPythonPackage rec { From 8f20e7ce3a5b1972c316345f594cdc0243bc178c Mon Sep 17 00:00:00 2001 From: "pe@pijul.org" Date: Sun, 28 Jan 2018 20:29:09 +0100 Subject: [PATCH 432/797] carnix: 0.6.0 -> 0.6.5 --- doc/languages-frameworks/rust.md | 100 +- pkgs/build-support/rust/carnix.nix | 1559 ++++++++++++++++------------ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 966 insertions(+), 699 deletions(-) diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index aa6a7d65410..d3a25e9d135 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -79,19 +79,24 @@ an example for a minimal `hello` crate: Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: ``` -with import {}; +# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone +{ lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; # ... (content skipped) - hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hello"; - version = "0.1.0"; - authors = [ "Authorname " ]; - src = ./.; - inherit dependencies buildDependencies features; - }; in rec { - hello_0_1_0 = hello_0_1_0_ rec {}; + hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "pe@pijul.org " ]; + src = ./.; + inherit dependencies buildDependencies features; + }; + hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ {}; + hello_0_1_0_features = f: updateFeatures f (rec { + hello_0_1_0.default = (f.hello_0_1_0.default or true); + }) [ ]; } ``` @@ -103,33 +108,44 @@ dependencies, for instance by adding a single line `libc="*"` to our following nix file: ``` -with import {}; +# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone +{ lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; # ... (content skipped) - hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hello"; - version = "0.1.0"; - authors = [ "Jörg Thalheim " ]; - src = ./.; - inherit dependencies buildDependencies features; - }; - libc_0_2_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.34"; - authors = [ "The Rust Project Developers" ]; - sha256 = "11jmqdxmv0ka10ay0l8nzx0nl7s2lc3dbrnh1mgbr2grzwdyxi2s"; - inherit dependencies buildDependencies features; - }; in rec { - hello_0_1_0 = hello_0_1_0_ rec { - dependencies = [ libc_0_2_34 ]; + hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; }; + hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "hello"; + version = "0.1.0"; + authors = [ "pe@pijul.org " ]; + src = ./.; + inherit dependencies buildDependencies features; }; - libc_0_2_34_features."default".from_hello_0_1_0__default = true; - libc_0_2_34 = libc_0_2_34_ rec { - features = mkFeatures libc_0_2_34_features; + libc_0_2_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.36"; + authors = [ "The Rust Project Developers" ]; + sha256 = "01633h4yfqm0s302fm0dlba469bx8y6cs4nqc8bqrmjqxfxn515l"; + inherit dependencies buildDependencies features; }; - libc_0_2_34_features."use_std".self_default = hasDefault libc_0_2_34_features; + hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ { + dependencies = mapFeatures features ([ libc_0_2_36 ]); + }; + hello_0_1_0_features = f: updateFeatures f (rec { + hello_0_1_0.default = (f.hello_0_1_0.default or true); + libc_0_2_36.default = true; + }) [ libc_0_2_36_features ]; + libc_0_2_36 = { features?(libc_0_2_36_features {}) }: libc_0_2_36_ { + features = mkFeatures (features.libc_0_2_36 or {}); + }; + libc_0_2_36_features = f: updateFeatures f (rec { + libc_0_2_36.default = (f.libc_0_2_36.default or true); + libc_0_2_36.use_std = + (f.libc_0_2_36.use_std or false) || + (f.libc_0_2_36.default or false) || + (libc_0_2_36.default or false); + }) []; } ``` @@ -146,7 +162,7 @@ or build inputs by overriding the hello crate in a seperate file. ``` with import {}; -(import ./hello.nix).hello_0_1_0.override { +((import ./hello.nix).hello {}).override { crateOverrides = defaultCrateOverrides // { hello = attrs: { buildInputs = [ openssl ]; }; }; @@ -166,7 +182,7 @@ patches the derivation: ``` with import {}; -(import ./hello.nix).hello_0_1_0.override { +((import ./hello.nix).hello {}).override { crateOverrides = defaultCrateOverrides // { hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { postPatch = '' @@ -187,7 +203,7 @@ crate, we could do: ``` with import {}; -(import hello.nix).hello_0_1_0.override { +((import hello.nix).hello {}).override { crateOverrides = defaultCrateOverrides // { libc = attrs: { buildInputs = []; }; }; @@ -199,23 +215,35 @@ Three more parameters can be overridden: - The version of rustc used to compile the crate: ``` - hello_0_1_0.override { rust = pkgs.rust; }; + (hello {}).override { rust = pkgs.rust; }; ``` - Whether to build in release mode or debug mode (release mode by default): ``` - hello_0_1_0.override { release = false; }; + (hello {}).override { release = false; }; ``` - Whether to print the commands sent to rustc when building (equivalent to `--verbose` in cargo: ``` - hello_0_1_0.override { verbose = false; }; + (hello {}).override { verbose = false; }; ``` +One can also supply features switches. For example, if we want to +compile `diesel_cli` only with the `postgres` feature, and no default +features, we would write: + +``` +(callPackage ./diesel.nix {}).diesel { + default = false; + postgres = true; +} +``` + + ## Using the Rust nightlies overlay diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index 1457832c928..8b0af499c8f 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,27 +1,24 @@ -# Generated by carnix 0.6.0: carnix -o carnix.nix --src ./. Cargo.lock +# Generated by carnix 0.6.5: carnix -o carnix.nix Cargo.lock --src ./. { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; - hasFeature = feature: - lib.lists.any - (originName: feature.${originName}) - (builtins.attrNames feature); - include = includedFiles: src: builtins.filterSource (path: type: lib.lists.any (f: let p = toString (src + ("/" + f)); in (path == p) || (type == "directory" && lib.strings.hasPrefix path p) ) includedFiles ) src; - + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: - if featureName != "" && hasFeature feat.${featureName} then + if feat.${featureName} or false then [ featureName ] ++ features else features - ) (if hasFeature (feat.default or {}) then [ "default" ] else []) (builtins.attrNames feat); + ) [] (builtins.attrNames feat); in rec { + carnix = f: carnix_0_6_5 { features = carnix_0_6_5_features { carnix_0_6_5 = f; }; }; aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "aho-corasick"; version = "0.6.3"; @@ -74,11 +71,11 @@ rec { sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; inherit dependencies buildDependencies features; }; - carnix_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + carnix_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "carnix"; - version = "0.6.0"; + version = "0.6.5"; authors = [ "pe@pijul.org " ]; - src = include [ "Cargo.toml" "src/main.rs" "src/cache.rs" "src/cfg.rs" "src/krate/mod.rs" "src/krate/prefetch.rs" ] ./.; + sha256 = "0r952s5az5mhw7z2r421i5lr0w5h436hah61md2bdb3204c2pl9c"; inherit dependencies buildDependencies features; }; cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -95,6 +92,13 @@ rec { sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; inherit dependencies buildDependencies features; }; + chrono_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "chrono"; + version = "0.4.0"; + authors = [ "Kang Seonghoon " ]; + sha256 = "0hm53hi6v7b6b1va6vn96lx26wvj8gzi2g51s1j02nlz0jcprw6a"; + inherit dependencies buildDependencies features; + }; clap_2_28_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "clap"; version = "2.28.0"; @@ -125,11 +129,11 @@ rec { sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37"; inherit dependencies buildDependencies features; }; - env_logger_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + env_logger_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "env_logger"; - version = "0.4.3"; + version = "0.5.3"; authors = [ "The Rust Project Developers" ]; - sha256 = "0nrx04p4xa86d5kc7aq4fwvipbqji9cmgy449h47nc9f1chafhgg"; + sha256 = "1i7jyxrwwv3w2h200ynq3fjg1iyyvi76ny215hi6d334vkkw2s2y"; inherit dependencies buildDependencies features; }; error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -205,11 +209,11 @@ rec { sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; inherit dependencies buildDependencies features; }; - log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + log_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "log"; - version = "0.3.8"; + version = "0.4.1"; authors = [ "The Rust Project Developers" ]; - sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; + sha256 = "01vm8yy3wngvyj6qp1x3xpcb4xq7v67yn9l7fsma8kz28mliz90d"; inherit dependencies buildDependencies features; }; lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -233,6 +237,27 @@ rec { sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; inherit dependencies buildDependencies features; }; + num_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0b29c25n9mpf6a921khj7a6y3hz5va4vgwppcd2if975qq1shakg"; + inherit dependencies buildDependencies features; + }; + num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.35"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc"; + inherit dependencies buildDependencies features; + }; + num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9"; + inherit dependencies buildDependencies features; + }; num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "num-traits"; version = "0.1.40"; @@ -362,6 +387,13 @@ rec { sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz"; inherit dependencies buildDependencies features; }; + termcolor_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termcolor"; + version = "0.3.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1rb853jzvkbwm62373dhls4x4r3r5cvfcsxvqh0i75rhx5j8kwsz"; + inherit dependencies buildDependencies features; + }; termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "termion"; version = "1.5.1"; @@ -461,690 +493,901 @@ rec { libName = "build"; inherit dependencies buildDependencies features; }; - aho_corasick_0_6_3 = f: aho_corasick_0_6_3_ rec { - dependencies = [ (memchr_1_0_2 f) ]; + wincolor_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wincolor"; + version = "0.1.4"; + authors = [ "Andrew Gallant " ]; + sha256 = "0cxv6hadnj5vffb8a73y7055p59n20bpqd524df85cm29dcjl38a"; + inherit dependencies buildDependencies features; }; - aho_corasick_0_6_3_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - memchr_1_0_2.default.from_aho_corasick_0_6_3__default_ = true; - })) - [ memchr_1_0_2_features ]; - ansi_term_0_10_2 = f: ansi_term_0_10_2_ rec {}; - ansi_term_0_10_2_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - atty_0_2_3 = f: atty_0_2_3_ rec { - dependencies = (if kernel == "redox" then [ (termion_1_5_1 f) ] else []) - ++ (if (kernel == "linux" || kernel == "darwin") then [ (libc_0_2_33 f) ] else []) - ++ (if kernel == "windows" then [ (kernel32_sys_0_2_2 f) (winapi_0_2_8 f) ] else []); + aho_corasick_0_6_3 = { features?(aho_corasick_0_6_3_features {}) }: aho_corasick_0_6_3_ { + dependencies = mapFeatures features ([ memchr_1_0_2 ]); }; - atty_0_2_3_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - kernel32_sys_0_2_2.default.from_atty_0_2_3__default_ = true; - libc_0_2_33.default.from_atty_0_2_3__default_ = false; - termion_1_5_1.default.from_atty_0_2_3__default_ = true; - winapi_0_2_8.default.from_atty_0_2_3__default_ = true; - })) - [ termion_1_5_1_features libc_0_2_33_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; - backtrace_0_3_4 = f: backtrace_0_3_4_ rec { - dependencies = [ (cfg_if_0_1_2 f) (rustc_demangle_0_1_5 f) ] - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then [ ] - ++ (if hasFeature (f.backtrace_0_3_4."backtrace-sys" or {}) then [(backtrace_sys_0_1_16 f)] else []) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then [ (libc_0_2_33 f) ] else []) - ++ (if kernel == "windows" then [ ] - ++ (if hasFeature (f.backtrace_0_3_4."dbghelp-sys" or {}) then [(dbghelp_sys_0_2_0 f)] else []) - ++ (if hasFeature (f.backtrace_0_3_4."kernel32-sys" or {}) then [(kernel32_sys_0_2_2 f)] else []) - ++ (if hasFeature (f.backtrace_0_3_4."winapi" or {}) then [(winapi_0_2_8 f)] else []) else []); - features = mkFeatures (f.backtrace_0_3_4 or {}); + aho_corasick_0_6_3_features = f: updateFeatures f (rec { + aho_corasick_0_6_3.default = (f.aho_corasick_0_6_3.default or true); + memchr_1_0_2.default = true; + }) [ memchr_1_0_2_features ]; + ansi_term_0_10_2 = { features?(ansi_term_0_10_2_features {}) }: ansi_term_0_10_2_ {}; + ansi_term_0_10_2_features = f: updateFeatures f (rec { + ansi_term_0_10_2.default = (f.ansi_term_0_10_2.default or true); + }) []; + atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ { + dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_33 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - backtrace_0_3_4_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - backtrace_0_3_4."kernel32-sys".self_dbghelp = hasFeature (backtrace_0_3_4."dbghelp" or {}) || hasFeature (features.backtrace_0_3_4."dbghelp" or {}); - backtrace_0_3_4."winapi".self_dbghelp = hasFeature (backtrace_0_3_4."dbghelp" or {}) || hasFeature (features.backtrace_0_3_4."dbghelp" or {}); - backtrace_0_3_4."dbghelp-sys".self_dbghelp = hasFeature (backtrace_0_3_4."dbghelp" or {}) || hasFeature (features.backtrace_0_3_4."dbghelp" or {}); - backtrace_0_3_4."libunwind".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); - backtrace_0_3_4."libbacktrace".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); - backtrace_0_3_4."coresymbolication".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); - backtrace_0_3_4."dladdr".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); - backtrace_0_3_4."dbghelp".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); - backtrace_0_3_4."addr2line".self_gimli-symbolize = hasFeature (backtrace_0_3_4."gimli-symbolize" or {}) || hasFeature (features.backtrace_0_3_4."gimli-symbolize" or {}); - backtrace_0_3_4."findshlibs".self_gimli-symbolize = hasFeature (backtrace_0_3_4."gimli-symbolize" or {}) || hasFeature (features.backtrace_0_3_4."gimli-symbolize" or {}); - backtrace_0_3_4."backtrace-sys".self_libbacktrace = hasFeature (backtrace_0_3_4."libbacktrace" or {}) || hasFeature (features.backtrace_0_3_4."libbacktrace" or {}); - backtrace_0_3_4."rustc-serialize".self_serialize-rustc = hasFeature (backtrace_0_3_4."serialize-rustc" or {}) || hasFeature (features.backtrace_0_3_4."serialize-rustc" or {}); - backtrace_0_3_4."serde".self_serialize-serde = hasFeature (backtrace_0_3_4."serialize-serde" or {}) || hasFeature (features.backtrace_0_3_4."serialize-serde" or {}); - backtrace_0_3_4."serde_derive".self_serialize-serde = hasFeature (backtrace_0_3_4."serialize-serde" or {}) || hasFeature (features.backtrace_0_3_4."serialize-serde" or {}); - backtrace_sys_0_1_16.default.from_backtrace_0_3_4__default_ = true; - cfg_if_0_1_2.default.from_backtrace_0_3_4__default_ = true; - dbghelp_sys_0_2_0.default.from_backtrace_0_3_4__default_ = true; - kernel32_sys_0_2_2.default.from_backtrace_0_3_4__default_ = true; - libc_0_2_33.default.from_backtrace_0_3_4__default_ = true; - rustc_demangle_0_1_5.default.from_backtrace_0_3_4__default_ = true; - winapi_0_2_8.default.from_backtrace_0_3_4__default_ = true; - })) - [ cfg_if_0_1_2_features rustc_demangle_0_1_5_features backtrace_sys_0_1_16_features libc_0_2_33_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; - backtrace_sys_0_1_16 = f: backtrace_sys_0_1_16_ rec { - dependencies = [ (libc_0_2_33 f) ]; - buildDependencies = [ (cc_1_0_3 f) ]; + atty_0_2_3_features = f: updateFeatures f (rec { + atty_0_2_3.default = (f.atty_0_2_3.default or true); + kernel32_sys_0_2_2.default = true; + libc_0_2_33.default = (f.libc_0_2_33.default or false); + termion_1_5_1.default = true; + winapi_0_2_8.default = true; + }) [ termion_1_5_1_features libc_0_2_33_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + backtrace_0_3_4 = { features?(backtrace_0_3_4_features {}) }: backtrace_0_3_4_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_5 ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] + ++ (if features.backtrace_0_3_4.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_33 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ ] + ++ (if features.backtrace_0_3_4.dbghelp-sys or false then [ dbghelp_sys_0_2_0 ] else []) + ++ (if features.backtrace_0_3_4.kernel32-sys or false then [ kernel32_sys_0_2_2 ] else []) + ++ (if features.backtrace_0_3_4.winapi or false then [ winapi_0_2_8 ] else [])) else []); + features = mkFeatures (features.backtrace_0_3_4 or {}); }; - backtrace_sys_0_1_16_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - cc_1_0_3.default.from_backtrace_sys_0_1_16__default_ = true; - libc_0_2_33.default.from_backtrace_sys_0_1_16__default_ = true; - })) - [ libc_0_2_33_features cc_1_0_3_features ]; - bitflags_0_7_0 = f: bitflags_0_7_0_ rec {}; - bitflags_0_7_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - bitflags_1_0_1 = f: bitflags_1_0_1_ rec { - features = mkFeatures (f.bitflags_1_0_1 or {}); + backtrace_0_3_4_features = f: updateFeatures f (rec { + backtrace_0_3_4.addr2line = + (f.backtrace_0_3_4.addr2line or false) || + (f.backtrace_0_3_4.gimli-symbolize or false) || + (backtrace_0_3_4.gimli-symbolize or false); + backtrace_0_3_4.backtrace-sys = + (f.backtrace_0_3_4.backtrace-sys or false) || + (f.backtrace_0_3_4.libbacktrace or false) || + (backtrace_0_3_4.libbacktrace or false); + backtrace_0_3_4.coresymbolication = + (f.backtrace_0_3_4.coresymbolication or false) || + (f.backtrace_0_3_4.default or false) || + (backtrace_0_3_4.default or false); + backtrace_0_3_4.dbghelp = + (f.backtrace_0_3_4.dbghelp or false) || + (f.backtrace_0_3_4.default or false) || + (backtrace_0_3_4.default or false); + backtrace_0_3_4.dbghelp-sys = + (f.backtrace_0_3_4.dbghelp-sys or false) || + (f.backtrace_0_3_4.dbghelp or false) || + (backtrace_0_3_4.dbghelp or false); + backtrace_0_3_4.default = (f.backtrace_0_3_4.default or true); + backtrace_0_3_4.dladdr = + (f.backtrace_0_3_4.dladdr or false) || + (f.backtrace_0_3_4.default or false) || + (backtrace_0_3_4.default or false); + backtrace_0_3_4.findshlibs = + (f.backtrace_0_3_4.findshlibs or false) || + (f.backtrace_0_3_4.gimli-symbolize or false) || + (backtrace_0_3_4.gimli-symbolize or false); + backtrace_0_3_4.kernel32-sys = + (f.backtrace_0_3_4.kernel32-sys or false) || + (f.backtrace_0_3_4.dbghelp or false) || + (backtrace_0_3_4.dbghelp or false); + backtrace_0_3_4.libbacktrace = + (f.backtrace_0_3_4.libbacktrace or false) || + (f.backtrace_0_3_4.default or false) || + (backtrace_0_3_4.default or false); + backtrace_0_3_4.libunwind = + (f.backtrace_0_3_4.libunwind or false) || + (f.backtrace_0_3_4.default or false) || + (backtrace_0_3_4.default or false); + backtrace_0_3_4.rustc-serialize = + (f.backtrace_0_3_4.rustc-serialize or false) || + (f.backtrace_0_3_4.serialize-rustc or false) || + (backtrace_0_3_4.serialize-rustc or false); + backtrace_0_3_4.serde = + (f.backtrace_0_3_4.serde or false) || + (f.backtrace_0_3_4.serialize-serde or false) || + (backtrace_0_3_4.serialize-serde or false); + backtrace_0_3_4.serde_derive = + (f.backtrace_0_3_4.serde_derive or false) || + (f.backtrace_0_3_4.serialize-serde or false) || + (backtrace_0_3_4.serialize-serde or false); + backtrace_0_3_4.winapi = + (f.backtrace_0_3_4.winapi or false) || + (f.backtrace_0_3_4.dbghelp or false) || + (backtrace_0_3_4.dbghelp or false); + backtrace_sys_0_1_16.default = true; + cfg_if_0_1_2.default = true; + dbghelp_sys_0_2_0.default = true; + kernel32_sys_0_2_2.default = true; + libc_0_2_33.default = true; + rustc_demangle_0_1_5.default = true; + winapi_0_2_8.default = true; + }) [ cfg_if_0_1_2_features rustc_demangle_0_1_5_features backtrace_sys_0_1_16_features libc_0_2_33_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ { + dependencies = mapFeatures features ([ libc_0_2_33 ]); + buildDependencies = mapFeatures features ([ cc_1_0_3 ]); }; - bitflags_1_0_1_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - bitflags_1_0_1."example_generated".self_default = hasFeature (bitflags_1_0_1.default or {}) || hasFeature (features.bitflags_1_0_1.default or {}); - })) - [ ]; - carnix_0_6_0 = f: carnix_0_6_0_ rec { - dependencies = [ (clap_2_28_0 f) (env_logger_0_4_3 f) (error_chain_0_11_0 f) (itertools_0_7_3 f) (log_0_3_8 f) (nom_3_2_1 f) (regex_0_2_2 f) (rusqlite_0_13_0 f) (serde_1_0_21 f) (serde_derive_1_0_21 f) (serde_json_1_0_6 f) (tempdir_0_3_5 f) (toml_0_4_5 f) ]; + backtrace_sys_0_1_16_features = f: updateFeatures f (rec { + backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true); + cc_1_0_3.default = true; + libc_0_2_33.default = true; + }) [ libc_0_2_33_features cc_1_0_3_features ]; + bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; + bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); + }) []; + bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ { + features = mkFeatures (features.bitflags_1_0_1 or {}); }; - carnix_0_6_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - clap_2_28_0.default.from_carnix_0_6_0__default_ = true; - env_logger_0_4_3.default.from_carnix_0_6_0__default_ = true; - error_chain_0_11_0.default.from_carnix_0_6_0__default_ = true; - itertools_0_7_3.default.from_carnix_0_6_0__default_ = true; - log_0_3_8.default.from_carnix_0_6_0__default_ = true; - nom_3_2_1.default.from_carnix_0_6_0__default_ = true; - regex_0_2_2.default.from_carnix_0_6_0__default_ = true; - rusqlite_0_13_0.default.from_carnix_0_6_0__default_ = true; - serde_1_0_21.default.from_carnix_0_6_0__default_ = true; - serde_derive_1_0_21.default.from_carnix_0_6_0__default_ = true; - serde_json_1_0_6.default.from_carnix_0_6_0__default_ = true; - tempdir_0_3_5.default.from_carnix_0_6_0__default_ = true; - toml_0_4_5.default.from_carnix_0_6_0__default_ = true; - })) - [ clap_2_28_0_features env_logger_0_4_3_features error_chain_0_11_0_features itertools_0_7_3_features log_0_3_8_features nom_3_2_1_features regex_0_2_2_features rusqlite_0_13_0_features serde_1_0_21_features serde_derive_1_0_21_features serde_json_1_0_6_features tempdir_0_3_5_features toml_0_4_5_features ]; - cc_1_0_3 = f: cc_1_0_3_ rec { - dependencies = []; - features = mkFeatures (f.cc_1_0_3 or {}); + bitflags_1_0_1_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = (f.bitflags_1_0_1.default or true); + bitflags_1_0_1.example_generated = + (f.bitflags_1_0_1.example_generated or false) || + (f.bitflags_1_0_1.default or false) || + (bitflags_1_0_1.default or false); + }) []; + carnix_0_6_5 = { features?(carnix_0_6_5_features {}) }: carnix_0_6_5_ { + dependencies = mapFeatures features ([ clap_2_28_0 env_logger_0_5_3 error_chain_0_11_0 itertools_0_7_3 log_0_4_1 nom_3_2_1 regex_0_2_2 rusqlite_0_13_0 serde_1_0_21 serde_derive_1_0_21 serde_json_1_0_6 tempdir_0_3_5 toml_0_4_5 ]); }; - cc_1_0_3_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - cc_1_0_3."rayon".self_parallel = hasFeature (cc_1_0_3."parallel" or {}) || hasFeature (features.cc_1_0_3."parallel" or {}); - })) - [ ]; - cfg_if_0_1_2 = f: cfg_if_0_1_2_ rec {}; - cfg_if_0_1_2_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - clap_2_28_0 = f: clap_2_28_0_ rec { - dependencies = [ (bitflags_1_0_1 f) (textwrap_0_9_0 f) (unicode_width_0_1_4 f) ] - ++ (if hasFeature (f.clap_2_28_0."ansi_term" or {}) then [(ansi_term_0_10_2 f)] else []) - ++ (if hasFeature (f.clap_2_28_0."atty" or {}) then [(atty_0_2_3 f)] else []) - ++ (if hasFeature (f.clap_2_28_0."strsim" or {}) then [(strsim_0_6_0 f)] else []) - ++ (if hasFeature (f.clap_2_28_0."vec_map" or {}) then [(vec_map_0_8_0 f)] else []); - features = mkFeatures (f.clap_2_28_0 or {}); + carnix_0_6_5_features = f: updateFeatures f (rec { + carnix_0_6_5.default = (f.carnix_0_6_5.default or true); + clap_2_28_0.default = true; + env_logger_0_5_3.default = true; + error_chain_0_11_0.default = true; + itertools_0_7_3.default = true; + log_0_4_1.default = true; + nom_3_2_1.default = true; + regex_0_2_2.default = true; + rusqlite_0_13_0.default = true; + serde_1_0_21.default = true; + serde_derive_1_0_21.default = true; + serde_json_1_0_6.default = true; + tempdir_0_3_5.default = true; + toml_0_4_5.default = true; + }) [ clap_2_28_0_features env_logger_0_5_3_features error_chain_0_11_0_features itertools_0_7_3_features log_0_4_1_features nom_3_2_1_features regex_0_2_2_features rusqlite_0_13_0_features serde_1_0_21_features serde_derive_1_0_21_features serde_json_1_0_6_features tempdir_0_3_5_features toml_0_4_5_features ]; + cc_1_0_3 = { features?(cc_1_0_3_features {}) }: cc_1_0_3_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.cc_1_0_3 or {}); }; - clap_2_28_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - clap_2_28_0."ansi_term".self_color = hasFeature (clap_2_28_0."color" or {}) || hasFeature (features.clap_2_28_0."color" or {}); - clap_2_28_0."atty".self_color = hasFeature (clap_2_28_0."color" or {}) || hasFeature (features.clap_2_28_0."color" or {}); - clap_2_28_0."suggestions".self_default = hasFeature (clap_2_28_0.default or {}) || hasFeature (features.clap_2_28_0.default or {}); - clap_2_28_0."color".self_default = hasFeature (clap_2_28_0.default or {}) || hasFeature (features.clap_2_28_0.default or {}); - clap_2_28_0."vec_map".self_default = hasFeature (clap_2_28_0.default or {}) || hasFeature (features.clap_2_28_0.default or {}); - clap_2_28_0."yaml".self_doc = hasFeature (clap_2_28_0."doc" or {}) || hasFeature (features.clap_2_28_0."doc" or {}); - clap_2_28_0."clippy".self_lints = hasFeature (clap_2_28_0."lints" or {}) || hasFeature (features.clap_2_28_0."lints" or {}); - clap_2_28_0."strsim".self_suggestions = hasFeature (clap_2_28_0."suggestions" or {}) || hasFeature (features.clap_2_28_0."suggestions" or {}); - clap_2_28_0."term_size".self_wrap_help = hasFeature (clap_2_28_0."wrap_help" or {}) || hasFeature (features.clap_2_28_0."wrap_help" or {}); - clap_2_28_0."yaml-rust".self_yaml = hasFeature (clap_2_28_0."yaml" or {}) || hasFeature (features.clap_2_28_0."yaml" or {}); - textwrap_0_9_0."term_size".from_clap_2_28_0__term_size = hasFeature (clap_2_28_0."wrap_help" or {}) || hasFeature (features.clap_2_28_0."wrap_help" or {}); - ansi_term_0_10_2.default.from_clap_2_28_0__default_ = true; - atty_0_2_3.default.from_clap_2_28_0__default_ = true; - bitflags_1_0_1.default.from_clap_2_28_0__default_ = true; - strsim_0_6_0.default.from_clap_2_28_0__default_ = true; - textwrap_0_9_0.default.from_clap_2_28_0__default_ = true; - unicode_width_0_1_4.default.from_clap_2_28_0__default_ = true; - vec_map_0_8_0.default.from_clap_2_28_0__default_ = true; - })) - [ ansi_term_0_10_2_features atty_0_2_3_features bitflags_1_0_1_features strsim_0_6_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ]; - dbghelp_sys_0_2_0 = f: dbghelp_sys_0_2_0_ rec { - dependencies = [ (winapi_0_2_8 f) ]; - buildDependencies = [ (winapi_build_0_1_1 f) ]; + cc_1_0_3_features = f: updateFeatures f (rec { + cc_1_0_3.default = (f.cc_1_0_3.default or true); + cc_1_0_3.rayon = + (f.cc_1_0_3.rayon or false) || + (f.cc_1_0_3.parallel or false) || + (cc_1_0_3.parallel or false); + }) []; + cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; + cfg_if_0_1_2_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); + }) []; + chrono_0_4_0 = { features?(chrono_0_4_0_features {}) }: chrono_0_4_0_ { + dependencies = mapFeatures features ([ num_0_1_40 time_0_1_38 ]); }; - dbghelp_sys_0_2_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - winapi_0_2_8.default.from_dbghelp_sys_0_2_0__default_ = true; - winapi_build_0_1_1.default.from_dbghelp_sys_0_2_0__default_ = true; - })) - [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - dtoa_0_4_2 = f: dtoa_0_4_2_ rec {}; - dtoa_0_4_2_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - either_1_4_0 = f: either_1_4_0_ rec { - dependencies = []; - features = mkFeatures (f.either_1_4_0 or {}); + chrono_0_4_0_features = f: updateFeatures f (rec { + chrono_0_4_0.default = (f.chrono_0_4_0.default or true); + num_0_1_40.default = (f.num_0_1_40.default or false); + time_0_1_38.default = true; + }) [ num_0_1_40_features time_0_1_38_features ]; + clap_2_28_0 = { features?(clap_2_28_0_features {}) }: clap_2_28_0_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ] + ++ (if features.clap_2_28_0.ansi_term or false then [ ansi_term_0_10_2 ] else []) + ++ (if features.clap_2_28_0.atty or false then [ atty_0_2_3 ] else []) + ++ (if features.clap_2_28_0.strsim or false then [ strsim_0_6_0 ] else []) + ++ (if features.clap_2_28_0.vec_map or false then [ vec_map_0_8_0 ] else [])); + features = mkFeatures (features.clap_2_28_0 or {}); }; - either_1_4_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - either_1_4_0."use_std".self_default = hasFeature (either_1_4_0.default or {}) || hasFeature (features.either_1_4_0.default or {}); - })) - [ ]; - env_logger_0_4_3 = f: env_logger_0_4_3_ rec { - dependencies = [ (log_0_3_8 f) ] - ++ (if hasFeature (f.env_logger_0_4_3."regex" or {}) then [(regex_0_2_2 f)] else []); - features = mkFeatures (f.env_logger_0_4_3 or {}); + clap_2_28_0_features = f: updateFeatures f (rec { + ansi_term_0_10_2.default = true; + atty_0_2_3.default = true; + bitflags_1_0_1.default = true; + clap_2_28_0.ansi_term = + (f.clap_2_28_0.ansi_term or false) || + (f.clap_2_28_0.color or false) || + (clap_2_28_0.color or false); + clap_2_28_0.atty = + (f.clap_2_28_0.atty or false) || + (f.clap_2_28_0.color or false) || + (clap_2_28_0.color or false); + clap_2_28_0.clippy = + (f.clap_2_28_0.clippy or false) || + (f.clap_2_28_0.lints or false) || + (clap_2_28_0.lints or false); + clap_2_28_0.color = + (f.clap_2_28_0.color or false) || + (f.clap_2_28_0.default or false) || + (clap_2_28_0.default or false); + clap_2_28_0.default = (f.clap_2_28_0.default or true); + clap_2_28_0.strsim = + (f.clap_2_28_0.strsim or false) || + (f.clap_2_28_0.suggestions or false) || + (clap_2_28_0.suggestions or false); + clap_2_28_0.suggestions = + (f.clap_2_28_0.suggestions or false) || + (f.clap_2_28_0.default or false) || + (clap_2_28_0.default or false); + clap_2_28_0.term_size = + (f.clap_2_28_0.term_size or false) || + (f.clap_2_28_0.wrap_help or false) || + (clap_2_28_0.wrap_help or false); + clap_2_28_0.vec_map = + (f.clap_2_28_0.vec_map or false) || + (f.clap_2_28_0.default or false) || + (clap_2_28_0.default or false); + clap_2_28_0.yaml = + (f.clap_2_28_0.yaml or false) || + (f.clap_2_28_0.doc or false) || + (clap_2_28_0.doc or false); + clap_2_28_0.yaml-rust = + (f.clap_2_28_0.yaml-rust or false) || + (f.clap_2_28_0.yaml or false) || + (clap_2_28_0.yaml or false); + strsim_0_6_0.default = true; + textwrap_0_9_0.default = true; + textwrap_0_9_0.term_size = + (f.textwrap_0_9_0.term_size or false) || + (clap_2_28_0.wrap_help or false) || + (f.clap_2_28_0.wrap_help or false); + unicode_width_0_1_4.default = true; + vec_map_0_8_0.default = true; + }) [ ansi_term_0_10_2_features atty_0_2_3_features bitflags_1_0_1_features strsim_0_6_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ]; + dbghelp_sys_0_2_0 = { features?(dbghelp_sys_0_2_0_features {}) }: dbghelp_sys_0_2_0_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - env_logger_0_4_3_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - env_logger_0_4_3."regex".self_default = hasFeature (env_logger_0_4_3.default or {}) || hasFeature (features.env_logger_0_4_3.default or {}); - log_0_3_8.default.from_env_logger_0_4_3__default_ = true; - regex_0_2_2.default.from_env_logger_0_4_3__default_ = true; - })) - [ log_0_3_8_features regex_0_2_2_features ]; - error_chain_0_11_0 = f: error_chain_0_11_0_ rec { - dependencies = [ ] - ++ (if hasFeature (f.error_chain_0_11_0."backtrace" or {}) then [(backtrace_0_3_4 f)] else []); - features = mkFeatures (f.error_chain_0_11_0 or {}); + dbghelp_sys_0_2_0_features = f: updateFeatures f (rec { + dbghelp_sys_0_2_0.default = (f.dbghelp_sys_0_2_0.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; + dtoa_0_4_2_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); + }) []; + either_1_4_0 = { features?(either_1_4_0_features {}) }: either_1_4_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.either_1_4_0 or {}); }; - error_chain_0_11_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - error_chain_0_11_0."backtrace".self_default = hasFeature (error_chain_0_11_0.default or {}) || hasFeature (features.error_chain_0_11_0.default or {}); - error_chain_0_11_0."example_generated".self_default = hasFeature (error_chain_0_11_0.default or {}) || hasFeature (features.error_chain_0_11_0.default or {}); - backtrace_0_3_4.default.from_error_chain_0_11_0__default_ = true; - })) - [ backtrace_0_3_4_features ]; - fuchsia_zircon_0_2_1 = f: fuchsia_zircon_0_2_1_ rec { - dependencies = [ (fuchsia_zircon_sys_0_2_0 f) ]; + either_1_4_0_features = f: updateFeatures f (rec { + either_1_4_0.default = (f.either_1_4_0.default or true); + either_1_4_0.use_std = + (f.either_1_4_0.use_std or false) || + (f.either_1_4_0.default or false) || + (either_1_4_0.default or false); + }) []; + env_logger_0_5_3 = { features?(env_logger_0_5_3_features {}) }: env_logger_0_5_3_ { + dependencies = mapFeatures features ([ atty_0_2_3 chrono_0_4_0 log_0_4_1 termcolor_0_3_3 ] + ++ (if features.env_logger_0_5_3.regex or false then [ regex_0_2_2 ] else [])); + features = mkFeatures (features.env_logger_0_5_3 or {}); }; - fuchsia_zircon_0_2_1_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - fuchsia_zircon_sys_0_2_0.default.from_fuchsia_zircon_0_2_1__default_ = true; - })) - [ fuchsia_zircon_sys_0_2_0_features ]; - fuchsia_zircon_sys_0_2_0 = f: fuchsia_zircon_sys_0_2_0_ rec { - dependencies = [ (bitflags_0_7_0 f) ]; + env_logger_0_5_3_features = f: updateFeatures f (rec { + atty_0_2_3.default = true; + chrono_0_4_0.default = true; + env_logger_0_5_3.default = (f.env_logger_0_5_3.default or true); + env_logger_0_5_3.regex = + (f.env_logger_0_5_3.regex or false) || + (f.env_logger_0_5_3.default or false) || + (env_logger_0_5_3.default or false); + log_0_4_1.default = true; + log_0_4_1.std = true; + regex_0_2_2.default = true; + termcolor_0_3_3.default = true; + }) [ atty_0_2_3_features chrono_0_4_0_features log_0_4_1_features regex_0_2_2_features termcolor_0_3_3_features ]; + error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ { + dependencies = mapFeatures features ([ ] + ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_4 ] else [])); + features = mkFeatures (features.error_chain_0_11_0 or {}); }; - fuchsia_zircon_sys_0_2_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - bitflags_0_7_0.default.from_fuchsia_zircon_sys_0_2_0__default_ = true; - })) - [ bitflags_0_7_0_features ]; - itertools_0_7_3 = f: itertools_0_7_3_ rec { - dependencies = [ (either_1_4_0 f) ]; - features = mkFeatures (f.itertools_0_7_3 or {}); + error_chain_0_11_0_features = f: updateFeatures f (rec { + backtrace_0_3_4.default = true; + error_chain_0_11_0.backtrace = + (f.error_chain_0_11_0.backtrace or false) || + (f.error_chain_0_11_0.default or false) || + (error_chain_0_11_0.default or false); + error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true); + error_chain_0_11_0.example_generated = + (f.error_chain_0_11_0.example_generated or false) || + (f.error_chain_0_11_0.default or false) || + (error_chain_0_11_0.default or false); + }) [ backtrace_0_3_4_features ]; + fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ { + dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]); }; - itertools_0_7_3_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - itertools_0_7_3."use_std".self_default = hasFeature (itertools_0_7_3.default or {}) || hasFeature (features.itertools_0_7_3.default or {}); - either_1_4_0.default.from_itertools_0_7_3__default_ = false; - })) - [ either_1_4_0_features ]; - itoa_0_3_4 = f: itoa_0_3_4_ rec { - features = mkFeatures (f.itoa_0_3_4 or {}); + fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec { + fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true); + fuchsia_zircon_sys_0_2_0.default = true; + }) [ fuchsia_zircon_sys_0_2_0_features ]; + fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 ]); }; - itoa_0_3_4_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - kernel32_sys_0_2_2 = f: kernel32_sys_0_2_2_ rec { - dependencies = [ (winapi_0_2_8 f) ]; - buildDependencies = [ (winapi_build_0_1_1 f) ]; + fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true); + }) [ bitflags_0_7_0_features ]; + itertools_0_7_3 = { features?(itertools_0_7_3_features {}) }: itertools_0_7_3_ { + dependencies = mapFeatures features ([ either_1_4_0 ]); + features = mkFeatures (features.itertools_0_7_3 or {}); }; - kernel32_sys_0_2_2_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - winapi_0_2_8.default.from_kernel32_sys_0_2_2__default_ = true; - winapi_build_0_1_1.default.from_kernel32_sys_0_2_2__default_ = true; - })) - [ winapi_0_2_8_features winapi_build_0_1_1_features ]; - lazy_static_0_2_11 = f: lazy_static_0_2_11_ rec { - dependencies = []; - features = mkFeatures (f.lazy_static_0_2_11 or {}); + itertools_0_7_3_features = f: updateFeatures f (rec { + either_1_4_0.default = (f.either_1_4_0.default or false); + itertools_0_7_3.default = (f.itertools_0_7_3.default or true); + itertools_0_7_3.use_std = + (f.itertools_0_7_3.use_std or false) || + (f.itertools_0_7_3.default or false) || + (itertools_0_7_3.default or false); + }) [ either_1_4_0_features ]; + itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ { + features = mkFeatures (features.itoa_0_3_4 or {}); }; - lazy_static_0_2_11_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - lazy_static_0_2_11."compiletest_rs".self_compiletest = hasFeature (lazy_static_0_2_11."compiletest" or {}) || hasFeature (features.lazy_static_0_2_11."compiletest" or {}); - lazy_static_0_2_11."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_11."spin_no_std" or {}) || hasFeature (features.lazy_static_0_2_11."spin_no_std" or {}); - lazy_static_0_2_11."spin".self_spin_no_std = hasFeature (lazy_static_0_2_11."spin_no_std" or {}) || hasFeature (features.lazy_static_0_2_11."spin_no_std" or {}); - })) - [ ]; - libc_0_2_33 = f: libc_0_2_33_ rec { - features = mkFeatures (f.libc_0_2_33 or {}); + itoa_0_3_4_features = f: updateFeatures f (rec { + itoa_0_3_4.default = (f.itoa_0_3_4.default or true); + }) []; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); }; - libc_0_2_33_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - libc_0_2_33."use_std".self_default = hasFeature (libc_0_2_33.default or {}) || hasFeature (features.libc_0_2_33.default or {}); - })) - [ ]; - libsqlite3_sys_0_9_0 = f: libsqlite3_sys_0_9_0_ rec { - dependencies = (if abi == "msvc" then [] else []); - buildDependencies = [ ] - ++ (if hasFeature (f.libsqlite3_sys_0_9_0."pkg-config" or {}) then [(pkg_config_0_3_9 f)] else []); - features = mkFeatures (f.libsqlite3_sys_0_9_0 or {}); + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_11 or {}); }; - libsqlite3_sys_0_9_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - libsqlite3_sys_0_9_0."bindgen".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0."buildtime_bindgen" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."buildtime_bindgen" or {}); - libsqlite3_sys_0_9_0."pkg-config".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0."buildtime_bindgen" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."buildtime_bindgen" or {}); - libsqlite3_sys_0_9_0."vcpkg".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0."buildtime_bindgen" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."buildtime_bindgen" or {}); - libsqlite3_sys_0_9_0."cc".self_bundled = hasFeature (libsqlite3_sys_0_9_0."bundled" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."bundled" or {}); - libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8".self_default = hasFeature (libsqlite3_sys_0_9_0.default or {}) || hasFeature (features.libsqlite3_sys_0_9_0.default or {}); - libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11" or {}); - libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11" or {}); - libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23" or {}); - libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23" or {}); - libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8" or {}); - libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8" or {}); - libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_16" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_16" or {}); - libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_16" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_16" or {}); - libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3" or {}); - libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3" or {}); - libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4" or {}); - libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4" or {}); - pkg_config_0_3_9.default.from_libsqlite3_sys_0_9_0__default_ = true; - })) - [ pkg_config_0_3_9_features ]; - linked_hash_map_0_4_2 = f: linked_hash_map_0_4_2_ rec { - dependencies = []; - features = mkFeatures (f.linked_hash_map_0_4_2 or {}); + lazy_static_0_2_11_features = f: updateFeatures f (rec { + lazy_static_0_2_11.compiletest_rs = + (f.lazy_static_0_2_11.compiletest_rs or false) || + (f.lazy_static_0_2_11.compiletest or false) || + (lazy_static_0_2_11.compiletest or false); + lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true); + lazy_static_0_2_11.nightly = + (f.lazy_static_0_2_11.nightly or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + lazy_static_0_2_11.spin = + (f.lazy_static_0_2_11.spin or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + }) []; + libc_0_2_33 = { features?(libc_0_2_33_features {}) }: libc_0_2_33_ { + features = mkFeatures (features.libc_0_2_33 or {}); }; - linked_hash_map_0_4_2_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - linked_hash_map_0_4_2."heapsize".self_heapsize_impl = hasFeature (linked_hash_map_0_4_2."heapsize_impl" or {}) || hasFeature (features.linked_hash_map_0_4_2."heapsize_impl" or {}); - linked_hash_map_0_4_2."serde".self_serde_impl = hasFeature (linked_hash_map_0_4_2."serde_impl" or {}) || hasFeature (features.linked_hash_map_0_4_2."serde_impl" or {}); - linked_hash_map_0_4_2."serde_test".self_serde_impl = hasFeature (linked_hash_map_0_4_2."serde_impl" or {}) || hasFeature (features.linked_hash_map_0_4_2."serde_impl" or {}); - })) - [ ]; - log_0_3_8 = f: log_0_3_8_ rec { - features = mkFeatures (f.log_0_3_8 or {}); + libc_0_2_33_features = f: updateFeatures f (rec { + libc_0_2_33.default = (f.libc_0_2_33.default or true); + libc_0_2_33.use_std = + (f.libc_0_2_33.use_std or false) || + (f.libc_0_2_33.default or false) || + (libc_0_2_33.default or false); + }) []; + libsqlite3_sys_0_9_0 = { features?(libsqlite3_sys_0_9_0_features {}) }: libsqlite3_sys_0_9_0_ { + dependencies = (if abi == "msvc" then mapFeatures features ([]) else []); + buildDependencies = mapFeatures features ([ ] + ++ (if features.libsqlite3_sys_0_9_0.pkg-config or false then [ pkg_config_0_3_9 ] else [])); + features = mkFeatures (features.libsqlite3_sys_0_9_0 or {}); }; - log_0_3_8_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - log_0_3_8."use_std".self_default = hasFeature (log_0_3_8.default or {}) || hasFeature (features.log_0_3_8.default or {}); - })) - [ ]; - lru_cache_0_1_1 = f: lru_cache_0_1_1_ rec { - dependencies = [ (linked_hash_map_0_4_2 f) ]; - features = mkFeatures (f.lru_cache_0_1_1 or {}); + libsqlite3_sys_0_9_0_features = f: updateFeatures f (rec { + libsqlite3_sys_0_9_0.bindgen = + (f.libsqlite3_sys_0_9_0.bindgen or false) || + (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_0.buildtime_bindgen or false); + libsqlite3_sys_0_9_0.cc = + (f.libsqlite3_sys_0_9_0.cc or false) || + (f.libsqlite3_sys_0_9_0.bundled or false) || + (libsqlite3_sys_0_9_0.bundled or false); + libsqlite3_sys_0_9_0.default = (f.libsqlite3_sys_0_9_0.default or true); + libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 = + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_0.default or false) || + (libsqlite3_sys_0_9_0.default or false); + libsqlite3_sys_0_9_0.pkg-config = + (f.libsqlite3_sys_0_9_0.pkg-config or false) || + (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_0.buildtime_bindgen or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false); + libsqlite3_sys_0_9_0.vcpkg = + (f.libsqlite3_sys_0_9_0.vcpkg or false) || + (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || + (libsqlite3_sys_0_9_0.buildtime_bindgen or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_16 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false); + pkg_config_0_3_9.default = true; + }) [ pkg_config_0_3_9_features ]; + linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.linked_hash_map_0_4_2 or {}); }; - lru_cache_0_1_1_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - lru_cache_0_1_1."heapsize".self_heapsize_impl = hasFeature (lru_cache_0_1_1."heapsize_impl" or {}) || hasFeature (features.lru_cache_0_1_1."heapsize_impl" or {}); - linked_hash_map_0_4_2."heapsize_impl".from_lru_cache_0_1_1__heapsize_impl = hasFeature (lru_cache_0_1_1."heapsize_impl" or {}) || hasFeature (features.lru_cache_0_1_1."heapsize_impl" or {}); - linked_hash_map_0_4_2.default.from_lru_cache_0_1_1__default_ = true; - })) - [ linked_hash_map_0_4_2_features ]; - memchr_1_0_2 = f: memchr_1_0_2_ rec { - dependencies = [ ] - ++ (if hasFeature (f.memchr_1_0_2."libc" or {}) then [(libc_0_2_33 f)] else []); - features = mkFeatures (f.memchr_1_0_2 or {}); + linked_hash_map_0_4_2_features = f: updateFeatures f (rec { + linked_hash_map_0_4_2.default = (f.linked_hash_map_0_4_2.default or true); + linked_hash_map_0_4_2.heapsize = + (f.linked_hash_map_0_4_2.heapsize or false) || + (f.linked_hash_map_0_4_2.heapsize_impl or false) || + (linked_hash_map_0_4_2.heapsize_impl or false); + linked_hash_map_0_4_2.serde = + (f.linked_hash_map_0_4_2.serde or false) || + (f.linked_hash_map_0_4_2.serde_impl or false) || + (linked_hash_map_0_4_2.serde_impl or false); + linked_hash_map_0_4_2.serde_test = + (f.linked_hash_map_0_4_2.serde_test or false) || + (f.linked_hash_map_0_4_2.serde_impl or false) || + (linked_hash_map_0_4_2.serde_impl or false); + }) []; + log_0_4_1 = { features?(log_0_4_1_features {}) }: log_0_4_1_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 ]); + features = mkFeatures (features.log_0_4_1 or {}); }; - memchr_1_0_2_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - memchr_1_0_2."use_std".self_default = hasFeature (memchr_1_0_2.default or {}) || hasFeature (features.memchr_1_0_2.default or {}); - memchr_1_0_2."libc".self_default = hasFeature (memchr_1_0_2.default or {}) || hasFeature (features.memchr_1_0_2.default or {}); - memchr_1_0_2."libc".self_use_std = hasFeature (memchr_1_0_2."use_std" or {}) || hasFeature (features.memchr_1_0_2."use_std" or {}); - libc_0_2_33."use_std".from_memchr_1_0_2__use_std = hasFeature (memchr_1_0_2."use_std" or {}) || hasFeature (features.memchr_1_0_2."use_std" or {}); - libc_0_2_33.default.from_memchr_1_0_2__default_ = false; - })) - [ libc_0_2_33_features ]; - nom_3_2_1 = f: nom_3_2_1_ rec { - dependencies = [ (memchr_1_0_2 f) ]; - features = mkFeatures (f.nom_3_2_1 or {}); + log_0_4_1_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = true; + log_0_4_1.default = (f.log_0_4_1.default or true); + }) [ cfg_if_0_1_2_features ]; + lru_cache_0_1_1 = { features?(lru_cache_0_1_1_features {}) }: lru_cache_0_1_1_ { + dependencies = mapFeatures features ([ linked_hash_map_0_4_2 ]); + features = mkFeatures (features.lru_cache_0_1_1 or {}); }; - nom_3_2_1_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - nom_3_2_1."std".self_default = hasFeature (nom_3_2_1.default or {}) || hasFeature (features.nom_3_2_1.default or {}); - nom_3_2_1."stream".self_default = hasFeature (nom_3_2_1.default or {}) || hasFeature (features.nom_3_2_1.default or {}); - nom_3_2_1."compiler_error".self_nightly = hasFeature (nom_3_2_1."nightly" or {}) || hasFeature (features.nom_3_2_1."nightly" or {}); - nom_3_2_1."regex".self_regexp = hasFeature (nom_3_2_1."regexp" or {}) || hasFeature (features.nom_3_2_1."regexp" or {}); - nom_3_2_1."regexp".self_regexp_macros = hasFeature (nom_3_2_1."regexp_macros" or {}) || hasFeature (features.nom_3_2_1."regexp_macros" or {}); - nom_3_2_1."lazy_static".self_regexp_macros = hasFeature (nom_3_2_1."regexp_macros" or {}) || hasFeature (features.nom_3_2_1."regexp_macros" or {}); - memchr_1_0_2."use_std".from_nom_3_2_1__use_std = hasFeature (nom_3_2_1."std" or {}) || hasFeature (features.nom_3_2_1."std" or {}); - memchr_1_0_2.default.from_nom_3_2_1__default_ = false; - })) - [ memchr_1_0_2_features ]; - num_traits_0_1_40 = f: num_traits_0_1_40_ rec {}; - num_traits_0_1_40_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - pkg_config_0_3_9 = f: pkg_config_0_3_9_ rec {}; - pkg_config_0_3_9_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - quote_0_3_15 = f: quote_0_3_15_ rec {}; - quote_0_3_15_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - rand_0_3_18 = f: rand_0_3_18_ rec { - dependencies = [ (libc_0_2_33 f) ] - ++ (if kernel == "fuchsia" then [ (fuchsia_zircon_0_2_1 f) ] else []); - features = mkFeatures (f.rand_0_3_18 or {}); + lru_cache_0_1_1_features = f: updateFeatures f (rec { + linked_hash_map_0_4_2.default = true; + linked_hash_map_0_4_2.heapsize_impl = + (f.linked_hash_map_0_4_2.heapsize_impl or false) || + (lru_cache_0_1_1.heapsize_impl or false) || + (f.lru_cache_0_1_1.heapsize_impl or false); + lru_cache_0_1_1.default = (f.lru_cache_0_1_1.default or true); + lru_cache_0_1_1.heapsize = + (f.lru_cache_0_1_1.heapsize or false) || + (f.lru_cache_0_1_1.heapsize_impl or false) || + (lru_cache_0_1_1.heapsize_impl or false); + }) [ linked_hash_map_0_4_2_features ]; + memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ { + dependencies = mapFeatures features ([ ] + ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_33 ] else [])); + features = mkFeatures (features.memchr_1_0_2 or {}); }; - rand_0_3_18_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - rand_0_3_18."i128_support".self_nightly = hasFeature (rand_0_3_18."nightly" or {}) || hasFeature (features.rand_0_3_18."nightly" or {}); - fuchsia_zircon_0_2_1.default.from_rand_0_3_18__default_ = true; - libc_0_2_33.default.from_rand_0_3_18__default_ = true; - })) - [ libc_0_2_33_features fuchsia_zircon_0_2_1_features ]; - redox_syscall_0_1_32 = f: redox_syscall_0_1_32_ rec {}; - redox_syscall_0_1_32_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - redox_termios_0_1_1 = f: redox_termios_0_1_1_ rec { - dependencies = [ (redox_syscall_0_1_32 f) ]; + memchr_1_0_2_features = f: updateFeatures f (rec { + libc_0_2_33.default = (f.libc_0_2_33.default or false); + libc_0_2_33.use_std = + (f.libc_0_2_33.use_std or false) || + (memchr_1_0_2.use_std or false) || + (f.memchr_1_0_2.use_std or false); + memchr_1_0_2.default = (f.memchr_1_0_2.default or true); + memchr_1_0_2.libc = + (f.memchr_1_0_2.libc or false) || + (f.memchr_1_0_2.default or false) || + (memchr_1_0_2.default or false) || + (f.memchr_1_0_2.use_std or false) || + (memchr_1_0_2.use_std or false); + memchr_1_0_2.use_std = + (f.memchr_1_0_2.use_std or false) || + (f.memchr_1_0_2.default or false) || + (memchr_1_0_2.default or false); + }) [ libc_0_2_33_features ]; + nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ { + dependencies = mapFeatures features ([ memchr_1_0_2 ]); + features = mkFeatures (features.nom_3_2_1 or {}); }; - redox_termios_0_1_1_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - redox_syscall_0_1_32.default.from_redox_termios_0_1_1__default_ = true; - })) - [ redox_syscall_0_1_32_features ]; - regex_0_2_2 = f: regex_0_2_2_ rec { - dependencies = [ (aho_corasick_0_6_3 f) (memchr_1_0_2 f) (regex_syntax_0_4_1 f) (thread_local_0_3_4 f) (utf8_ranges_1_0_0 f) ]; - features = mkFeatures (f.regex_0_2_2 or {}); + nom_3_2_1_features = f: updateFeatures f (rec { + memchr_1_0_2.default = (f.memchr_1_0_2.default or false); + memchr_1_0_2.use_std = + (f.memchr_1_0_2.use_std or false) || + (nom_3_2_1.std or false) || + (f.nom_3_2_1.std or false); + nom_3_2_1.compiler_error = + (f.nom_3_2_1.compiler_error or false) || + (f.nom_3_2_1.nightly or false) || + (nom_3_2_1.nightly or false); + nom_3_2_1.default = (f.nom_3_2_1.default or true); + nom_3_2_1.lazy_static = + (f.nom_3_2_1.lazy_static or false) || + (f.nom_3_2_1.regexp_macros or false) || + (nom_3_2_1.regexp_macros or false); + nom_3_2_1.regex = + (f.nom_3_2_1.regex or false) || + (f.nom_3_2_1.regexp or false) || + (nom_3_2_1.regexp or false); + nom_3_2_1.regexp = + (f.nom_3_2_1.regexp or false) || + (f.nom_3_2_1.regexp_macros or false) || + (nom_3_2_1.regexp_macros or false); + nom_3_2_1.std = + (f.nom_3_2_1.std or false) || + (f.nom_3_2_1.default or false) || + (nom_3_2_1.default or false); + nom_3_2_1.stream = + (f.nom_3_2_1.stream or false) || + (f.nom_3_2_1.default or false) || + (nom_3_2_1.default or false); + }) [ memchr_1_0_2_features ]; + num_0_1_40 = { features?(num_0_1_40_features {}) }: num_0_1_40_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_iter_0_1_34 num_traits_0_1_40 ]); + features = mkFeatures (features.num_0_1_40 or {}); }; - regex_0_2_2_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - regex_0_2_2."simd".self_simd-accel = hasFeature (regex_0_2_2."simd-accel" or {}) || hasFeature (features.regex_0_2_2."simd-accel" or {}); - aho_corasick_0_6_3.default.from_regex_0_2_2__default_ = true; - memchr_1_0_2.default.from_regex_0_2_2__default_ = true; - regex_syntax_0_4_1.default.from_regex_0_2_2__default_ = true; - thread_local_0_3_4.default.from_regex_0_2_2__default_ = true; - utf8_ranges_1_0_0.default.from_regex_0_2_2__default_ = true; - })) - [ aho_corasick_0_6_3_features memchr_1_0_2_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_4_1 = f: regex_syntax_0_4_1_ rec {}; - regex_syntax_0_4_1_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - rusqlite_0_13_0 = f: rusqlite_0_13_0_ rec { - dependencies = [ (bitflags_1_0_1 f) (libsqlite3_sys_0_9_0 f) (lru_cache_0_1_1 f) (time_0_1_38 f) ]; - features = mkFeatures (f.rusqlite_0_13_0 or {}); + num_0_1_40_features = f: updateFeatures f (rec { + num_0_1_40.bigint = + (f.num_0_1_40.bigint or false) || + (f.num_0_1_40.default or false) || + (num_0_1_40.default or false); + num_0_1_40.complex = + (f.num_0_1_40.complex or false) || + (f.num_0_1_40.default or false) || + (num_0_1_40.default or false); + num_0_1_40.default = (f.num_0_1_40.default or true); + num_0_1_40.num-bigint = + (f.num_0_1_40.num-bigint or false) || + (f.num_0_1_40.bigint or false) || + (num_0_1_40.bigint or false); + num_0_1_40.num-complex = + (f.num_0_1_40.num-complex or false) || + (f.num_0_1_40.complex or false) || + (num_0_1_40.complex or false); + num_0_1_40.num-rational = + (f.num_0_1_40.num-rational or false) || + (f.num_0_1_40.rational or false) || + (num_0_1_40.rational or false); + num_0_1_40.rational = + (f.num_0_1_40.rational or false) || + (f.num_0_1_40.default or false) || + (num_0_1_40.default or false); + num_0_1_40.rustc-serialize = + (f.num_0_1_40.rustc-serialize or false) || + (f.num_0_1_40.default or false) || + (num_0_1_40.default or false); + num_integer_0_1_35.default = true; + num_iter_0_1_34.default = true; + num_traits_0_1_40.default = true; + }) [ num_integer_0_1_35_features num_iter_0_1_34_features num_traits_0_1_40_features ]; + num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { + dependencies = mapFeatures features ([ num_traits_0_1_40 ]); }; - rusqlite_0_13_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11".from_rusqlite_0_13_0__min_sqlite_version_3_6_11 = hasFeature (rusqlite_0_13_0."backup" or {}) || hasFeature (features.rusqlite_0_13_0."backup" or {}); - libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4".from_rusqlite_0_13_0__min_sqlite_version_3_7_4 = hasFeature (rusqlite_0_13_0."blob" or {}) || hasFeature (features.rusqlite_0_13_0."blob" or {}); - libsqlite3_sys_0_9_0."buildtime_bindgen".from_rusqlite_0_13_0__buildtime_bindgen = hasFeature (rusqlite_0_13_0."buildtime_bindgen" or {}) || hasFeature (features.rusqlite_0_13_0."buildtime_bindgen" or {}); - libsqlite3_sys_0_9_0."bundled".from_rusqlite_0_13_0__bundled = hasFeature (rusqlite_0_13_0."bundled" or {}) || hasFeature (features.rusqlite_0_13_0."bundled" or {}); - libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3".from_rusqlite_0_13_0__min_sqlite_version_3_7_3 = hasFeature (rusqlite_0_13_0."functions" or {}) || hasFeature (features.rusqlite_0_13_0."functions" or {}); - libsqlite3_sys_0_9_0."sqlcipher".from_rusqlite_0_13_0__sqlcipher = hasFeature (rusqlite_0_13_0."sqlcipher" or {}) || hasFeature (features.rusqlite_0_13_0."sqlcipher" or {}); - libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23".from_rusqlite_0_13_0__min_sqlite_version_3_6_23 = hasFeature (rusqlite_0_13_0."trace" or {}) || hasFeature (features.rusqlite_0_13_0."trace" or {}); - bitflags_1_0_1.default.from_rusqlite_0_13_0__default_ = true; - libsqlite3_sys_0_9_0.default.from_rusqlite_0_13_0__default_ = true; - lru_cache_0_1_1.default.from_rusqlite_0_13_0__default_ = true; - time_0_1_38.default.from_rusqlite_0_13_0__default_ = true; - })) - [ bitflags_1_0_1_features libsqlite3_sys_0_9_0_features lru_cache_0_1_1_features time_0_1_38_features ]; - rustc_demangle_0_1_5 = f: rustc_demangle_0_1_5_ rec {}; - rustc_demangle_0_1_5_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - serde_1_0_21 = f: serde_1_0_21_ rec { - dependencies = []; - features = mkFeatures (f.serde_1_0_21 or {}); + num_integer_0_1_35_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); + num_traits_0_1_40.default = true; + }) [ num_traits_0_1_40_features ]; + num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]); }; - serde_1_0_21_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - serde_1_0_21."unstable".self_alloc = hasFeature (serde_1_0_21."alloc" or {}) || hasFeature (features.serde_1_0_21."alloc" or {}); - serde_1_0_21."std".self_default = hasFeature (serde_1_0_21.default or {}) || hasFeature (features.serde_1_0_21.default or {}); - serde_1_0_21."serde_derive".self_derive = hasFeature (serde_1_0_21."derive" or {}) || hasFeature (features.serde_1_0_21."derive" or {}); - serde_1_0_21."serde_derive".self_playground = hasFeature (serde_1_0_21."playground" or {}) || hasFeature (features.serde_1_0_21."playground" or {}); - })) - [ ]; - serde_derive_1_0_21 = f: serde_derive_1_0_21_ rec { - dependencies = [ (quote_0_3_15 f) (serde_derive_internals_0_17_0 f) (syn_0_11_11 f) ]; + num_iter_0_1_34_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = true; + num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); + num_traits_0_1_40.default = true; + }) [ num_integer_0_1_35_features num_traits_0_1_40_features ]; + num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {}; + num_traits_0_1_40_features = f: updateFeatures f (rec { + num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true); + }) []; + pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; + pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); + }) []; + quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {}; + quote_0_3_15_features = f: updateFeatures f (rec { + quote_0_3_15.default = (f.quote_0_3_15.default or true); + }) []; + rand_0_3_18 = { features?(rand_0_3_18_features {}) }: rand_0_3_18_ { + dependencies = mapFeatures features ([ libc_0_2_33 ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_2_1 ]) else []); + features = mkFeatures (features.rand_0_3_18 or {}); }; - serde_derive_1_0_21_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - syn_0_11_11."visit".from_serde_derive_1_0_21 = true; - quote_0_3_15.default.from_serde_derive_1_0_21__default_ = true; - serde_derive_internals_0_17_0.default.from_serde_derive_1_0_21__default_ = false; - syn_0_11_11.default.from_serde_derive_1_0_21__default_ = true; - })) - [ quote_0_3_15_features serde_derive_internals_0_17_0_features syn_0_11_11_features ]; - serde_derive_internals_0_17_0 = f: serde_derive_internals_0_17_0_ rec { - dependencies = [ (syn_0_11_11 f) (synom_0_11_3 f) ]; + rand_0_3_18_features = f: updateFeatures f (rec { + fuchsia_zircon_0_2_1.default = true; + libc_0_2_33.default = true; + rand_0_3_18.default = (f.rand_0_3_18.default or true); + rand_0_3_18.i128_support = + (f.rand_0_3_18.i128_support or false) || + (f.rand_0_3_18.nightly or false) || + (rand_0_3_18.nightly or false); + }) [ libc_0_2_33_features fuchsia_zircon_0_2_1_features ]; + redox_syscall_0_1_32 = { features?(redox_syscall_0_1_32_features {}) }: redox_syscall_0_1_32_ {}; + redox_syscall_0_1_32_features = f: updateFeatures f (rec { + redox_syscall_0_1_32.default = (f.redox_syscall_0_1_32.default or true); + }) []; + redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { + dependencies = mapFeatures features ([ redox_syscall_0_1_32 ]); }; - serde_derive_internals_0_17_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - syn_0_11_11."parsing".from_serde_derive_internals_0_17_0 = true; - syn_0_11_11.default.from_serde_derive_internals_0_17_0__default_ = false; - synom_0_11_3.default.from_serde_derive_internals_0_17_0__default_ = true; - })) - [ syn_0_11_11_features synom_0_11_3_features ]; - serde_json_1_0_6 = f: serde_json_1_0_6_ rec { - dependencies = [ (dtoa_0_4_2 f) (itoa_0_3_4 f) (num_traits_0_1_40 f) (serde_1_0_21 f) ]; - features = mkFeatures (f.serde_json_1_0_6 or {}); + redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_syscall_0_1_32.default = true; + redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); + }) [ redox_syscall_0_1_32_features ]; + regex_0_2_2 = { features?(regex_0_2_2_features {}) }: regex_0_2_2_ { + dependencies = mapFeatures features ([ aho_corasick_0_6_3 memchr_1_0_2 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]); + features = mkFeatures (features.regex_0_2_2 or {}); }; - serde_json_1_0_6_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - serde_json_1_0_6."linked-hash-map".self_preserve_order = hasFeature (serde_json_1_0_6."preserve_order" or {}) || hasFeature (features.serde_json_1_0_6."preserve_order" or {}); - dtoa_0_4_2.default.from_serde_json_1_0_6__default_ = true; - itoa_0_3_4.default.from_serde_json_1_0_6__default_ = true; - num_traits_0_1_40.default.from_serde_json_1_0_6__default_ = true; - serde_1_0_21.default.from_serde_json_1_0_6__default_ = true; - })) - [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_40_features serde_1_0_21_features ]; - strsim_0_6_0 = f: strsim_0_6_0_ rec {}; - strsim_0_6_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - syn_0_11_11 = f: syn_0_11_11_ rec { - dependencies = [ ] - ++ (if hasFeature (f.syn_0_11_11."quote" or {}) then [(quote_0_3_15 f)] else []) - ++ (if hasFeature (f.syn_0_11_11."synom" or {}) then [(synom_0_11_3 f)] else []) - ++ (if hasFeature (f.syn_0_11_11."unicode-xid" or {}) then [(unicode_xid_0_0_4 f)] else []); - features = mkFeatures (f.syn_0_11_11 or {}); + regex_0_2_2_features = f: updateFeatures f (rec { + aho_corasick_0_6_3.default = true; + memchr_1_0_2.default = true; + regex_0_2_2.default = (f.regex_0_2_2.default or true); + regex_0_2_2.simd = + (f.regex_0_2_2.simd or false) || + (f.regex_0_2_2.simd-accel or false) || + (regex_0_2_2.simd-accel or false); + regex_syntax_0_4_1.default = true; + thread_local_0_3_4.default = true; + utf8_ranges_1_0_0.default = true; + }) [ aho_corasick_0_6_3_features memchr_1_0_2_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ]; + regex_syntax_0_4_1 = { features?(regex_syntax_0_4_1_features {}) }: regex_syntax_0_4_1_ {}; + regex_syntax_0_4_1_features = f: updateFeatures f (rec { + regex_syntax_0_4_1.default = (f.regex_syntax_0_4_1.default or true); + }) []; + rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_0 lru_cache_0_1_1 time_0_1_38 ]); + features = mkFeatures (features.rusqlite_0_13_0 or {}); }; - syn_0_11_11_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - syn_0_11_11."parsing".self_default = hasFeature (syn_0_11_11.default or {}) || hasFeature (features.syn_0_11_11.default or {}); - syn_0_11_11."printing".self_default = hasFeature (syn_0_11_11.default or {}) || hasFeature (features.syn_0_11_11.default or {}); - syn_0_11_11."unicode-xid".self_parsing = hasFeature (syn_0_11_11."parsing" or {}) || hasFeature (features.syn_0_11_11."parsing" or {}); - syn_0_11_11."synom".self_parsing = hasFeature (syn_0_11_11."parsing" or {}) || hasFeature (features.syn_0_11_11."parsing" or {}); - syn_0_11_11."quote".self_printing = hasFeature (syn_0_11_11."printing" or {}) || hasFeature (features.syn_0_11_11."printing" or {}); - quote_0_3_15.default.from_syn_0_11_11__default_ = true; - synom_0_11_3.default.from_syn_0_11_11__default_ = true; - unicode_xid_0_0_4.default.from_syn_0_11_11__default_ = true; - })) - [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; - synom_0_11_3 = f: synom_0_11_3_ rec { - dependencies = [ (unicode_xid_0_0_4 f) ]; + rusqlite_0_13_0_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + libsqlite3_sys_0_9_0.buildtime_bindgen = + (f.libsqlite3_sys_0_9_0.buildtime_bindgen or false) || + (rusqlite_0_13_0.buildtime_bindgen or false) || + (f.rusqlite_0_13_0.buildtime_bindgen or false); + libsqlite3_sys_0_9_0.bundled = + (f.libsqlite3_sys_0_9_0.bundled or false) || + (rusqlite_0_13_0.bundled or false) || + (f.rusqlite_0_13_0.bundled or false); + libsqlite3_sys_0_9_0.default = true; + libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 = + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_11 or false) || + (rusqlite_0_13_0.backup or false) || + (f.rusqlite_0_13_0.backup or false); + libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 = + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_6_23 or false) || + (rusqlite_0_13_0.trace or false) || + (f.rusqlite_0_13_0.trace or false); + libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 = + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_3 or false) || + (rusqlite_0_13_0.functions or false) || + (f.rusqlite_0_13_0.functions or false); + libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 = + (f.libsqlite3_sys_0_9_0.min_sqlite_version_3_7_4 or false) || + (rusqlite_0_13_0.blob or false) || + (f.rusqlite_0_13_0.blob or false); + libsqlite3_sys_0_9_0.sqlcipher = + (f.libsqlite3_sys_0_9_0.sqlcipher or false) || + (rusqlite_0_13_0.sqlcipher or false) || + (f.rusqlite_0_13_0.sqlcipher or false); + lru_cache_0_1_1.default = true; + rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true); + time_0_1_38.default = true; + }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_0_features lru_cache_0_1_1_features time_0_1_38_features ]; + rustc_demangle_0_1_5 = { features?(rustc_demangle_0_1_5_features {}) }: rustc_demangle_0_1_5_ {}; + rustc_demangle_0_1_5_features = f: updateFeatures f (rec { + rustc_demangle_0_1_5.default = (f.rustc_demangle_0_1_5.default or true); + }) []; + serde_1_0_21 = { features?(serde_1_0_21_features {}) }: serde_1_0_21_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_1_0_21 or {}); }; - synom_0_11_3_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - unicode_xid_0_0_4.default.from_synom_0_11_3__default_ = true; - })) - [ unicode_xid_0_0_4_features ]; - tempdir_0_3_5 = f: tempdir_0_3_5_ rec { - dependencies = [ (rand_0_3_18 f) ]; + serde_1_0_21_features = f: updateFeatures f (rec { + serde_1_0_21.default = (f.serde_1_0_21.default or true); + serde_1_0_21.serde_derive = + (f.serde_1_0_21.serde_derive or false) || + (f.serde_1_0_21.derive or false) || + (serde_1_0_21.derive or false) || + (f.serde_1_0_21.playground or false) || + (serde_1_0_21.playground or false); + serde_1_0_21.std = + (f.serde_1_0_21.std or false) || + (f.serde_1_0_21.default or false) || + (serde_1_0_21.default or false); + serde_1_0_21.unstable = + (f.serde_1_0_21.unstable or false) || + (f.serde_1_0_21.alloc or false) || + (serde_1_0_21.alloc or false); + }) []; + serde_derive_1_0_21 = { features?(serde_derive_1_0_21_features {}) }: serde_derive_1_0_21_ { + dependencies = mapFeatures features ([ quote_0_3_15 serde_derive_internals_0_17_0 syn_0_11_11 ]); }; - tempdir_0_3_5_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - rand_0_3_18.default.from_tempdir_0_3_5__default_ = true; - })) - [ rand_0_3_18_features ]; - termion_1_5_1 = f: termion_1_5_1_ rec { - dependencies = (if !(kernel == "redox") then [ (libc_0_2_33 f) ] else []) - ++ (if kernel == "redox" then [ (redox_syscall_0_1_32 f) (redox_termios_0_1_1 f) ] else []); + serde_derive_1_0_21_features = f: updateFeatures f (rec { + quote_0_3_15.default = true; + serde_derive_1_0_21.default = (f.serde_derive_1_0_21.default or true); + serde_derive_internals_0_17_0.default = (f.serde_derive_internals_0_17_0.default or false); + syn_0_11_11.default = true; + syn_0_11_11.visit = true; + }) [ quote_0_3_15_features serde_derive_internals_0_17_0_features syn_0_11_11_features ]; + serde_derive_internals_0_17_0 = { features?(serde_derive_internals_0_17_0_features {}) }: serde_derive_internals_0_17_0_ { + dependencies = mapFeatures features ([ syn_0_11_11 synom_0_11_3 ]); }; - termion_1_5_1_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - libc_0_2_33.default.from_termion_1_5_1__default_ = true; - redox_syscall_0_1_32.default.from_termion_1_5_1__default_ = true; - redox_termios_0_1_1.default.from_termion_1_5_1__default_ = true; - })) - [ libc_0_2_33_features redox_syscall_0_1_32_features redox_termios_0_1_1_features ]; - textwrap_0_9_0 = f: textwrap_0_9_0_ rec { - dependencies = [ (unicode_width_0_1_4 f) ]; + serde_derive_internals_0_17_0_features = f: updateFeatures f (rec { + serde_derive_internals_0_17_0.default = (f.serde_derive_internals_0_17_0.default or true); + syn_0_11_11.default = (f.syn_0_11_11.default or false); + syn_0_11_11.parsing = true; + synom_0_11_3.default = true; + }) [ syn_0_11_11_features synom_0_11_3_features ]; + serde_json_1_0_6 = { features?(serde_json_1_0_6_features {}) }: serde_json_1_0_6_ { + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_21 ]); + features = mkFeatures (features.serde_json_1_0_6 or {}); }; - textwrap_0_9_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - unicode_width_0_1_4.default.from_textwrap_0_9_0__default_ = true; - })) - [ unicode_width_0_1_4_features ]; - thread_local_0_3_4 = f: thread_local_0_3_4_ rec { - dependencies = [ (lazy_static_0_2_11 f) (unreachable_1_0_0 f) ]; + serde_json_1_0_6_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = true; + itoa_0_3_4.default = true; + num_traits_0_1_40.default = true; + serde_1_0_21.default = true; + serde_json_1_0_6.default = (f.serde_json_1_0_6.default or true); + serde_json_1_0_6.linked-hash-map = + (f.serde_json_1_0_6.linked-hash-map or false) || + (f.serde_json_1_0_6.preserve_order or false) || + (serde_json_1_0_6.preserve_order or false); + }) [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_40_features serde_1_0_21_features ]; + strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; + strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + }) []; + syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ { + dependencies = mapFeatures features ([ ] + ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else []) + ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else []) + ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else [])); + features = mkFeatures (features.syn_0_11_11 or {}); }; - thread_local_0_3_4_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - lazy_static_0_2_11.default.from_thread_local_0_3_4__default_ = true; - unreachable_1_0_0.default.from_thread_local_0_3_4__default_ = true; - })) - [ lazy_static_0_2_11_features unreachable_1_0_0_features ]; - time_0_1_38 = f: time_0_1_38_ rec { - dependencies = [ (libc_0_2_33 f) ] - ++ (if kernel == "redox" then [ (redox_syscall_0_1_32 f) ] else []) - ++ (if kernel == "windows" then [ (kernel32_sys_0_2_2 f) (winapi_0_2_8 f) ] else []); + syn_0_11_11_features = f: updateFeatures f (rec { + quote_0_3_15.default = true; + syn_0_11_11.default = (f.syn_0_11_11.default or true); + syn_0_11_11.parsing = + (f.syn_0_11_11.parsing or false) || + (f.syn_0_11_11.default or false) || + (syn_0_11_11.default or false); + syn_0_11_11.printing = + (f.syn_0_11_11.printing or false) || + (f.syn_0_11_11.default or false) || + (syn_0_11_11.default or false); + syn_0_11_11.quote = + (f.syn_0_11_11.quote or false) || + (f.syn_0_11_11.printing or false) || + (syn_0_11_11.printing or false); + syn_0_11_11.synom = + (f.syn_0_11_11.synom or false) || + (f.syn_0_11_11.parsing or false) || + (syn_0_11_11.parsing or false); + syn_0_11_11.unicode-xid = + (f.syn_0_11_11.unicode-xid or false) || + (f.syn_0_11_11.parsing or false) || + (syn_0_11_11.parsing or false); + synom_0_11_3.default = true; + unicode_xid_0_0_4.default = true; + }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; + synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ { + dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]); }; - time_0_1_38_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - kernel32_sys_0_2_2.default.from_time_0_1_38__default_ = true; - libc_0_2_33.default.from_time_0_1_38__default_ = true; - redox_syscall_0_1_32.default.from_time_0_1_38__default_ = true; - winapi_0_2_8.default.from_time_0_1_38__default_ = true; - })) - [ libc_0_2_33_features redox_syscall_0_1_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; - toml_0_4_5 = f: toml_0_4_5_ rec { - dependencies = [ (serde_1_0_21 f) ]; + synom_0_11_3_features = f: updateFeatures f (rec { + synom_0_11_3.default = (f.synom_0_11_3.default or true); + unicode_xid_0_0_4.default = true; + }) [ unicode_xid_0_0_4_features ]; + tempdir_0_3_5 = { features?(tempdir_0_3_5_features {}) }: tempdir_0_3_5_ { + dependencies = mapFeatures features ([ rand_0_3_18 ]); }; - toml_0_4_5_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - serde_1_0_21.default.from_toml_0_4_5__default_ = true; - })) - [ serde_1_0_21_features ]; - unicode_width_0_1_4 = f: unicode_width_0_1_4_ rec { - features = mkFeatures (f.unicode_width_0_1_4 or {}); + tempdir_0_3_5_features = f: updateFeatures f (rec { + rand_0_3_18.default = true; + tempdir_0_3_5.default = (f.tempdir_0_3_5.default or true); + }) [ rand_0_3_18_features ]; + termcolor_0_3_3 = { features?(termcolor_0_3_3_features {}) }: termcolor_0_3_3_ { + dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_4 ]) else []); }; - unicode_width_0_1_4_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - unicode_xid_0_0_4 = f: unicode_xid_0_0_4_ rec { - features = mkFeatures (f.unicode_xid_0_0_4 or {}); + termcolor_0_3_3_features = f: updateFeatures f (rec { + termcolor_0_3_3.default = (f.termcolor_0_3_3.default or true); + wincolor_0_1_4.default = true; + }) [ wincolor_0_1_4_features ]; + termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { + dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_33 ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_32 redox_termios_0_1_1 ]) else []); }; - unicode_xid_0_0_4_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - unreachable_1_0_0 = f: unreachable_1_0_0_ rec { - dependencies = [ (void_1_0_2 f) ]; + termion_1_5_1_features = f: updateFeatures f (rec { + libc_0_2_33.default = true; + redox_syscall_0_1_32.default = true; + redox_termios_0_1_1.default = true; + termion_1_5_1.default = (f.termion_1_5_1.default or true); + }) [ libc_0_2_33_features redox_syscall_0_1_32_features redox_termios_0_1_1_features ]; + textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { + dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); }; - unreachable_1_0_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - void_1_0_2.default.from_unreachable_1_0_0__default_ = false; - })) - [ void_1_0_2_features ]; - utf8_ranges_1_0_0 = f: utf8_ranges_1_0_0_ rec {}; - utf8_ranges_1_0_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - vcpkg_0_2_2 = f: vcpkg_0_2_2_ rec {}; - vcpkg_0_2_2_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - vec_map_0_8_0 = f: vec_map_0_8_0_ rec { - dependencies = []; - features = mkFeatures (f.vec_map_0_8_0 or {}); + textwrap_0_9_0_features = f: updateFeatures f (rec { + textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); + unicode_width_0_1_4.default = true; + }) [ unicode_width_0_1_4_features ]; + thread_local_0_3_4 = { features?(thread_local_0_3_4_features {}) }: thread_local_0_3_4_ { + dependencies = mapFeatures features ([ lazy_static_0_2_11 unreachable_1_0_0 ]); }; - vec_map_0_8_0_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - vec_map_0_8_0."serde".self_eders = hasFeature (vec_map_0_8_0."eders" or {}) || hasFeature (features.vec_map_0_8_0."eders" or {}); - vec_map_0_8_0."serde_derive".self_eders = hasFeature (vec_map_0_8_0."eders" or {}) || hasFeature (features.vec_map_0_8_0."eders" or {}); - })) - [ ]; - void_1_0_2 = f: void_1_0_2_ rec { - features = mkFeatures (f.void_1_0_2 or {}); + thread_local_0_3_4_features = f: updateFeatures f (rec { + lazy_static_0_2_11.default = true; + thread_local_0_3_4.default = (f.thread_local_0_3_4.default or true); + unreachable_1_0_0.default = true; + }) [ lazy_static_0_2_11_features unreachable_1_0_0_features ]; + time_0_1_38 = { features?(time_0_1_38_features {}) }: time_0_1_38_ { + dependencies = mapFeatures features ([ libc_0_2_33 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_32 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); }; - void_1_0_2_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - void_1_0_2."std".self_default = hasFeature (void_1_0_2.default or {}) || hasFeature (features.void_1_0_2.default or {}); - })) - [ ]; - winapi_0_2_8 = f: winapi_0_2_8_ rec {}; - winapi_0_2_8_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; - winapi_build_0_1_1 = f: winapi_build_0_1_1_ rec {}; - winapi_build_0_1_1_features = features: - lib.lists.foldl' (features: f: f features) - (lib.attrsets.recursiveUpdate features (rec { - })) - [ ]; + time_0_1_38_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_33.default = true; + redox_syscall_0_1_32.default = true; + time_0_1_38.default = (f.time_0_1_38.default or true); + winapi_0_2_8.default = true; + }) [ libc_0_2_33_features redox_syscall_0_1_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + toml_0_4_5 = { features?(toml_0_4_5_features {}) }: toml_0_4_5_ { + dependencies = mapFeatures features ([ serde_1_0_21 ]); + }; + toml_0_4_5_features = f: updateFeatures f (rec { + serde_1_0_21.default = true; + toml_0_4_5.default = (f.toml_0_4_5.default or true); + }) [ serde_1_0_21_features ]; + unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { + features = mkFeatures (features.unicode_width_0_1_4 or {}); + }; + unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); + }) []; + unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ { + features = mkFeatures (features.unicode_xid_0_0_4 or {}); + }; + unicode_xid_0_0_4_features = f: updateFeatures f (rec { + unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true); + }) []; + unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { + dependencies = mapFeatures features ([ void_1_0_2 ]); + }; + unreachable_1_0_0_features = f: updateFeatures f (rec { + unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); + void_1_0_2.default = (f.void_1_0_2.default or false); + }) [ void_1_0_2_features ]; + utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; + utf8_ranges_1_0_0_features = f: updateFeatures f (rec { + utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); + }) []; + vcpkg_0_2_2 = { features?(vcpkg_0_2_2_features {}) }: vcpkg_0_2_2_ {}; + vcpkg_0_2_2_features = f: updateFeatures f (rec { + vcpkg_0_2_2.default = (f.vcpkg_0_2_2.default or true); + }) []; + vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.vec_map_0_8_0 or {}); + }; + vec_map_0_8_0_features = f: updateFeatures f (rec { + vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true); + vec_map_0_8_0.serde = + (f.vec_map_0_8_0.serde or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + vec_map_0_8_0.serde_derive = + (f.vec_map_0_8_0.serde_derive or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + }) []; + void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { + features = mkFeatures (features.void_1_0_2 or {}); + }; + void_1_0_2_features = f: updateFeatures f (rec { + void_1_0_2.default = (f.void_1_0_2.default or true); + void_1_0_2.std = + (f.void_1_0_2.std or false) || + (f.void_1_0_2.default or false) || + (void_1_0_2.default or false); + }) []; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + wincolor_0_1_4 = { features?(wincolor_0_1_4_features {}) }: wincolor_0_1_4_ { + dependencies = mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]); + }; + wincolor_0_1_4_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + winapi_0_2_8.default = true; + wincolor_0_1_4.default = (f.wincolor_0_1_4.default or true); + }) [ kernel32_sys_0_2_2_features winapi_0_2_8_features ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3462be10bfe..d1bc39902e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6488,11 +6488,7 @@ with pkgs; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; - carnix = - let carnix = callPackage ../build-support/rust/carnix.nix { }; - carnixFeatures = carnix.carnix_0_6_0_features {}; - in - carnix.carnix_0_6_0 carnixFeatures; + carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; From 6580b18d3fca8803777cbc1c22d34c469e8027d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Feb 2018 22:30:45 +0000 Subject: [PATCH 433/797] cargo-vendor: move to all-packages --- pkgs/build-support/rust/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index efb376b382d..63d08e1d031 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,9 +1,7 @@ -{ callPackage, fetchurl, stdenv, path, cacert, git, rust }: +{ callPackage, fetchurl, stdenv, path, cacert, git, rust, cargo-vendor }: let - cargoVendor = callPackage ./cargo-vendor {}; - fetchcargo = import ./fetchcargo.nix { - inherit stdenv cacert git rust cargoVendor; + inherit stdenv cacert git rust cargo-vendor; }; in { name, cargoSha256 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1bc39902e8..7e076dd7e1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6488,6 +6488,8 @@ with pkgs; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; + cargo-vendor = callPackage ../build-support/rust/cargo-vendor {}; + carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; From 6f7683063904ac11e4134460e9e99b696a12bbbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= Date: Sun, 4 Feb 2018 00:06:36 +0100 Subject: [PATCH 434/797] slade-git: init at 2018.01.29 --- pkgs/applications/misc/slade/git.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/slade/git.nix diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix new file mode 100644 index 00000000000..29e01da1b5b --- /dev/null +++ b/pkgs/applications/misc/slade/git.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: + +stdenv.mkDerivation { + name = "slade-git-3.1.2.2018.01.29"; + + src = fetchFromGitHub { + owner = "sirjuddington"; + repo = "SLADE"; + rev = "f7409c504b40c4962f419038db934c32688ddd2e"; + sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld"; + }; + + cmakeFlags = ["-DNO_WEBVIEW=1"]; + nativeBuildInputs = [ cmake pkgconfig zip ]; + buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Doom editor"; + homepage = http://slade.mancubus.net/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ertes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3462be10bfe..03de8c1a44d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1897,6 +1897,10 @@ with pkgs; wxGTK = wxGTK30; }; + slade-git = callPackage ../applications/misc/slade/git.nix { + wxGTK = wxGTK30; + }; + drive = callPackage ../applications/networking/drive { }; driftnet = callPackage ../tools/networking/driftnet {}; From 3a53aa01418376c823811e47caf62d1f42e03c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= Date: Sat, 3 Feb 2018 18:53:26 +0100 Subject: [PATCH 435/797] doom-bcc-git: init at 2018.01.04 --- pkgs/games/zdoom/bcc-git.nix | 30 ++++++++++++++++++++++++++ pkgs/games/zdoom/bcc-warning-fix.patch | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 57 insertions(+) create mode 100644 pkgs/games/zdoom/bcc-git.nix create mode 100644 pkgs/games/zdoom/bcc-warning-fix.patch diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix new file mode 100644 index 00000000000..ce531e854ed --- /dev/null +++ b/pkgs/games/zdoom/bcc-git.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "doom-bcc-git-0.8.0.2018.01.04"; + + src = fetchFromGitHub { + owner = "wormt"; + repo = "bcc"; + rev = "d58b44d9f18b28fd732c27113e5607a454506d19"; + sha256 = "1m83ip40ln61qrvb1fbgaqbld2xip9n3k817lwkk1936pml9zcrq"; + }; + + enableParallelBuilding = true; + + patches = [ ./bcc-warning-fix.patch ]; + + installPhase = '' + mkdir -p $out/{bin,lib,share/doc} + install -m755 bcc $out/bin/bcc + cp -av doc $out/share/doc/bcc + cp -av lib $out/lib/bcc + ''; + + meta = with stdenv.lib; { + description = "Compiler for Doom/Hexen scripts (ACS, BCS)"; + homepage = https://github.com/wormt/bcc; + license = licenses.mit; + maintainers = with maintainers; [ertes]; + }; +} diff --git a/pkgs/games/zdoom/bcc-warning-fix.patch b/pkgs/games/zdoom/bcc-warning-fix.patch new file mode 100644 index 00000000000..4a352cb1e47 --- /dev/null +++ b/pkgs/games/zdoom/bcc-warning-fix.patch @@ -0,0 +1,25 @@ +From c6ac05c96b7908ccd35f3908fc0f13650b0583c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= +Date: Sat, 3 Feb 2018 17:08:54 +0100 +Subject: [PATCH] Remove -Werror + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index bbe2c75..3357d2d 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ EXE=bcc + BUILD_DIR=build + CC=gcc + INCLUDE=-Isrc -I src/parse +-OPTIONS=-Wall -Werror -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \ ++OPTIONS=-Wall -Wno-unused -std=c99 -pedantic -Wstrict-aliasing \ + -Wstrict-aliasing=2 -Wmissing-field-initializers -D_BSD_SOURCE \ + -D_DEFAULT_SOURCE $(INCLUDE) + VERSION_FILE=$(BUILD_DIR)/version.c +-- +2.15.1 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3462be10bfe..09e4d0c85c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1893,6 +1893,8 @@ with pkgs; }; doomseeker = callPackage ../applications/misc/doomseeker { }; + doom-bcc-git = callPackage ../games/zdoom/bcc-git.nix { }; + slade = callPackage ../applications/misc/slade { wxGTK = wxGTK30; }; From 5fecc07932efd31581c5288931cc1ca2819441fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= Date: Sun, 4 Feb 2018 00:48:06 +0100 Subject: [PATCH 436/797] slade-git: Attribute naming convention --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03de8c1a44d..6ce66d16027 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1897,7 +1897,7 @@ with pkgs; wxGTK = wxGTK30; }; - slade-git = callPackage ../applications/misc/slade/git.nix { + sladeUnstable = callPackage ../applications/misc/slade/git.nix { wxGTK = wxGTK30; }; From 1394c852e253e81e9a1112fd8347508bbe8c2c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= Date: Sun, 4 Feb 2018 00:51:48 +0100 Subject: [PATCH 437/797] doom-bcc-git: Attribute naming convention --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09e4d0c85c9..73be98fbb41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1893,7 +1893,7 @@ with pkgs; }; doomseeker = callPackage ../applications/misc/doomseeker { }; - doom-bcc-git = callPackage ../games/zdoom/bcc-git.nix { }; + doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; slade = callPackage ../applications/misc/slade { wxGTK = wxGTK30; From 113b04ae28983b319b0385ae49739c014f39e633 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 3 Feb 2018 17:58:39 -0600 Subject: [PATCH 438/797] qgit: 2.6 -> 2.7 (#34536) Changelog: http://libre.tibirna.org/projects/qgit/wiki/27 --- .../git-and-tools/qgit/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 7da45e2d3f9..188e5a4faaf 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, cmake, qtbase }: +{ stdenv, fetchgit, cmake, qtbase }: stdenv.mkDerivation rec { - name = "qgit-2.6"; + name = "qgit-2.7"; - src = fetchurl { - url = "http://libre.tibirna.org/attachments/download/12/${name}.tar.gz"; - sha256 = "1brrhac6s6jrw3djhgailg5d5s0vgrfvr0sczqgzpp3i6pxf8qzl"; + src = fetchgit { + url = "http://repo.or.cz/qgit4/redivivus.git"; + rev = name; + sha256 = "0c0zxykpgkxb8gpgzz5i6b8nrzg7cdxikvpg678x7gsnxhlwjv3a"; }; buildInputs = [ qtbase ]; nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { license = licenses.gpl2; homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit; From a5f91d1f15be06c066b04ec08fa1ab60ad44e9c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= Date: Sun, 4 Feb 2018 01:00:58 +0100 Subject: [PATCH 439/797] doom-bcc-git: CC=cc (for Darwin) --- pkgs/games/zdoom/bcc-git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix index ce531e854ed..2a1219e66ea 100644 --- a/pkgs/games/zdoom/bcc-git.nix +++ b/pkgs/games/zdoom/bcc-git.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; + makeFlags = ["CC=cc"]; patches = [ ./bcc-warning-fix.patch ]; From 2a2c8eab26ab75b381d3fec32efa412d7344a09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Feb 2018 00:09:00 +0000 Subject: [PATCH 440/797] rust: fix evaluation --- pkgs/build-support/rust/fetchcargo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 19cffcd9c14..d03d85c0788 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -1,8 +1,8 @@ -{ stdenv, cacert, git, rust, cargoVendor }: +{ stdenv, cacert, git, rust, cargo-vendor }: { name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-vendor"; - nativeBuildInputs = [ cacert cargoVendor git rust.cargo ]; + nativeBuildInputs = [ cacert cargo-vendor git rust.cargo ]; inherit src srcs sourceRoot; phases = "unpackPhase installPhase"; From 4bef2fbc4fe6f3a18f13d6f073c015b9fd0c43f0 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Sat, 3 Feb 2018 19:44:22 -0500 Subject: [PATCH 441/797] keybase-gui: fix missing desktop file The keybase-gui package doesn't currently include the `.desktop` file and supporting icons. This change fixes that. --- pkgs/tools/security/keybase-gui/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index ce98740e89b..4cc61dfdca9 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { tar xf data.tar.xz ''; installPhase = '' - mkdir -p $out/{bin,share} + mkdir -p $out/bin + mv usr/share $out/share mv opt/keybase $out/share/ cat > $out/bin/keybase-gui < Date: Sun, 4 Feb 2018 02:46:49 +0200 Subject: [PATCH 442/797] boehmgc: 7.6.2 -> 7.6.4 --- pkgs/development/libraries/boehm-gc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index b79900288c9..f3c58a93872 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "boehm-gc-${version}"; - version = "7.6.2"; + version = "7.6.4"; src = fetchurl { urls = [ "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" ]; - sha256 = "07nli9hgdzc09qzw169sn7gchkrn5kqgyniv2rspcy1xaq2j04dx"; + sha256 = "076dzsqqyxd3nlzs0z277vvhqjp8nv5dqi763s0m90zr6ljiyk5r"; }; buildInputs = [ libatomic_ops ]; From f0d5bf8ce5c113c63f4254d478c3c32f91cf0274 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 4 Feb 2018 02:47:00 +0200 Subject: [PATCH 443/797] iptables: 1.6.1 -> 1.6.2 --- pkgs/os-specific/linux/iptables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index ee1d21ddf2b..1668933db80 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "iptables-${version}"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; - sha256 = "1x8c9y340x79djsq54bc1674ryv59jfphrk4f88i7qbvbnyxghhg"; + sha256 = "0crp0lvh5m2f15pr8cw97h8yb8zjj10x95zj06j46cr68vx2vl2m"; }; nativeBuildInputs = [ bison flex pkgconfig ]; From d8571b5795238f7d753764053e92ec319dbccaaa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 4 Feb 2018 02:47:08 +0200 Subject: [PATCH 444/797] iproute: 4.14.1 -> 4.15.0 --- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index be9be49208a..793c9db603b 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.14.1"; + version = "4.15.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0rq0n7yxb0hmk0s6wx5awzjgf7ikjbibd0a5ix20ldfcmxlc0fnl"; + sha256 = "0mc3g4kj7h3jhwz2b2gdf41gp6bhqn7axh4mnyvhkdnpk5m63m28"; }; preConfigure = '' From ac1abbf4fcc56304c65a933427cfa92c86187763 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Tue, 30 Jan 2018 13:23:18 -0500 Subject: [PATCH 445/797] keybase: 1.0.39 -> 1.0.40 --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index a0fc788a69e..c221a46d5f9 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.39"; + version = "1.0.40"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "0b64h536xp8r1q7fa23mf1p8ybnh0fz1n468fp56mvh98vmqys5b"; + sha256 = "05x0h87dinl8zaqikr1sx38bv1n6ymxqp440b384d8y76w66rphi"; }; buildFlags = [ "-tags production" ]; From 16ac5eb7f01a90f5fe2bbfa926531b1b542d5aca Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Tue, 30 Jan 2018 13:24:09 -0500 Subject: [PATCH 446/797] kbfs: 20171004.40555d -> 1.0.40 --- pkgs/tools/security/kbfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index ba024328ba5..dbd372275bc 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "20171004.40555d"; + version = "1.0.40"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "40555dbc9c93a05f3a82053860df30e45c7bd779"; - sha256 = "08wj8fh1ja8kfzvbza5csy9mpfy39lifnzvfrnbj7vyyv88qc3h0"; + rev = "v${version}"; + sha256 = "1bgbzk3ykjb6y5sa5i9f6hwcp8b21dndq7iw9m8fdxh4n4mm6n9p"; }; buildFlags = [ "-tags production" ]; From 7e714bda87989b7f43f25022e3b87728d5704857 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Tue, 30 Jan 2018 13:24:34 -0500 Subject: [PATCH 447/797] keybase-gui: 1.0.39 -> 1.0.40 --- pkgs/tools/security/keybase-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index ce98740e89b..81a90143183 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -37,10 +37,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "1.0.33-20171003193427.d9ceb86ac"; + version = "1.0.40-20180127033950.76a4b90c9"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "0sqani2fy5jzqmz35md1bdw2vwpx91l87b6s3x9z53halzq7vfy6"; + sha256 = "1pskmwif5nx32d53kz8vbijv61i50kpjwyy53a37rz5nx3hgj3ar"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' From d6d4ef658032fc716bb1a9f73596da306fad83a0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 3 Feb 2018 20:27:04 -0500 Subject: [PATCH 448/797] linux: 4.9.79 -> 4.9.80 --- 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 314ba6827c3..cc02908fb89 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.79"; + version = "4.9.80"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0kf2zh7gf8jsm11vmp2hx2bji54ndsaj74ma405rj0qyxdchd45i"; + sha256 = "0ys74q9f93c42flqracaqnkh0qwcbnimhppd80rz5hxgq3686bly"; }; } // (args.argsOverride or {})) From e5ffae3966bb8e1009233e11119ec2f9e2a0e6dc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 3 Feb 2018 20:29:23 -0500 Subject: [PATCH 449/797] linux: 4.14.16 -> 4.14.17 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0a3ad3ef84f..413e3ea32dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; import ./generic.nix (args // rec { - version = "4.14.16"; + version = "4.14.17"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "095c2cjmjfsgnmml4f3lzc0pbhjy8nv8w07rywgpp5s5494dn2q7"; + sha256 = "0jqa86bnnlzv0r0bvzvmbj1c89a5m64zrjfvfrjlwg3vy63r9ii7"; }; } // (args.argsOverride or {})) From fcbb7da94299529675e265eee123261acf81ca53 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 3 Feb 2018 20:31:52 -0500 Subject: [PATCH 450/797] linux: 4.4.114 -> 4.4.115 --- 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 ec6141c3d20..c1c989e28c8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.114"; + version = "4.4.115"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1nag129dv3krn9b3f958fv2ns56x1nlgf8fy3mx74pkzqm6hnh4m"; + sha256 = "1pxm4r09402h4k8zgl0w1wm4vfvcaa3y7l36h50jr5wgi6l8rx2q"; }; } // (args.argsOverride or {})) From 4069faad7f80f5a42488c65f57a9b5c56a44bf34 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 3 Feb 2018 20:36:14 -0500 Subject: [PATCH 451/797] linux-copperhead: 4.15.a -> 4.15.1.a --- pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index c449d632ba8..d87ed3e8082 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15"; + version = "4.15.1"; revision = "a"; - sha256 = "1jia6isz4mi7a76rg7nd5iqll6py5kjz0myp4z0dx17xm9axcgqm"; + sha256 = "1k9ng0110vzl29rzbglk3vmnpfqk04rd2mja5aqql81z5pb1x528"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 8c280d3ad520fd604f154b863aede0929df5f870 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 3 Feb 2018 20:38:25 -0500 Subject: [PATCH 452/797] linux: 4.15 -> 4.15.1 --- pkgs/os-specific/linux/kernel/linux-4.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index 0f1aae1aa1b..fa9d0b4bcda 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; import ./generic.nix (args // rec { - version = "4.15"; + version = "4.15.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ import ./generic.nix (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js"; + sha256 = "1pxgs5wqmidwa5lz6q1m9gz6jyvhvlgy8r5bs48cm08b0vcwsvlq"; }; } // (args.argsOverride or {})) From 810a19bab31eb78b2b78f7dc293dda4171b6ee54 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 4 Feb 2018 05:17:53 +0300 Subject: [PATCH 453/797] way-cooler: 0.6.2 -> 0.8.0 --- .../window-managers/way-cooler/default.nix | 59 +- .../window-managers/way-cooler/way-cooler.nix | 2680 +++++++++++------ .../window-managers/way-cooler/wc-bg.nix | 2213 ++++++++------ .../window-managers/way-cooler/wc-grab.nix | 1281 ++++---- .../window-managers/way-cooler/wc-lock.nix | 2021 +++++++++---- .../rust/default-crate-overrides.nix | 26 +- 6 files changed, 5363 insertions(+), 2917 deletions(-) diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix index 1830ee2c42a..c8b67ec047a 100644 --- a/pkgs/applications/window-managers/way-cooler/default.nix +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides -, wayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon, pam, python3Packages, lemonbar +{ stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides +, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf }: let @@ -9,13 +9,10 @@ let fakegit = writeShellScriptBin "git" '' echo "" ''; - way-cooler = ((callPackage ./way-cooler.nix {}).way_cooler_0_6_2.override { + way-cooler = (((callPackage ./way-cooler.nix {}).way_cooler { builtin-lua = true; }).override { crateOverrides = defaultCrateOverrides // { - way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit ]; }; - dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; }; - gobject-sys = attrs: { buildInputs = [ dbus_glib ]; }; - cairo-rs = attrs: { buildInputs = [ cairo ]; }; + way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; }; };}).overrideAttrs (oldAttrs: rec { nativeBuildInputs = [ makeWrapper ]; @@ -23,51 +20,35 @@ let mkdir -p $out/etc cp -r config $out/etc/way-cooler ''; - # prior v0.7 https://github.com/way-cooler/way-cooler/issues/395 postFixup = '' - makeWrapper $out/bin/way_cooler $out/bin/way-cooler \ + cd $out/bin + mv way_cooler way-cooler + ''; + }); + wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec { + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + makeWrapper $out/bin/wc_bg $out/bin/wc-bg \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}" ''; }); - wc-bg = ((callPackage ./wc-bg.nix {}).way_cooler_bg_0_2_1.override { - crateOverrides = defaultCrateOverrides // { - - dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; }; - };}).overrideAttrs (oldAttrs: rec { - postFixup = '' - cd $out/bin - mv way_cooler_bg way-cooler-bg - ''; - }); - wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab_0_2_0.override { - crateOverrides = defaultCrateOverrides // { - - wc-grab = attrs: { - src = fetchFromGitHub { - owner = "way-cooler"; - repo = "way-cooler-grab"; - rev = "v0.2.0"; - sha256 = "1pc8rhvzdi6bi8g5w03i0ygbcpks9051c3d3yc290rgmmmmkmnwq"; - }; - }; - - dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; }; - };}).overrideAttrs (oldAttrs: rec { + wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec { postFixup = '' cd $out/bin mv wc_grab wc-grab ''; }); - wc-lock = ((callPackage ./wc-lock.nix {}).wc_lock_0_1_0.override { - crateOverrides = defaultCrateOverrides // { wc-lock = attrs: { + wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override { + crateOverrides = defaultCrateOverrides // { - buildInputs = [ pam ]; - };};}).overrideAttrs (oldAttrs: rec { + wc-lock = attrs: { buildInputs = [ pam ]; }; + };}).overrideAttrs (oldAttrs: rec { nativeBuildInputs = [ makeWrapper ]; postFixup = '' makeWrapper $out/bin/wc_lock $out/bin/wc-lock \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon ]}" + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}" ''; }); # https://github.com/way-cooler/way-cooler/issues/446 @@ -102,7 +83,7 @@ let ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d ''; in symlinkJoin rec { - version = "0.6.2"; + version = "0.8.0"; name = "way-cooler-with-extensions-${version}"; paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ]; diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix index 816a1c88708..9ba6db36772 100644 --- a/pkgs/applications/window-managers/way-cooler/way-cooler.nix +++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix @@ -1,938 +1,1862 @@ -# Generated by carnix 0.5.0: carnix -o way-cooler.nix Cargo.lock +# Generated by carnix 0.6.5: carnix -o way-cooler.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; - hasFeature = feature: - lib.lists.any - (originName: feature.${originName}) - (builtins.attrNames feature); - - hasDefault = feature: - let defaultFeatures = builtins.attrNames (feature."default" or {}); in - (defaultFeatures == []) - || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); - + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: - if featureName != "" && hasFeature feat.${featureName} then + if feat.${featureName} or false then [ featureName ] ++ features else features - ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); - aho_corasick_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.5.3"; - authors = [ "Andrew Gallant " ]; - sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn"; - libName = "aho_corasick"; - crateBin = [ { name = "aho-corasick-dot"; } ]; - inherit dependencies buildDependencies features; - }; - bitflags_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.4.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c"; - inherit dependencies buildDependencies features; - }; - bitflags_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.5.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0bgw1kiy121kikjrwj6zsd7l8n1gg1jirivzkc7zpjsvqa3p0hla"; - inherit dependencies buildDependencies features; - }; - bitflags_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.6.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6"; - inherit dependencies buildDependencies features; - }; - bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.7.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; - inherit dependencies buildDependencies features; - }; - bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.8.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2"; - inherit dependencies buildDependencies features; - }; - c_vec_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "c_vec"; - version = "1.2.1"; - authors = [ "Guillaume Gomez " ]; - sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd"; - inherit dependencies buildDependencies features; - }; - cairo_rs_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cairo-rs"; - version = "0.1.3"; - authors = [ "The Gtk-rs Project Developers" ]; - sha256 = "17wp5wh1jvn2ny8s6fckvbwn0x8ixha6xrqas1bqxd9ygm5g58w1"; - libName = "cairo"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - cairo_sys_rs_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cairo-sys-rs"; - version = "0.3.4"; - authors = [ "The Gtk-rs Project Developers" ]; - sha256 = "1fzxshv7vysnnc2nywla6gj3hh00nr6cz1ak0mrxkg65rzrgxkww"; - libName = "cairo_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - cfg_if_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.0"; - authors = [ "Alex Crichton " ]; - sha256 = "1grr9v6ijms84cvl1jqv5hp9clw9gn3l3g6kj9a31sdzvidd6v29"; - inherit dependencies buildDependencies features; - }; - dbus_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dbus"; - version = "0.4.1"; - authors = [ "David Henningsson " ]; - sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - dbus_macros_0_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dbus-macros"; - version = "0.0.6"; - authors = [ "Antoni Boucher " ]; - sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd"; - inherit dependencies buildDependencies features; - }; - dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dlib"; - version = "0.3.1"; - authors = [ "Victor Berger " ]; - sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; - inherit dependencies buildDependencies features; - }; - dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.1"; - authors = [ "David Tolnay " ]; - sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; - inherit dependencies buildDependencies features; - }; - dummy_rustwlc_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dummy-rustwlc"; - version = "0.6.3"; - authors = [ "Snirk Immington " "Preston Carpenter " ]; - sha256 = "09pcl2r3ifajgq794j4jqaq0n4kyb2z4aaavs1fr78w4fhrzqqmj"; - inherit dependencies buildDependencies features; - }; - env_logger_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "env_logger"; - version = "0.3.5"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw"; - inherit dependencies buildDependencies features; - }; - fixedbitset_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fixedbitset"; - version = "0.1.6"; - authors = [ "bluss" ]; - sha256 = "1jcq0i41l888153v4jyb6q2kc9sjs004md5byfz5mprlmhdawha3"; - inherit dependencies buildDependencies features; - }; - gcc_0_3_46_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "gcc"; - version = "0.3.46"; - authors = [ "Alex Crichton " ]; - sha256 = "17rbdxa2yapjymbdq7b930sc1ipiwhx4xz7hh48q4bz3d28zg6qb"; - inherit dependencies buildDependencies features; - }; - getopts_0_2_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "getopts"; - version = "0.2.14"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1wdz34vls97g9868h8kiw4wmwkbyxg4xm3xzvr1542hc3w4c7z0a"; - inherit dependencies buildDependencies features; - }; - glib_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "glib"; - version = "0.1.3"; - authors = [ "The Gtk-rs Project Developers" ]; - sha256 = "1j2zwsnxlfdrj8wdi8yp3zl5l9nydsifgxspnwl6ijq3ywnjhcpa"; - inherit dependencies buildDependencies features; - }; - glib_sys_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "glib-sys"; - version = "0.3.4"; - authors = [ "The Gtk-rs Project Developers" ]; - sha256 = "06ymp4ljrjnb7cly0bixy3svxgnwpbx79499889dqakpfs7566rc"; - libName = "glib_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - gobject_sys_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "gobject-sys"; - version = "0.3.4"; - authors = [ "The Gtk-rs Project Developers" ]; - sha256 = "0rrk3c94myhspyl3iq7k4kcm72zxl8bk3r7kvqv2f9lf6y820giw"; - libName = "gobject_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - hlua_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "hlua"; - version = "0.1.9"; - authors = [ "pierre.krieger1708@gmail.com" ]; - sha256 = "1vn7w1rcaj9g04yx5jak09a3wpw7g3yx2fgn8ibx36z07vpf57fs"; - inherit dependencies buildDependencies features; - }; - itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itoa"; - version = "0.3.1"; - authors = [ "David Tolnay " ]; - sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; - inherit dependencies buildDependencies features; - }; - json_macro_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "json_macro"; - version = "0.1.1"; - authors = [ "Denis Kolodin " ]; - sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy"; - inherit dependencies buildDependencies features; - }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian " ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "0.2.8"; - authors = [ "Marvin Löbel " ]; - sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; - inherit dependencies buildDependencies features; - }; - libc_0_2_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.23"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1i29f6k26fmv81c5bjc6hw2j95sd01h9ad66qxdc755b24xfa9jm"; - inherit dependencies buildDependencies features; - }; - libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libloading"; - version = "0.3.4"; - authors = [ "Simonas Kazlauskas " ]; - sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - log_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.3.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1qxrwkhpfzhgcmfnw4bl9yy7wwr92wwbin3dp6izcfy58lr369v4"; - inherit dependencies buildDependencies features; - }; - lua52_sys_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lua52-sys"; - version = "0.0.4"; - authors = [ "Pierre Krieger " ]; - sha256 = "115i7k2dnnf4c1b2mxwf5mvqv2wsqmmxm3krphf5wjky20gi2ciz"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - memchr_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "0.1.11"; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8"; - inherit dependencies buildDependencies features; - }; - nix_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "nix"; - version = "0.6.0"; - authors = [ "Carl Lerche " ]; - sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - nix_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "nix"; - version = "0.8.1"; - authors = [ "The nix-rust Project Developers" ]; - sha256 = "0iqmn55ajwcq91pl8xviwdvc2zrkaccajsp0nc9lbq9ydli0vhf9"; - inherit dependencies buildDependencies features; - }; - num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.1.37"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; - inherit dependencies buildDependencies features; - }; - ordermap_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ordermap"; - version = "0.2.10"; - authors = [ "bluss" ]; - sha256 = "1pj6d56nwi0wa7cnwl80dwz13vws9nf5s1b7k7i2dav35gkpwy1z"; - inherit dependencies buildDependencies features; - }; - petgraph_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "petgraph"; - version = "0.4.5"; - authors = [ "bluss" "mitchmindtree" ]; - sha256 = "0482id2flwnxkhj1443g384cvk7f9lva9n6wj2wsag9145zhpjzg"; - inherit dependencies buildDependencies features; - }; - phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_codegen"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; - inherit dependencies buildDependencies features; - }; - phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_generator"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; - inherit dependencies buildDependencies features; - }; - phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_shared"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.9"; - authors = [ "Alex Crichton " ]; - sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; - inherit dependencies buildDependencies features; - }; - rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.3.15"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; - inherit dependencies buildDependencies features; - }; - regex_0_1_80_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex"; - version = "0.1.80"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6"; - inherit dependencies buildDependencies features; - }; - regex_syntax_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.3.9"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; - inherit dependencies buildDependencies features; - }; - rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc-serialize"; - version = "0.3.24"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; - inherit dependencies buildDependencies features; - }; - rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc_version"; - version = "0.1.7"; - authors = [ "Marvin Löbel " ]; - sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; - inherit dependencies buildDependencies features; - }; - rustwlc_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustwlc"; - version = "0.6.2"; - authors = [ "Snirk Immington " "Timidger " ]; - sha256 = "16k8wzyvn1syxcjimy2vh7hc6jlbw31v03ysrzrqgfwncmwx5b2d"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver"; - version = "0.1.20"; - authors = [ "The Rust Project Developers" ]; - sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; - inherit dependencies buildDependencies features; - }; - serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "0.9.15"; - authors = [ "Erick Tryzelaar " ]; - sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; - inherit dependencies buildDependencies features; - }; - serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "0.9.10"; - authors = [ "Erick Tryzelaar " ]; - sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; - inherit dependencies buildDependencies features; - }; - siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "siphasher"; - version = "0.2.2"; - authors = [ "Frank Denis " ]; - sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; - inherit dependencies buildDependencies features; - }; - target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "target_build_utils"; - version = "0.3.1"; - authors = [ "Simonas Kazlauskas " ]; - sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - thread_id_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread-id"; - version = "2.0.0"; - authors = [ "Ruud van Asseldonk " ]; - sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3"; - inherit dependencies buildDependencies features; - }; - thread_local_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.2.7"; - authors = [ "Amanieu d'Antras " ]; - sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7"; - inherit dependencies buildDependencies features; - }; - utf8_ranges_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "utf8-ranges"; - version = "0.1.3"; - authors = [ "Andrew Gallant " ]; - sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; - inherit dependencies buildDependencies features; - }; - uuid_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "uuid"; - version = "0.3.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip"; - inherit dependencies buildDependencies features; - }; - void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - authors = [ "Jonathan Reem " ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - inherit dependencies buildDependencies features; - }; - way_cooler_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "way-cooler"; - version = "0.6.2"; - authors = [ "Snirk Immington " "Timidger " ]; - sha256 = "0ygzgjjhf54fcpk6sbi0acbyki4ff1v7wyckfk4lhv4ycpg9v3cj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - wayland_scanner_0_9_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-scanner"; - version = "0.9.4"; - authors = [ "Victor Berger " ]; - sha256 = "1kdhpm1gkn99sj8vxhyr1x6nxnhm0cjvypajycvn2fa9sdpgw8yc"; - inherit dependencies buildDependencies features; - }; - wayland_server_0_9_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-server"; - version = "0.9.4"; - authors = [ "Victor Berger " ]; - sha256 = "1aqidrac0z7ny65yhfv9inl3xmdmph21yhmyd3k0nafyghgg9pxw"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-sys"; - version = "0.6.0"; - authors = [ "Victor Berger " ]; - sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl"; - inherit dependencies buildDependencies features; - }; - wayland_sys_0_9_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-sys"; - version = "0.9.4"; - authors = [ "Victor Berger " ]; - sha256 = "0vqrc46ib5hgbq6djghapairbjskdncas09k680f7pwylbi7yzcj"; - inherit dependencies buildDependencies features; - }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - authors = [ "Peter Atashian " ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - inherit dependencies buildDependencies features; - }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - authors = [ "Peter Atashian " ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - inherit dependencies buildDependencies features; - }; - xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "xml-rs"; - version = "0.3.6"; - authors = [ "Vladimir Matveev " ]; - sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15"; - libPath = "src/lib.rs"; - libName = "xml"; - crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; - inherit dependencies buildDependencies features; - }; - + ) [] (builtins.attrNames feat); in rec { - aho_corasick_0_5_3 = aho_corasick_0_5_3_ rec { - dependencies = [ memchr_0_1_11 ]; + way_cooler = f: way_cooler_0_8_0 { features = way_cooler_0_8_0_features { way_cooler_0_8_0 = f; }; }; + aho_corasick_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn"; + libName = "aho_corasick"; + crateBin = [ { name = "aho-corasick-dot"; } ]; + inherit dependencies buildDependencies features; }; - memchr_0_1_11_features."default".from_aho_corasick_0_5_3__default = true; - bitflags_0_4_0 = bitflags_0_4_0_ rec { - features = mkFeatures bitflags_0_4_0_features; + bitflags_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.4.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c"; + inherit dependencies buildDependencies features; }; - bitflags_0_4_0_features."".self = true; - bitflags_0_5_0 = bitflags_0_5_0_ rec { - features = mkFeatures bitflags_0_5_0_features; + bitflags_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.6.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6"; + inherit dependencies buildDependencies features; }; - bitflags_0_5_0_features."".self = true; - bitflags_0_6_0 = bitflags_0_6_0_ rec {}; - bitflags_0_7_0 = bitflags_0_7_0_ rec {}; - bitflags_0_8_2 = bitflags_0_8_2_ rec { - features = mkFeatures bitflags_0_8_2_features; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; }; - bitflags_0_8_2_features."i128".self_unstable = hasFeature (bitflags_0_8_2_features."unstable" or {}); - c_vec_1_2_1 = c_vec_1_2_1_ rec {}; - cairo_rs_0_1_3 = cairo_rs_0_1_3_ rec { - dependencies = [ c_vec_1_2_1 cairo_sys_rs_0_3_4 glib_0_1_3 libc_0_2_23 ] - ++ (if lib.lists.any (x: x == "glib") features then [glib_0_1_3] else []) - ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []); - buildDependencies = []; - features = mkFeatures cairo_rs_0_1_3_features; + bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + inherit dependencies buildDependencies features; }; - cairo_rs_0_1_3_features."".self = true; - cairo_rs_0_1_3_features."glib".self_default = hasDefault cairo_rs_0_1_3_features; - cairo_rs_0_1_3_features."gtk-rs-lgpl-docs".self_embed-lgpl-docs = hasFeature (cairo_rs_0_1_3_features."embed-lgpl-docs" or {}); - cairo_rs_0_1_3_features."gtk-rs-lgpl-docs".self_purge-lgpl-docs = hasFeature (cairo_rs_0_1_3_features."purge-lgpl-docs" or {}); - c_vec_1_2_1_features."default".from_cairo_rs_0_1_3__default = true; - cairo_sys_rs_0_3_4_features."png".from_cairo_rs_0_1_3__png = hasFeature (cairo_rs_0_1_3_features."png" or {}); - cairo_sys_rs_0_3_4_features."v1_12".from_cairo_rs_0_1_3__v1_12 = hasFeature (cairo_rs_0_1_3_features."v1_12" or {}); - cairo_sys_rs_0_3_4_features."xcb".from_cairo_rs_0_1_3__xcb = hasFeature (cairo_rs_0_1_3_features."xcb" or {}); - cairo_sys_rs_0_3_4_features."default".from_cairo_rs_0_1_3__default = true; - glib_0_1_3_features."default".from_cairo_rs_0_1_3__default = true; - libc_0_2_23_features."default".from_cairo_rs_0_1_3__default = true; - winapi_0_2_8_features."default".from_cairo_rs_0_1_3__default = true; - cairo_sys_rs_0_3_4 = cairo_sys_rs_0_3_4_ rec { - dependencies = [ libc_0_2_23 ] - ++ (if kernel == "windows" then [ winapi_0_2_8 ] else []); - buildDependencies = [ pkg_config_0_3_9 ]; - features = mkFeatures cairo_sys_rs_0_3_4_features; + bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; + inherit dependencies buildDependencies features; }; - cairo_sys_rs_0_3_4_features."v1_12".self_v1_14 = hasFeature (cairo_sys_rs_0_3_4_features."v1_14" or {}); - cairo_sys_rs_0_3_4_features."x11".self_xlib = hasFeature (cairo_sys_rs_0_3_4_features."xlib" or {}); - libc_0_2_23_features."default".from_cairo_sys_rs_0_3_4__default = true; - x11_0_0_0_features."xlib".from_cairo_sys_rs_0_3_4 = true; - x11_0_0_0_features."default".from_cairo_sys_rs_0_3_4__default = true; - winapi_0_2_8_features."default".from_cairo_sys_rs_0_3_4__default = true; - cfg_if_0_1_0 = cfg_if_0_1_0_ rec {}; - dbus_0_4_1 = dbus_0_4_1_ rec { - dependencies = [ libc_0_2_23 ]; - buildDependencies = [ pkg_config_0_3_9 ]; + c_vec_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "c_vec"; + version = "1.2.1"; + authors = [ "Guillaume Gomez " ]; + sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd"; + inherit dependencies buildDependencies features; }; - libc_0_2_23_features."default".from_dbus_0_4_1__default = true; - dbus_macros_0_0_6 = dbus_macros_0_0_6_ rec { - dependencies = [ dbus_0_4_1 ]; + cairo_rs_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cairo-rs"; + version = "0.2.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "0bcbhbyips15b7la4r43p4x57jv1w2ll8iwg9lxwvzz5k6c7iwvd"; + libName = "cairo"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - dbus_0_4_1_features."default".from_dbus_macros_0_0_6__default = true; - dlib_0_3_1 = dlib_0_3_1_ rec { - dependencies = [ libloading_0_3_4 ]; - features = mkFeatures dlib_0_3_1_features; + cairo_sys_rs_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cairo-sys-rs"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "062nxihlydci65pyy2ldn7djkc9sm7a5xvkl8pxrsxfxvfapm5br"; + libName = "cairo_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - dlib_0_3_1_features."".self = true; - libloading_0_3_4_features."default".from_dlib_0_3_1__default = true; - dtoa_0_4_1 = dtoa_0_4_1_ rec {}; - dummy_rustwlc_0_6_3 = dummy_rustwlc_0_6_3_ rec { - dependencies = [ bitflags_0_6_0 libc_0_2_23 wayland_sys_0_9_4 ]; + cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.2"; + authors = [ "Alex Crichton " ]; + sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; + inherit dependencies buildDependencies features; }; - bitflags_0_6_0_features."default".from_dummy_rustwlc_0_6_3__default = true; - libc_0_2_23_features."default".from_dummy_rustwlc_0_6_3__default = true; - wayland_sys_0_9_4_features."server".from_dummy_rustwlc_0_6_3 = true; - wayland_sys_0_9_4_features."dlopen".from_dummy_rustwlc_0_6_3 = true; - wayland_sys_0_9_4_features."default".from_dummy_rustwlc_0_6_3__default = true; - env_logger_0_3_5 = env_logger_0_3_5_ rec { - dependencies = [ log_0_3_7 regex_0_1_80 ] - ++ (if lib.lists.any (x: x == "regex") features then [regex_0_1_80] else []); - features = mkFeatures env_logger_0_3_5_features; + dbus_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus"; + version = "0.4.1"; + authors = [ "David Henningsson " ]; + sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - env_logger_0_3_5_features."".self = true; - env_logger_0_3_5_features."regex".self_default = hasDefault env_logger_0_3_5_features; - log_0_3_7_features."default".from_env_logger_0_3_5__default = true; - regex_0_1_80_features."default".from_env_logger_0_3_5__default = true; - fixedbitset_0_1_6 = fixedbitset_0_1_6_ rec {}; - gcc_0_3_46 = gcc_0_3_46_ rec { - dependencies = []; - features = mkFeatures gcc_0_3_46_features; + dbus_macros_0_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus-macros"; + version = "0.0.6"; + authors = [ "Antoni Boucher " ]; + sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd"; + inherit dependencies buildDependencies features; }; - gcc_0_3_46_features."rayon".self_parallel = hasFeature (gcc_0_3_46_features."parallel" or {}); - rayon_0_0_0_features."default".from_gcc_0_3_46__default = true; - getopts_0_2_14 = getopts_0_2_14_ rec {}; - glib_0_1_3 = glib_0_1_3_ rec { - dependencies = [ bitflags_0_5_0 glib_sys_0_3_4 gobject_sys_0_3_4 lazy_static_0_2_8 libc_0_2_23 ]; - features = mkFeatures glib_0_1_3_features; + dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.3.1"; + authors = [ "Victor Berger " ]; + sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; + inherit dependencies buildDependencies features; }; - glib_0_1_3_features."v2_38".self_v2_40 = hasFeature (glib_0_1_3_features."v2_40" or {}); - glib_0_1_3_features."v2_40".self_v2_44 = hasFeature (glib_0_1_3_features."v2_44" or {}); - glib_0_1_3_features."v2_44".self_v2_46 = hasFeature (glib_0_1_3_features."v2_46" or {}); - glib_0_1_3_features."v2_46".self_v2_48 = hasFeature (glib_0_1_3_features."v2_48" or {}); - glib_0_1_3_features."v2_48".self_v2_50 = hasFeature (glib_0_1_3_features."v2_50" or {}); - bitflags_0_5_0_features."default".from_glib_0_1_3__default = true; - glib_sys_0_3_4_features."v2_38".from_glib_0_1_3__v2_38 = hasFeature (glib_0_1_3_features."v2_38" or {}); - glib_sys_0_3_4_features."v2_40".from_glib_0_1_3__v2_40 = hasFeature (glib_0_1_3_features."v2_40" or {}); - glib_sys_0_3_4_features."v2_44".from_glib_0_1_3__v2_44 = hasFeature (glib_0_1_3_features."v2_44" or {}); - glib_sys_0_3_4_features."v2_46".from_glib_0_1_3__v2_46 = hasFeature (glib_0_1_3_features."v2_46" or {}); - glib_sys_0_3_4_features."v2_48".from_glib_0_1_3__v2_48 = hasFeature (glib_0_1_3_features."v2_48" or {}); - glib_sys_0_3_4_features."v2_50".from_glib_0_1_3__v2_50 = hasFeature (glib_0_1_3_features."v2_50" or {}); - glib_sys_0_3_4_features."default".from_glib_0_1_3__default = true; - gobject_sys_0_3_4_features."v2_38".from_glib_0_1_3__v2_38 = hasFeature (glib_0_1_3_features."v2_38" or {}); - gobject_sys_0_3_4_features."v2_44".from_glib_0_1_3__v2_44 = hasFeature (glib_0_1_3_features."v2_44" or {}); - gobject_sys_0_3_4_features."v2_46".from_glib_0_1_3__v2_46 = hasFeature (glib_0_1_3_features."v2_46" or {}); - gobject_sys_0_3_4_features."default".from_glib_0_1_3__default = true; - lazy_static_0_2_8_features."default".from_glib_0_1_3__default = true; - libc_0_2_23_features."default".from_glib_0_1_3__default = true; - glib_sys_0_3_4 = glib_sys_0_3_4_ rec { - dependencies = [ bitflags_0_8_2 libc_0_2_23 ]; - buildDependencies = [ pkg_config_0_3_9 ]; - features = mkFeatures glib_sys_0_3_4_features; + dlib_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.4.0"; + authors = [ "Victor Berger " ]; + sha256 = "08sy43rji5dyhyz8r4i0dz6zan1r1dz8sh6fk3c1jyhy8v8s96jr"; + inherit dependencies buildDependencies features; }; - glib_sys_0_3_4_features."v2_34".self_v2_36 = hasFeature (glib_sys_0_3_4_features."v2_36" or {}); - glib_sys_0_3_4_features."v2_36".self_v2_38 = hasFeature (glib_sys_0_3_4_features."v2_38" or {}); - glib_sys_0_3_4_features."v2_38".self_v2_40 = hasFeature (glib_sys_0_3_4_features."v2_40" or {}); - glib_sys_0_3_4_features."v2_40".self_v2_44 = hasFeature (glib_sys_0_3_4_features."v2_44" or {}); - glib_sys_0_3_4_features."v2_44".self_v2_46 = hasFeature (glib_sys_0_3_4_features."v2_46" or {}); - glib_sys_0_3_4_features."v2_46".self_v2_48 = hasFeature (glib_sys_0_3_4_features."v2_48" or {}); - glib_sys_0_3_4_features."v2_48".self_v2_50 = hasFeature (glib_sys_0_3_4_features."v2_50" or {}); - bitflags_0_8_2_features."default".from_glib_sys_0_3_4__default = true; - libc_0_2_23_features."default".from_glib_sys_0_3_4__default = true; - gobject_sys_0_3_4 = gobject_sys_0_3_4_ rec { - dependencies = [ bitflags_0_8_2 glib_sys_0_3_4 libc_0_2_23 ]; - buildDependencies = [ pkg_config_0_3_9 ]; - features = mkFeatures gobject_sys_0_3_4_features; + dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + inherit dependencies buildDependencies features; }; - gobject_sys_0_3_4_features."v2_34".self_v2_36 = hasFeature (gobject_sys_0_3_4_features."v2_36" or {}); - gobject_sys_0_3_4_features."v2_36".self_v2_38 = hasFeature (gobject_sys_0_3_4_features."v2_38" or {}); - gobject_sys_0_3_4_features."v2_38".self_v2_42 = hasFeature (gobject_sys_0_3_4_features."v2_42" or {}); - gobject_sys_0_3_4_features."v2_42".self_v2_44 = hasFeature (gobject_sys_0_3_4_features."v2_44" or {}); - gobject_sys_0_3_4_features."v2_44".self_v2_46 = hasFeature (gobject_sys_0_3_4_features."v2_46" or {}); - bitflags_0_8_2_features."default".from_gobject_sys_0_3_4__default = true; - glib_sys_0_3_4_features."default".from_gobject_sys_0_3_4__default = true; - libc_0_2_23_features."default".from_gobject_sys_0_3_4__default = true; - hlua_0_1_9 = hlua_0_1_9_ rec { - dependencies = [ libc_0_2_23 lua52_sys_0_0_4 ]; + dummy_rustwlc_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dummy-rustwlc"; + version = "0.7.1"; + authors = [ "Snirk Immington " "Preston Carpenter " ]; + sha256 = "13priwnxpjvmym6yh9v9x1230ca04cba7bzbnn21pbvqngis1y88"; + inherit dependencies buildDependencies features; }; - libc_0_2_23_features."default".from_hlua_0_1_9__default = true; - lua52_sys_0_0_4_features."default".from_hlua_0_1_9__default = true; - itoa_0_3_1 = itoa_0_3_1_ rec {}; - json_macro_0_1_1 = json_macro_0_1_1_ rec { - dependencies = [ rustc_serialize_0_3_24 ]; + env_logger_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "env_logger"; + version = "0.3.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw"; + inherit dependencies buildDependencies features; }; - rustc_serialize_0_3_24_features."default".from_json_macro_0_1_1__default = true; - kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { - dependencies = [ winapi_0_2_8 ]; - buildDependencies = [ winapi_build_0_1_1 ]; + fixedbitset_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fixedbitset"; + version = "0.1.8"; + authors = [ "bluss" ]; + sha256 = "18qr6w8jlfvhq825dr0mv9k0xqgb43sshdihbarc9khi9cz910a2"; + inherit dependencies buildDependencies features; }; - winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; - lazy_static_0_2_8 = lazy_static_0_2_8_ rec { - dependencies = []; - features = mkFeatures lazy_static_0_2_8_features; + fuchsia_zircon_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.2"; + authors = [ "Raph Levien " ]; + sha256 = "1zhxksplv52nlqd4j21h8462b5s913ngnhd303qsxsxn8dpaxgkq"; + inherit dependencies buildDependencies features; }; - lazy_static_0_2_8_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); - lazy_static_0_2_8_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); - spin_0_0_0_features."default".from_lazy_static_0_2_8__default = true; - libc_0_2_23 = libc_0_2_23_ rec { - features = mkFeatures libc_0_2_23_features; + fuchsia_zircon_sys_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.2"; + authors = [ "Raph Levien " ]; + sha256 = "0p8mrhg8pxk4kpzziv6nlxd8xgkj916gsg2b0x2mvf9dxwzrqhnk"; + inherit dependencies buildDependencies features; }; - libc_0_2_23_features."use_std".self_default = hasDefault libc_0_2_23_features; - libloading_0_3_4 = libloading_0_3_4_ rec { - dependencies = [ lazy_static_0_2_8 ] - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); - buildDependencies = [ target_build_utils_0_3_1 ]; + gcc_0_3_54_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gcc"; + version = "0.3.54"; + authors = [ "Alex Crichton " ]; + sha256 = "07a5i47r8achc6gxsba3ga17h9gnh4b9a2cak8vjg4hx62aajkr4"; + inherit dependencies buildDependencies features; }; - lazy_static_0_2_8_features."default".from_libloading_0_3_4__default = true; - kernel32_sys_0_2_2_features."default".from_libloading_0_3_4__default = true; - winapi_0_2_8_features."default".from_libloading_0_3_4__default = true; - log_0_3_7 = log_0_3_7_ rec { - features = mkFeatures log_0_3_7_features; + gdk_pixbuf_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gdk-pixbuf"; + version = "0.2.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "082z1s30haa59ax35wsv06mj8z8bhhq0fac36g01qa77kpiphj5y"; + libName = "gdk_pixbuf"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - log_0_3_7_features."use_std".self_default = hasDefault log_0_3_7_features; - lua52_sys_0_0_4 = lua52_sys_0_0_4_ rec { - dependencies = [ libc_0_2_23 ]; - buildDependencies = [ gcc_0_3_46 pkg_config_0_3_9 ]; + gdk_pixbuf_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gdk-pixbuf-sys"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "1r98zdqqik3hh1l10jmhhcjx59yk4m0bs9pc7hnkwp2p6gm968vp"; + libName = "gdk_pixbuf_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - libc_0_2_23_features."default".from_lua52_sys_0_0_4__default = true; - memchr_0_1_11 = memchr_0_1_11_ rec { - dependencies = [ libc_0_2_23 ]; + getopts_0_2_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "getopts"; + version = "0.2.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "14wm893ihscwwbwpd1xvjm23slaidridbl2p2ghwkx69xfzm9333"; + inherit dependencies buildDependencies features; }; - libc_0_2_23_features."default".from_memchr_0_1_11__default = true; - nix_0_6_0 = nix_0_6_0_ rec { - dependencies = [ bitflags_0_4_0 cfg_if_0_1_0 libc_0_2_23 void_1_0_2 ]; - buildDependencies = [ rustc_version_0_1_7 semver_0_1_20 ]; - features = mkFeatures nix_0_6_0_features; + gio_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gio-sys"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "064lv6h3qfgjzc6pbbxgln24b2fq9gxzh78z6d7fwfa97azllv2l"; + libName = "gio_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - nix_0_6_0_features."".self = true; - bitflags_0_4_0_features."default".from_nix_0_6_0__default = true; - cfg_if_0_1_0_features."default".from_nix_0_6_0__default = true; - libc_0_2_23_features."default".from_nix_0_6_0__default = true; - void_1_0_2_features."default".from_nix_0_6_0__default = true; - nix_0_8_1 = nix_0_8_1_ rec { - dependencies = [ bitflags_0_7_0 cfg_if_0_1_0 libc_0_2_23 void_1_0_2 ]; - features = mkFeatures nix_0_8_1_features; + glib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glib"; + version = "0.3.1"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "00s3n0pd8by1fk2l01mxmbnqq4ff6wadnkcf9jbjvr1l9bzgyqbl"; + inherit dependencies buildDependencies features; }; - nix_0_8_1_features."".self = true; - bitflags_0_7_0_features."default".from_nix_0_8_1__default = true; - cfg_if_0_1_0_features."default".from_nix_0_8_1__default = true; - libc_0_2_23_features."default".from_nix_0_8_1__default = true; - void_1_0_2_features."default".from_nix_0_8_1__default = true; - num_traits_0_1_37 = num_traits_0_1_37_ rec {}; - ordermap_0_2_10 = ordermap_0_2_10_ rec { - features = mkFeatures ordermap_0_2_10_features; + glib_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glib-sys"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "153i1zmk824hdf8agkaqcgddlwpvgng71n7bdpaav5f4zzlfyp2w"; + libName = "glib_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - ordermap_0_2_10_features."".self = true; - petgraph_0_4_5 = petgraph_0_4_5_ rec { - dependencies = [ fixedbitset_0_1_6 ordermap_0_2_10 ] - ++ (if lib.lists.any (x: x == "ordermap") features then [ordermap_0_2_10] else []); - features = mkFeatures petgraph_0_4_5_features; + gobject_sys_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gobject-sys"; + version = "0.4.0"; + authors = [ "The Gtk-rs Project Developers" ]; + sha256 = "00zmcbzqfhn9w01cphhf3hbq8ldd9ajba7x07z59vv1gdq6wjzli"; + libName = "gobject_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - petgraph_0_4_5_features."".self = true; - petgraph_0_4_5_features."unstable".self_all = hasFeature (petgraph_0_4_5_features."all" or {}); - petgraph_0_4_5_features."quickcheck".self_all = hasFeature (petgraph_0_4_5_features."all" or {}); - petgraph_0_4_5_features."stable_graph".self_all = hasFeature (petgraph_0_4_5_features."all" or {}); - petgraph_0_4_5_features."graphmap".self_all = hasFeature (petgraph_0_4_5_features."all" or {}); - petgraph_0_4_5_features."graphmap".self_default = hasDefault petgraph_0_4_5_features; - petgraph_0_4_5_features."stable_graph".self_default = hasDefault petgraph_0_4_5_features; - petgraph_0_4_5_features."ordermap".self_graphmap = hasFeature (petgraph_0_4_5_features."graphmap" or {}); - petgraph_0_4_5_features."generate".self_unstable = hasFeature (petgraph_0_4_5_features."unstable" or {}); - fixedbitset_0_1_6_features."default".from_petgraph_0_4_5__default = true; - ordermap_0_2_10_features."default".from_petgraph_0_4_5__default = true; - quickcheck_0_0_0_features."default".from_petgraph_0_4_5__default = false; - phf_0_7_21 = phf_0_7_21_ rec { - dependencies = [ phf_shared_0_7_21 ]; - features = mkFeatures phf_0_7_21_features; + itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.4"; + authors = [ "David Tolnay " ]; + sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + inherit dependencies buildDependencies features; }; - phf_0_7_21_features."".self = true; - phf_shared_0_7_21_features."core".from_phf_0_7_21__core = hasFeature (phf_0_7_21_features."core" or {}); - phf_shared_0_7_21_features."unicase".from_phf_0_7_21__unicase = hasFeature (phf_0_7_21_features."unicase" or {}); - phf_shared_0_7_21_features."default".from_phf_0_7_21__default = true; - phf_codegen_0_7_21 = phf_codegen_0_7_21_ rec { - dependencies = [ phf_generator_0_7_21 phf_shared_0_7_21 ]; + json_macro_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "json_macro"; + version = "0.1.1"; + authors = [ "Denis Kolodin " ]; + sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy"; + inherit dependencies buildDependencies features; }; - phf_generator_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; - phf_shared_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; - phf_generator_0_7_21 = phf_generator_0_7_21_ rec { - dependencies = [ phf_shared_0_7_21 rand_0_3_15 ]; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - phf_shared_0_7_21_features."default".from_phf_generator_0_7_21__default = true; - rand_0_3_15_features."default".from_phf_generator_0_7_21__default = true; - phf_shared_0_7_21 = phf_shared_0_7_21_ rec { - dependencies = [ siphasher_0_2_2 ]; - features = mkFeatures phf_shared_0_7_21_features; + lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.11"; + authors = [ "Marvin Löbel " ]; + sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + inherit dependencies buildDependencies features; }; - phf_shared_0_7_21_features."".self = true; - siphasher_0_2_2_features."default".from_phf_shared_0_7_21__default = true; - unicase_0_0_0_features."default".from_phf_shared_0_7_21__default = true; - pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; - rand_0_3_15 = rand_0_3_15_ rec { - dependencies = [ libc_0_2_23 ]; + lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "1.0.0"; + authors = [ "Marvin Löbel " ]; + sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; + inherit dependencies buildDependencies features; }; - libc_0_2_23_features."default".from_rand_0_3_15__default = true; - regex_0_1_80 = regex_0_1_80_ rec { - dependencies = [ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ]; - features = mkFeatures regex_0_1_80_features; + libc_0_2_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "11jmqdxmv0ka10ay0l8nzx0nl7s2lc3dbrnh1mgbr2grzwdyxi2s"; + inherit dependencies buildDependencies features; }; - regex_0_1_80_features."simd".self_simd-accel = hasFeature (regex_0_1_80_features."simd-accel" or {}); - aho_corasick_0_5_3_features."default".from_regex_0_1_80__default = true; - memchr_0_1_11_features."default".from_regex_0_1_80__default = true; - regex_syntax_0_3_9_features."default".from_regex_0_1_80__default = true; - simd_0_0_0_features."default".from_regex_0_1_80__default = true; - thread_local_0_2_7_features."default".from_regex_0_1_80__default = true; - utf8_ranges_0_1_3_features."default".from_regex_0_1_80__default = true; - regex_syntax_0_3_9 = regex_syntax_0_3_9_ rec {}; - rustc_serialize_0_3_24 = rustc_serialize_0_3_24_ rec {}; - rustc_version_0_1_7 = rustc_version_0_1_7_ rec { - dependencies = [ semver_0_1_20 ]; + libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.3.4"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - semver_0_1_20_features."default".from_rustc_version_0_1_7__default = true; - rustwlc_0_6_2 = rustwlc_0_6_2_ rec { - dependencies = [ bitflags_0_7_0 libc_0_2_23 wayland_sys_0_6_0 ] - ++ (if lib.lists.any (x: x == "wayland-sys") features then [wayland_sys_0_6_0] else []); - features = mkFeatures rustwlc_0_6_2_features; + libloading_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.4.3"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1cgb6xbadm59gc3cq733wrzsp59914hrjam0fan5gn1z100b6319"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - rustwlc_0_6_2_features."".self = true; - rustwlc_0_6_2_features."wayland-sys".self_wlc-wayland = hasFeature (rustwlc_0_6_2_features."wlc-wayland" or {}); - bitflags_0_7_0_features."default".from_rustwlc_0_6_2__default = true; - libc_0_2_23_features."default".from_rustwlc_0_6_2__default = true; - wayland_sys_0_6_0_features."server".from_rustwlc_0_6_2 = true; - wayland_sys_0_6_0_features."default".from_rustwlc_0_6_2__default = true; - semver_0_1_20 = semver_0_1_20_ rec {}; - serde_0_9_15 = serde_0_9_15_ rec { - dependencies = []; - features = mkFeatures serde_0_9_15_features; + log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.9"; + authors = [ "The Rust Project Developers" ]; + sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2"; + inherit dependencies buildDependencies features; }; - serde_0_9_15_features."unstable".self_alloc = hasFeature (serde_0_9_15_features."alloc" or {}); - serde_0_9_15_features."alloc".self_collections = hasFeature (serde_0_9_15_features."collections" or {}); - serde_0_9_15_features."std".self_default = hasDefault serde_0_9_15_features; - serde_0_9_15_features."serde_derive".self_derive = hasFeature (serde_0_9_15_features."derive" or {}); - serde_0_9_15_features."serde_derive".self_playground = hasFeature (serde_0_9_15_features."playground" or {}); - serde_0_9_15_features."unstable".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {}); - serde_0_9_15_features."std".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {}); - serde_derive_0_0_0_features."default".from_serde_0_9_15__default = true; - serde_json_0_9_10 = serde_json_0_9_10_ rec { - dependencies = [ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_15 ]; - features = mkFeatures serde_json_0_9_10_features; + log_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.4.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0d6m7c1cr6sj3kk47801zyjgnzyl94yh2ra9gxc3waljza7wvx92"; + inherit dependencies buildDependencies features; }; - serde_json_0_9_10_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_0_9_10_features."preserve_order" or {}); - dtoa_0_4_1_features."default".from_serde_json_0_9_10__default = true; - itoa_0_3_1_features."default".from_serde_json_0_9_10__default = true; - linked_hash_map_0_0_0_features."default".from_serde_json_0_9_10__default = true; - num_traits_0_1_37_features."default".from_serde_json_0_9_10__default = true; - serde_0_9_15_features."default".from_serde_json_0_9_10__default = true; - siphasher_0_2_2 = siphasher_0_2_2_ rec { - dependencies = []; + memchr_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memchr"; + version = "0.1.11"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8"; + inherit dependencies buildDependencies features; }; - clippy_0_0_0_features."default".from_siphasher_0_2_2__default = true; - target_build_utils_0_3_1 = target_build_utils_0_3_1_ rec { - dependencies = [ phf_0_7_21 serde_json_0_9_10 ] - ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_0_9_10] else []); - buildDependencies = [ phf_codegen_0_7_21 ]; - features = mkFeatures target_build_utils_0_3_1_features; + nix_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nix"; + version = "0.6.0"; + authors = [ "Carl Lerche " ]; + sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - target_build_utils_0_3_1_features."".self = true; - target_build_utils_0_3_1_features."serde_json".self_default = hasDefault target_build_utils_0_3_1_features; - phf_0_7_21_features."default".from_target_build_utils_0_3_1__default = true; - serde_json_0_9_10_features."default".from_target_build_utils_0_3_1__default = true; - thread_id_2_0_0 = thread_id_2_0_0_ rec { - dependencies = [ kernel32_sys_0_2_2 libc_0_2_23 ]; + nix_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "nix"; + version = "0.9.0"; + authors = [ "The nix-rust Project Developers" ]; + sha256 = "00p63bphzwwn460rja5l2wcpgmv7ljf7illf6n95cppx63d180q0"; + inherit dependencies buildDependencies features; }; - kernel32_sys_0_2_2_features."default".from_thread_id_2_0_0__default = true; - libc_0_2_23_features."default".from_thread_id_2_0_0__default = true; - thread_local_0_2_7 = thread_local_0_2_7_ rec { - dependencies = [ thread_id_2_0_0 ]; + num_traits_0_1_41_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.41"; + authors = [ "The Rust Project Developers" ]; + sha256 = "134gv890n1gv8v0jys55k0940gqp2hibgf1fs8q9jmyk2xp1jp9m"; + inherit dependencies buildDependencies features; }; - thread_id_2_0_0_features."default".from_thread_local_0_2_7__default = true; - utf8_ranges_0_1_3 = utf8_ranges_0_1_3_ rec {}; - uuid_0_3_1 = uuid_0_3_1_ rec { - dependencies = [ rand_0_3_15 rustc_serialize_0_3_24 ] - ++ (if lib.lists.any (x: x == "rand") features then [rand_0_3_15] else []) ++ (if lib.lists.any (x: x == "rustc-serialize") features then [rustc_serialize_0_3_24] else []); - features = mkFeatures uuid_0_3_1_features; + ordermap_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ordermap"; + version = "0.3.2"; + authors = [ "bluss" ]; + sha256 = "13zw8i0gf3snihmg9xvd63sd3ffdhhv8bmgfwbwf4shqxh6h3sac"; + inherit dependencies buildDependencies features; }; - uuid_0_3_1_features."".self = true; - uuid_0_3_1_features."rand".self_v4 = hasFeature (uuid_0_3_1_features."v4" or {}); - uuid_0_3_1_features."sha1".self_v5 = hasFeature (uuid_0_3_1_features."v5" or {}); - rand_0_3_15_features."default".from_uuid_0_3_1__default = true; - rustc_serialize_0_3_24_features."default".from_uuid_0_3_1__default = true; - serde_0_0_0_features."default".from_uuid_0_3_1__default = true; - sha1_0_0_0_features."default".from_uuid_0_3_1__default = true; - void_1_0_2 = void_1_0_2_ rec { - features = mkFeatures void_1_0_2_features; + petgraph_0_4_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "petgraph"; + version = "0.4.10"; + authors = [ "bluss" "mitchmindtree" ]; + sha256 = "1fdh2hwkrbf716qxdiasjn8jspvshhykclj8mwafdd8h241159sj"; + inherit dependencies buildDependencies features; }; - void_1_0_2_features."std".self_default = hasDefault void_1_0_2_features; - way_cooler_0_6_2 = way_cooler_0_6_2_ rec { - dependencies = [ bitflags_0_7_0 cairo_rs_0_1_3 dbus_0_4_1 dbus_macros_0_0_6 env_logger_0_3_5 getopts_0_2_14 hlua_0_1_9 json_macro_0_1_1 lazy_static_0_2_8 log_0_3_7 nix_0_6_0 petgraph_0_4_5 rustc_serialize_0_3_24 rustwlc_0_6_2 uuid_0_3_1 wayland_server_0_9_4 wayland_sys_0_9_4 ]; - buildDependencies = [ wayland_scanner_0_9_4 ]; - features = mkFeatures way_cooler_0_6_2_features; + phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; }; - way_cooler_0_6_2_features."".self = true; - bitflags_0_7_0_features."default".from_way_cooler_0_6_2__default = true; - cairo_rs_0_1_3_features."default".from_way_cooler_0_6_2__default = true; - dbus_0_4_1_features."default".from_way_cooler_0_6_2__default = true; - dbus_macros_0_0_6_features."default".from_way_cooler_0_6_2__default = true; - env_logger_0_3_5_features."default".from_way_cooler_0_6_2__default = true; - getopts_0_2_14_features."default".from_way_cooler_0_6_2__default = true; - hlua_0_1_9_features."default".from_way_cooler_0_6_2__default = true; - json_macro_0_1_1_features."default".from_way_cooler_0_6_2__default = true; - lazy_static_0_2_8_features."default".from_way_cooler_0_6_2__default = true; - log_0_3_7_features."default".from_way_cooler_0_6_2__default = true; - nix_0_6_0_features."default".from_way_cooler_0_6_2__default = true; - petgraph_0_4_5_features."default".from_way_cooler_0_6_2__default = true; - rustc_serialize_0_3_24_features."default".from_way_cooler_0_6_2__default = true; - rustwlc_0_6_2_features."wlc-wayland".from_way_cooler_0_6_2 = true; - rustwlc_0_6_2_features."static-wlc".from_way_cooler_0_6_2__static-wlc = hasFeature (way_cooler_0_6_2_features."static-wlc" or {}); - rustwlc_0_6_2_features."default".from_way_cooler_0_6_2__default = true; - uuid_0_3_1_features."v4".from_way_cooler_0_6_2 = true; - uuid_0_3_1_features."rustc-serialize".from_way_cooler_0_6_2 = true; - uuid_0_3_1_features."default".from_way_cooler_0_6_2__default = true; - wayland_server_0_9_4_features."default".from_way_cooler_0_6_2__default = true; - wayland_sys_0_9_4_features."client".from_way_cooler_0_6_2 = true; - wayland_sys_0_9_4_features."dlopen".from_way_cooler_0_6_2 = true; - wayland_sys_0_9_4_features."default".from_way_cooler_0_6_2__default = true; - wayland_scanner_0_9_4 = wayland_scanner_0_9_4_ rec { - dependencies = [ xml_rs_0_3_6 ]; + phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + inherit dependencies buildDependencies features; }; - xml_rs_0_3_6_features."default".from_wayland_scanner_0_9_4__default = true; - wayland_server_0_9_4 = wayland_server_0_9_4_ rec { - dependencies = [ bitflags_0_7_0 libc_0_2_23 nix_0_8_1 wayland_sys_0_9_4 ]; - buildDependencies = [ wayland_scanner_0_9_4 ]; - features = mkFeatures wayland_server_0_9_4_features; + phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + inherit dependencies buildDependencies features; }; - wayland_server_0_9_4_features."".self = true; - bitflags_0_7_0_features."default".from_wayland_server_0_9_4__default = true; - libc_0_2_23_features."default".from_wayland_server_0_9_4__default = true; - nix_0_8_1_features."default".from_wayland_server_0_9_4__default = true; - wayland_sys_0_9_4_features."server".from_wayland_server_0_9_4 = true; - wayland_sys_0_9_4_features."dlopen".from_wayland_server_0_9_4__dlopen = hasFeature (wayland_server_0_9_4_features."dlopen" or {}); - wayland_sys_0_9_4_features."default".from_wayland_server_0_9_4__default = true; - wayland_sys_0_6_0 = wayland_sys_0_6_0_ rec { - dependencies = [ dlib_0_3_1 libc_0_2_23 ] - ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_23] else []); - features = mkFeatures wayland_sys_0_6_0_features; + phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; }; - wayland_sys_0_6_0_features."".self = true; - wayland_sys_0_6_0_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); - wayland_sys_0_6_0_features."libc".self_server = hasFeature (wayland_sys_0_6_0_features."server" or {}); - dlib_0_3_1_features."dlopen".from_wayland_sys_0_6_0__dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); - dlib_0_3_1_features."default".from_wayland_sys_0_6_0__default = true; - lazy_static_0_0_0_features."default".from_wayland_sys_0_6_0__default = true; - libc_0_2_23_features."default".from_wayland_sys_0_6_0__default = true; - wayland_sys_0_9_4 = wayland_sys_0_9_4_ rec { - dependencies = [ dlib_0_3_1 lazy_static_0_2_8 libc_0_2_23 ] - ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_2_8] else []) ++ (if lib.lists.any (x: x == "libc") features then [libc_0_2_23] else []); - features = mkFeatures wayland_sys_0_9_4_features; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; }; - wayland_sys_0_9_4_features."".self = true; - wayland_sys_0_9_4_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_9_4_features."dlopen" or {}); - wayland_sys_0_9_4_features."libc".self_server = hasFeature (wayland_sys_0_9_4_features."server" or {}); - dlib_0_3_1_features."dlopen".from_wayland_sys_0_9_4__dlopen = hasFeature (wayland_sys_0_9_4_features."dlopen" or {}); - dlib_0_3_1_features."default".from_wayland_sys_0_9_4__default = true; - lazy_static_0_2_8_features."default".from_wayland_sys_0_9_4__default = true; - libc_0_2_23_features."default".from_wayland_sys_0_9_4__default = true; - winapi_0_2_8 = winapi_0_2_8_ rec {}; - winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; - xml_rs_0_3_6 = xml_rs_0_3_6_ rec { - dependencies = [ bitflags_0_7_0 ]; + rand_0_3_19_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.19"; + authors = [ "The Rust Project Developers" ]; + sha256 = "19zx65w7rrrfnjifmjp2i80w9bc6ld7pcwnk5hmr9xszmmvhk8zp"; + inherit dependencies buildDependencies features; }; - bitflags_0_7_0_features."default".from_xml_rs_0_3_6__default = true; + regex_0_1_80_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex"; + version = "0.1.80"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6"; + inherit dependencies buildDependencies features; + }; + regex_syntax_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.3.9"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; + inherit dependencies buildDependencies features; + }; + rlua_0_9_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rlua"; + version = "0.9.7"; + authors = [ "kyren " ]; + sha256 = "1671b5ga54aq49sqx69hvnjr732hf9jpqwswwxgpcqq8q05mfzgp"; + inherit dependencies buildDependencies features; + }; + rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-serialize"; + version = "0.3.24"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; + inherit dependencies buildDependencies features; + }; + rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc_version"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; + inherit dependencies buildDependencies features; + }; + rustwlc_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustwlc"; + version = "0.7.0"; + authors = [ "Snirk Immington " "Timidger " ]; + sha256 = "0gqi9pdw74al33ja25h33q68vnfklj3gpjgkiqqbr3gflgli5h1i"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.1.20"; + authors = [ "The Rust Project Developers" ]; + sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; + inherit dependencies buildDependencies features; + }; + serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "0.9.15"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; + inherit dependencies buildDependencies features; + }; + serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "0.9.10"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; + }; + target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "target_build_utils"; + version = "0.3.1"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + thread_id_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread-id"; + version = "2.0.0"; + authors = [ "Ruud van Asseldonk " ]; + sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3"; + inherit dependencies buildDependencies features; + }; + thread_local_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.2.7"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7"; + inherit dependencies buildDependencies features; + }; + token_store_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "token_store"; + version = "0.1.2"; + authors = [ "Victor Berger " ]; + sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq"; + inherit dependencies buildDependencies features; + }; + utf8_ranges_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "utf8-ranges"; + version = "0.1.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; + inherit dependencies buildDependencies features; + }; + uuid_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "uuid"; + version = "0.3.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip"; + inherit dependencies buildDependencies features; + }; + void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + inherit dependencies buildDependencies features; + }; + way_cooler_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "way-cooler"; + version = "0.8.0"; + authors = [ "Snirk Immington " "Timidger " ]; + sha256 = "1xg7sg0ssc7a8nx7g6pjdfz9ndf0l7p2n0ydh3sqym3k5ifxi965"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_scanner_0_12_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-scanner"; + version = "0.12.4"; + authors = [ "Victor Berger " ]; + sha256 = "043s30i7da64a7inmwiib36ax681vw7zr0pfl54alcyc6pgyanb1"; + inherit dependencies buildDependencies features; + }; + wayland_server_0_12_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-server"; + version = "0.12.4"; + authors = [ "Victor Berger " ]; + sha256 = "0m8565848l8f1h3mwlyxy3nfqv11vpl50y9qcpmp60hw8w2vw124"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.6.0"; + authors = [ "Victor Berger " ]; + sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.9.10"; + authors = [ "Victor Berger " ]; + sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_12_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.12.4"; + authors = [ "Victor Berger " ]; + sha256 = "1q9qyjl6bz356kh50lzvk48qbs87zbaqh5mhm6nlngkg1qrbvi6c"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + xcb_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xcb"; + version = "0.8.1"; + authors = [ "Remi Thebault " ]; + sha256 = "12jk8rbbmw3h9w0c7idvjph5bx0qpjgrv0nql2cfwy571j9qxb7j"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + xml_rs_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xml-rs"; + version = "0.7.0"; + authors = [ "Vladimir Matveev " ]; + sha256 = "12rynhqjgkg2hzy9x1d1232p9d9jm40bc3by5yzjv8gx089mflyb"; + libPath = "src/lib.rs"; + libName = "xml"; + crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; + inherit dependencies buildDependencies features; + }; + aho_corasick_0_5_3 = { features?(aho_corasick_0_5_3_features {}) }: aho_corasick_0_5_3_ { + dependencies = mapFeatures features ([ memchr_0_1_11 ]); + }; + aho_corasick_0_5_3_features = f: updateFeatures f (rec { + aho_corasick_0_5_3.default = (f.aho_corasick_0_5_3.default or true); + memchr_0_1_11.default = true; + }) [ memchr_0_1_11_features ]; + bitflags_0_4_0 = { features?(bitflags_0_4_0_features {}) }: bitflags_0_4_0_ { + features = mkFeatures (features.bitflags_0_4_0 or {}); + }; + bitflags_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_4_0.default = (f.bitflags_0_4_0.default or true); + }) []; + bitflags_0_6_0 = { features?(bitflags_0_6_0_features {}) }: bitflags_0_6_0_ {}; + bitflags_0_6_0_features = f: updateFeatures f (rec { + bitflags_0_6_0.default = (f.bitflags_0_6_0.default or true); + }) []; + bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; + bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); + }) []; + bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { + features = mkFeatures (features.bitflags_0_9_1 or {}); + }; + bitflags_0_9_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); + bitflags_0_9_1.example_generated = + (f.bitflags_0_9_1.example_generated or false) || + (f.bitflags_0_9_1.default or false) || + (bitflags_0_9_1.default or false); + }) []; + bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ { + features = mkFeatures (features.bitflags_1_0_1 or {}); + }; + bitflags_1_0_1_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = (f.bitflags_1_0_1.default or true); + bitflags_1_0_1.example_generated = + (f.bitflags_1_0_1.example_generated or false) || + (f.bitflags_1_0_1.default or false) || + (bitflags_1_0_1.default or false); + }) []; + c_vec_1_2_1 = { features?(c_vec_1_2_1_features {}) }: c_vec_1_2_1_ {}; + c_vec_1_2_1_features = f: updateFeatures f (rec { + c_vec_1_2_1.default = (f.c_vec_1_2_1.default or true); + }) []; + cairo_rs_0_2_0 = { features?(cairo_rs_0_2_0_features {}) }: cairo_rs_0_2_0_ { + dependencies = mapFeatures features ([ c_vec_1_2_1 cairo_sys_rs_0_4_0 libc_0_2_34 ] + ++ (if features.cairo_rs_0_2_0.glib or false then [ glib_0_3_1 ] else []) + ++ (if features.cairo_rs_0_2_0.glib-sys or false then [ glib_sys_0_4_0 ] else [])) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([]); + features = mkFeatures (features.cairo_rs_0_2_0 or {}); + }; + cairo_rs_0_2_0_features = f: updateFeatures f (rec { + c_vec_1_2_1.default = true; + cairo_rs_0_2_0.default = (f.cairo_rs_0_2_0.default or true); + cairo_rs_0_2_0.glib = + (f.cairo_rs_0_2_0.glib or false) || + (f.cairo_rs_0_2_0.use_glib or false) || + (cairo_rs_0_2_0.use_glib or false); + cairo_rs_0_2_0.glib-sys = + (f.cairo_rs_0_2_0.glib-sys or false) || + (f.cairo_rs_0_2_0.use_glib or false) || + (cairo_rs_0_2_0.use_glib or false); + cairo_rs_0_2_0.gtk-rs-lgpl-docs = + (f.cairo_rs_0_2_0.gtk-rs-lgpl-docs or false) || + (f.cairo_rs_0_2_0.embed-lgpl-docs or false) || + (cairo_rs_0_2_0.embed-lgpl-docs or false) || + (f.cairo_rs_0_2_0.purge-lgpl-docs or false) || + (cairo_rs_0_2_0.purge-lgpl-docs or false); + cairo_rs_0_2_0.use_glib = + (f.cairo_rs_0_2_0.use_glib or false) || + (f.cairo_rs_0_2_0.default or false) || + (cairo_rs_0_2_0.default or false); + cairo_sys_rs_0_4_0.default = true; + cairo_sys_rs_0_4_0.png = + (f.cairo_sys_rs_0_4_0.png or false) || + (cairo_rs_0_2_0.png or false) || + (f.cairo_rs_0_2_0.png or false); + cairo_sys_rs_0_4_0.v1_12 = + (f.cairo_sys_rs_0_4_0.v1_12 or false) || + (cairo_rs_0_2_0.v1_12 or false) || + (f.cairo_rs_0_2_0.v1_12 or false); + cairo_sys_rs_0_4_0.xcb = + (f.cairo_sys_rs_0_4_0.xcb or false) || + (cairo_rs_0_2_0.xcb or false) || + (f.cairo_rs_0_2_0.xcb or false); + glib_0_3_1.default = true; + glib_sys_0_4_0.default = true; + libc_0_2_34.default = true; + winapi_0_2_8.default = true; + }) [ c_vec_1_2_1_features cairo_sys_rs_0_4_0_features glib_0_3_1_features glib_sys_0_4_0_features libc_0_2_34_features winapi_0_2_8_features ]; + cairo_sys_rs_0_4_0 = { features?(cairo_sys_rs_0_4_0_features {}) }: cairo_sys_rs_0_4_0_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]) + ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.cairo_sys_rs_0_4_0 or {}); + }; + cairo_sys_rs_0_4_0_features = f: updateFeatures f (rec { + cairo_sys_rs_0_4_0.default = (f.cairo_sys_rs_0_4_0.default or true); + cairo_sys_rs_0_4_0.v1_12 = + (f.cairo_sys_rs_0_4_0.v1_12 or false) || + (f.cairo_sys_rs_0_4_0.v1_14 or false) || + (cairo_sys_rs_0_4_0.v1_14 or false); + cairo_sys_rs_0_4_0.x11 = + (f.cairo_sys_rs_0_4_0.x11 or false) || + (f.cairo_sys_rs_0_4_0.xlib or false) || + (cairo_sys_rs_0_4_0.xlib or false); + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + winapi_0_2_8.default = true; + }) [ libc_0_2_34_features pkg_config_0_3_9_features winapi_0_2_8_features ]; + cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; + cfg_if_0_1_2_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); + }) []; + dbus_0_4_1 = { features?(dbus_0_4_1_features {}) }: dbus_0_4_1_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + }; + dbus_0_4_1_features = f: updateFeatures f (rec { + dbus_0_4_1.default = (f.dbus_0_4_1.default or true); + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ libc_0_2_34_features pkg_config_0_3_9_features ]; + dbus_macros_0_0_6 = { features?(dbus_macros_0_0_6_features {}) }: dbus_macros_0_0_6_ { + dependencies = mapFeatures features ([ dbus_0_4_1 ]); + }; + dbus_macros_0_0_6_features = f: updateFeatures f (rec { + dbus_0_4_1.default = true; + dbus_macros_0_0_6.default = (f.dbus_macros_0_0_6.default or true); + }) [ dbus_0_4_1_features ]; + dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ { + dependencies = mapFeatures features ([ libloading_0_3_4 ]); + features = mkFeatures (features.dlib_0_3_1 or {}); + }; + dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1.default = (f.dlib_0_3_1.default or true); + libloading_0_3_4.default = true; + }) [ libloading_0_3_4_features ]; + dlib_0_4_0 = { features?(dlib_0_4_0_features {}) }: dlib_0_4_0_ { + dependencies = mapFeatures features ([ libloading_0_4_3 ]); + features = mkFeatures (features.dlib_0_4_0 or {}); + }; + dlib_0_4_0_features = f: updateFeatures f (rec { + dlib_0_4_0.default = (f.dlib_0_4_0.default or true); + libloading_0_4_3.default = true; + }) [ libloading_0_4_3_features ]; + dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; + dtoa_0_4_2_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); + }) []; + dummy_rustwlc_0_7_1 = { features?(dummy_rustwlc_0_7_1_features {}) }: dummy_rustwlc_0_7_1_ { + dependencies = mapFeatures features ([ bitflags_0_6_0 libc_0_2_34 wayland_sys_0_9_10 ]); + }; + dummy_rustwlc_0_7_1_features = f: updateFeatures f (rec { + bitflags_0_6_0.default = true; + dummy_rustwlc_0_7_1.default = (f.dummy_rustwlc_0_7_1.default or true); + libc_0_2_34.default = true; + wayland_sys_0_9_10.default = true; + wayland_sys_0_9_10.dlopen = true; + wayland_sys_0_9_10.server = true; + }) [ bitflags_0_6_0_features libc_0_2_34_features wayland_sys_0_9_10_features ]; + env_logger_0_3_5 = { features?(env_logger_0_3_5_features {}) }: env_logger_0_3_5_ { + dependencies = mapFeatures features ([ log_0_3_9 ] + ++ (if features.env_logger_0_3_5.regex or false then [ regex_0_1_80 ] else [])); + features = mkFeatures (features.env_logger_0_3_5 or {}); + }; + env_logger_0_3_5_features = f: updateFeatures f (rec { + env_logger_0_3_5.default = (f.env_logger_0_3_5.default or true); + env_logger_0_3_5.regex = + (f.env_logger_0_3_5.regex or false) || + (f.env_logger_0_3_5.default or false) || + (env_logger_0_3_5.default or false); + log_0_3_9.default = true; + regex_0_1_80.default = true; + }) [ log_0_3_9_features regex_0_1_80_features ]; + fixedbitset_0_1_8 = { features?(fixedbitset_0_1_8_features {}) }: fixedbitset_0_1_8_ {}; + fixedbitset_0_1_8_features = f: updateFeatures f (rec { + fixedbitset_0_1_8.default = (f.fixedbitset_0_1_8.default or true); + }) []; + fuchsia_zircon_0_3_2 = { features?(fuchsia_zircon_0_3_2_features {}) }: fuchsia_zircon_0_3_2_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_2 ]); + }; + fuchsia_zircon_0_3_2_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + fuchsia_zircon_0_3_2.default = (f.fuchsia_zircon_0_3_2.default or true); + fuchsia_zircon_sys_0_3_2.default = true; + }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_2_features ]; + fuchsia_zircon_sys_0_3_2 = { features?(fuchsia_zircon_sys_0_3_2_features {}) }: fuchsia_zircon_sys_0_3_2_ {}; + fuchsia_zircon_sys_0_3_2_features = f: updateFeatures f (rec { + fuchsia_zircon_sys_0_3_2.default = (f.fuchsia_zircon_sys_0_3_2.default or true); + }) []; + gcc_0_3_54 = { features?(gcc_0_3_54_features {}) }: gcc_0_3_54_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.gcc_0_3_54 or {}); + }; + gcc_0_3_54_features = f: updateFeatures f (rec { + gcc_0_3_54.default = (f.gcc_0_3_54.default or true); + gcc_0_3_54.rayon = + (f.gcc_0_3_54.rayon or false) || + (f.gcc_0_3_54.parallel or false) || + (gcc_0_3_54.parallel or false); + }) []; + gdk_pixbuf_0_2_0 = { features?(gdk_pixbuf_0_2_0_features {}) }: gdk_pixbuf_0_2_0_ { + dependencies = mapFeatures features ([ gdk_pixbuf_sys_0_4_0 glib_0_3_1 glib_sys_0_4_0 gobject_sys_0_4_0 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([]); + features = mkFeatures (features.gdk_pixbuf_0_2_0 or {}); + }; + gdk_pixbuf_0_2_0_features = f: updateFeatures f (rec { + gdk_pixbuf_0_2_0.default = (f.gdk_pixbuf_0_2_0.default or true); + gdk_pixbuf_0_2_0.gtk-rs-lgpl-docs = + (f.gdk_pixbuf_0_2_0.gtk-rs-lgpl-docs or false) || + (f.gdk_pixbuf_0_2_0.embed-lgpl-docs or false) || + (gdk_pixbuf_0_2_0.embed-lgpl-docs or false) || + (f.gdk_pixbuf_0_2_0.purge-lgpl-docs or false) || + (gdk_pixbuf_0_2_0.purge-lgpl-docs or false); + gdk_pixbuf_0_2_0.v2_28 = + (f.gdk_pixbuf_0_2_0.v2_28 or false) || + (f.gdk_pixbuf_0_2_0.v2_30 or false) || + (gdk_pixbuf_0_2_0.v2_30 or false); + gdk_pixbuf_0_2_0.v2_30 = + (f.gdk_pixbuf_0_2_0.v2_30 or false) || + (f.gdk_pixbuf_0_2_0.v2_32 or false) || + (gdk_pixbuf_0_2_0.v2_32 or false); + gdk_pixbuf_0_2_0.v2_32 = + (f.gdk_pixbuf_0_2_0.v2_32 or false) || + (f.gdk_pixbuf_0_2_0.v2_36 or false) || + (gdk_pixbuf_0_2_0.v2_36 or false); + gdk_pixbuf_sys_0_4_0.default = true; + gdk_pixbuf_sys_0_4_0.v2_28 = + (f.gdk_pixbuf_sys_0_4_0.v2_28 or false) || + (gdk_pixbuf_0_2_0.v2_28 or false) || + (f.gdk_pixbuf_0_2_0.v2_28 or false); + gdk_pixbuf_sys_0_4_0.v2_30 = + (f.gdk_pixbuf_sys_0_4_0.v2_30 or false) || + (gdk_pixbuf_0_2_0.v2_30 or false) || + (f.gdk_pixbuf_0_2_0.v2_30 or false); + gdk_pixbuf_sys_0_4_0.v2_32 = + (f.gdk_pixbuf_sys_0_4_0.v2_32 or false) || + (gdk_pixbuf_0_2_0.v2_32 or false) || + (f.gdk_pixbuf_0_2_0.v2_32 or false); + gdk_pixbuf_sys_0_4_0.v2_36 = + (f.gdk_pixbuf_sys_0_4_0.v2_36 or false) || + (gdk_pixbuf_0_2_0.v2_36 or false) || + (f.gdk_pixbuf_0_2_0.v2_36 or false); + glib_0_3_1.default = true; + glib_sys_0_4_0.default = true; + gobject_sys_0_4_0.default = true; + libc_0_2_34.default = true; + }) [ gdk_pixbuf_sys_0_4_0_features glib_0_3_1_features glib_sys_0_4_0_features gobject_sys_0_4_0_features libc_0_2_34_features ]; + gdk_pixbuf_sys_0_4_0 = { features?(gdk_pixbuf_sys_0_4_0_features {}) }: gdk_pixbuf_sys_0_4_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 gio_sys_0_4_0 glib_sys_0_4_0 gobject_sys_0_4_0 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.gdk_pixbuf_sys_0_4_0 or {}); + }; + gdk_pixbuf_sys_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + gdk_pixbuf_sys_0_4_0.default = (f.gdk_pixbuf_sys_0_4_0.default or true); + gdk_pixbuf_sys_0_4_0.v2_28 = + (f.gdk_pixbuf_sys_0_4_0.v2_28 or false) || + (f.gdk_pixbuf_sys_0_4_0.v2_30 or false) || + (gdk_pixbuf_sys_0_4_0.v2_30 or false); + gdk_pixbuf_sys_0_4_0.v2_30 = + (f.gdk_pixbuf_sys_0_4_0.v2_30 or false) || + (f.gdk_pixbuf_sys_0_4_0.v2_32 or false) || + (gdk_pixbuf_sys_0_4_0.v2_32 or false); + gdk_pixbuf_sys_0_4_0.v2_32 = + (f.gdk_pixbuf_sys_0_4_0.v2_32 or false) || + (f.gdk_pixbuf_sys_0_4_0.v2_36 or false) || + (gdk_pixbuf_sys_0_4_0.v2_36 or false); + gio_sys_0_4_0.default = true; + glib_sys_0_4_0.default = true; + gobject_sys_0_4_0.default = true; + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ bitflags_0_9_1_features gio_sys_0_4_0_features glib_sys_0_4_0_features gobject_sys_0_4_0_features libc_0_2_34_features pkg_config_0_3_9_features ]; + getopts_0_2_15 = { features?(getopts_0_2_15_features {}) }: getopts_0_2_15_ {}; + getopts_0_2_15_features = f: updateFeatures f (rec { + getopts_0_2_15.default = (f.getopts_0_2_15.default or true); + }) []; + gio_sys_0_4_0 = { features?(gio_sys_0_4_0_features {}) }: gio_sys_0_4_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 glib_sys_0_4_0 gobject_sys_0_4_0 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.gio_sys_0_4_0 or {}); + }; + gio_sys_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + gio_sys_0_4_0.default = (f.gio_sys_0_4_0.default or true); + gio_sys_0_4_0.v2_34 = + (f.gio_sys_0_4_0.v2_34 or false) || + (f.gio_sys_0_4_0.v2_36 or false) || + (gio_sys_0_4_0.v2_36 or false); + gio_sys_0_4_0.v2_36 = + (f.gio_sys_0_4_0.v2_36 or false) || + (f.gio_sys_0_4_0.v2_38 or false) || + (gio_sys_0_4_0.v2_38 or false); + gio_sys_0_4_0.v2_38 = + (f.gio_sys_0_4_0.v2_38 or false) || + (f.gio_sys_0_4_0.v2_40 or false) || + (gio_sys_0_4_0.v2_40 or false); + gio_sys_0_4_0.v2_40 = + (f.gio_sys_0_4_0.v2_40 or false) || + (f.gio_sys_0_4_0.v2_42 or false) || + (gio_sys_0_4_0.v2_42 or false); + gio_sys_0_4_0.v2_42 = + (f.gio_sys_0_4_0.v2_42 or false) || + (f.gio_sys_0_4_0.v2_44 or false) || + (gio_sys_0_4_0.v2_44 or false); + gio_sys_0_4_0.v2_44 = + (f.gio_sys_0_4_0.v2_44 or false) || + (f.gio_sys_0_4_0.v2_46 or false) || + (gio_sys_0_4_0.v2_46 or false); + gio_sys_0_4_0.v2_46 = + (f.gio_sys_0_4_0.v2_46 or false) || + (f.gio_sys_0_4_0.v2_48 or false) || + (gio_sys_0_4_0.v2_48 or false); + gio_sys_0_4_0.v2_48 = + (f.gio_sys_0_4_0.v2_48 or false) || + (f.gio_sys_0_4_0.v2_50 or false) || + (gio_sys_0_4_0.v2_50 or false); + glib_sys_0_4_0.default = true; + gobject_sys_0_4_0.default = true; + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ bitflags_0_9_1_features glib_sys_0_4_0_features gobject_sys_0_4_0_features libc_0_2_34_features pkg_config_0_3_9_features ]; + glib_0_3_1 = { features?(glib_0_3_1_features {}) }: glib_0_3_1_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 glib_sys_0_4_0 gobject_sys_0_4_0 lazy_static_0_2_11 libc_0_2_34 ]); + features = mkFeatures (features.glib_0_3_1 or {}); + }; + glib_0_3_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + glib_0_3_1.default = (f.glib_0_3_1.default or true); + glib_0_3_1.v2_34 = + (f.glib_0_3_1.v2_34 or false) || + (f.glib_0_3_1.v2_38 or false) || + (glib_0_3_1.v2_38 or false); + glib_0_3_1.v2_38 = + (f.glib_0_3_1.v2_38 or false) || + (f.glib_0_3_1.v2_40 or false) || + (glib_0_3_1.v2_40 or false); + glib_0_3_1.v2_40 = + (f.glib_0_3_1.v2_40 or false) || + (f.glib_0_3_1.v2_44 or false) || + (glib_0_3_1.v2_44 or false); + glib_0_3_1.v2_44 = + (f.glib_0_3_1.v2_44 or false) || + (f.glib_0_3_1.v2_46 or false) || + (glib_0_3_1.v2_46 or false); + glib_0_3_1.v2_46 = + (f.glib_0_3_1.v2_46 or false) || + (f.glib_0_3_1.v2_48 or false) || + (glib_0_3_1.v2_48 or false); + glib_0_3_1.v2_48 = + (f.glib_0_3_1.v2_48 or false) || + (f.glib_0_3_1.v2_50 or false) || + (glib_0_3_1.v2_50 or false); + glib_sys_0_4_0.default = true; + glib_sys_0_4_0.v2_34 = + (f.glib_sys_0_4_0.v2_34 or false) || + (glib_0_3_1.v2_34 or false) || + (f.glib_0_3_1.v2_34 or false); + glib_sys_0_4_0.v2_38 = + (f.glib_sys_0_4_0.v2_38 or false) || + (glib_0_3_1.v2_38 or false) || + (f.glib_0_3_1.v2_38 or false); + glib_sys_0_4_0.v2_40 = + (f.glib_sys_0_4_0.v2_40 or false) || + (glib_0_3_1.v2_40 or false) || + (f.glib_0_3_1.v2_40 or false); + glib_sys_0_4_0.v2_44 = + (f.glib_sys_0_4_0.v2_44 or false) || + (glib_0_3_1.v2_44 or false) || + (f.glib_0_3_1.v2_44 or false); + glib_sys_0_4_0.v2_46 = + (f.glib_sys_0_4_0.v2_46 or false) || + (glib_0_3_1.v2_46 or false) || + (f.glib_0_3_1.v2_46 or false); + glib_sys_0_4_0.v2_48 = + (f.glib_sys_0_4_0.v2_48 or false) || + (glib_0_3_1.v2_48 or false) || + (f.glib_0_3_1.v2_48 or false); + glib_sys_0_4_0.v2_50 = + (f.glib_sys_0_4_0.v2_50 or false) || + (glib_0_3_1.v2_50 or false) || + (f.glib_0_3_1.v2_50 or false); + gobject_sys_0_4_0.default = true; + gobject_sys_0_4_0.v2_34 = + (f.gobject_sys_0_4_0.v2_34 or false) || + (glib_0_3_1.v2_34 or false) || + (f.glib_0_3_1.v2_34 or false); + gobject_sys_0_4_0.v2_38 = + (f.gobject_sys_0_4_0.v2_38 or false) || + (glib_0_3_1.v2_38 or false) || + (f.glib_0_3_1.v2_38 or false); + gobject_sys_0_4_0.v2_44 = + (f.gobject_sys_0_4_0.v2_44 or false) || + (glib_0_3_1.v2_44 or false) || + (f.glib_0_3_1.v2_44 or false); + gobject_sys_0_4_0.v2_46 = + (f.gobject_sys_0_4_0.v2_46 or false) || + (glib_0_3_1.v2_46 or false) || + (f.glib_0_3_1.v2_46 or false); + lazy_static_0_2_11.default = true; + libc_0_2_34.default = true; + }) [ bitflags_0_9_1_features glib_sys_0_4_0_features gobject_sys_0_4_0_features lazy_static_0_2_11_features libc_0_2_34_features ]; + glib_sys_0_4_0 = { features?(glib_sys_0_4_0_features {}) }: glib_sys_0_4_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.glib_sys_0_4_0 or {}); + }; + glib_sys_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + glib_sys_0_4_0.default = (f.glib_sys_0_4_0.default or true); + glib_sys_0_4_0.v2_34 = + (f.glib_sys_0_4_0.v2_34 or false) || + (f.glib_sys_0_4_0.v2_36 or false) || + (glib_sys_0_4_0.v2_36 or false); + glib_sys_0_4_0.v2_36 = + (f.glib_sys_0_4_0.v2_36 or false) || + (f.glib_sys_0_4_0.v2_38 or false) || + (glib_sys_0_4_0.v2_38 or false); + glib_sys_0_4_0.v2_38 = + (f.glib_sys_0_4_0.v2_38 or false) || + (f.glib_sys_0_4_0.v2_40 or false) || + (glib_sys_0_4_0.v2_40 or false); + glib_sys_0_4_0.v2_40 = + (f.glib_sys_0_4_0.v2_40 or false) || + (f.glib_sys_0_4_0.v2_44 or false) || + (glib_sys_0_4_0.v2_44 or false); + glib_sys_0_4_0.v2_44 = + (f.glib_sys_0_4_0.v2_44 or false) || + (f.glib_sys_0_4_0.v2_46 or false) || + (glib_sys_0_4_0.v2_46 or false); + glib_sys_0_4_0.v2_46 = + (f.glib_sys_0_4_0.v2_46 or false) || + (f.glib_sys_0_4_0.v2_48 or false) || + (glib_sys_0_4_0.v2_48 or false); + glib_sys_0_4_0.v2_48 = + (f.glib_sys_0_4_0.v2_48 or false) || + (f.glib_sys_0_4_0.v2_50 or false) || + (glib_sys_0_4_0.v2_50 or false); + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ bitflags_0_9_1_features libc_0_2_34_features pkg_config_0_3_9_features ]; + gobject_sys_0_4_0 = { features?(gobject_sys_0_4_0_features {}) }: gobject_sys_0_4_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 glib_sys_0_4_0 libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ pkg_config_0_3_9 ]); + features = mkFeatures (features.gobject_sys_0_4_0 or {}); + }; + gobject_sys_0_4_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + glib_sys_0_4_0.default = true; + gobject_sys_0_4_0.default = (f.gobject_sys_0_4_0.default or true); + gobject_sys_0_4_0.v2_34 = + (f.gobject_sys_0_4_0.v2_34 or false) || + (f.gobject_sys_0_4_0.v2_36 or false) || + (gobject_sys_0_4_0.v2_36 or false); + gobject_sys_0_4_0.v2_36 = + (f.gobject_sys_0_4_0.v2_36 or false) || + (f.gobject_sys_0_4_0.v2_38 or false) || + (gobject_sys_0_4_0.v2_38 or false); + gobject_sys_0_4_0.v2_38 = + (f.gobject_sys_0_4_0.v2_38 or false) || + (f.gobject_sys_0_4_0.v2_42 or false) || + (gobject_sys_0_4_0.v2_42 or false); + gobject_sys_0_4_0.v2_42 = + (f.gobject_sys_0_4_0.v2_42 or false) || + (f.gobject_sys_0_4_0.v2_44 or false) || + (gobject_sys_0_4_0.v2_44 or false); + gobject_sys_0_4_0.v2_44 = + (f.gobject_sys_0_4_0.v2_44 or false) || + (f.gobject_sys_0_4_0.v2_46 or false) || + (gobject_sys_0_4_0.v2_46 or false); + libc_0_2_34.default = true; + pkg_config_0_3_9.default = true; + }) [ bitflags_0_9_1_features glib_sys_0_4_0_features libc_0_2_34_features pkg_config_0_3_9_features ]; + itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ { + features = mkFeatures (features.itoa_0_3_4 or {}); + }; + itoa_0_3_4_features = f: updateFeatures f (rec { + itoa_0_3_4.default = (f.itoa_0_3_4.default or true); + }) []; + json_macro_0_1_1 = { features?(json_macro_0_1_1_features {}) }: json_macro_0_1_1_ { + dependencies = mapFeatures features ([ rustc_serialize_0_3_24 ]); + }; + json_macro_0_1_1_features = f: updateFeatures f (rec { + json_macro_0_1_1.default = (f.json_macro_0_1_1.default or true); + rustc_serialize_0_3_24.default = true; + }) [ rustc_serialize_0_3_24_features ]; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_11 or {}); + }; + lazy_static_0_2_11_features = f: updateFeatures f (rec { + lazy_static_0_2_11.compiletest_rs = + (f.lazy_static_0_2_11.compiletest_rs or false) || + (f.lazy_static_0_2_11.compiletest or false) || + (lazy_static_0_2_11.compiletest or false); + lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true); + lazy_static_0_2_11.nightly = + (f.lazy_static_0_2_11.nightly or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + lazy_static_0_2_11.spin = + (f.lazy_static_0_2_11.spin or false) || + (f.lazy_static_0_2_11.spin_no_std or false) || + (lazy_static_0_2_11.spin_no_std or false); + }) []; + lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_1_0_0 or {}); + }; + lazy_static_1_0_0_features = f: updateFeatures f (rec { + lazy_static_1_0_0.compiletest_rs = + (f.lazy_static_1_0_0.compiletest_rs or false) || + (f.lazy_static_1_0_0.compiletest or false) || + (lazy_static_1_0_0.compiletest or false); + lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); + lazy_static_1_0_0.nightly = + (f.lazy_static_1_0_0.nightly or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); + lazy_static_1_0_0.spin = + (f.lazy_static_1_0_0.spin or false) || + (f.lazy_static_1_0_0.spin_no_std or false) || + (lazy_static_1_0_0.spin_no_std or false); + }) []; + libc_0_2_34 = { features?(libc_0_2_34_features {}) }: libc_0_2_34_ { + features = mkFeatures (features.libc_0_2_34 or {}); + }; + libc_0_2_34_features = f: updateFeatures f (rec { + libc_0_2_34.default = (f.libc_0_2_34.default or true); + libc_0_2_34.use_std = + (f.libc_0_2_34.use_std or false) || + (f.libc_0_2_34.default or false) || + (libc_0_2_34.default or false); + }) []; + libloading_0_3_4 = { features?(libloading_0_3_4_features {}) }: libloading_0_3_4_ { + dependencies = mapFeatures features ([ lazy_static_0_2_11 ]) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); + }; + libloading_0_3_4_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + lazy_static_0_2_11.default = true; + libloading_0_3_4.default = (f.libloading_0_3_4.default or true); + target_build_utils_0_3_1.default = true; + winapi_0_2_8.default = true; + }) [ lazy_static_0_2_11_features target_build_utils_0_3_1_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + libloading_0_4_3 = { features?(libloading_0_4_3_features {}) }: libloading_0_4_3_ { + dependencies = mapFeatures features ([ lazy_static_1_0_0 ]) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + libloading_0_4_3_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + lazy_static_1_0_0.default = true; + libloading_0_4_3.default = (f.libloading_0_4_3.default or true); + winapi_0_2_8.default = true; + }) [ lazy_static_1_0_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + log_0_3_9 = { features?(log_0_3_9_features {}) }: log_0_3_9_ { + dependencies = mapFeatures features ([ log_0_4_0 ]); + features = mkFeatures (features.log_0_3_9 or {}); + }; + log_0_3_9_features = f: updateFeatures f (rec { + log_0_3_9.default = (f.log_0_3_9.default or true); + log_0_3_9.use_std = + (f.log_0_3_9.use_std or false) || + (f.log_0_3_9.default or false) || + (log_0_3_9.default or false); + log_0_4_0.default = true; + log_0_4_0.max_level_debug = + (f.log_0_4_0.max_level_debug or false) || + (log_0_3_9.max_level_debug or false) || + (f.log_0_3_9.max_level_debug or false); + log_0_4_0.max_level_error = + (f.log_0_4_0.max_level_error or false) || + (log_0_3_9.max_level_error or false) || + (f.log_0_3_9.max_level_error or false); + log_0_4_0.max_level_info = + (f.log_0_4_0.max_level_info or false) || + (log_0_3_9.max_level_info or false) || + (f.log_0_3_9.max_level_info or false); + log_0_4_0.max_level_off = + (f.log_0_4_0.max_level_off or false) || + (log_0_3_9.max_level_off or false) || + (f.log_0_3_9.max_level_off or false); + log_0_4_0.max_level_trace = + (f.log_0_4_0.max_level_trace or false) || + (log_0_3_9.max_level_trace or false) || + (f.log_0_3_9.max_level_trace or false); + log_0_4_0.max_level_warn = + (f.log_0_4_0.max_level_warn or false) || + (log_0_3_9.max_level_warn or false) || + (f.log_0_3_9.max_level_warn or false); + log_0_4_0.release_max_level_debug = + (f.log_0_4_0.release_max_level_debug or false) || + (log_0_3_9.release_max_level_debug or false) || + (f.log_0_3_9.release_max_level_debug or false); + log_0_4_0.release_max_level_error = + (f.log_0_4_0.release_max_level_error or false) || + (log_0_3_9.release_max_level_error or false) || + (f.log_0_3_9.release_max_level_error or false); + log_0_4_0.release_max_level_info = + (f.log_0_4_0.release_max_level_info or false) || + (log_0_3_9.release_max_level_info or false) || + (f.log_0_3_9.release_max_level_info or false); + log_0_4_0.release_max_level_off = + (f.log_0_4_0.release_max_level_off or false) || + (log_0_3_9.release_max_level_off or false) || + (f.log_0_3_9.release_max_level_off or false); + log_0_4_0.release_max_level_trace = + (f.log_0_4_0.release_max_level_trace or false) || + (log_0_3_9.release_max_level_trace or false) || + (f.log_0_3_9.release_max_level_trace or false); + log_0_4_0.release_max_level_warn = + (f.log_0_4_0.release_max_level_warn or false) || + (log_0_3_9.release_max_level_warn or false) || + (f.log_0_3_9.release_max_level_warn or false); + log_0_4_0.std = + (f.log_0_4_0.std or false) || + (log_0_3_9.use_std or false) || + (f.log_0_3_9.use_std or false); + }) [ log_0_4_0_features ]; + log_0_4_0 = { features?(log_0_4_0_features {}) }: log_0_4_0_ { + dependencies = mapFeatures features ([ cfg_if_0_1_2 ]); + features = mkFeatures (features.log_0_4_0 or {}); + }; + log_0_4_0_features = f: updateFeatures f (rec { + cfg_if_0_1_2.default = true; + log_0_4_0.default = (f.log_0_4_0.default or true); + }) [ cfg_if_0_1_2_features ]; + memchr_0_1_11 = { features?(memchr_0_1_11_features {}) }: memchr_0_1_11_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]); + }; + memchr_0_1_11_features = f: updateFeatures f (rec { + libc_0_2_34.default = true; + memchr_0_1_11.default = (f.memchr_0_1_11.default or true); + }) [ libc_0_2_34_features ]; + nix_0_6_0 = { features?(nix_0_6_0_features {}) }: nix_0_6_0_ { + dependencies = mapFeatures features ([ bitflags_0_4_0 cfg_if_0_1_2 libc_0_2_34 void_1_0_2 ]); + buildDependencies = mapFeatures features ([ rustc_version_0_1_7 semver_0_1_20 ]); + features = mkFeatures (features.nix_0_6_0 or {}); + }; + nix_0_6_0_features = f: updateFeatures f (rec { + bitflags_0_4_0.default = true; + cfg_if_0_1_2.default = true; + libc_0_2_34.default = true; + nix_0_6_0.default = (f.nix_0_6_0.default or true); + rustc_version_0_1_7.default = true; + semver_0_1_20.default = true; + void_1_0_2.default = true; + }) [ bitflags_0_4_0_features cfg_if_0_1_2_features libc_0_2_34_features void_1_0_2_features rustc_version_0_1_7_features semver_0_1_20_features ]; + nix_0_9_0 = { features?(nix_0_9_0_features {}) }: nix_0_9_0_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 cfg_if_0_1_2 libc_0_2_34 void_1_0_2 ]); + }; + nix_0_9_0_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + cfg_if_0_1_2.default = true; + libc_0_2_34.default = true; + nix_0_9_0.default = (f.nix_0_9_0.default or true); + void_1_0_2.default = true; + }) [ bitflags_0_9_1_features cfg_if_0_1_2_features libc_0_2_34_features void_1_0_2_features ]; + num_traits_0_1_41 = { features?(num_traits_0_1_41_features {}) }: num_traits_0_1_41_ {}; + num_traits_0_1_41_features = f: updateFeatures f (rec { + num_traits_0_1_41.default = (f.num_traits_0_1_41.default or true); + }) []; + ordermap_0_3_2 = { features?(ordermap_0_3_2_features {}) }: ordermap_0_3_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.ordermap_0_3_2 or {}); + }; + ordermap_0_3_2_features = f: updateFeatures f (rec { + ordermap_0_3_2.default = (f.ordermap_0_3_2.default or true); + ordermap_0_3_2.serde = + (f.ordermap_0_3_2.serde or false) || + (f.ordermap_0_3_2.serde-1 or false) || + (ordermap_0_3_2.serde-1 or false); + }) []; + petgraph_0_4_10 = { features?(petgraph_0_4_10_features {}) }: petgraph_0_4_10_ { + dependencies = mapFeatures features ([ fixedbitset_0_1_8 ] + ++ (if features.petgraph_0_4_10.ordermap or false then [ ordermap_0_3_2 ] else [])); + features = mkFeatures (features.petgraph_0_4_10 or {}); + }; + petgraph_0_4_10_features = f: updateFeatures f (rec { + fixedbitset_0_1_8.default = true; + ordermap_0_3_2.default = true; + petgraph_0_4_10.default = (f.petgraph_0_4_10.default or true); + petgraph_0_4_10.generate = + (f.petgraph_0_4_10.generate or false) || + (f.petgraph_0_4_10.unstable or false) || + (petgraph_0_4_10.unstable or false); + petgraph_0_4_10.graphmap = + (f.petgraph_0_4_10.graphmap or false) || + (f.petgraph_0_4_10.all or false) || + (petgraph_0_4_10.all or false) || + (f.petgraph_0_4_10.default or false) || + (petgraph_0_4_10.default or false); + petgraph_0_4_10.ordermap = + (f.petgraph_0_4_10.ordermap or false) || + (f.petgraph_0_4_10.graphmap or false) || + (petgraph_0_4_10.graphmap or false); + petgraph_0_4_10.quickcheck = + (f.petgraph_0_4_10.quickcheck or false) || + (f.petgraph_0_4_10.all or false) || + (petgraph_0_4_10.all or false); + petgraph_0_4_10.serde = + (f.petgraph_0_4_10.serde or false) || + (f.petgraph_0_4_10.serde-1 or false) || + (petgraph_0_4_10.serde-1 or false); + petgraph_0_4_10.serde_derive = + (f.petgraph_0_4_10.serde_derive or false) || + (f.petgraph_0_4_10.serde-1 or false) || + (petgraph_0_4_10.serde-1 or false); + petgraph_0_4_10.stable_graph = + (f.petgraph_0_4_10.stable_graph or false) || + (f.petgraph_0_4_10.all or false) || + (petgraph_0_4_10.all or false) || + (f.petgraph_0_4_10.default or false) || + (petgraph_0_4_10.default or false); + petgraph_0_4_10.unstable = + (f.petgraph_0_4_10.unstable or false) || + (f.petgraph_0_4_10.all or false) || + (petgraph_0_4_10.all or false); + }) [ fixedbitset_0_1_8_features ordermap_0_3_2_features ]; + phf_0_7_21 = { features?(phf_0_7_21_features {}) }: phf_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 ]); + features = mkFeatures (features.phf_0_7_21 or {}); + }; + phf_0_7_21_features = f: updateFeatures f (rec { + phf_0_7_21.default = (f.phf_0_7_21.default or true); + phf_shared_0_7_21.core = + (f.phf_shared_0_7_21.core or false) || + (phf_0_7_21.core or false) || + (f.phf_0_7_21.core or false); + phf_shared_0_7_21.default = true; + phf_shared_0_7_21.unicase = + (f.phf_shared_0_7_21.unicase or false) || + (phf_0_7_21.unicase or false) || + (f.phf_0_7_21.unicase or false); + }) [ phf_shared_0_7_21_features ]; + phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { + dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); + }; + phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); + phf_generator_0_7_21.default = true; + phf_shared_0_7_21.default = true; + }) [ phf_generator_0_7_21_features phf_shared_0_7_21_features ]; + phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_19 ]); + }; + phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); + phf_shared_0_7_21.default = true; + rand_0_3_19.default = true; + }) [ phf_shared_0_7_21_features rand_0_3_19_features ]; + phf_shared_0_7_21 = { features?(phf_shared_0_7_21_features {}) }: phf_shared_0_7_21_ { + dependencies = mapFeatures features ([ siphasher_0_2_2 ]); + features = mkFeatures (features.phf_shared_0_7_21 or {}); + }; + phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); + siphasher_0_2_2.default = true; + }) [ siphasher_0_2_2_features ]; + pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; + pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); + }) []; + rand_0_3_19 = { features?(rand_0_3_19_features {}) }: rand_0_3_19_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_2 ]) else []); + features = mkFeatures (features.rand_0_3_19 or {}); + }; + rand_0_3_19_features = f: updateFeatures f (rec { + fuchsia_zircon_0_3_2.default = true; + libc_0_2_34.default = true; + rand_0_3_19.default = (f.rand_0_3_19.default or true); + rand_0_3_19.i128_support = + (f.rand_0_3_19.i128_support or false) || + (f.rand_0_3_19.nightly or false) || + (rand_0_3_19.nightly or false); + }) [ libc_0_2_34_features fuchsia_zircon_0_3_2_features ]; + regex_0_1_80 = { features?(regex_0_1_80_features {}) }: regex_0_1_80_ { + dependencies = mapFeatures features ([ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ]); + features = mkFeatures (features.regex_0_1_80 or {}); + }; + regex_0_1_80_features = f: updateFeatures f (rec { + aho_corasick_0_5_3.default = true; + memchr_0_1_11.default = true; + regex_0_1_80.default = (f.regex_0_1_80.default or true); + regex_0_1_80.simd = + (f.regex_0_1_80.simd or false) || + (f.regex_0_1_80.simd-accel or false) || + (regex_0_1_80.simd-accel or false); + regex_syntax_0_3_9.default = true; + thread_local_0_2_7.default = true; + utf8_ranges_0_1_3.default = true; + }) [ aho_corasick_0_5_3_features memchr_0_1_11_features regex_syntax_0_3_9_features thread_local_0_2_7_features utf8_ranges_0_1_3_features ]; + regex_syntax_0_3_9 = { features?(regex_syntax_0_3_9_features {}) }: regex_syntax_0_3_9_ {}; + regex_syntax_0_3_9_features = f: updateFeatures f (rec { + regex_syntax_0_3_9.default = (f.regex_syntax_0_3_9.default or true); + }) []; + rlua_0_9_7 = { features?(rlua_0_9_7_features {}) }: rlua_0_9_7_ { + dependencies = mapFeatures features ([ libc_0_2_34 ]); + buildDependencies = mapFeatures features ([ ] + ++ (if features.rlua_0_9_7.gcc or false then [ gcc_0_3_54 ] else [])); + features = mkFeatures (features.rlua_0_9_7 or {}); + }; + rlua_0_9_7_features = f: updateFeatures f (rec { + gcc_0_3_54.default = true; + libc_0_2_34.default = true; + rlua_0_9_7.builtin-lua = + (f.rlua_0_9_7.builtin-lua or false) || + (f.rlua_0_9_7.default or false) || + (rlua_0_9_7.default or false); + rlua_0_9_7.default = (f.rlua_0_9_7.default or true); + rlua_0_9_7.gcc = + (f.rlua_0_9_7.gcc or false) || + (f.rlua_0_9_7.builtin-lua or false) || + (rlua_0_9_7.builtin-lua or false); + }) [ libc_0_2_34_features gcc_0_3_54_features ]; + rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; + rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); + }) []; + rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ { + dependencies = mapFeatures features ([ semver_0_1_20 ]); + }; + rustc_version_0_1_7_features = f: updateFeatures f (rec { + rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true); + semver_0_1_20.default = true; + }) [ semver_0_1_20_features ]; + rustwlc_0_7_0 = { features?(rustwlc_0_7_0_features {}) }: rustwlc_0_7_0_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 libc_0_2_34 ] + ++ (if features.rustwlc_0_7_0.wayland-sys or false then [ wayland_sys_0_6_0 ] else [])); + features = mkFeatures (features.rustwlc_0_7_0 or {}); + }; + rustwlc_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + libc_0_2_34.default = true; + rustwlc_0_7_0.default = (f.rustwlc_0_7_0.default or true); + rustwlc_0_7_0.wayland-sys = + (f.rustwlc_0_7_0.wayland-sys or false) || + (f.rustwlc_0_7_0.wlc-wayland or false) || + (rustwlc_0_7_0.wlc-wayland or false); + wayland_sys_0_6_0.default = true; + wayland_sys_0_6_0.server = true; + }) [ bitflags_0_7_0_features libc_0_2_34_features wayland_sys_0_6_0_features ]; + semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {}; + semver_0_1_20_features = f: updateFeatures f (rec { + semver_0_1_20.default = (f.semver_0_1_20.default or true); + }) []; + serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_0_9_15 or {}); + }; + serde_0_9_15_features = f: updateFeatures f (rec { + serde_0_9_15.alloc = + (f.serde_0_9_15.alloc or false) || + (f.serde_0_9_15.collections or false) || + (serde_0_9_15.collections or false); + serde_0_9_15.default = (f.serde_0_9_15.default or true); + serde_0_9_15.serde_derive = + (f.serde_0_9_15.serde_derive or false) || + (f.serde_0_9_15.derive or false) || + (serde_0_9_15.derive or false) || + (f.serde_0_9_15.playground or false) || + (serde_0_9_15.playground or false); + serde_0_9_15.std = + (f.serde_0_9_15.std or false) || + (f.serde_0_9_15.default or false) || + (serde_0_9_15.default or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + serde_0_9_15.unstable = + (f.serde_0_9_15.unstable or false) || + (f.serde_0_9_15.alloc or false) || + (serde_0_9_15.alloc or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + }) []; + serde_json_0_9_10 = { features?(serde_json_0_9_10_features {}) }: serde_json_0_9_10_ { + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_41 serde_0_9_15 ]); + features = mkFeatures (features.serde_json_0_9_10 or {}); + }; + serde_json_0_9_10_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = true; + itoa_0_3_4.default = true; + num_traits_0_1_41.default = true; + serde_0_9_15.default = true; + serde_json_0_9_10.default = (f.serde_json_0_9_10.default or true); + serde_json_0_9_10.linked-hash-map = + (f.serde_json_0_9_10.linked-hash-map or false) || + (f.serde_json_0_9_10.preserve_order or false) || + (serde_json_0_9_10.preserve_order or false); + }) [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_41_features serde_0_9_15_features ]; + siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { + dependencies = mapFeatures features ([]); + }; + siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); + }) []; + target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { + dependencies = mapFeatures features ([ phf_0_7_21 ] + ++ (if features.target_build_utils_0_3_1.serde_json or false then [ serde_json_0_9_10 ] else [])); + buildDependencies = mapFeatures features ([ phf_codegen_0_7_21 ]); + features = mkFeatures (features.target_build_utils_0_3_1 or {}); + }; + target_build_utils_0_3_1_features = f: updateFeatures f (rec { + phf_0_7_21.default = true; + phf_codegen_0_7_21.default = true; + serde_json_0_9_10.default = true; + target_build_utils_0_3_1.default = (f.target_build_utils_0_3_1.default or true); + target_build_utils_0_3_1.serde_json = + (f.target_build_utils_0_3_1.serde_json or false) || + (f.target_build_utils_0_3_1.default or false) || + (target_build_utils_0_3_1.default or false); + }) [ phf_0_7_21_features serde_json_0_9_10_features phf_codegen_0_7_21_features ]; + thread_id_2_0_0 = { features?(thread_id_2_0_0_features {}) }: thread_id_2_0_0_ { + dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_34 ]); + }; + thread_id_2_0_0_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_34.default = true; + thread_id_2_0_0.default = (f.thread_id_2_0_0.default or true); + }) [ kernel32_sys_0_2_2_features libc_0_2_34_features ]; + thread_local_0_2_7 = { features?(thread_local_0_2_7_features {}) }: thread_local_0_2_7_ { + dependencies = mapFeatures features ([ thread_id_2_0_0 ]); + }; + thread_local_0_2_7_features = f: updateFeatures f (rec { + thread_id_2_0_0.default = true; + thread_local_0_2_7.default = (f.thread_local_0_2_7.default or true); + }) [ thread_id_2_0_0_features ]; + token_store_0_1_2 = { features?(token_store_0_1_2_features {}) }: token_store_0_1_2_ {}; + token_store_0_1_2_features = f: updateFeatures f (rec { + token_store_0_1_2.default = (f.token_store_0_1_2.default or true); + }) []; + utf8_ranges_0_1_3 = { features?(utf8_ranges_0_1_3_features {}) }: utf8_ranges_0_1_3_ {}; + utf8_ranges_0_1_3_features = f: updateFeatures f (rec { + utf8_ranges_0_1_3.default = (f.utf8_ranges_0_1_3.default or true); + }) []; + uuid_0_3_1 = { features?(uuid_0_3_1_features {}) }: uuid_0_3_1_ { + dependencies = mapFeatures features ([ ] + ++ (if features.uuid_0_3_1.rand or false then [ rand_0_3_19 ] else []) + ++ (if features.uuid_0_3_1.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.uuid_0_3_1 or {}); + }; + uuid_0_3_1_features = f: updateFeatures f (rec { + rand_0_3_19.default = true; + rustc_serialize_0_3_24.default = true; + uuid_0_3_1.default = (f.uuid_0_3_1.default or true); + uuid_0_3_1.rand = + (f.uuid_0_3_1.rand or false) || + (f.uuid_0_3_1.v4 or false) || + (uuid_0_3_1.v4 or false); + uuid_0_3_1.sha1 = + (f.uuid_0_3_1.sha1 or false) || + (f.uuid_0_3_1.v5 or false) || + (uuid_0_3_1.v5 or false); + }) [ rand_0_3_19_features rustc_serialize_0_3_24_features ]; + void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { + features = mkFeatures (features.void_1_0_2 or {}); + }; + void_1_0_2_features = f: updateFeatures f (rec { + void_1_0_2.default = (f.void_1_0_2.default or true); + void_1_0_2.std = + (f.void_1_0_2.std or false) || + (f.void_1_0_2.default or false) || + (void_1_0_2.default or false); + }) []; + way_cooler_0_8_0 = { features?(way_cooler_0_8_0_features {}) }: way_cooler_0_8_0_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 cairo_rs_0_2_0 cairo_sys_rs_0_4_0 dbus_0_4_1 dbus_macros_0_0_6 env_logger_0_3_5 gdk_pixbuf_0_2_0 getopts_0_2_15 glib_0_3_1 json_macro_0_1_1 lazy_static_0_2_11 log_0_3_9 nix_0_6_0 petgraph_0_4_10 rlua_0_9_7 rustc_serialize_0_3_24 rustwlc_0_7_0 uuid_0_3_1 wayland_server_0_12_4 wayland_sys_0_12_4 xcb_0_8_1 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_12_4 ]); + features = mkFeatures (features.way_cooler_0_8_0 or {}); + }; + way_cooler_0_8_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + cairo_rs_0_2_0.default = true; + cairo_sys_rs_0_4_0.default = true; + dbus_0_4_1.default = true; + dbus_macros_0_0_6.default = true; + env_logger_0_3_5.default = true; + gdk_pixbuf_0_2_0.default = true; + getopts_0_2_15.default = true; + glib_0_3_1.default = true; + json_macro_0_1_1.default = true; + lazy_static_0_2_11.default = true; + log_0_3_9.default = true; + nix_0_6_0.default = true; + petgraph_0_4_10.default = true; + rlua_0_9_7.builtin-lua = + (f.rlua_0_9_7.builtin-lua or false) || + (way_cooler_0_8_0.builtin-lua or false) || + (f.way_cooler_0_8_0.builtin-lua or false); + rlua_0_9_7.default = (f.rlua_0_9_7.default or false); + rustc_serialize_0_3_24.default = true; + rustwlc_0_7_0.default = true; + rustwlc_0_7_0.static-wlc = + (f.rustwlc_0_7_0.static-wlc or false) || + (way_cooler_0_8_0.static-wlc or false) || + (f.way_cooler_0_8_0.static-wlc or false); + rustwlc_0_7_0.wlc-wayland = true; + uuid_0_3_1.default = true; + uuid_0_3_1.rustc-serialize = true; + uuid_0_3_1.v4 = true; + way_cooler_0_8_0.default = (f.way_cooler_0_8_0.default or true); + wayland_scanner_0_12_4.default = true; + wayland_server_0_12_4.default = true; + wayland_sys_0_12_4.client = true; + wayland_sys_0_12_4.default = true; + wayland_sys_0_12_4.dlopen = true; + xcb_0_8_1.default = true; + xcb_0_8_1.xkb = true; + }) [ bitflags_0_7_0_features cairo_rs_0_2_0_features cairo_sys_rs_0_4_0_features dbus_0_4_1_features dbus_macros_0_0_6_features env_logger_0_3_5_features gdk_pixbuf_0_2_0_features getopts_0_2_15_features glib_0_3_1_features json_macro_0_1_1_features lazy_static_0_2_11_features log_0_3_9_features nix_0_6_0_features petgraph_0_4_10_features rlua_0_9_7_features rustc_serialize_0_3_24_features rustwlc_0_7_0_features uuid_0_3_1_features wayland_server_0_12_4_features wayland_sys_0_12_4_features xcb_0_8_1_features wayland_scanner_0_12_4_features ]; + wayland_scanner_0_12_4 = { features?(wayland_scanner_0_12_4_features {}) }: wayland_scanner_0_12_4_ { + dependencies = mapFeatures features ([ xml_rs_0_7_0 ]); + }; + wayland_scanner_0_12_4_features = f: updateFeatures f (rec { + wayland_scanner_0_12_4.default = (f.wayland_scanner_0_12_4.default or true); + xml_rs_0_7_0.default = true; + }) [ xml_rs_0_7_0_features ]; + wayland_server_0_12_4 = { features?(wayland_server_0_12_4_features {}) }: wayland_server_0_12_4_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 libc_0_2_34 nix_0_9_0 token_store_0_1_2 wayland_sys_0_12_4 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_12_4 ]); + features = mkFeatures (features.wayland_server_0_12_4 or {}); + }; + wayland_server_0_12_4_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + libc_0_2_34.default = true; + nix_0_9_0.default = true; + token_store_0_1_2.default = true; + wayland_scanner_0_12_4.default = true; + wayland_server_0_12_4.default = (f.wayland_server_0_12_4.default or true); + wayland_sys_0_12_4.default = true; + wayland_sys_0_12_4.dlopen = + (f.wayland_sys_0_12_4.dlopen or false) || + (wayland_server_0_12_4.dlopen or false) || + (f.wayland_server_0_12_4.dlopen or false); + wayland_sys_0_12_4.server = true; + }) [ bitflags_1_0_1_features libc_0_2_34_features nix_0_9_0_features token_store_0_1_2_features wayland_sys_0_12_4_features wayland_scanner_0_12_4_features ]; + wayland_sys_0_6_0 = { features?(wayland_sys_0_6_0_features {}) }: wayland_sys_0_6_0_ { + dependencies = mapFeatures features ([ dlib_0_3_1 ] + ++ (if features.wayland_sys_0_6_0.libc or false then [ libc_0_2_34 ] else [])); + features = mkFeatures (features.wayland_sys_0_6_0 or {}); + }; + wayland_sys_0_6_0_features = f: updateFeatures f (rec { + dlib_0_3_1.default = true; + dlib_0_3_1.dlopen = + (f.dlib_0_3_1.dlopen or false) || + (wayland_sys_0_6_0.dlopen or false) || + (f.wayland_sys_0_6_0.dlopen or false); + libc_0_2_34.default = true; + wayland_sys_0_6_0.default = (f.wayland_sys_0_6_0.default or true); + wayland_sys_0_6_0.lazy_static = + (f.wayland_sys_0_6_0.lazy_static or false) || + (f.wayland_sys_0_6_0.dlopen or false) || + (wayland_sys_0_6_0.dlopen or false); + wayland_sys_0_6_0.libc = + (f.wayland_sys_0_6_0.libc or false) || + (f.wayland_sys_0_6_0.server or false) || + (wayland_sys_0_6_0.server or false); + }) [ dlib_0_3_1_features libc_0_2_34_features ]; + wayland_sys_0_9_10 = { features?(wayland_sys_0_9_10_features {}) }: wayland_sys_0_9_10_ { + dependencies = mapFeatures features ([ dlib_0_3_1 ] + ++ (if features.wayland_sys_0_9_10.lazy_static or false then [ lazy_static_0_2_11 ] else []) + ++ (if features.wayland_sys_0_9_10.libc or false then [ libc_0_2_34 ] else [])); + features = mkFeatures (features.wayland_sys_0_9_10 or {}); + }; + wayland_sys_0_9_10_features = f: updateFeatures f (rec { + dlib_0_3_1.default = true; + dlib_0_3_1.dlopen = + (f.dlib_0_3_1.dlopen or false) || + (wayland_sys_0_9_10.dlopen or false) || + (f.wayland_sys_0_9_10.dlopen or false); + lazy_static_0_2_11.default = true; + libc_0_2_34.default = true; + wayland_sys_0_9_10.default = (f.wayland_sys_0_9_10.default or true); + wayland_sys_0_9_10.lazy_static = + (f.wayland_sys_0_9_10.lazy_static or false) || + (f.wayland_sys_0_9_10.dlopen or false) || + (wayland_sys_0_9_10.dlopen or false); + wayland_sys_0_9_10.libc = + (f.wayland_sys_0_9_10.libc or false) || + (f.wayland_sys_0_9_10.server or false) || + (wayland_sys_0_9_10.server or false); + }) [ dlib_0_3_1_features lazy_static_0_2_11_features libc_0_2_34_features ]; + wayland_sys_0_12_4 = { features?(wayland_sys_0_12_4_features {}) }: wayland_sys_0_12_4_ { + dependencies = mapFeatures features ([ dlib_0_4_0 ] + ++ (if features.wayland_sys_0_12_4.lazy_static or false then [ lazy_static_0_2_11 ] else []) + ++ (if features.wayland_sys_0_12_4.libc or false then [ libc_0_2_34 ] else [])); + features = mkFeatures (features.wayland_sys_0_12_4 or {}); + }; + wayland_sys_0_12_4_features = f: updateFeatures f (rec { + dlib_0_4_0.default = true; + dlib_0_4_0.dlopen = + (f.dlib_0_4_0.dlopen or false) || + (wayland_sys_0_12_4.dlopen or false) || + (f.wayland_sys_0_12_4.dlopen or false); + lazy_static_0_2_11.default = true; + libc_0_2_34.default = true; + wayland_sys_0_12_4.default = (f.wayland_sys_0_12_4.default or true); + wayland_sys_0_12_4.lazy_static = + (f.wayland_sys_0_12_4.lazy_static or false) || + (f.wayland_sys_0_12_4.dlopen or false) || + (wayland_sys_0_12_4.dlopen or false); + wayland_sys_0_12_4.libc = + (f.wayland_sys_0_12_4.libc or false) || + (f.wayland_sys_0_12_4.server or false) || + (wayland_sys_0_12_4.server or false); + }) [ dlib_0_4_0_features lazy_static_0_2_11_features libc_0_2_34_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + xcb_0_8_1 = { features?(xcb_0_8_1_features {}) }: xcb_0_8_1_ { + dependencies = mapFeatures features ([ libc_0_2_34 log_0_3_9 ]); + buildDependencies = mapFeatures features ([ libc_0_2_34 ]); + features = mkFeatures (features.xcb_0_8_1 or {}); + }; + xcb_0_8_1_features = f: updateFeatures f (rec { + libc_0_2_34.default = true; + log_0_3_9.default = true; + xcb_0_8_1.composite = + (f.xcb_0_8_1.composite or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.damage = + (f.xcb_0_8_1.damage or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.default = (f.xcb_0_8_1.default or true); + xcb_0_8_1.dpms = + (f.xcb_0_8_1.dpms or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.dri2 = + (f.xcb_0_8_1.dri2 or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.dri3 = + (f.xcb_0_8_1.dri3 or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.glx = + (f.xcb_0_8_1.glx or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.randr = + (f.xcb_0_8_1.randr or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.record = + (f.xcb_0_8_1.record or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.render = + (f.xcb_0_8_1.render or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.present or false) || + (xcb_0_8_1.present or false) || + (f.xcb_0_8_1.randr or false) || + (xcb_0_8_1.randr or false) || + (f.xcb_0_8_1.xfixes or false) || + (xcb_0_8_1.xfixes or false); + xcb_0_8_1.res = + (f.xcb_0_8_1.res or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.screensaver = + (f.xcb_0_8_1.screensaver or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.shape = + (f.xcb_0_8_1.shape or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.xfixes or false) || + (xcb_0_8_1.xfixes or false); + xcb_0_8_1.shm = + (f.xcb_0_8_1.shm or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.xv or false) || + (xcb_0_8_1.xv or false); + xcb_0_8_1.sync = + (f.xcb_0_8_1.sync or false) || + (f.xcb_0_8_1.present or false) || + (xcb_0_8_1.present or false); + xcb_0_8_1.thread = + (f.xcb_0_8_1.thread or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xevie = + (f.xcb_0_8_1.xevie or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xf86dri = + (f.xcb_0_8_1.xf86dri or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xfixes = + (f.xcb_0_8_1.xfixes or false) || + (f.xcb_0_8_1.composite or false) || + (xcb_0_8_1.composite or false) || + (f.xcb_0_8_1.damage or false) || + (xcb_0_8_1.damage or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.present or false) || + (xcb_0_8_1.present or false) || + (f.xcb_0_8_1.xinput or false) || + (xcb_0_8_1.xinput or false); + xcb_0_8_1.xinerama = + (f.xcb_0_8_1.xinerama or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xkb = + (f.xcb_0_8_1.xkb or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xlib_xcb = + (f.xcb_0_8_1.xlib_xcb or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xprint = + (f.xcb_0_8_1.xprint or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xselinux = + (f.xcb_0_8_1.xselinux or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xtest = + (f.xcb_0_8_1.xtest or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + xcb_0_8_1.xv = + (f.xcb_0_8_1.xv or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false) || + (f.xcb_0_8_1.xvmc or false) || + (xcb_0_8_1.xvmc or false); + xcb_0_8_1.xvmc = + (f.xcb_0_8_1.xvmc or false) || + (f.xcb_0_8_1.debug_all or false) || + (xcb_0_8_1.debug_all or false); + }) [ libc_0_2_34_features log_0_3_9_features libc_0_2_34_features ]; + xml_rs_0_7_0 = { features?(xml_rs_0_7_0_features {}) }: xml_rs_0_7_0_ { + dependencies = mapFeatures features ([ bitflags_1_0_1 ]); + }; + xml_rs_0_7_0_features = f: updateFeatures f (rec { + bitflags_1_0_1.default = true; + xml_rs_0_7_0.default = (f.xml_rs_0_7_0.default or true); + }) [ bitflags_1_0_1_features ]; } diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix index 50e2bf83734..d1c0993982a 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix @@ -1,962 +1,1379 @@ -# Generated by carnix 0.5.0: carnix -o wc-bg.nix Cargo.lock +# Generated by carnix 0.6.5: carnix -o wc-bg.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; - hasFeature = feature: - lib.lists.any - (originName: feature.${originName}) - (builtins.attrNames feature); - - hasDefault = feature: - let defaultFeatures = builtins.attrNames (feature."default" or {}); in - (defaultFeatures == []) - || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); - + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: - if featureName != "" && hasFeature feat.${featureName} then + if feat.${featureName} or false then [ featureName ] ++ features else features - ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); - ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.9.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; - sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; - inherit dependencies buildDependencies features; - }; - atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.2"; - authors = [ "softprops " ]; - sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; - inherit dependencies buildDependencies features; - }; - bitflags_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.6.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6"; - inherit dependencies buildDependencies features; - }; - bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.7.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; - inherit dependencies buildDependencies features; - }; - bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.8.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2"; - inherit dependencies buildDependencies features; - }; - byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "byteorder"; - version = "0.5.3"; - authors = [ "Andrew Gallant " ]; - sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx"; - inherit dependencies buildDependencies features; - }; - byteorder_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "byteorder"; - version = "1.0.0"; - authors = [ "Andrew Gallant " ]; - sha256 = "14pdnds4517vcpablc51vv76hvc3glnpkpbb7qdil591q7lyb0m1"; - inherit dependencies buildDependencies features; - }; - clap_2_23_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.23.2"; - authors = [ "Kevin K. " ]; - sha256 = "1sfc2h9sn4k3vkgqxwk2mhl75f0i9gl3ncl7d2y7plhp18k5nlrs"; - inherit dependencies buildDependencies features; - }; - color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "color_quant"; - version = "1.0.0"; - authors = [ "nwin " ]; - sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; - inherit dependencies buildDependencies features; - }; - dbus_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dbus"; - version = "0.5.2"; - authors = [ "David Henningsson " ]; - sha256 = "1ga3p2myqxbz34n2bbw4gk1ipf76mjr8r2rvrvnalwggymzfkhj7"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "deque"; - version = "0.3.1"; - authors = [ "Alex Crichton " "Samuel Fredrickson " "Linus Färnstrand " "Amanieu d'Antras " ]; - sha256 = "04x8i5aagxmslk350i8qszyw7kmvrqc3d99g4qi1xnfmr61y7m68"; - inherit dependencies buildDependencies features; - }; - dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dlib"; - version = "0.3.1"; - authors = [ "Victor Berger " ]; - sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; - inherit dependencies buildDependencies features; - }; - dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.1"; - authors = [ "David Tolnay " ]; - sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; - inherit dependencies buildDependencies features; - }; - enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "enum_primitive"; - version = "0.1.1"; - authors = [ "Anders Kaseorg " ]; - sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; - inherit dependencies buildDependencies features; - }; - error_chain_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "error-chain"; - version = "0.7.2"; - authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; - sha256 = "0b1r4ggdgy1djfvz2s4l5kirmfsmxd286y6wx0p9ahv2phb7inyi"; - inherit dependencies buildDependencies features; - }; - flate2_0_2_19_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "flate2"; - version = "0.2.19"; - authors = [ "Alex Crichton " ]; - sha256 = "1dpnvw4hcxplalr3bk527d9rfiy7c08580hji9dnfcv5fmdg1znq"; - inherit dependencies buildDependencies features; - }; - gcc_0_3_45_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "gcc"; - version = "0.3.45"; - authors = [ "Alex Crichton " ]; - sha256 = "0d3pzpbh7wr7645i2rkg5f7c4bhp01a9syrw600fjcvqhkiykp5n"; - inherit dependencies buildDependencies features; - }; - gif_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "gif"; - version = "0.9.1"; - authors = [ "nwin " ]; - sha256 = "16s7b0rqc6gg1fcbppakm3jy2q462w3qvykcmcmifmg7q7lwsg6r"; - inherit dependencies buildDependencies features; - }; - glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "glob"; - version = "0.2.11"; - authors = [ "The Rust Project Developers" ]; - sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; - inherit dependencies buildDependencies features; - }; - image_0_10_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "image"; - version = "0.10.4"; - authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; - sha256 = "1pwrs7k5760b38i1lg872x9q2zc6xvhs7mjhlzvjnr5p85zx2fbw"; - libPath = "./src/lib.rs"; - inherit dependencies buildDependencies features; - }; - inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "inflate"; - version = "0.1.1"; - authors = [ "nwin " ]; - sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; - inherit dependencies buildDependencies features; - }; - itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itoa"; - version = "0.3.1"; - authors = [ "David Tolnay " ]; - sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; - inherit dependencies buildDependencies features; - }; - jpeg_decoder_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "jpeg-decoder"; - version = "0.1.12"; - authors = [ "Ulf Nilsson " ]; - sha256 = "1f8y6v3alf93gwfmcd53izh77w2a1gv85zlhdbnyla2kna7r9pwz"; - inherit dependencies buildDependencies features; - }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian " ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "0.1.16"; - authors = [ "Marvin Löbel " ]; - sha256 = "0lc5ixs5bmnc43lfri2ynh9393l7vs0z3sw2v5rkaady2ivnznpc"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "0.2.8"; - authors = [ "Marvin Löbel " ]; - sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; - inherit dependencies buildDependencies features; - }; - libc_0_2_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.21"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0glj3lxwc8358cfw9pb5dd4zr9iynzj6w2ly59nshrggsw021j75"; - inherit dependencies buildDependencies features; - }; - libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libloading"; - version = "0.3.4"; - authors = [ "Simonas Kazlauskas " ]; - sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lzw"; - version = "0.10.0"; - authors = [ "nwin " ]; - sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; - inherit dependencies buildDependencies features; - }; - metadeps_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "metadeps"; - version = "1.1.1"; - authors = [ "Josh Triplett " ]; - sha256 = "1px8v94jn4ps63gqmvgsfcqxrwjhpa9z4xr0y1lh95wn2063fsar"; - inherit dependencies buildDependencies features; - }; - miniz_sys_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "miniz-sys"; - version = "0.1.9"; - authors = [ "Alex Crichton " ]; - sha256 = "09m2953zr0msq8cgk86991y4aqfvw3cxf52fx0d49jqy92nqmfmv"; - libPath = "lib.rs"; - libName = "miniz_sys"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - num_bigint_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-bigint"; - version = "0.1.37"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0scyqfi5azf48yyc8fhns8i1g8zq1rax155hhj9mhr0c1j6w99gs"; - inherit dependencies buildDependencies features; - }; - num_integer_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-integer"; - version = "0.1.34"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1i160ddy78sgih3xq9r6raqmg4s83abwbphv4cvyb1lnwsh0b318"; - inherit dependencies buildDependencies features; - }; - num_iter_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-iter"; - version = "0.1.33"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1xjzf2p2vaqwknkr4s8ka5hn6cpr5rsshnydbpkn2pvapfzdrqd3"; - inherit dependencies buildDependencies features; - }; - num_rational_0_1_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-rational"; - version = "0.1.36"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0jibhs8xiap2wlv1xjwdvhyj4yrxwfisqbnfm53vjm5ldlijp87p"; - inherit dependencies buildDependencies features; - }; - num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.1.37"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; - inherit dependencies buildDependencies features; - }; - num_cpus_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num_cpus"; - version = "1.3.0"; - authors = [ "Sean McArthur " ]; - sha256 = "0i0zm6qh932k9b67qf7f1vsczkdim5kg9qv73m7y5hhw1i781rrb"; - inherit dependencies buildDependencies features; - }; - phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_codegen"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; - inherit dependencies buildDependencies features; - }; - phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_generator"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; - inherit dependencies buildDependencies features; - }; - phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_shared"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.9"; - authors = [ "Alex Crichton " ]; - sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; - inherit dependencies buildDependencies features; - }; - png_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "png"; - version = "0.5.2"; - authors = [ "nwin " ]; - sha256 = "1pgann3f1ysgf8y1acw86v4s3ji1xk85ri353biyvh4i1cpn1g3q"; - inherit dependencies buildDependencies features; - }; - rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.3.15"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; - inherit dependencies buildDependencies features; - }; - rayon_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rayon"; - version = "0.7.0"; - authors = [ "Niko Matsakis " ]; - sha256 = "102qkpni68wc9fz1hmba1z8d6pgnl86g5gdl9i3h3ilc6zjymxx7"; - inherit dependencies buildDependencies features; - }; - rayon_core_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rayon-core"; - version = "1.0.0"; - authors = [ "Niko Matsakis " ]; - sha256 = "0gv3ysmx69r20n0ywjnqbgm802jjzgg0rly1iv1ssphgn5gg4hsh"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - rustc_serialize_0_3_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc-serialize"; - version = "0.3.23"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0s8i928syzkj1xrsfqf04xlyi4zl37bfpzilf160gi2vhcikj0lw"; - inherit dependencies buildDependencies features; - }; - rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc_version"; - version = "0.1.7"; - authors = [ "Marvin Löbel " ]; - sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; - inherit dependencies buildDependencies features; - }; - scoped_threadpool_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "scoped_threadpool"; - version = "0.1.7"; - authors = [ "Marvin Löbel " ]; - sha256 = "0dg58f18i6v071640062n0vymr4h42cnj0xy8a7b80sc0mddykyk"; - inherit dependencies buildDependencies features; - }; - semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver"; - version = "0.1.20"; - authors = [ "The Rust Project Developers" ]; - sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; - inherit dependencies buildDependencies features; - }; - serde_0_9_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "0.9.13"; - authors = [ "Erick Tryzelaar " ]; - sha256 = "1lgh3mhmdagzb6wrm6nd4f9mfqwmw464hc8q99ia2qv4xwkx72xp"; - inherit dependencies buildDependencies features; - }; - serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "0.9.10"; - authors = [ "Erick Tryzelaar " ]; - sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; - inherit dependencies buildDependencies features; - }; - siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "siphasher"; - version = "0.2.2"; - authors = [ "Frank Denis " ]; - sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; - inherit dependencies buildDependencies features; - }; - strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.6.0"; - authors = [ "Danny Guo " ]; - sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; - inherit dependencies buildDependencies features; - }; - target_build_utils_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "target_build_utils"; - version = "0.3.0"; - authors = [ "Simonas Kazlauskas " ]; - sha256 = "03vxpzmcsvzi1zzjj1h9c956m9s815v3ikrxa1mz1h5hzs3q7bkg"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - tempfile_2_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tempfile"; - version = "2.1.5"; - authors = [ "Steven Allen " ]; - sha256 = "1yz8aaj78z9gsn4b71y0m6fa5bnxhqafcczhxvmwra56k943aqkw"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "term_size"; - version = "0.3.0"; - authors = [ "Kevin K. " "Benjamin Sago " ]; - sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs"; - inherit dependencies buildDependencies features; - }; - toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "toml"; - version = "0.2.1"; - authors = [ "Alex Crichton " ]; - sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs"; - inherit dependencies buildDependencies features; - }; - unicode_segmentation_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-segmentation"; - version = "1.1.0"; - authors = [ "kwantam " ]; - sha256 = "10hk7wy0217jwdbp27p36skwkig5lbhk482yfzij9m87h247rry0"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - authors = [ "kwantam " ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - inherit dependencies buildDependencies features; - }; - vec_map_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vec_map"; - version = "0.7.0"; - authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; - sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1"; - inherit dependencies buildDependencies features; - }; - way_cooler_bg_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "way-cooler-bg"; - version = "0.2.1"; - authors = [ "Timidger " ]; - sha256 = "04sa2g4kisc6g15fam7ciqya96l5ajfd8x2fq5i46m22qrvagvq2"; - inherit dependencies buildDependencies features; - }; - wayland_client_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-client"; - version = "0.6.2"; - authors = [ "Victor Berger " ]; - sha256 = "04p9wjjvd4ahylhb27i7aggcrchcqk9ykpny6hjsc1lqfbqbhj3d"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - wayland_scanner_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-scanner"; - version = "0.6.0"; - authors = [ "Victor Berger " ]; - sha256 = "01x9i8ngl9m3hngv7p0xb2qfwfxpcljhbrils506cf1l1q8838kb"; - inherit dependencies buildDependencies features; - }; - wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-sys"; - version = "0.6.0"; - authors = [ "Victor Berger " ]; - sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl"; - inherit dependencies buildDependencies features; - }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - authors = [ "Peter Atashian " ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - inherit dependencies buildDependencies features; - }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - authors = [ "Peter Atashian " ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - inherit dependencies buildDependencies features; - }; - xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "xml-rs"; - version = "0.3.6"; - authors = [ "Vladimir Matveev " ]; - sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15"; - libPath = "src/lib.rs"; - libName = "xml"; - crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; - inherit dependencies buildDependencies features; - }; - + ) [] (builtins.attrNames feat); in rec { - ansi_term_0_9_0 = ansi_term_0_9_0_ rec {}; - atty_0_2_2 = atty_0_2_2_ rec { - dependencies = (if !(kernel == "windows") then [ libc_0_2_21 ] else []) - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + wc_bg = f: wc_bg_0_3_0 { features = wc_bg_0_3_0_features { wc_bg_0_3_0 = f; }; }; + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; }; - libc_0_2_21_features."default".from_atty_0_2_2__default = true; - kernel32_sys_0_2_2_features."default".from_atty_0_2_2__default = true; - winapi_0_2_8_features."default".from_atty_0_2_2__default = true; - bitflags_0_6_0 = bitflags_0_6_0_ rec {}; - bitflags_0_7_0 = bitflags_0_7_0_ rec {}; - bitflags_0_8_2 = bitflags_0_8_2_ rec { - features = mkFeatures bitflags_0_8_2_features; + atty_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.3"; + authors = [ "softprops " ]; + sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; + inherit dependencies buildDependencies features; }; - bitflags_0_8_2_features."i128".self_unstable = hasFeature (bitflags_0_8_2_features."unstable" or {}); - byteorder_0_5_3 = byteorder_0_5_3_ rec { - features = mkFeatures byteorder_0_5_3_features; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; }; - byteorder_0_5_3_features."std".self_default = hasDefault byteorder_0_5_3_features; - byteorder_1_0_0 = byteorder_1_0_0_ rec { - features = mkFeatures byteorder_1_0_0_features; + bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.9.1"; + authors = [ "The Rust Project Developers" ]; + sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; + inherit dependencies buildDependencies features; }; - byteorder_1_0_0_features."std".self_default = hasDefault byteorder_1_0_0_features; - clap_2_23_2 = clap_2_23_2_ rec { - dependencies = [ ansi_term_0_9_0 atty_0_2_2 bitflags_0_8_2 strsim_0_6_0 term_size_0_3_0 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ] - ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_9_0] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_2] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "term_size") features then [term_size_0_3_0] else []); - features = mkFeatures clap_2_23_2_features; + byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx"; + inherit dependencies buildDependencies features; }; - clap_2_23_2_features."".self = true; - clap_2_23_2_features."ansi_term".self_color = hasFeature (clap_2_23_2_features."color" or {}); - clap_2_23_2_features."atty".self_color = hasFeature (clap_2_23_2_features."color" or {}); - clap_2_23_2_features."suggestions".self_default = hasDefault clap_2_23_2_features; - clap_2_23_2_features."color".self_default = hasDefault clap_2_23_2_features; - clap_2_23_2_features."wrap_help".self_default = hasDefault clap_2_23_2_features; - clap_2_23_2_features."clippy".self_lints = hasFeature (clap_2_23_2_features."lints" or {}); - clap_2_23_2_features."strsim".self_suggestions = hasFeature (clap_2_23_2_features."suggestions" or {}); - clap_2_23_2_features."term_size".self_wrap_help = hasFeature (clap_2_23_2_features."wrap_help" or {}); - clap_2_23_2_features."yaml-rust".self_yaml = hasFeature (clap_2_23_2_features."yaml" or {}); - ansi_term_0_9_0_features."default".from_clap_2_23_2__default = true; - atty_0_2_2_features."default".from_clap_2_23_2__default = true; - bitflags_0_8_2_features."default".from_clap_2_23_2__default = true; - clippy_0_0_0_features."default".from_clap_2_23_2__default = true; - strsim_0_6_0_features."default".from_clap_2_23_2__default = true; - term_size_0_3_0_features."default".from_clap_2_23_2__default = true; - unicode_segmentation_1_1_0_features."default".from_clap_2_23_2__default = true; - unicode_width_0_1_4_features."default".from_clap_2_23_2__default = true; - vec_map_0_7_0_features."default".from_clap_2_23_2__default = true; - yaml_rust_0_0_0_features."default".from_clap_2_23_2__default = true; - color_quant_1_0_0 = color_quant_1_0_0_ rec {}; - dbus_0_5_2 = dbus_0_5_2_ rec { - dependencies = [ libc_0_2_21 ]; - buildDependencies = [ metadeps_1_1_1 ]; - features = mkFeatures dbus_0_5_2_features; + byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.1.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp"; + inherit dependencies buildDependencies features; }; - dbus_0_5_2_features."".self = true; - libc_0_2_21_features."default".from_dbus_0_5_2__default = true; - deque_0_3_1 = deque_0_3_1_ rec { - dependencies = [ rand_0_3_15 ]; + cc_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1s5ha0k6cdy1049a5kpzvhnjc9hjvi18zrcr5dmbqpd03ag751g1"; + inherit dependencies buildDependencies features; }; - rand_0_3_15_features."default".from_deque_0_3_1__default = true; - dlib_0_3_1 = dlib_0_3_1_ rec { - dependencies = [ libloading_0_3_4 ]; - features = mkFeatures dlib_0_3_1_features; + clap_2_26_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.26.2"; + authors = [ "Kevin K. " ]; + sha256 = "0njvc0b7m11yym25jrr8h47nb3k3lpzzafjf22y33c5p4rw7fn2d"; + inherit dependencies buildDependencies features; }; - dlib_0_3_1_features."".self = true; - libloading_0_3_4_features."default".from_dlib_0_3_1__default = true; - dtoa_0_4_1 = dtoa_0_4_1_ rec {}; - enum_primitive_0_1_1 = enum_primitive_0_1_1_ rec { - dependencies = [ num_traits_0_1_37 ]; + coco_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "coco"; + version = "0.1.1"; + authors = [ "Stjepan Glavina " ]; + sha256 = "0hvj4jaj9y6i38c4dkii8nqq98cgx3kyx78cjqkdvk0aqq5sfr94"; + inherit dependencies buildDependencies features; }; - num_traits_0_1_37_features."default".from_enum_primitive_0_1_1__default = false; - error_chain_0_7_2 = error_chain_0_7_2_ rec { - dependencies = []; - features = mkFeatures error_chain_0_7_2_features; + color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "color_quant"; + version = "1.0.0"; + authors = [ "nwin " ]; + sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; + inherit dependencies buildDependencies features; }; - error_chain_0_7_2_features."backtrace".self_default = hasDefault error_chain_0_7_2_features; - error_chain_0_7_2_features."example_generated".self_default = hasDefault error_chain_0_7_2_features; - backtrace_0_0_0_features."default".from_error_chain_0_7_2__default = true; - flate2_0_2_19 = flate2_0_2_19_ rec { - dependencies = [ libc_0_2_21 miniz_sys_0_1_9 ] - ++ (if lib.lists.any (x: x == "miniz-sys") features then [miniz_sys_0_1_9] else []); - features = mkFeatures flate2_0_2_19_features; + dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.3.1"; + authors = [ "Victor Berger " ]; + sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; + inherit dependencies buildDependencies features; }; - flate2_0_2_19_features."".self = true; - flate2_0_2_19_features."miniz-sys".self_default = hasDefault flate2_0_2_19_features; - flate2_0_2_19_features."tokio-io".self_tokio = hasFeature (flate2_0_2_19_features."tokio" or {}); - flate2_0_2_19_features."futures".self_tokio = hasFeature (flate2_0_2_19_features."tokio" or {}); - flate2_0_2_19_features."libz-sys".self_zlib = hasFeature (flate2_0_2_19_features."zlib" or {}); - futures_0_0_0_features."default".from_flate2_0_2_19__default = true; - libc_0_2_21_features."default".from_flate2_0_2_19__default = true; - libz_sys_0_0_0_features."default".from_flate2_0_2_19__default = true; - miniz_sys_0_1_9_features."default".from_flate2_0_2_19__default = true; - tokio_io_0_0_0_features."default".from_flate2_0_2_19__default = true; - gcc_0_3_45 = gcc_0_3_45_ rec { - dependencies = []; - features = mkFeatures gcc_0_3_45_features; + dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.2"; + authors = [ "David Tolnay " ]; + sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; + inherit dependencies buildDependencies features; }; - gcc_0_3_45_features."rayon".self_parallel = hasFeature (gcc_0_3_45_features."parallel" or {}); - rayon_0_0_0_features."default".from_gcc_0_3_45__default = true; - gif_0_9_1 = gif_0_9_1_ rec { - dependencies = [ color_quant_1_0_0 lzw_0_10_0 ]; - features = mkFeatures gif_0_9_1_features; + either_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.2.0"; + authors = [ "bluss" ]; + sha256 = "0l72xaf1kwzgbl3andf3d2ggz7km9059rbmp90iywww8inlnqppp"; + inherit dependencies buildDependencies features; }; - gif_0_9_1_features."libc".self_c_api = hasFeature (gif_0_9_1_features."c_api" or {}); - gif_0_9_1_features."raii_no_panic".self_default = hasDefault gif_0_9_1_features; - color_quant_1_0_0_features."default".from_gif_0_9_1__default = true; - libc_0_0_0_features."default".from_gif_0_9_1__default = true; - lzw_0_10_0_features."default".from_gif_0_9_1__default = true; - glob_0_2_11 = glob_0_2_11_ rec {}; - image_0_10_4 = image_0_10_4_ rec { - dependencies = [ byteorder_0_5_3 enum_primitive_0_1_1 gif_0_9_1 glob_0_2_11 jpeg_decoder_0_1_12 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 png_0_5_2 scoped_threadpool_0_1_7 ] - ++ (if lib.lists.any (x: x == "gif") features then [gif_0_9_1] else []) ++ (if lib.lists.any (x: x == "jpeg-decoder") features then [jpeg_decoder_0_1_12] else []) ++ (if lib.lists.any (x: x == "png") features then [png_0_5_2] else []) ++ (if lib.lists.any (x: x == "scoped_threadpool") features then [scoped_threadpool_0_1_7] else []); - features = mkFeatures image_0_10_4_features; + enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "enum_primitive"; + version = "0.1.1"; + authors = [ "Anders Kaseorg " ]; + sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; + inherit dependencies buildDependencies features; }; - image_0_10_4_features."".self = true; - image_0_10_4_features."gif_codec".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."jpeg".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."ico".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."png_codec".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."ppm".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."tga".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."tiff".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."webp".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."bmp".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."hdr".self_default = hasDefault image_0_10_4_features; - image_0_10_4_features."gif".self_gif_codec = hasFeature (image_0_10_4_features."gif_codec" or {}); - image_0_10_4_features."scoped_threadpool".self_hdr = hasFeature (image_0_10_4_features."hdr" or {}); - image_0_10_4_features."bmp".self_ico = hasFeature (image_0_10_4_features."ico" or {}); - image_0_10_4_features."png_codec".self_ico = hasFeature (image_0_10_4_features."ico" or {}); - image_0_10_4_features."jpeg-decoder".self_jpeg = hasFeature (image_0_10_4_features."jpeg" or {}); - image_0_10_4_features."png".self_png_codec = hasFeature (image_0_10_4_features."png_codec" or {}); - byteorder_0_5_3_features."default".from_image_0_10_4__default = true; - enum_primitive_0_1_1_features."default".from_image_0_10_4__default = true; - gif_0_9_1_features."default".from_image_0_10_4__default = true; - glob_0_2_11_features."default".from_image_0_10_4__default = true; - jpeg_decoder_0_1_12_features."default".from_image_0_10_4__default = true; - num_iter_0_1_33_features."default".from_image_0_10_4__default = true; - num_rational_0_1_36_features."default".from_image_0_10_4__default = true; - num_traits_0_1_37_features."default".from_image_0_10_4__default = true; - png_0_5_2_features."default".from_image_0_10_4__default = true; - scoped_threadpool_0_1_7_features."default".from_image_0_10_4__default = true; - inflate_0_1_1 = inflate_0_1_1_ rec { - features = mkFeatures inflate_0_1_1_features; + flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "flate2"; + version = "0.2.20"; + authors = [ "Alex Crichton " ]; + sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; + inherit dependencies buildDependencies features; }; - inflate_0_1_1_features."".self = true; - itoa_0_3_1 = itoa_0_3_1_ rec {}; - jpeg_decoder_0_1_12 = jpeg_decoder_0_1_12_ rec { - dependencies = [ byteorder_1_0_0 rayon_0_7_0 ] - ++ (if lib.lists.any (x: x == "rayon") features then [rayon_0_7_0] else []); - features = mkFeatures jpeg_decoder_0_1_12_features; + fuchsia_zircon_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.2.1"; + authors = [ "Raph Levien " ]; + sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; + inherit dependencies buildDependencies features; }; - jpeg_decoder_0_1_12_features."".self = true; - jpeg_decoder_0_1_12_features."rayon".self_default = hasDefault jpeg_decoder_0_1_12_features; - byteorder_1_0_0_features."default".from_jpeg_decoder_0_1_12__default = true; - rayon_0_7_0_features."default".from_jpeg_decoder_0_1_12__default = true; - kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { - dependencies = [ winapi_0_2_8 ]; - buildDependencies = [ winapi_build_0_1_1 ]; + fuchsia_zircon_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.2.0"; + authors = [ "Raph Levien " ]; + sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; + inherit dependencies buildDependencies features; }; - winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; - lazy_static_0_1_16 = lazy_static_0_1_16_ rec { - features = mkFeatures lazy_static_0_1_16_features; + futures_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures"; + version = "0.1.16"; + authors = [ "Alex Crichton " ]; + sha256 = "0ndk8cl6l600a95q8il2c3y38jz50nhfsczps0nziadqdd45gy2b"; + inherit dependencies buildDependencies features; }; - lazy_static_0_1_16_features."".self = true; - lazy_static_0_2_8 = lazy_static_0_2_8_ rec { - dependencies = []; - features = mkFeatures lazy_static_0_2_8_features; + gif_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gif"; + version = "0.9.2"; + authors = [ "nwin " ]; + sha256 = "0dl76jrn6127w3bdg2b58p5psf8fpnbzdxdkw1i35ac8dn4vxcqa"; + inherit dependencies buildDependencies features; }; - lazy_static_0_2_8_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); - lazy_static_0_2_8_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); - spin_0_0_0_features."default".from_lazy_static_0_2_8__default = true; - libc_0_2_21 = libc_0_2_21_ rec { - features = mkFeatures libc_0_2_21_features; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; }; - libc_0_2_21_features."use_std".self_default = hasDefault libc_0_2_21_features; - libloading_0_3_4 = libloading_0_3_4_ rec { - dependencies = [ lazy_static_0_2_8 ] - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); - buildDependencies = [ target_build_utils_0_3_0 ]; + image_0_10_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "image"; + version = "0.10.4"; + authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; + sha256 = "1pwrs7k5760b38i1lg872x9q2zc6xvhs7mjhlzvjnr5p85zx2fbw"; + libPath = "./src/lib.rs"; + inherit dependencies buildDependencies features; }; - lazy_static_0_2_8_features."default".from_libloading_0_3_4__default = true; - kernel32_sys_0_2_2_features."default".from_libloading_0_3_4__default = true; - winapi_0_2_8_features."default".from_libloading_0_3_4__default = true; - lzw_0_10_0 = lzw_0_10_0_ rec { - features = mkFeatures lzw_0_10_0_features; + inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "inflate"; + version = "0.1.1"; + authors = [ "nwin " ]; + sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; + inherit dependencies buildDependencies features; }; - lzw_0_10_0_features."raii_no_panic".self_default = hasDefault lzw_0_10_0_features; - metadeps_1_1_1 = metadeps_1_1_1_ rec { - dependencies = [ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]; + itoa_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.4"; + authors = [ "David Tolnay " ]; + sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; + inherit dependencies buildDependencies features; }; - error_chain_0_7_2_features."default".from_metadeps_1_1_1__default = false; - pkg_config_0_3_9_features."default".from_metadeps_1_1_1__default = true; - toml_0_2_1_features."default".from_metadeps_1_1_1__default = false; - miniz_sys_0_1_9 = miniz_sys_0_1_9_ rec { - dependencies = [ libc_0_2_21 ]; - buildDependencies = [ gcc_0_3_45 ]; + jpeg_decoder_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jpeg-decoder"; + version = "0.1.13"; + authors = [ "Ulf Nilsson " ]; + sha256 = "0w16gbywlm9p0p3wx34b85q4d1izrx89afcsxlc6g11cx2js4fa2"; + inherit dependencies buildDependencies features; }; - libc_0_2_21_features."default".from_miniz_sys_0_1_9__default = true; - num_bigint_0_1_37 = num_bigint_0_1_37_ rec { - dependencies = [ num_integer_0_1_34 num_traits_0_1_37 rand_0_3_15 rustc_serialize_0_3_23 ] - ++ (if lib.lists.any (x: x == "rand") features then [rand_0_3_15] else []) ++ (if lib.lists.any (x: x == "rustc-serialize") features then [rustc_serialize_0_3_23] else []); - features = mkFeatures num_bigint_0_1_37_features; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - num_bigint_0_1_37_features."".self = true; - num_bigint_0_1_37_features."rand".self_default = hasDefault num_bigint_0_1_37_features; - num_bigint_0_1_37_features."rustc-serialize".self_default = hasDefault num_bigint_0_1_37_features; - num_integer_0_1_34_features."default".from_num_bigint_0_1_37__default = true; - num_traits_0_1_37_features."default".from_num_bigint_0_1_37__default = true; - rand_0_3_15_features."default".from_num_bigint_0_1_37__default = true; - rustc_serialize_0_3_23_features."default".from_num_bigint_0_1_37__default = true; - serde_0_0_0_features."default".from_num_bigint_0_1_37__default = true; - num_integer_0_1_34 = num_integer_0_1_34_ rec { - dependencies = [ num_traits_0_1_37 ]; + lazy_static_0_2_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.9"; + authors = [ "Marvin Löbel " ]; + sha256 = "08ldzr5292y3hvi6l6v8l4i6v95lm1aysmnfln65h10sqrfh6iw7"; + inherit dependencies buildDependencies features; }; - num_traits_0_1_37_features."default".from_num_integer_0_1_34__default = true; - num_iter_0_1_33 = num_iter_0_1_33_ rec { - dependencies = [ num_integer_0_1_34 num_traits_0_1_37 ]; + libc_0_2_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.32"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1i8njlar6v9qvmkyfvwzhxrvkqw6ijp8fqdnya5csqixxz18a532"; + inherit dependencies buildDependencies features; }; - num_integer_0_1_34_features."default".from_num_iter_0_1_33__default = true; - num_traits_0_1_37_features."default".from_num_iter_0_1_33__default = true; - num_rational_0_1_36 = num_rational_0_1_36_ rec { - dependencies = [ num_bigint_0_1_37 num_integer_0_1_34 num_traits_0_1_37 rustc_serialize_0_3_23 ] - ++ (if lib.lists.any (x: x == "num-bigint") features then [num_bigint_0_1_37] else []) ++ (if lib.lists.any (x: x == "rustc-serialize") features then [rustc_serialize_0_3_23] else []); - features = mkFeatures num_rational_0_1_36_features; + libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.3.4"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - num_rational_0_1_36_features."".self = true; - num_rational_0_1_36_features."num-bigint".self_bigint = hasFeature (num_rational_0_1_36_features."bigint" or {}); - num_rational_0_1_36_features."bigint".self_default = hasDefault num_rational_0_1_36_features; - num_rational_0_1_36_features."rustc-serialize".self_default = hasDefault num_rational_0_1_36_features; - num_bigint_0_1_37_features."default".from_num_rational_0_1_36__default = true; - num_integer_0_1_34_features."default".from_num_rational_0_1_36__default = true; - num_traits_0_1_37_features."default".from_num_rational_0_1_36__default = true; - rustc_serialize_0_3_23_features."default".from_num_rational_0_1_36__default = true; - serde_0_0_0_features."default".from_num_rational_0_1_36__default = true; - num_traits_0_1_37 = num_traits_0_1_37_ rec {}; - num_cpus_1_3_0 = num_cpus_1_3_0_ rec { - dependencies = [ libc_0_2_21 ]; + lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lzw"; + version = "0.10.0"; + authors = [ "nwin " ]; + sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; + inherit dependencies buildDependencies features; }; - libc_0_2_21_features."default".from_num_cpus_1_3_0__default = true; - phf_0_7_21 = phf_0_7_21_ rec { - dependencies = [ phf_shared_0_7_21 ]; - features = mkFeatures phf_0_7_21_features; + miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miniz-sys"; + version = "0.1.10"; + authors = [ "Alex Crichton " ]; + sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; + libPath = "lib.rs"; + libName = "miniz_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - phf_0_7_21_features."".self = true; - phf_shared_0_7_21_features."core".from_phf_0_7_21__core = hasFeature (phf_0_7_21_features."core" or {}); - phf_shared_0_7_21_features."unicase".from_phf_0_7_21__unicase = hasFeature (phf_0_7_21_features."unicase" or {}); - phf_shared_0_7_21_features."default".from_phf_0_7_21__default = true; - phf_codegen_0_7_21 = phf_codegen_0_7_21_ rec { - dependencies = [ phf_generator_0_7_21 phf_shared_0_7_21 ]; + num_bigint_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-bigint"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0pkxd9mb4chdbipprxjc8ll7kjh79n278s2z663zmd80yg5xi788"; + inherit dependencies buildDependencies features; }; - phf_generator_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; - phf_shared_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; - phf_generator_0_7_21 = phf_generator_0_7_21_ rec { - dependencies = [ phf_shared_0_7_21 rand_0_3_15 ]; + num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.35"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc"; + inherit dependencies buildDependencies features; }; - phf_shared_0_7_21_features."default".from_phf_generator_0_7_21__default = true; - rand_0_3_15_features."default".from_phf_generator_0_7_21__default = true; - phf_shared_0_7_21 = phf_shared_0_7_21_ rec { - dependencies = [ siphasher_0_2_2 ]; - features = mkFeatures phf_shared_0_7_21_features; + num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9"; + inherit dependencies buildDependencies features; }; - phf_shared_0_7_21_features."".self = true; - siphasher_0_2_2_features."default".from_phf_shared_0_7_21__default = true; - unicase_0_0_0_features."default".from_phf_shared_0_7_21__default = true; - pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; - png_0_5_2 = png_0_5_2_ rec { - dependencies = [ bitflags_0_7_0 flate2_0_2_19 inflate_0_1_1 num_iter_0_1_33 ] - ++ (if lib.lists.any (x: x == "flate2") features then [flate2_0_2_19] else []); - features = mkFeatures png_0_5_2_features; + num_rational_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-rational"; + version = "0.1.39"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1qsacdfp97zgpajc2pgbrbga3yag1f0k7yz0gi78vd165gxdwk3m"; + inherit dependencies buildDependencies features; }; - png_0_5_2_features."".self = true; - png_0_5_2_features."png-encoding".self_default = hasDefault png_0_5_2_features; - png_0_5_2_features."flate2".self_png-encoding = hasFeature (png_0_5_2_features."png-encoding" or {}); - bitflags_0_7_0_features."default".from_png_0_5_2__default = true; - flate2_0_2_19_features."default".from_png_0_5_2__default = true; - inflate_0_1_1_features."default".from_png_0_5_2__default = true; - num_iter_0_1_33_features."default".from_png_0_5_2__default = true; - rand_0_3_15 = rand_0_3_15_ rec { - dependencies = [ libc_0_2_21 ]; + num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + inherit dependencies buildDependencies features; }; - libc_0_2_21_features."default".from_rand_0_3_15__default = true; - rayon_0_7_0 = rayon_0_7_0_ rec { - dependencies = [ rayon_core_1_0_0 ]; - features = mkFeatures rayon_0_7_0_features; + num_cpus_1_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.7.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0231xmd65ma3pqfiw8pkv9dvm9x708z4xlrwp3i0sgiwv408dz3f"; + inherit dependencies buildDependencies features; }; - rayon_0_7_0_features."".self = true; - rayon_core_1_0_0_features."unstable".from_rayon_0_7_0__unstable = hasFeature (rayon_0_7_0_features."unstable" or {}); - rayon_core_1_0_0_features."default".from_rayon_0_7_0__default = true; - rayon_core_1_0_0 = rayon_core_1_0_0_ rec { - dependencies = [ deque_0_3_1 lazy_static_0_2_8 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]; - features = mkFeatures rayon_core_1_0_0_features; + phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; }; - rayon_core_1_0_0_features."futures".self_unstable = hasFeature (rayon_core_1_0_0_features."unstable" or {}); - deque_0_3_1_features."default".from_rayon_core_1_0_0__default = true; - futures_0_0_0_features."default".from_rayon_core_1_0_0__default = true; - lazy_static_0_2_8_features."default".from_rayon_core_1_0_0__default = true; - libc_0_2_21_features."default".from_rayon_core_1_0_0__default = true; - num_cpus_1_3_0_features."default".from_rayon_core_1_0_0__default = true; - rand_0_3_15_features."default".from_rayon_core_1_0_0__default = true; - rustc_serialize_0_3_23 = rustc_serialize_0_3_23_ rec {}; - rustc_version_0_1_7 = rustc_version_0_1_7_ rec { - dependencies = [ semver_0_1_20 ]; + phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + inherit dependencies buildDependencies features; }; - semver_0_1_20_features."default".from_rustc_version_0_1_7__default = true; - scoped_threadpool_0_1_7 = scoped_threadpool_0_1_7_ rec { - features = mkFeatures scoped_threadpool_0_1_7_features; + phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + inherit dependencies buildDependencies features; }; - scoped_threadpool_0_1_7_features."".self = true; - semver_0_1_20 = semver_0_1_20_ rec {}; - serde_0_9_13 = serde_0_9_13_ rec { - dependencies = []; - features = mkFeatures serde_0_9_13_features; + phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; }; - serde_0_9_13_features."unstable".self_alloc = hasFeature (serde_0_9_13_features."alloc" or {}); - serde_0_9_13_features."alloc".self_collections = hasFeature (serde_0_9_13_features."collections" or {}); - serde_0_9_13_features."std".self_default = hasDefault serde_0_9_13_features; - serde_0_9_13_features."serde_derive".self_derive = hasFeature (serde_0_9_13_features."derive" or {}); - serde_0_9_13_features."serde_derive".self_playground = hasFeature (serde_0_9_13_features."playground" or {}); - serde_0_9_13_features."unstable".self_unstable-testing = hasFeature (serde_0_9_13_features."unstable-testing" or {}); - serde_0_9_13_features."std".self_unstable-testing = hasFeature (serde_0_9_13_features."unstable-testing" or {}); - serde_derive_0_0_0_features."default".from_serde_0_9_13__default = true; - serde_json_0_9_10 = serde_json_0_9_10_ rec { - dependencies = [ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_13 ]; - features = mkFeatures serde_json_0_9_10_features; + png_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "png"; + version = "0.5.2"; + authors = [ "nwin " ]; + sha256 = "1pgann3f1ysgf8y1acw86v4s3ji1xk85ri353biyvh4i1cpn1g3q"; + inherit dependencies buildDependencies features; }; - serde_json_0_9_10_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_0_9_10_features."preserve_order" or {}); - dtoa_0_4_1_features."default".from_serde_json_0_9_10__default = true; - itoa_0_3_1_features."default".from_serde_json_0_9_10__default = true; - linked_hash_map_0_0_0_features."default".from_serde_json_0_9_10__default = true; - num_traits_0_1_37_features."default".from_serde_json_0_9_10__default = true; - serde_0_9_13_features."default".from_serde_json_0_9_10__default = true; - siphasher_0_2_2 = siphasher_0_2_2_ rec { - dependencies = []; + rand_0_3_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.17"; + authors = [ "The Rust Project Developers" ]; + sha256 = "06ra3pr36dlyq3kp5lbia8xnw5g0zsys2d69frr7y6df5hhb1r8j"; + inherit dependencies buildDependencies features; }; - clippy_0_0_0_features."default".from_siphasher_0_2_2__default = true; - strsim_0_6_0 = strsim_0_6_0_ rec {}; - target_build_utils_0_3_0 = target_build_utils_0_3_0_ rec { - dependencies = [ phf_0_7_21 serde_json_0_9_10 ] - ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_0_9_10] else []); - buildDependencies = [ phf_codegen_0_7_21 ]; - features = mkFeatures target_build_utils_0_3_0_features; + rayon_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon"; + version = "0.8.2"; + authors = [ "Niko Matsakis " "Josh Stone " ]; + sha256 = "0d0mddg1k75hb9138pn8lysy2095jijrinskqbpgfr73s0jx6dq8"; + inherit dependencies buildDependencies features; }; - target_build_utils_0_3_0_features."".self = true; - target_build_utils_0_3_0_features."serde_json".self_default = hasDefault target_build_utils_0_3_0_features; - phf_0_7_21_features."default".from_target_build_utils_0_3_0__default = true; - serde_json_0_9_10_features."default".from_target_build_utils_0_3_0__default = true; - tempfile_2_1_5 = tempfile_2_1_5_ rec { - dependencies = [ rand_0_3_15 ] - ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_21 ] else []) - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); - buildDependencies = [ rustc_version_0_1_7 ]; + rayon_core_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon-core"; + version = "1.2.1"; + authors = [ "Niko Matsakis " "Josh Stone " ]; + sha256 = "12xv2r0dqrgvla24bl5mfvcw0599dlhrj0mx620nq95nyds753kk"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - rand_0_3_15_features."default".from_tempfile_2_1_5__default = true; - libc_0_2_21_features."default".from_tempfile_2_1_5__default = true; - kernel32_sys_0_2_2_features."default".from_tempfile_2_1_5__default = true; - winapi_0_2_8_features."default".from_tempfile_2_1_5__default = true; - term_size_0_3_0 = term_size_0_3_0_ rec { - dependencies = [] - ++ (if !(kernel == "windows") then [ libc_0_2_21 ] else []) - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); - features = mkFeatures term_size_0_3_0_features; + redox_syscall_0_1_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.31"; + authors = [ "Jeremy Soller " ]; + sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4"; + libName = "syscall"; + inherit dependencies buildDependencies features; }; - term_size_0_3_0_features."clippy".self_lints = hasFeature (term_size_0_3_0_features."lints" or {}); - term_size_0_3_0_features."nightly".self_lints = hasFeature (term_size_0_3_0_features."lints" or {}); - term_size_0_3_0_features."lints".self_travis = hasFeature (term_size_0_3_0_features."travis" or {}); - term_size_0_3_0_features."nightly".self_travis = hasFeature (term_size_0_3_0_features."travis" or {}); - clippy_0_0_0_features."default".from_term_size_0_3_0__default = true; - libc_0_2_21_features."default".from_term_size_0_3_0__default = true; - kernel32_sys_0_2_2_features."default".from_term_size_0_3_0__default = true; - winapi_0_2_8_features."default".from_term_size_0_3_0__default = true; - toml_0_2_1 = toml_0_2_1_ rec { - dependencies = []; + redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; }; - toml_0_2_1_features."rustc-serialize".self_default = hasDefault toml_0_2_1_features; - rustc_serialize_0_0_0_features."default".from_toml_0_2_1__default = true; - serde_0_0_0_features."default".from_toml_0_2_1__default = true; - unicode_segmentation_1_1_0 = unicode_segmentation_1_1_0_ rec { - features = mkFeatures unicode_segmentation_1_1_0_features; + rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-serialize"; + version = "0.3.24"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; + inherit dependencies buildDependencies features; }; - unicode_segmentation_1_1_0_features."".self = true; - unicode_width_0_1_4 = unicode_width_0_1_4_ rec { - features = mkFeatures unicode_width_0_1_4_features; + scoped_threadpool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1al42hqbbijpah9bc6hw9c49nhnyrc0sj274ja1q3k9305c3s5a6"; + inherit dependencies buildDependencies features; }; - unicode_width_0_1_4_features."".self = true; - vec_map_0_7_0 = vec_map_0_7_0_ rec { - dependencies = []; - features = mkFeatures vec_map_0_7_0_features; + scopeguard_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scopeguard"; + version = "0.3.2"; + authors = [ "bluss" ]; + sha256 = "0xlvfawva4fnp6kwr5xjwf0q2d1w6di81nhfby1sa55xj1ia5zs2"; + inherit dependencies buildDependencies features; }; - vec_map_0_7_0_features."serde".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); - vec_map_0_7_0_features."serde_derive".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); - serde_0_0_0_features."default".from_vec_map_0_7_0__default = true; - serde_derive_0_0_0_features."default".from_vec_map_0_7_0__default = true; - way_cooler_bg_0_2_1 = way_cooler_bg_0_2_1_ rec { - dependencies = [ byteorder_0_5_3 clap_2_23_2 dbus_0_5_2 image_0_10_4 tempfile_2_1_5 wayland_client_0_6_2 wayland_sys_0_6_0 ]; + serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "0.9.15"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; + inherit dependencies buildDependencies features; }; - byteorder_0_5_3_features."default".from_way_cooler_bg_0_2_1__default = true; - clap_2_23_2_features."default".from_way_cooler_bg_0_2_1__default = true; - dbus_0_5_2_features."default".from_way_cooler_bg_0_2_1__default = true; - image_0_10_4_features."default".from_way_cooler_bg_0_2_1__default = true; - tempfile_2_1_5_features."default".from_way_cooler_bg_0_2_1__default = true; - wayland_client_0_6_2_features."cursor".from_way_cooler_bg_0_2_1 = true; - wayland_client_0_6_2_features."dlopen".from_way_cooler_bg_0_2_1 = true; - wayland_client_0_6_2_features."default".from_way_cooler_bg_0_2_1__default = true; - wayland_sys_0_6_0_features."client".from_way_cooler_bg_0_2_1 = true; - wayland_sys_0_6_0_features."dlopen".from_way_cooler_bg_0_2_1 = true; - wayland_sys_0_6_0_features."default".from_way_cooler_bg_0_2_1__default = true; - wayland_client_0_6_2 = wayland_client_0_6_2_ rec { - dependencies = [ bitflags_0_6_0 libc_0_2_21 wayland_sys_0_6_0 ]; - buildDependencies = [ wayland_scanner_0_6_0 ]; - features = mkFeatures wayland_client_0_6_2_features; + serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "0.9.10"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; + inherit dependencies buildDependencies features; }; - wayland_client_0_6_2_features."wp-presentation_time".self_all_stable_protocols = hasFeature (wayland_client_0_6_2_features."all_stable_protocols" or {}); - wayland_client_0_6_2_features."wp-viewporter".self_all_stable_protocols = hasFeature (wayland_client_0_6_2_features."all_stable_protocols" or {}); - wayland_client_0_6_2_features."unstable-protocols".self_all_unstable_protocols = hasFeature (wayland_client_0_6_2_features."all_unstable_protocols" or {}); - wayland_client_0_6_2_features."wpu-xdg_shell".self_all_unstable_protocols = hasFeature (wayland_client_0_6_2_features."all_unstable_protocols" or {}); - bitflags_0_6_0_features."default".from_wayland_client_0_6_2__default = true; - lazy_static_0_0_0_features."default".from_wayland_client_0_6_2__default = true; - libc_0_2_21_features."default".from_wayland_client_0_6_2__default = true; - wayland_sys_0_6_0_features."client".from_wayland_client_0_6_2 = true; - wayland_sys_0_6_0_features."cursor".from_wayland_client_0_6_2__cursor = hasFeature (wayland_client_0_6_2_features."cursor" or {}); - wayland_sys_0_6_0_features."dlopen".from_wayland_client_0_6_2__dlopen = hasFeature (wayland_client_0_6_2_features."dlopen" or {}); - wayland_sys_0_6_0_features."egl".from_wayland_client_0_6_2__egl = hasFeature (wayland_client_0_6_2_features."egl" or {}); - wayland_sys_0_6_0_features."default".from_wayland_client_0_6_2__default = true; - wayland_scanner_0_6_0 = wayland_scanner_0_6_0_ rec { - dependencies = [ xml_rs_0_3_6 ]; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; }; - xml_rs_0_3_6_features."default".from_wayland_scanner_0_6_0__default = true; - wayland_sys_0_6_0 = wayland_sys_0_6_0_ rec { - dependencies = [ dlib_0_3_1 lazy_static_0_1_16 ] - ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_1_16] else []); - features = mkFeatures wayland_sys_0_6_0_features; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; }; - wayland_sys_0_6_0_features."".self = true; - wayland_sys_0_6_0_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); - wayland_sys_0_6_0_features."libc".self_server = hasFeature (wayland_sys_0_6_0_features."server" or {}); - dlib_0_3_1_features."dlopen".from_wayland_sys_0_6_0__dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); - dlib_0_3_1_features."default".from_wayland_sys_0_6_0__default = true; - lazy_static_0_1_16_features."default".from_wayland_sys_0_6_0__default = true; - libc_0_0_0_features."default".from_wayland_sys_0_6_0__default = true; - winapi_0_2_8 = winapi_0_2_8_ rec {}; - winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; - xml_rs_0_3_6 = xml_rs_0_3_6_ rec { - dependencies = [ bitflags_0_7_0 ]; + target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "target_build_utils"; + version = "0.3.1"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - bitflags_0_7_0_features."default".from_xml_rs_0_3_6__default = true; + tempfile_2_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempfile"; + version = "2.2.0"; + authors = [ "Steven Allen " ]; + sha256 = "1z3l901ipvi0s0mdppw4lwfa77ydb22rfnf6y9sh0pifj7ah5drf"; + inherit dependencies buildDependencies features; + }; + term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "term_size"; + version = "0.3.0"; + authors = [ "Kevin K. " "Benjamin Sago " ]; + sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs"; + inherit dependencies buildDependencies features; + }; + termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + inherit dependencies buildDependencies features; + }; + textwrap_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "textwrap"; + version = "0.8.0"; + authors = [ "Martin Geisler " ]; + sha256 = "02j8apii1032cvp9fwrxw4pf11xb287j2n1iv1iixp8yh6vzrq41"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; + inherit dependencies buildDependencies features; + }; + way_cooler_client_helpers_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "way-cooler-client-helpers"; + version = "0.1.0"; + authors = [ "Timidger " ]; + sha256 = "0749lh5crd0rhq4dxij9mb3y5902laazjd01l6ci5782bjfk4s39"; + inherit dependencies buildDependencies features; + }; + wayland_client_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-client"; + version = "0.9.10"; + authors = [ "Victor Berger " ]; + sha256 = "1cs7zwvqahiysnfqfask96zpfr2bp47dlwwwd9ap8ccvcjbspj67"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_scanner_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-scanner"; + version = "0.9.10"; + authors = [ "Victor Berger " ]; + sha256 = "0vhnj3vfnrknvdmy72pjh7dck5q5sz1v8kfr0qqzkqf0ylavvyb2"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.9.10"; + authors = [ "Victor Berger " ]; + sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8"; + inherit dependencies buildDependencies features; + }; + wc_bg_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wc-bg"; + version = "0.3.0"; + authors = [ "Timidger " ]; + sha256 = "1jywymr80k96481vr6nyyqhlf2gj2n2zgvkwkny2m84v9n3pqn62"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + xml_rs_0_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xml-rs"; + version = "0.6.1"; + authors = [ "Vladimir Matveev " ]; + sha256 = "0adjwgmn061p60n81s52a9p26y2jdc20wvinsyw2nzmby5wvnbwk"; + libPath = "src/lib.rs"; + libName = "xml"; + crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; + inherit dependencies buildDependencies features; + }; + ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; + ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); + }) []; + atty_0_2_3 = { features?(atty_0_2_3_features {}) }: atty_0_2_3_ { + dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + atty_0_2_3_features = f: updateFeatures f (rec { + atty_0_2_3.default = (f.atty_0_2_3.default or true); + kernel32_sys_0_2_2.default = true; + libc_0_2_32.default = (f.libc_0_2_32.default or false); + termion_1_5_1.default = true; + winapi_0_2_8.default = true; + }) [ termion_1_5_1_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; + bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); + }) []; + bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ { + features = mkFeatures (features.bitflags_0_9_1 or {}); + }; + bitflags_0_9_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true); + bitflags_0_9_1.example_generated = + (f.bitflags_0_9_1.example_generated or false) || + (f.bitflags_0_9_1.default or false) || + (bitflags_0_9_1.default or false); + }) []; + byteorder_0_5_3 = { features?(byteorder_0_5_3_features {}) }: byteorder_0_5_3_ { + features = mkFeatures (features.byteorder_0_5_3 or {}); + }; + byteorder_0_5_3_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = (f.byteorder_0_5_3.default or true); + byteorder_0_5_3.std = + (f.byteorder_0_5_3.std or false) || + (f.byteorder_0_5_3.default or false) || + (byteorder_0_5_3.default or false); + }) []; + byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ { + features = mkFeatures (features.byteorder_1_1_0 or {}); + }; + byteorder_1_1_0_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true); + byteorder_1_1_0.std = + (f.byteorder_1_1_0.std or false) || + (f.byteorder_1_1_0.default or false) || + (byteorder_1_1_0.default or false); + }) []; + cc_1_0_0 = { features?(cc_1_0_0_features {}) }: cc_1_0_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.cc_1_0_0 or {}); + }; + cc_1_0_0_features = f: updateFeatures f (rec { + cc_1_0_0.default = (f.cc_1_0_0.default or true); + cc_1_0_0.rayon = + (f.cc_1_0_0.rayon or false) || + (f.cc_1_0_0.parallel or false) || + (cc_1_0_0.parallel or false); + }) []; + clap_2_26_2 = { features?(clap_2_26_2_features {}) }: clap_2_26_2_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 textwrap_0_8_0 unicode_width_0_1_4 vec_map_0_8_0 ] + ++ (if features.clap_2_26_2.ansi_term or false then [ ansi_term_0_9_0 ] else []) + ++ (if features.clap_2_26_2.atty or false then [ atty_0_2_3 ] else []) + ++ (if features.clap_2_26_2.strsim or false then [ strsim_0_6_0 ] else []) + ++ (if features.clap_2_26_2.term_size or false then [ term_size_0_3_0 ] else [])); + features = mkFeatures (features.clap_2_26_2 or {}); + }; + clap_2_26_2_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = true; + atty_0_2_3.default = true; + bitflags_0_9_1.default = true; + clap_2_26_2.ansi_term = + (f.clap_2_26_2.ansi_term or false) || + (f.clap_2_26_2.color or false) || + (clap_2_26_2.color or false); + clap_2_26_2.atty = + (f.clap_2_26_2.atty or false) || + (f.clap_2_26_2.color or false) || + (clap_2_26_2.color or false); + clap_2_26_2.clippy = + (f.clap_2_26_2.clippy or false) || + (f.clap_2_26_2.lints or false) || + (clap_2_26_2.lints or false); + clap_2_26_2.color = + (f.clap_2_26_2.color or false) || + (f.clap_2_26_2.default or false) || + (clap_2_26_2.default or false); + clap_2_26_2.default = (f.clap_2_26_2.default or true); + clap_2_26_2.strsim = + (f.clap_2_26_2.strsim or false) || + (f.clap_2_26_2.suggestions or false) || + (clap_2_26_2.suggestions or false); + clap_2_26_2.suggestions = + (f.clap_2_26_2.suggestions or false) || + (f.clap_2_26_2.default or false) || + (clap_2_26_2.default or false); + clap_2_26_2.term_size = + (f.clap_2_26_2.term_size or false) || + (f.clap_2_26_2.wrap_help or false) || + (clap_2_26_2.wrap_help or false); + clap_2_26_2.wrap_help = + (f.clap_2_26_2.wrap_help or false) || + (f.clap_2_26_2.default or false) || + (clap_2_26_2.default or false); + clap_2_26_2.yaml = + (f.clap_2_26_2.yaml or false) || + (f.clap_2_26_2.doc or false) || + (clap_2_26_2.doc or false); + clap_2_26_2.yaml-rust = + (f.clap_2_26_2.yaml-rust or false) || + (f.clap_2_26_2.yaml or false) || + (clap_2_26_2.yaml or false); + strsim_0_6_0.default = true; + term_size_0_3_0.default = true; + textwrap_0_8_0.default = true; + unicode_width_0_1_4.default = true; + vec_map_0_8_0.default = true; + }) [ ansi_term_0_9_0_features atty_0_2_3_features bitflags_0_9_1_features strsim_0_6_0_features term_size_0_3_0_features textwrap_0_8_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ]; + coco_0_1_1 = { features?(coco_0_1_1_features {}) }: coco_0_1_1_ { + dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]); + features = mkFeatures (features.coco_0_1_1 or {}); + }; + coco_0_1_1_features = f: updateFeatures f (rec { + coco_0_1_1.default = (f.coco_0_1_1.default or true); + either_1_2_0.default = true; + scopeguard_0_3_2.default = true; + }) [ either_1_2_0_features scopeguard_0_3_2_features ]; + color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; + color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); + }) []; + dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ { + dependencies = mapFeatures features ([ libloading_0_3_4 ]); + features = mkFeatures (features.dlib_0_3_1 or {}); + }; + dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1.default = (f.dlib_0_3_1.default or true); + libloading_0_3_4.default = true; + }) [ libloading_0_3_4_features ]; + dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; + dtoa_0_4_2_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); + }) []; + either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ { + features = mkFeatures (features.either_1_2_0 or {}); + }; + either_1_2_0_features = f: updateFeatures f (rec { + either_1_2_0.default = (f.either_1_2_0.default or true); + either_1_2_0.use_std = + (f.either_1_2_0.use_std or false) || + (f.either_1_2_0.default or false) || + (either_1_2_0.default or false); + }) []; + enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { + dependencies = mapFeatures features ([ num_traits_0_1_40 ]); + }; + enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); + num_traits_0_1_40.default = (f.num_traits_0_1_40.default or false); + }) [ num_traits_0_1_40_features ]; + flate2_0_2_20 = { features?(flate2_0_2_20_features {}) }: flate2_0_2_20_ { + dependencies = mapFeatures features ([ libc_0_2_32 ] + ++ (if features.flate2_0_2_20.miniz-sys or false then [ miniz_sys_0_1_10 ] else [])); + features = mkFeatures (features.flate2_0_2_20 or {}); + }; + flate2_0_2_20_features = f: updateFeatures f (rec { + flate2_0_2_20.default = (f.flate2_0_2_20.default or true); + flate2_0_2_20.futures = + (f.flate2_0_2_20.futures or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + flate2_0_2_20.libz-sys = + (f.flate2_0_2_20.libz-sys or false) || + (f.flate2_0_2_20.zlib or false) || + (flate2_0_2_20.zlib or false); + flate2_0_2_20.miniz-sys = + (f.flate2_0_2_20.miniz-sys or false) || + (f.flate2_0_2_20.default or false) || + (flate2_0_2_20.default or false); + flate2_0_2_20.tokio-io = + (f.flate2_0_2_20.tokio-io or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + libc_0_2_32.default = true; + miniz_sys_0_1_10.default = true; + }) [ libc_0_2_32_features miniz_sys_0_1_10_features ]; + fuchsia_zircon_0_2_1 = { features?(fuchsia_zircon_0_2_1_features {}) }: fuchsia_zircon_0_2_1_ { + dependencies = mapFeatures features ([ fuchsia_zircon_sys_0_2_0 ]); + }; + fuchsia_zircon_0_2_1_features = f: updateFeatures f (rec { + fuchsia_zircon_0_2_1.default = (f.fuchsia_zircon_0_2_1.default or true); + fuchsia_zircon_sys_0_2_0.default = true; + }) [ fuchsia_zircon_sys_0_2_0_features ]; + fuchsia_zircon_sys_0_2_0 = { features?(fuchsia_zircon_sys_0_2_0_features {}) }: fuchsia_zircon_sys_0_2_0_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 ]); + }; + fuchsia_zircon_sys_0_2_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + fuchsia_zircon_sys_0_2_0.default = (f.fuchsia_zircon_sys_0_2_0.default or true); + }) [ bitflags_0_7_0_features ]; + futures_0_1_16 = { features?(futures_0_1_16_features {}) }: futures_0_1_16_ { + features = mkFeatures (features.futures_0_1_16 or {}); + }; + futures_0_1_16_features = f: updateFeatures f (rec { + futures_0_1_16.default = (f.futures_0_1_16.default or true); + futures_0_1_16.use_std = + (f.futures_0_1_16.use_std or false) || + (f.futures_0_1_16.default or false) || + (futures_0_1_16.default or false); + futures_0_1_16.with-deprecated = + (f.futures_0_1_16.with-deprecated or false) || + (f.futures_0_1_16.default or false) || + (futures_0_1_16.default or false); + }) []; + gif_0_9_2 = { features?(gif_0_9_2_features {}) }: gif_0_9_2_ { + dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]); + features = mkFeatures (features.gif_0_9_2 or {}); + }; + gif_0_9_2_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = true; + gif_0_9_2.default = (f.gif_0_9_2.default or true); + gif_0_9_2.libc = + (f.gif_0_9_2.libc or false) || + (f.gif_0_9_2.c_api or false) || + (gif_0_9_2.c_api or false); + gif_0_9_2.raii_no_panic = + (f.gif_0_9_2.raii_no_panic or false) || + (f.gif_0_9_2.default or false) || + (gif_0_9_2.default or false); + lzw_0_10_0.default = true; + }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; + glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; + glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11.default = (f.glob_0_2_11.default or true); + }) []; + image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ { + dependencies = mapFeatures features ([ byteorder_0_5_3 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_34 num_rational_0_1_39 num_traits_0_1_40 ] + ++ (if features.image_0_10_4.gif or false then [ gif_0_9_2 ] else []) + ++ (if features.image_0_10_4.jpeg-decoder or false then [ jpeg_decoder_0_1_13 ] else []) + ++ (if features.image_0_10_4.png or false then [ png_0_5_2 ] else []) + ++ (if features.image_0_10_4.scoped_threadpool or false then [ scoped_threadpool_0_1_8 ] else [])); + features = mkFeatures (features.image_0_10_4 or {}); + }; + image_0_10_4_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = true; + enum_primitive_0_1_1.default = true; + gif_0_9_2.default = true; + glob_0_2_11.default = true; + image_0_10_4.bmp = + (f.image_0_10_4.bmp or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false) || + (f.image_0_10_4.ico or false) || + (image_0_10_4.ico or false); + image_0_10_4.default = (f.image_0_10_4.default or true); + image_0_10_4.gif = + (f.image_0_10_4.gif or false) || + (f.image_0_10_4.gif_codec or false) || + (image_0_10_4.gif_codec or false); + image_0_10_4.gif_codec = + (f.image_0_10_4.gif_codec or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.hdr = + (f.image_0_10_4.hdr or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.ico = + (f.image_0_10_4.ico or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.jpeg = + (f.image_0_10_4.jpeg or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.jpeg-decoder = + (f.image_0_10_4.jpeg-decoder or false) || + (f.image_0_10_4.jpeg or false) || + (image_0_10_4.jpeg or false); + image_0_10_4.png = + (f.image_0_10_4.png or false) || + (f.image_0_10_4.png_codec or false) || + (image_0_10_4.png_codec or false); + image_0_10_4.png_codec = + (f.image_0_10_4.png_codec or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false) || + (f.image_0_10_4.ico or false) || + (image_0_10_4.ico or false); + image_0_10_4.ppm = + (f.image_0_10_4.ppm or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.scoped_threadpool = + (f.image_0_10_4.scoped_threadpool or false) || + (f.image_0_10_4.hdr or false) || + (image_0_10_4.hdr or false); + image_0_10_4.tga = + (f.image_0_10_4.tga or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.tiff = + (f.image_0_10_4.tiff or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.webp = + (f.image_0_10_4.webp or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + jpeg_decoder_0_1_13.default = true; + num_iter_0_1_34.default = true; + num_rational_0_1_39.default = true; + num_traits_0_1_40.default = true; + png_0_5_2.default = true; + scoped_threadpool_0_1_8.default = true; + }) [ byteorder_0_5_3_features enum_primitive_0_1_1_features gif_0_9_2_features glob_0_2_11_features jpeg_decoder_0_1_13_features num_iter_0_1_34_features num_rational_0_1_39_features num_traits_0_1_40_features png_0_5_2_features scoped_threadpool_0_1_8_features ]; + inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { + features = mkFeatures (features.inflate_0_1_1 or {}); + }; + inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1.default = (f.inflate_0_1_1.default or true); + }) []; + itoa_0_3_4 = { features?(itoa_0_3_4_features {}) }: itoa_0_3_4_ { + features = mkFeatures (features.itoa_0_3_4 or {}); + }; + itoa_0_3_4_features = f: updateFeatures f (rec { + itoa_0_3_4.default = (f.itoa_0_3_4.default or true); + }) []; + jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ { + dependencies = mapFeatures features ([ byteorder_1_1_0 ] + ++ (if features.jpeg_decoder_0_1_13.rayon or false then [ rayon_0_8_2 ] else [])); + features = mkFeatures (features.jpeg_decoder_0_1_13 or {}); + }; + jpeg_decoder_0_1_13_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = true; + jpeg_decoder_0_1_13.default = (f.jpeg_decoder_0_1_13.default or true); + jpeg_decoder_0_1_13.rayon = + (f.jpeg_decoder_0_1_13.rayon or false) || + (f.jpeg_decoder_0_1_13.default or false) || + (jpeg_decoder_0_1_13.default or false); + rayon_0_8_2.default = true; + }) [ byteorder_1_1_0_features rayon_0_8_2_features ]; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + lazy_static_0_2_9 = { features?(lazy_static_0_2_9_features {}) }: lazy_static_0_2_9_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_9 or {}); + }; + lazy_static_0_2_9_features = f: updateFeatures f (rec { + lazy_static_0_2_9.default = (f.lazy_static_0_2_9.default or true); + lazy_static_0_2_9.nightly = + (f.lazy_static_0_2_9.nightly or false) || + (f.lazy_static_0_2_9.spin_no_std or false) || + (lazy_static_0_2_9.spin_no_std or false); + lazy_static_0_2_9.spin = + (f.lazy_static_0_2_9.spin or false) || + (f.lazy_static_0_2_9.spin_no_std or false) || + (lazy_static_0_2_9.spin_no_std or false); + }) []; + libc_0_2_32 = { features?(libc_0_2_32_features {}) }: libc_0_2_32_ { + features = mkFeatures (features.libc_0_2_32 or {}); + }; + libc_0_2_32_features = f: updateFeatures f (rec { + libc_0_2_32.default = (f.libc_0_2_32.default or true); + libc_0_2_32.use_std = + (f.libc_0_2_32.use_std or false) || + (f.libc_0_2_32.default or false) || + (libc_0_2_32.default or false); + }) []; + libloading_0_3_4 = { features?(libloading_0_3_4_features {}) }: libloading_0_3_4_ { + dependencies = mapFeatures features ([ lazy_static_0_2_9 ]) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); + }; + libloading_0_3_4_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + lazy_static_0_2_9.default = true; + libloading_0_3_4.default = (f.libloading_0_3_4.default or true); + target_build_utils_0_3_1.default = true; + winapi_0_2_8.default = true; + }) [ lazy_static_0_2_9_features target_build_utils_0_3_1_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ { + features = mkFeatures (features.lzw_0_10_0 or {}); + }; + lzw_0_10_0_features = f: updateFeatures f (rec { + lzw_0_10_0.default = (f.lzw_0_10_0.default or true); + lzw_0_10_0.raii_no_panic = + (f.lzw_0_10_0.raii_no_panic or false) || + (f.lzw_0_10_0.default or false) || + (lzw_0_10_0.default or false); + }) []; + miniz_sys_0_1_10 = { features?(miniz_sys_0_1_10_features {}) }: miniz_sys_0_1_10_ { + dependencies = mapFeatures features ([ libc_0_2_32 ]); + buildDependencies = mapFeatures features ([ cc_1_0_0 ]); + }; + miniz_sys_0_1_10_features = f: updateFeatures f (rec { + cc_1_0_0.default = true; + libc_0_2_32.default = true; + miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); + }) [ libc_0_2_32_features cc_1_0_0_features ]; + num_bigint_0_1_40 = { features?(num_bigint_0_1_40_features {}) }: num_bigint_0_1_40_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ] + ++ (if features.num_bigint_0_1_40.rand or false then [ rand_0_3_17 ] else []) + ++ (if features.num_bigint_0_1_40.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.num_bigint_0_1_40 or {}); + }; + num_bigint_0_1_40_features = f: updateFeatures f (rec { + num_bigint_0_1_40.default = (f.num_bigint_0_1_40.default or true); + num_bigint_0_1_40.rand = + (f.num_bigint_0_1_40.rand or false) || + (f.num_bigint_0_1_40.default or false) || + (num_bigint_0_1_40.default or false); + num_bigint_0_1_40.rustc-serialize = + (f.num_bigint_0_1_40.rustc-serialize or false) || + (f.num_bigint_0_1_40.default or false) || + (num_bigint_0_1_40.default or false); + num_integer_0_1_35.default = true; + num_traits_0_1_40.default = true; + rand_0_3_17.default = true; + rustc_serialize_0_3_24.default = true; + }) [ num_integer_0_1_35_features num_traits_0_1_40_features rand_0_3_17_features rustc_serialize_0_3_24_features ]; + num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { + dependencies = mapFeatures features ([ num_traits_0_1_40 ]); + }; + num_integer_0_1_35_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); + num_traits_0_1_40.default = true; + }) [ num_traits_0_1_40_features ]; + num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ]); + }; + num_iter_0_1_34_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = true; + num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); + num_traits_0_1_40.default = true; + }) [ num_integer_0_1_35_features num_traits_0_1_40_features ]; + num_rational_0_1_39 = { features?(num_rational_0_1_39_features {}) }: num_rational_0_1_39_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_40 ] + ++ (if features.num_rational_0_1_39.num-bigint or false then [ num_bigint_0_1_40 ] else []) + ++ (if features.num_rational_0_1_39.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.num_rational_0_1_39 or {}); + }; + num_rational_0_1_39_features = f: updateFeatures f (rec { + num_bigint_0_1_40.default = true; + num_integer_0_1_35.default = true; + num_rational_0_1_39.bigint = + (f.num_rational_0_1_39.bigint or false) || + (f.num_rational_0_1_39.default or false) || + (num_rational_0_1_39.default or false); + num_rational_0_1_39.default = (f.num_rational_0_1_39.default or true); + num_rational_0_1_39.num-bigint = + (f.num_rational_0_1_39.num-bigint or false) || + (f.num_rational_0_1_39.bigint or false) || + (num_rational_0_1_39.bigint or false); + num_rational_0_1_39.rustc-serialize = + (f.num_rational_0_1_39.rustc-serialize or false) || + (f.num_rational_0_1_39.default or false) || + (num_rational_0_1_39.default or false); + num_traits_0_1_40.default = true; + rustc_serialize_0_3_24.default = true; + }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_40_features rustc_serialize_0_3_24_features ]; + num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {}; + num_traits_0_1_40_features = f: updateFeatures f (rec { + num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true); + }) []; + num_cpus_1_7_0 = { features?(num_cpus_1_7_0_features {}) }: num_cpus_1_7_0_ { + dependencies = mapFeatures features ([ libc_0_2_32 ]); + }; + num_cpus_1_7_0_features = f: updateFeatures f (rec { + libc_0_2_32.default = true; + num_cpus_1_7_0.default = (f.num_cpus_1_7_0.default or true); + }) [ libc_0_2_32_features ]; + phf_0_7_21 = { features?(phf_0_7_21_features {}) }: phf_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 ]); + features = mkFeatures (features.phf_0_7_21 or {}); + }; + phf_0_7_21_features = f: updateFeatures f (rec { + phf_0_7_21.default = (f.phf_0_7_21.default or true); + phf_shared_0_7_21.core = + (f.phf_shared_0_7_21.core or false) || + (phf_0_7_21.core or false) || + (f.phf_0_7_21.core or false); + phf_shared_0_7_21.default = true; + phf_shared_0_7_21.unicase = + (f.phf_shared_0_7_21.unicase or false) || + (phf_0_7_21.unicase or false) || + (f.phf_0_7_21.unicase or false); + }) [ phf_shared_0_7_21_features ]; + phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { + dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); + }; + phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); + phf_generator_0_7_21.default = true; + phf_shared_0_7_21.default = true; + }) [ phf_generator_0_7_21_features phf_shared_0_7_21_features ]; + phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_17 ]); + }; + phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); + phf_shared_0_7_21.default = true; + rand_0_3_17.default = true; + }) [ phf_shared_0_7_21_features rand_0_3_17_features ]; + phf_shared_0_7_21 = { features?(phf_shared_0_7_21_features {}) }: phf_shared_0_7_21_ { + dependencies = mapFeatures features ([ siphasher_0_2_2 ]); + features = mkFeatures (features.phf_shared_0_7_21 or {}); + }; + phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); + siphasher_0_2_2.default = true; + }) [ siphasher_0_2_2_features ]; + png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_34 ] + ++ (if features.png_0_5_2.flate2 or false then [ flate2_0_2_20 ] else [])); + features = mkFeatures (features.png_0_5_2 or {}); + }; + png_0_5_2_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + flate2_0_2_20.default = true; + inflate_0_1_1.default = true; + num_iter_0_1_34.default = true; + png_0_5_2.default = (f.png_0_5_2.default or true); + png_0_5_2.flate2 = + (f.png_0_5_2.flate2 or false) || + (f.png_0_5_2.png-encoding or false) || + (png_0_5_2.png-encoding or false); + png_0_5_2.png-encoding = + (f.png_0_5_2.png-encoding or false) || + (f.png_0_5_2.default or false) || + (png_0_5_2.default or false); + }) [ bitflags_0_7_0_features flate2_0_2_20_features inflate_0_1_1_features num_iter_0_1_34_features ]; + rand_0_3_17 = { features?(rand_0_3_17_features {}) }: rand_0_3_17_ { + dependencies = mapFeatures features ([ libc_0_2_32 ]) + ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_2_1 ]) else []); + features = mkFeatures (features.rand_0_3_17 or {}); + }; + rand_0_3_17_features = f: updateFeatures f (rec { + fuchsia_zircon_0_2_1.default = true; + libc_0_2_32.default = true; + rand_0_3_17.default = (f.rand_0_3_17.default or true); + rand_0_3_17.i128_support = + (f.rand_0_3_17.i128_support or false) || + (f.rand_0_3_17.nightly or false) || + (rand_0_3_17.nightly or false); + }) [ libc_0_2_32_features fuchsia_zircon_0_2_1_features ]; + rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ { + dependencies = mapFeatures features ([ rayon_core_1_2_1 ]); + }; + rayon_0_8_2_features = f: updateFeatures f (rec { + rayon_0_8_2.default = (f.rayon_0_8_2.default or true); + rayon_core_1_2_1.default = true; + }) [ rayon_core_1_2_1_features ]; + rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ { + dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_9 libc_0_2_32 num_cpus_1_7_0 rand_0_3_17 ]); + }; + rayon_core_1_2_1_features = f: updateFeatures f (rec { + coco_0_1_1.default = true; + futures_0_1_16.default = true; + lazy_static_0_2_9.default = true; + libc_0_2_32.default = true; + num_cpus_1_7_0.default = true; + rand_0_3_17.default = true; + rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true); + }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_9_features libc_0_2_32_features num_cpus_1_7_0_features rand_0_3_17_features ]; + redox_syscall_0_1_31 = { features?(redox_syscall_0_1_31_features {}) }: redox_syscall_0_1_31_ {}; + redox_syscall_0_1_31_features = f: updateFeatures f (rec { + redox_syscall_0_1_31.default = (f.redox_syscall_0_1_31.default or true); + }) []; + redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { + dependencies = mapFeatures features ([ redox_syscall_0_1_31 ]); + }; + redox_termios_0_1_1_features = f: updateFeatures f (rec { + redox_syscall_0_1_31.default = true; + redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); + }) [ redox_syscall_0_1_31_features ]; + rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; + rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); + }) []; + scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ { + features = mkFeatures (features.scoped_threadpool_0_1_8 or {}); + }; + scoped_threadpool_0_1_8_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true); + }) []; + scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ { + features = mkFeatures (features.scopeguard_0_3_2 or {}); + }; + scopeguard_0_3_2_features = f: updateFeatures f (rec { + scopeguard_0_3_2.default = (f.scopeguard_0_3_2.default or true); + scopeguard_0_3_2.use_std = + (f.scopeguard_0_3_2.use_std or false) || + (f.scopeguard_0_3_2.default or false) || + (scopeguard_0_3_2.default or false); + }) []; + serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_0_9_15 or {}); + }; + serde_0_9_15_features = f: updateFeatures f (rec { + serde_0_9_15.alloc = + (f.serde_0_9_15.alloc or false) || + (f.serde_0_9_15.collections or false) || + (serde_0_9_15.collections or false); + serde_0_9_15.default = (f.serde_0_9_15.default or true); + serde_0_9_15.serde_derive = + (f.serde_0_9_15.serde_derive or false) || + (f.serde_0_9_15.derive or false) || + (serde_0_9_15.derive or false) || + (f.serde_0_9_15.playground or false) || + (serde_0_9_15.playground or false); + serde_0_9_15.std = + (f.serde_0_9_15.std or false) || + (f.serde_0_9_15.default or false) || + (serde_0_9_15.default or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + serde_0_9_15.unstable = + (f.serde_0_9_15.unstable or false) || + (f.serde_0_9_15.alloc or false) || + (serde_0_9_15.alloc or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + }) []; + serde_json_0_9_10 = { features?(serde_json_0_9_10_features {}) }: serde_json_0_9_10_ { + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_0_9_15 ]); + features = mkFeatures (features.serde_json_0_9_10 or {}); + }; + serde_json_0_9_10_features = f: updateFeatures f (rec { + dtoa_0_4_2.default = true; + itoa_0_3_4.default = true; + num_traits_0_1_40.default = true; + serde_0_9_15.default = true; + serde_json_0_9_10.default = (f.serde_json_0_9_10.default or true); + serde_json_0_9_10.linked-hash-map = + (f.serde_json_0_9_10.linked-hash-map or false) || + (f.serde_json_0_9_10.preserve_order or false) || + (serde_json_0_9_10.preserve_order or false); + }) [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_40_features serde_0_9_15_features ]; + siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { + dependencies = mapFeatures features ([]); + }; + siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); + }) []; + strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; + strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + }) []; + target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { + dependencies = mapFeatures features ([ phf_0_7_21 ] + ++ (if features.target_build_utils_0_3_1.serde_json or false then [ serde_json_0_9_10 ] else [])); + buildDependencies = mapFeatures features ([ phf_codegen_0_7_21 ]); + features = mkFeatures (features.target_build_utils_0_3_1 or {}); + }; + target_build_utils_0_3_1_features = f: updateFeatures f (rec { + phf_0_7_21.default = true; + phf_codegen_0_7_21.default = true; + serde_json_0_9_10.default = true; + target_build_utils_0_3_1.default = (f.target_build_utils_0_3_1.default or true); + target_build_utils_0_3_1.serde_json = + (f.target_build_utils_0_3_1.serde_json or false) || + (f.target_build_utils_0_3_1.default or false) || + (target_build_utils_0_3_1.default or false); + }) [ phf_0_7_21_features serde_json_0_9_10_features phf_codegen_0_7_21_features ]; + tempfile_2_2_0 = { features?(tempfile_2_2_0_features {}) }: tempfile_2_2_0_ { + dependencies = mapFeatures features ([ rand_0_3_17 ]) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_32 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + tempfile_2_2_0_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_32.default = true; + rand_0_3_17.default = true; + redox_syscall_0_1_31.default = true; + tempfile_2_2_0.default = (f.tempfile_2_2_0.default or true); + winapi_0_2_8.default = true; + }) [ rand_0_3_17_features redox_syscall_0_1_31_features libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + term_size_0_3_0 = { features?(term_size_0_3_0_features {}) }: term_size_0_3_0_ { + dependencies = mapFeatures features ([]) + ++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_32 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + features = mkFeatures (features.term_size_0_3_0 or {}); + }; + term_size_0_3_0_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_32.default = true; + term_size_0_3_0.clippy = + (f.term_size_0_3_0.clippy or false) || + (f.term_size_0_3_0.lints or false) || + (term_size_0_3_0.lints or false); + term_size_0_3_0.default = (f.term_size_0_3_0.default or true); + term_size_0_3_0.lints = + (f.term_size_0_3_0.lints or false) || + (f.term_size_0_3_0.travis or false) || + (term_size_0_3_0.travis or false); + term_size_0_3_0.nightly = + (f.term_size_0_3_0.nightly or false) || + (f.term_size_0_3_0.lints or false) || + (term_size_0_3_0.lints or false) || + (f.term_size_0_3_0.travis or false) || + (term_size_0_3_0.travis or false); + winapi_0_2_8.default = true; + }) [ libc_0_2_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { + dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_32 ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_31 redox_termios_0_1_1 ]) else []); + }; + termion_1_5_1_features = f: updateFeatures f (rec { + libc_0_2_32.default = true; + redox_syscall_0_1_31.default = true; + redox_termios_0_1_1.default = true; + termion_1_5_1.default = (f.termion_1_5_1.default or true); + }) [ libc_0_2_32_features redox_syscall_0_1_31_features redox_termios_0_1_1_features ]; + textwrap_0_8_0 = { features?(textwrap_0_8_0_features {}) }: textwrap_0_8_0_ { + dependencies = mapFeatures features ([ term_size_0_3_0 unicode_width_0_1_4 ]); + }; + textwrap_0_8_0_features = f: updateFeatures f (rec { + term_size_0_3_0.default = true; + textwrap_0_8_0.default = (f.textwrap_0_8_0.default or true); + unicode_width_0_1_4.default = true; + }) [ term_size_0_3_0_features unicode_width_0_1_4_features ]; + unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { + features = mkFeatures (features.unicode_width_0_1_4 or {}); + }; + unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); + }) []; + vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.vec_map_0_8_0 or {}); + }; + vec_map_0_8_0_features = f: updateFeatures f (rec { + vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true); + vec_map_0_8_0.serde = + (f.vec_map_0_8_0.serde or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + vec_map_0_8_0.serde_derive = + (f.vec_map_0_8_0.serde_derive or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + }) []; + way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ { + dependencies = mapFeatures features ([ wayland_client_0_9_10 wayland_sys_0_9_10 ]); + }; + way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec { + way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true); + wayland_client_0_9_10.cursor = true; + wayland_client_0_9_10.default = true; + wayland_client_0_9_10.dlopen = true; + wayland_sys_0_9_10.client = true; + wayland_sys_0_9_10.default = true; + wayland_sys_0_9_10.dlopen = true; + }) [ wayland_client_0_9_10_features wayland_sys_0_9_10_features ]; + wayland_client_0_9_10 = { features?(wayland_client_0_9_10_features {}) }: wayland_client_0_9_10_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 libc_0_2_32 wayland_sys_0_9_10 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]); + features = mkFeatures (features.wayland_client_0_9_10 or {}); + }; + wayland_client_0_9_10_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + libc_0_2_32.default = true; + wayland_client_0_9_10.cursor = + (f.wayland_client_0_9_10.cursor or false) || + (f.wayland_client_0_9_10.default or false) || + (wayland_client_0_9_10.default or false); + wayland_client_0_9_10.default = (f.wayland_client_0_9_10.default or true); + wayland_client_0_9_10.egl = + (f.wayland_client_0_9_10.egl or false) || + (f.wayland_client_0_9_10.default or false) || + (wayland_client_0_9_10.default or false); + wayland_scanner_0_9_10.default = true; + wayland_sys_0_9_10.client = true; + wayland_sys_0_9_10.cursor = + (f.wayland_sys_0_9_10.cursor or false) || + (wayland_client_0_9_10.cursor or false) || + (f.wayland_client_0_9_10.cursor or false); + wayland_sys_0_9_10.default = true; + wayland_sys_0_9_10.dlopen = + (f.wayland_sys_0_9_10.dlopen or false) || + (wayland_client_0_9_10.dlopen or false) || + (f.wayland_client_0_9_10.dlopen or false); + wayland_sys_0_9_10.egl = + (f.wayland_sys_0_9_10.egl or false) || + (wayland_client_0_9_10.egl or false) || + (f.wayland_client_0_9_10.egl or false); + }) [ bitflags_0_9_1_features libc_0_2_32_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ]; + wayland_scanner_0_9_10 = { features?(wayland_scanner_0_9_10_features {}) }: wayland_scanner_0_9_10_ { + dependencies = mapFeatures features ([ xml_rs_0_6_1 ]); + }; + wayland_scanner_0_9_10_features = f: updateFeatures f (rec { + wayland_scanner_0_9_10.default = (f.wayland_scanner_0_9_10.default or true); + xml_rs_0_6_1.default = true; + }) [ xml_rs_0_6_1_features ]; + wayland_sys_0_9_10 = { features?(wayland_sys_0_9_10_features {}) }: wayland_sys_0_9_10_ { + dependencies = mapFeatures features ([ dlib_0_3_1 ] + ++ (if features.wayland_sys_0_9_10.lazy_static or false then [ lazy_static_0_2_9 ] else [])); + features = mkFeatures (features.wayland_sys_0_9_10 or {}); + }; + wayland_sys_0_9_10_features = f: updateFeatures f (rec { + dlib_0_3_1.default = true; + dlib_0_3_1.dlopen = + (f.dlib_0_3_1.dlopen or false) || + (wayland_sys_0_9_10.dlopen or false) || + (f.wayland_sys_0_9_10.dlopen or false); + lazy_static_0_2_9.default = true; + wayland_sys_0_9_10.default = (f.wayland_sys_0_9_10.default or true); + wayland_sys_0_9_10.lazy_static = + (f.wayland_sys_0_9_10.lazy_static or false) || + (f.wayland_sys_0_9_10.dlopen or false) || + (wayland_sys_0_9_10.dlopen or false); + wayland_sys_0_9_10.libc = + (f.wayland_sys_0_9_10.libc or false) || + (f.wayland_sys_0_9_10.server or false) || + (wayland_sys_0_9_10.server or false); + }) [ dlib_0_3_1_features lazy_static_0_2_9_features ]; + wc_bg_0_3_0 = { features?(wc_bg_0_3_0_features {}) }: wc_bg_0_3_0_ { + dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_26_2 image_0_10_4 tempfile_2_2_0 way_cooler_client_helpers_0_1_0 wayland_client_0_9_10 wayland_sys_0_9_10 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_9_10 ]); + }; + wc_bg_0_3_0_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = true; + clap_2_26_2.default = true; + image_0_10_4.default = true; + tempfile_2_2_0.default = true; + way_cooler_client_helpers_0_1_0.default = true; + wayland_client_0_9_10.cursor = true; + wayland_client_0_9_10.default = true; + wayland_client_0_9_10.dlopen = true; + wayland_scanner_0_9_10.default = true; + wayland_sys_0_9_10.client = true; + wayland_sys_0_9_10.default = true; + wayland_sys_0_9_10.dlopen = true; + wc_bg_0_3_0.default = (f.wc_bg_0_3_0.default or true); + }) [ byteorder_0_5_3_features clap_2_26_2_features image_0_10_4_features tempfile_2_2_0_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_10_features wayland_sys_0_9_10_features wayland_scanner_0_9_10_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + xml_rs_0_6_1 = { features?(xml_rs_0_6_1_features {}) }: xml_rs_0_6_1_ { + dependencies = mapFeatures features ([ bitflags_0_9_1 ]); + }; + xml_rs_0_6_1_features = f: updateFeatures f (rec { + bitflags_0_9_1.default = true; + xml_rs_0_6_1.default = (f.xml_rs_0_6_1.default or true); + }) [ bitflags_0_9_1_features ]; } diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix index bc5d937206d..253281b6a9a 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix @@ -1,562 +1,801 @@ -# Generated by carnix 0.5.0: carnix -o wc-grab.nix Cargo.lock +# Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; - hasFeature = feature: - lib.lists.any - (originName: feature.${originName}) - (builtins.attrNames feature); - - hasDefault = feature: - let defaultFeatures = builtins.attrNames (feature."default" or {}); in - (defaultFeatures == []) - || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); - + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: - if featureName != "" && hasFeature feat.${featureName} then + if feat.${featureName} or false then [ featureName ] ++ features else features - ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); - adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "adler32"; - version = "1.0.0"; - authors = [ "Remi Rampin " ]; - sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w"; - inherit dependencies buildDependencies features; - }; - ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.9.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; - sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; - inherit dependencies buildDependencies features; - }; - atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.2"; - authors = [ "softprops " ]; - sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; - inherit dependencies buildDependencies features; - }; - bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.7.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; - inherit dependencies buildDependencies features; - }; - bitflags_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.8.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1h489m0wzhng5gvvc40jgdbaf0ac3rgkka31vwinhsjmfvrqcc4v"; - inherit dependencies buildDependencies features; - }; - byteorder_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "byteorder"; - version = "1.0.0"; - authors = [ "Andrew Gallant " ]; - sha256 = "14pdnds4517vcpablc51vv76hvc3glnpkpbb7qdil591q7lyb0m1"; - inherit dependencies buildDependencies features; - }; - clap_2_22_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.22.0"; - authors = [ "Kevin K. " ]; - sha256 = "0gdgyfh3ydpd2px4xh0i5qd6bhi2c5f43bqv9z4kla9vkmmfiavd"; - inherit dependencies buildDependencies features; - }; - color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "color_quant"; - version = "1.0.0"; - authors = [ "nwin " ]; - sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; - inherit dependencies buildDependencies features; - }; - dbus_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dbus"; - version = "0.5.2"; - authors = [ "David Henningsson " ]; - sha256 = "1ga3p2myqxbz34n2bbw4gk1ipf76mjr8r2rvrvnalwggymzfkhj7"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - deflate_0_7_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "deflate"; - version = "0.7.5"; - authors = [ "oyvindln " ]; - sha256 = "18bcmdkyshnzpkxx22b29gn55g6bk5ysy98ghjpjhxy3hky96rvy"; - inherit dependencies buildDependencies features; - }; - deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "deque"; - version = "0.3.1"; - authors = [ "Alex Crichton " "Samuel Fredrickson " "Linus Färnstrand " "Amanieu d'Antras " ]; - sha256 = "04x8i5aagxmslk350i8qszyw7kmvrqc3d99g4qi1xnfmr61y7m68"; - inherit dependencies buildDependencies features; - }; - enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "enum_primitive"; - version = "0.1.1"; - authors = [ "Anders Kaseorg " ]; - sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; - inherit dependencies buildDependencies features; - }; - error_chain_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "error-chain"; - version = "0.7.2"; - authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; - sha256 = "0b1r4ggdgy1djfvz2s4l5kirmfsmxd286y6wx0p9ahv2phb7inyi"; - inherit dependencies buildDependencies features; - }; - gif_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "gif"; - version = "0.9.1"; - authors = [ "nwin " ]; - sha256 = "16s7b0rqc6gg1fcbppakm3jy2q462w3qvykcmcmifmg7q7lwsg6r"; - inherit dependencies buildDependencies features; - }; - glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "glob"; - version = "0.2.11"; - authors = [ "The Rust Project Developers" ]; - sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; - inherit dependencies buildDependencies features; - }; - image_0_12_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "image"; - version = "0.12.3"; - authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; - sha256 = "12xdzi29vr19gz3h93c1ihyvyv9xar9sp0inrjwwvlbjvn8nn0p9"; - libPath = "./src/lib.rs"; - inherit dependencies buildDependencies features; - }; - inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "inflate"; - version = "0.1.1"; - authors = [ "nwin " ]; - sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; - inherit dependencies buildDependencies features; - }; - jpeg_decoder_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "jpeg-decoder"; - version = "0.1.11"; - authors = [ "Ulf Nilsson " ]; - sha256 = "1xm39c1cff5gkczs164371hk2gpkjpkbw63k4f8mjnpwwpn9xk4n"; - inherit dependencies buildDependencies features; - }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian " ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - libc_0_2_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.21"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0glj3lxwc8358cfw9pb5dd4zr9iynzj6w2ly59nshrggsw021j75"; - inherit dependencies buildDependencies features; - }; - lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lzw"; - version = "0.10.0"; - authors = [ "nwin " ]; - sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; - inherit dependencies buildDependencies features; - }; - metadeps_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "metadeps"; - version = "1.1.1"; - authors = [ "Josh Triplett " ]; - sha256 = "1px8v94jn4ps63gqmvgsfcqxrwjhpa9z4xr0y1lh95wn2063fsar"; - inherit dependencies buildDependencies features; - }; - num_integer_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-integer"; - version = "0.1.33"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1rhy9lf4lhl7r8278n73mi9y55v9a71639as3v92bj2gk1x4k729"; - inherit dependencies buildDependencies features; - }; - num_iter_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-iter"; - version = "0.1.33"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1xjzf2p2vaqwknkr4s8ka5hn6cpr5rsshnydbpkn2pvapfzdrqd3"; - inherit dependencies buildDependencies features; - }; - num_rational_0_1_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-rational"; - version = "0.1.36"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0jibhs8xiap2wlv1xjwdvhyj4yrxwfisqbnfm53vjm5ldlijp87p"; - inherit dependencies buildDependencies features; - }; - num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.1.37"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; - inherit dependencies buildDependencies features; - }; - num_cpus_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num_cpus"; - version = "1.3.0"; - authors = [ "Sean McArthur " ]; - sha256 = "0i0zm6qh932k9b67qf7f1vsczkdim5kg9qv73m7y5hhw1i781rrb"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.9"; - authors = [ "Alex Crichton " ]; - sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; - inherit dependencies buildDependencies features; - }; - png_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "png"; - version = "0.6.2"; - authors = [ "nwin " ]; - sha256 = "03i78w5jbvk9y6babfrh7h0akvg81pcyyhniilv24z5v0vh5jvjs"; - inherit dependencies buildDependencies features; - }; - rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.3.15"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; - inherit dependencies buildDependencies features; - }; - rayon_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rayon"; - version = "0.6.0"; - authors = [ "Niko Matsakis " ]; - sha256 = "0y2693bari5j4h46mjzkyc9lkfbnq2d1p0ldyn6sb02jn63lpw97"; - inherit dependencies buildDependencies features; - }; - scoped_threadpool_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "scoped_threadpool"; - version = "0.1.7"; - authors = [ "Marvin Löbel " ]; - sha256 = "0dg58f18i6v071640062n0vymr4h42cnj0xy8a7b80sc0mddykyk"; - inherit dependencies buildDependencies features; - }; - strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.6.0"; - authors = [ "Danny Guo " ]; - sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; - inherit dependencies buildDependencies features; - }; - term_size_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "term_size"; - version = "0.2.3"; - authors = [ "Kevin K. " "Benjamin Sago " ]; - sha256 = "16b7gq2dmz7mws4vgai7whxy4xkg4yvlhm7spz0q6jyipqfq87ci"; - inherit dependencies buildDependencies features; - }; - toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "toml"; - version = "0.2.1"; - authors = [ "Alex Crichton " ]; - sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs"; - inherit dependencies buildDependencies features; - }; - unicode_segmentation_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-segmentation"; - version = "1.1.0"; - authors = [ "kwantam " ]; - sha256 = "10hk7wy0217jwdbp27p36skwkig5lbhk482yfzij9m87h247rry0"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - authors = [ "kwantam " ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - inherit dependencies buildDependencies features; - }; - vec_map_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vec_map"; - version = "0.7.0"; - authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; - sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1"; - inherit dependencies buildDependencies features; - }; - wc_grab_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wc-grab"; - version = "0.2.0"; - authors = [ "Timidger " ]; - src = ./.; - inherit dependencies buildDependencies features; - }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - authors = [ "Peter Atashian " ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - inherit dependencies buildDependencies features; - }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - authors = [ "Peter Atashian " ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - inherit dependencies buildDependencies features; - }; - + ) [] (builtins.attrNames feat); in rec { - adler32_1_0_0 = adler32_1_0_0_ rec {}; - ansi_term_0_9_0 = ansi_term_0_9_0_ rec {}; - atty_0_2_2 = atty_0_2_2_ rec { - dependencies = (if !(kernel == "windows") then [ libc_0_2_21 ] else []) - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + wc_grab = f: wc_grab_0_3_0 { features = wc_grab_0_3_0_features { wc_grab_0_3_0 = f; }; }; + adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "adler32"; + version = "1.0.0"; + authors = [ "Remi Rampin " ]; + sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w"; + inherit dependencies buildDependencies features; }; - libc_0_2_21_features."default".from_atty_0_2_2__default = true; - kernel32_sys_0_2_2_features."default".from_atty_0_2_2__default = true; - winapi_0_2_8_features."default".from_atty_0_2_2__default = true; - bitflags_0_7_0 = bitflags_0_7_0_ rec {}; - bitflags_0_8_0 = bitflags_0_8_0_ rec { - features = mkFeatures bitflags_0_8_0_features; + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; }; - bitflags_0_8_0_features."i128".self_unstable = hasFeature (bitflags_0_8_0_features."unstable" or {}); - byteorder_1_0_0 = byteorder_1_0_0_ rec { - features = mkFeatures byteorder_1_0_0_features; + atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.2"; + authors = [ "softprops " ]; + sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; + inherit dependencies buildDependencies features; }; - byteorder_1_0_0_features."std".self_default = hasDefault byteorder_1_0_0_features; - clap_2_22_0 = clap_2_22_0_ rec { - dependencies = [ ansi_term_0_9_0 atty_0_2_2 bitflags_0_8_0 strsim_0_6_0 term_size_0_2_3 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ] - ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_9_0] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_2] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "term_size") features then [term_size_0_2_3] else []); - features = mkFeatures clap_2_22_0_features; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; }; - clap_2_22_0_features."".self = true; - clap_2_22_0_features."ansi_term".self_color = hasFeature (clap_2_22_0_features."color" or {}); - clap_2_22_0_features."atty".self_color = hasFeature (clap_2_22_0_features."color" or {}); - clap_2_22_0_features."suggestions".self_default = hasDefault clap_2_22_0_features; - clap_2_22_0_features."color".self_default = hasDefault clap_2_22_0_features; - clap_2_22_0_features."wrap_help".self_default = hasDefault clap_2_22_0_features; - clap_2_22_0_features."clippy".self_lints = hasFeature (clap_2_22_0_features."lints" or {}); - clap_2_22_0_features."strsim".self_suggestions = hasFeature (clap_2_22_0_features."suggestions" or {}); - clap_2_22_0_features."term_size".self_wrap_help = hasFeature (clap_2_22_0_features."wrap_help" or {}); - clap_2_22_0_features."yaml-rust".self_yaml = hasFeature (clap_2_22_0_features."yaml" or {}); - ansi_term_0_9_0_features."default".from_clap_2_22_0__default = true; - atty_0_2_2_features."default".from_clap_2_22_0__default = true; - bitflags_0_8_0_features."default".from_clap_2_22_0__default = true; - clippy_0_0_0_features."default".from_clap_2_22_0__default = true; - strsim_0_6_0_features."default".from_clap_2_22_0__default = true; - term_size_0_2_3_features."default".from_clap_2_22_0__default = true; - unicode_segmentation_1_1_0_features."default".from_clap_2_22_0__default = true; - unicode_width_0_1_4_features."default".from_clap_2_22_0__default = true; - vec_map_0_7_0_features."default".from_clap_2_22_0__default = true; - yaml_rust_0_0_0_features."default".from_clap_2_22_0__default = true; - color_quant_1_0_0 = color_quant_1_0_0_ rec {}; - dbus_0_5_2 = dbus_0_5_2_ rec { - dependencies = [ libc_0_2_21 ]; - buildDependencies = [ metadeps_1_1_1 ]; - features = mkFeatures dbus_0_5_2_features; + bitflags_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.8.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1h489m0wzhng5gvvc40jgdbaf0ac3rgkka31vwinhsjmfvrqcc4v"; + inherit dependencies buildDependencies features; }; - dbus_0_5_2_features."".self = true; - libc_0_2_21_features."default".from_dbus_0_5_2__default = true; - deflate_0_7_5 = deflate_0_7_5_ rec { - dependencies = [ adler32_1_0_0 byteorder_1_0_0 ]; + byteorder_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.0.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "14pdnds4517vcpablc51vv76hvc3glnpkpbb7qdil591q7lyb0m1"; + inherit dependencies buildDependencies features; }; - adler32_1_0_0_features."default".from_deflate_0_7_5__default = true; - byteorder_1_0_0_features."default".from_deflate_0_7_5__default = true; - deque_0_3_1 = deque_0_3_1_ rec { - dependencies = [ rand_0_3_15 ]; + clap_2_22_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.22.0"; + authors = [ "Kevin K. " ]; + sha256 = "0gdgyfh3ydpd2px4xh0i5qd6bhi2c5f43bqv9z4kla9vkmmfiavd"; + inherit dependencies buildDependencies features; }; - rand_0_3_15_features."default".from_deque_0_3_1__default = true; - enum_primitive_0_1_1 = enum_primitive_0_1_1_ rec { - dependencies = [ num_traits_0_1_37 ]; + color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "color_quant"; + version = "1.0.0"; + authors = [ "nwin " ]; + sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; + inherit dependencies buildDependencies features; }; - num_traits_0_1_37_features."default".from_enum_primitive_0_1_1__default = false; - error_chain_0_7_2 = error_chain_0_7_2_ rec { - dependencies = []; - features = mkFeatures error_chain_0_7_2_features; + dbus_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus"; + version = "0.5.2"; + authors = [ "David Henningsson " ]; + sha256 = "1ga3p2myqxbz34n2bbw4gk1ipf76mjr8r2rvrvnalwggymzfkhj7"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - error_chain_0_7_2_features."backtrace".self_default = hasDefault error_chain_0_7_2_features; - error_chain_0_7_2_features."example_generated".self_default = hasDefault error_chain_0_7_2_features; - backtrace_0_0_0_features."default".from_error_chain_0_7_2__default = true; - gif_0_9_1 = gif_0_9_1_ rec { - dependencies = [ color_quant_1_0_0 lzw_0_10_0 ]; - features = mkFeatures gif_0_9_1_features; + deflate_0_7_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "deflate"; + version = "0.7.5"; + authors = [ "oyvindln " ]; + sha256 = "18bcmdkyshnzpkxx22b29gn55g6bk5ysy98ghjpjhxy3hky96rvy"; + inherit dependencies buildDependencies features; }; - gif_0_9_1_features."libc".self_c_api = hasFeature (gif_0_9_1_features."c_api" or {}); - gif_0_9_1_features."raii_no_panic".self_default = hasDefault gif_0_9_1_features; - color_quant_1_0_0_features."default".from_gif_0_9_1__default = true; - libc_0_0_0_features."default".from_gif_0_9_1__default = true; - lzw_0_10_0_features."default".from_gif_0_9_1__default = true; - glob_0_2_11 = glob_0_2_11_ rec {}; - image_0_12_3 = image_0_12_3_ rec { - dependencies = [ byteorder_1_0_0 enum_primitive_0_1_1 gif_0_9_1 glob_0_2_11 jpeg_decoder_0_1_11 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 png_0_6_2 scoped_threadpool_0_1_7 ] - ++ (if lib.lists.any (x: x == "gif") features then [gif_0_9_1] else []) ++ (if lib.lists.any (x: x == "jpeg-decoder") features then [jpeg_decoder_0_1_11] else []) ++ (if lib.lists.any (x: x == "png") features then [png_0_6_2] else []) ++ (if lib.lists.any (x: x == "scoped_threadpool") features then [scoped_threadpool_0_1_7] else []); - features = mkFeatures image_0_12_3_features; + deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "deque"; + version = "0.3.1"; + authors = [ "Alex Crichton " "Samuel Fredrickson " "Linus Färnstrand " "Amanieu d'Antras " ]; + sha256 = "04x8i5aagxmslk350i8qszyw7kmvrqc3d99g4qi1xnfmr61y7m68"; + inherit dependencies buildDependencies features; }; - image_0_12_3_features."".self = true; - image_0_12_3_features."gif_codec".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."jpeg".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."ico".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."png_codec".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."ppm".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."tga".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."tiff".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."webp".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."bmp".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."hdr".self_default = hasDefault image_0_12_3_features; - image_0_12_3_features."gif".self_gif_codec = hasFeature (image_0_12_3_features."gif_codec" or {}); - image_0_12_3_features."scoped_threadpool".self_hdr = hasFeature (image_0_12_3_features."hdr" or {}); - image_0_12_3_features."bmp".self_ico = hasFeature (image_0_12_3_features."ico" or {}); - image_0_12_3_features."png_codec".self_ico = hasFeature (image_0_12_3_features."ico" or {}); - image_0_12_3_features."jpeg-decoder".self_jpeg = hasFeature (image_0_12_3_features."jpeg" or {}); - image_0_12_3_features."png".self_png_codec = hasFeature (image_0_12_3_features."png_codec" or {}); - byteorder_1_0_0_features."default".from_image_0_12_3__default = true; - enum_primitive_0_1_1_features."default".from_image_0_12_3__default = true; - gif_0_9_1_features."default".from_image_0_12_3__default = true; - glob_0_2_11_features."default".from_image_0_12_3__default = true; - jpeg_decoder_0_1_11_features."default".from_image_0_12_3__default = true; - num_iter_0_1_33_features."default".from_image_0_12_3__default = true; - num_rational_0_1_36_features."default".from_image_0_12_3__default = false; - num_traits_0_1_37_features."default".from_image_0_12_3__default = true; - png_0_6_2_features."default".from_image_0_12_3__default = true; - scoped_threadpool_0_1_7_features."default".from_image_0_12_3__default = true; - inflate_0_1_1 = inflate_0_1_1_ rec { - features = mkFeatures inflate_0_1_1_features; + enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "enum_primitive"; + version = "0.1.1"; + authors = [ "Anders Kaseorg " ]; + sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; + inherit dependencies buildDependencies features; }; - inflate_0_1_1_features."".self = true; - jpeg_decoder_0_1_11 = jpeg_decoder_0_1_11_ rec { - dependencies = [ byteorder_1_0_0 rayon_0_6_0 ] - ++ (if lib.lists.any (x: x == "rayon") features then [rayon_0_6_0] else []); - features = mkFeatures jpeg_decoder_0_1_11_features; + error_chain_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.7.2"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "0b1r4ggdgy1djfvz2s4l5kirmfsmxd286y6wx0p9ahv2phb7inyi"; + inherit dependencies buildDependencies features; }; - jpeg_decoder_0_1_11_features."".self = true; - jpeg_decoder_0_1_11_features."rayon".self_default = hasDefault jpeg_decoder_0_1_11_features; - byteorder_1_0_0_features."default".from_jpeg_decoder_0_1_11__default = true; - rayon_0_6_0_features."default".from_jpeg_decoder_0_1_11__default = true; - kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { - dependencies = [ winapi_0_2_8 ]; - buildDependencies = [ winapi_build_0_1_1 ]; + gif_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gif"; + version = "0.9.1"; + authors = [ "nwin " ]; + sha256 = "16s7b0rqc6gg1fcbppakm3jy2q462w3qvykcmcmifmg7q7lwsg6r"; + inherit dependencies buildDependencies features; }; - winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; - libc_0_2_21 = libc_0_2_21_ rec { - features = mkFeatures libc_0_2_21_features; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; }; - libc_0_2_21_features."use_std".self_default = hasDefault libc_0_2_21_features; - lzw_0_10_0 = lzw_0_10_0_ rec { - features = mkFeatures lzw_0_10_0_features; + image_0_12_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "image"; + version = "0.12.3"; + authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; + sha256 = "12xdzi29vr19gz3h93c1ihyvyv9xar9sp0inrjwwvlbjvn8nn0p9"; + libPath = "./src/lib.rs"; + inherit dependencies buildDependencies features; }; - lzw_0_10_0_features."raii_no_panic".self_default = hasDefault lzw_0_10_0_features; - metadeps_1_1_1 = metadeps_1_1_1_ rec { - dependencies = [ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]; + inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "inflate"; + version = "0.1.1"; + authors = [ "nwin " ]; + sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; + inherit dependencies buildDependencies features; }; - error_chain_0_7_2_features."default".from_metadeps_1_1_1__default = false; - pkg_config_0_3_9_features."default".from_metadeps_1_1_1__default = true; - toml_0_2_1_features."default".from_metadeps_1_1_1__default = false; - num_integer_0_1_33 = num_integer_0_1_33_ rec { - dependencies = [ num_traits_0_1_37 ]; + jpeg_decoder_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jpeg-decoder"; + version = "0.1.11"; + authors = [ "Ulf Nilsson " ]; + sha256 = "1xm39c1cff5gkczs164371hk2gpkjpkbw63k4f8mjnpwwpn9xk4n"; + inherit dependencies buildDependencies features; }; - num_traits_0_1_37_features."default".from_num_integer_0_1_33__default = true; - num_iter_0_1_33 = num_iter_0_1_33_ rec { - dependencies = [ num_integer_0_1_33 num_traits_0_1_37 ]; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - num_integer_0_1_33_features."default".from_num_iter_0_1_33__default = true; - num_traits_0_1_37_features."default".from_num_iter_0_1_33__default = true; - num_rational_0_1_36 = num_rational_0_1_36_ rec { - dependencies = [ num_integer_0_1_33 num_traits_0_1_37 ]; - features = mkFeatures num_rational_0_1_36_features; + libc_0_2_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.21"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0glj3lxwc8358cfw9pb5dd4zr9iynzj6w2ly59nshrggsw021j75"; + inherit dependencies buildDependencies features; }; - num_rational_0_1_36_features."num-bigint".self_bigint = hasFeature (num_rational_0_1_36_features."bigint" or {}); - num_rational_0_1_36_features."bigint".self_default = hasDefault num_rational_0_1_36_features; - num_rational_0_1_36_features."rustc-serialize".self_default = hasDefault num_rational_0_1_36_features; - num_bigint_0_0_0_features."default".from_num_rational_0_1_36__default = true; - num_integer_0_1_33_features."default".from_num_rational_0_1_36__default = true; - num_traits_0_1_37_features."default".from_num_rational_0_1_36__default = true; - rustc_serialize_0_0_0_features."default".from_num_rational_0_1_36__default = true; - serde_0_0_0_features."default".from_num_rational_0_1_36__default = true; - num_traits_0_1_37 = num_traits_0_1_37_ rec {}; - num_cpus_1_3_0 = num_cpus_1_3_0_ rec { - dependencies = [ libc_0_2_21 ]; + lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lzw"; + version = "0.10.0"; + authors = [ "nwin " ]; + sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; + inherit dependencies buildDependencies features; }; - libc_0_2_21_features."default".from_num_cpus_1_3_0__default = true; - pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; - png_0_6_2 = png_0_6_2_ rec { - dependencies = [ bitflags_0_7_0 deflate_0_7_5 inflate_0_1_1 num_iter_0_1_33 ] - ++ (if lib.lists.any (x: x == "deflate") features then [deflate_0_7_5] else []); - features = mkFeatures png_0_6_2_features; + metadeps_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "metadeps"; + version = "1.1.1"; + authors = [ "Josh Triplett " ]; + sha256 = "1px8v94jn4ps63gqmvgsfcqxrwjhpa9z4xr0y1lh95wn2063fsar"; + inherit dependencies buildDependencies features; }; - png_0_6_2_features."".self = true; - png_0_6_2_features."png-encoding".self_default = hasDefault png_0_6_2_features; - png_0_6_2_features."deflate".self_png-encoding = hasFeature (png_0_6_2_features."png-encoding" or {}); - bitflags_0_7_0_features."default".from_png_0_6_2__default = true; - deflate_0_7_5_features."default".from_png_0_6_2__default = true; - inflate_0_1_1_features."default".from_png_0_6_2__default = true; - num_iter_0_1_33_features."default".from_png_0_6_2__default = true; - rand_0_3_15 = rand_0_3_15_ rec { - dependencies = [ libc_0_2_21 ]; + num_integer_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1rhy9lf4lhl7r8278n73mi9y55v9a71639as3v92bj2gk1x4k729"; + inherit dependencies buildDependencies features; }; - libc_0_2_21_features."default".from_rand_0_3_15__default = true; - rayon_0_6_0 = rayon_0_6_0_ rec { - dependencies = [ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]; - features = mkFeatures rayon_0_6_0_features; + num_iter_0_1_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.33"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1xjzf2p2vaqwknkr4s8ka5hn6cpr5rsshnydbpkn2pvapfzdrqd3"; + inherit dependencies buildDependencies features; }; - rayon_0_6_0_features."".self = true; - deque_0_3_1_features."default".from_rayon_0_6_0__default = true; - libc_0_2_21_features."default".from_rayon_0_6_0__default = true; - num_cpus_1_3_0_features."default".from_rayon_0_6_0__default = true; - rand_0_3_15_features."default".from_rayon_0_6_0__default = true; - scoped_threadpool_0_1_7 = scoped_threadpool_0_1_7_ rec { - features = mkFeatures scoped_threadpool_0_1_7_features; + num_rational_0_1_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-rational"; + version = "0.1.36"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0jibhs8xiap2wlv1xjwdvhyj4yrxwfisqbnfm53vjm5ldlijp87p"; + inherit dependencies buildDependencies features; }; - scoped_threadpool_0_1_7_features."".self = true; - strsim_0_6_0 = strsim_0_6_0_ rec {}; - term_size_0_2_3 = term_size_0_2_3_ rec { - dependencies = [] - ++ (if !(kernel == "windows") then [ libc_0_2_21 ] else []) - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); - features = mkFeatures term_size_0_2_3_features; + num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; + inherit dependencies buildDependencies features; }; - term_size_0_2_3_features."clippy".self_lints = hasFeature (term_size_0_2_3_features."lints" or {}); - term_size_0_2_3_features."nightly".self_lints = hasFeature (term_size_0_2_3_features."lints" or {}); - term_size_0_2_3_features."lints".self_travis = hasFeature (term_size_0_2_3_features."travis" or {}); - term_size_0_2_3_features."nightly".self_travis = hasFeature (term_size_0_2_3_features."travis" or {}); - clippy_0_0_0_features."default".from_term_size_0_2_3__default = true; - libc_0_2_21_features."default".from_term_size_0_2_3__default = true; - kernel32_sys_0_2_2_features."default".from_term_size_0_2_3__default = true; - winapi_0_2_8_features."default".from_term_size_0_2_3__default = true; - toml_0_2_1 = toml_0_2_1_ rec { - dependencies = []; + num_cpus_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.3.0"; + authors = [ "Sean McArthur " ]; + sha256 = "0i0zm6qh932k9b67qf7f1vsczkdim5kg9qv73m7y5hhw1i781rrb"; + inherit dependencies buildDependencies features; }; - toml_0_2_1_features."rustc-serialize".self_default = hasDefault toml_0_2_1_features; - rustc_serialize_0_0_0_features."default".from_toml_0_2_1__default = true; - serde_0_0_0_features."default".from_toml_0_2_1__default = true; - unicode_segmentation_1_1_0 = unicode_segmentation_1_1_0_ rec { - features = mkFeatures unicode_segmentation_1_1_0_features; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; }; - unicode_segmentation_1_1_0_features."".self = true; - unicode_width_0_1_4 = unicode_width_0_1_4_ rec { - features = mkFeatures unicode_width_0_1_4_features; + png_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "png"; + version = "0.6.2"; + authors = [ "nwin " ]; + sha256 = "03i78w5jbvk9y6babfrh7h0akvg81pcyyhniilv24z5v0vh5jvjs"; + inherit dependencies buildDependencies features; }; - unicode_width_0_1_4_features."".self = true; - vec_map_0_7_0 = vec_map_0_7_0_ rec { - dependencies = []; - features = mkFeatures vec_map_0_7_0_features; + rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; + inherit dependencies buildDependencies features; }; - vec_map_0_7_0_features."serde".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); - vec_map_0_7_0_features."serde_derive".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); - serde_0_0_0_features."default".from_vec_map_0_7_0__default = true; - serde_derive_0_0_0_features."default".from_vec_map_0_7_0__default = true; - wc_grab_0_2_0 = wc_grab_0_2_0_ rec { - dependencies = [ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]; + rayon_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon"; + version = "0.6.0"; + authors = [ "Niko Matsakis " ]; + sha256 = "0y2693bari5j4h46mjzkyc9lkfbnq2d1p0ldyn6sb02jn63lpw97"; + inherit dependencies buildDependencies features; }; - clap_2_22_0_features."default".from_wc_grab_0_2_0__default = true; - dbus_0_5_2_features."default".from_wc_grab_0_2_0__default = true; - image_0_12_3_features."default".from_wc_grab_0_2_0__default = true; - winapi_0_2_8 = winapi_0_2_8_ rec {}; - winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; + scoped_threadpool_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0dg58f18i6v071640062n0vymr4h42cnj0xy8a7b80sc0mddykyk"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + term_size_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "term_size"; + version = "0.2.3"; + authors = [ "Kevin K. " "Benjamin Sago " ]; + sha256 = "16b7gq2dmz7mws4vgai7whxy4xkg4yvlhm7spz0q6jyipqfq87ci"; + inherit dependencies buildDependencies features; + }; + toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs"; + inherit dependencies buildDependencies features; + }; + unicode_segmentation_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-segmentation"; + version = "1.1.0"; + authors = [ "kwantam " ]; + sha256 = "10hk7wy0217jwdbp27p36skwkig5lbhk482yfzij9m87h247rry0"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + vec_map_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.7.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1"; + inherit dependencies buildDependencies features; + }; + wc_grab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wc-grab"; + version = "0.3.0"; + authors = [ "Timidger " ]; + sha256 = "02dkjxffzh38h3hiwfypkjv0g8dsfkp9wk20j04x4qydg4dr8a8h"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {}; + adler32_1_0_0_features = f: updateFeatures f (rec { + adler32_1_0_0.default = (f.adler32_1_0_0.default or true); + }) []; + ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; + ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); + }) []; + atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ { + dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + atty_0_2_2_features = f: updateFeatures f (rec { + atty_0_2_2.default = (f.atty_0_2_2.default or true); + kernel32_sys_0_2_2.default = true; + libc_0_2_21.default = true; + winapi_0_2_8.default = true; + }) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; + bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); + }) []; + bitflags_0_8_0 = { features?(bitflags_0_8_0_features {}) }: bitflags_0_8_0_ { + features = mkFeatures (features.bitflags_0_8_0 or {}); + }; + bitflags_0_8_0_features = f: updateFeatures f (rec { + bitflags_0_8_0.default = (f.bitflags_0_8_0.default or true); + bitflags_0_8_0.i128 = + (f.bitflags_0_8_0.i128 or false) || + (f.bitflags_0_8_0.unstable or false) || + (bitflags_0_8_0.unstable or false); + }) []; + byteorder_1_0_0 = { features?(byteorder_1_0_0_features {}) }: byteorder_1_0_0_ { + features = mkFeatures (features.byteorder_1_0_0 or {}); + }; + byteorder_1_0_0_features = f: updateFeatures f (rec { + byteorder_1_0_0.default = (f.byteorder_1_0_0.default or true); + byteorder_1_0_0.std = + (f.byteorder_1_0_0.std or false) || + (f.byteorder_1_0_0.default or false) || + (byteorder_1_0_0.default or false); + }) []; + clap_2_22_0 = { features?(clap_2_22_0_features {}) }: clap_2_22_0_ { + dependencies = mapFeatures features ([ bitflags_0_8_0 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ] + ++ (if features.clap_2_22_0.ansi_term or false then [ ansi_term_0_9_0 ] else []) + ++ (if features.clap_2_22_0.atty or false then [ atty_0_2_2 ] else []) + ++ (if features.clap_2_22_0.strsim or false then [ strsim_0_6_0 ] else []) + ++ (if features.clap_2_22_0.term_size or false then [ term_size_0_2_3 ] else [])); + features = mkFeatures (features.clap_2_22_0 or {}); + }; + clap_2_22_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = true; + atty_0_2_2.default = true; + bitflags_0_8_0.default = true; + clap_2_22_0.ansi_term = + (f.clap_2_22_0.ansi_term or false) || + (f.clap_2_22_0.color or false) || + (clap_2_22_0.color or false); + clap_2_22_0.atty = + (f.clap_2_22_0.atty or false) || + (f.clap_2_22_0.color or false) || + (clap_2_22_0.color or false); + clap_2_22_0.clippy = + (f.clap_2_22_0.clippy or false) || + (f.clap_2_22_0.lints or false) || + (clap_2_22_0.lints or false); + clap_2_22_0.color = + (f.clap_2_22_0.color or false) || + (f.clap_2_22_0.default or false) || + (clap_2_22_0.default or false); + clap_2_22_0.default = (f.clap_2_22_0.default or true); + clap_2_22_0.strsim = + (f.clap_2_22_0.strsim or false) || + (f.clap_2_22_0.suggestions or false) || + (clap_2_22_0.suggestions or false); + clap_2_22_0.suggestions = + (f.clap_2_22_0.suggestions or false) || + (f.clap_2_22_0.default or false) || + (clap_2_22_0.default or false); + clap_2_22_0.term_size = + (f.clap_2_22_0.term_size or false) || + (f.clap_2_22_0.wrap_help or false) || + (clap_2_22_0.wrap_help or false); + clap_2_22_0.wrap_help = + (f.clap_2_22_0.wrap_help or false) || + (f.clap_2_22_0.default or false) || + (clap_2_22_0.default or false); + clap_2_22_0.yaml-rust = + (f.clap_2_22_0.yaml-rust or false) || + (f.clap_2_22_0.yaml or false) || + (clap_2_22_0.yaml or false); + strsim_0_6_0.default = true; + term_size_0_2_3.default = true; + unicode_segmentation_1_1_0.default = true; + unicode_width_0_1_4.default = true; + vec_map_0_7_0.default = true; + }) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_0_features strsim_0_6_0_features term_size_0_2_3_features unicode_segmentation_1_1_0_features unicode_width_0_1_4_features vec_map_0_7_0_features ]; + color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; + color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); + }) []; + dbus_0_5_2 = { features?(dbus_0_5_2_features {}) }: dbus_0_5_2_ { + dependencies = mapFeatures features ([ libc_0_2_21 ]); + buildDependencies = mapFeatures features ([ metadeps_1_1_1 ]); + features = mkFeatures (features.dbus_0_5_2 or {}); + }; + dbus_0_5_2_features = f: updateFeatures f (rec { + dbus_0_5_2.default = (f.dbus_0_5_2.default or true); + libc_0_2_21.default = true; + metadeps_1_1_1.default = true; + }) [ libc_0_2_21_features metadeps_1_1_1_features ]; + deflate_0_7_5 = { features?(deflate_0_7_5_features {}) }: deflate_0_7_5_ { + dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_0_0 ]); + }; + deflate_0_7_5_features = f: updateFeatures f (rec { + adler32_1_0_0.default = true; + byteorder_1_0_0.default = true; + deflate_0_7_5.default = (f.deflate_0_7_5.default or true); + }) [ adler32_1_0_0_features byteorder_1_0_0_features ]; + deque_0_3_1 = { features?(deque_0_3_1_features {}) }: deque_0_3_1_ { + dependencies = mapFeatures features ([ rand_0_3_15 ]); + }; + deque_0_3_1_features = f: updateFeatures f (rec { + deque_0_3_1.default = (f.deque_0_3_1.default or true); + rand_0_3_15.default = true; + }) [ rand_0_3_15_features ]; + enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { + dependencies = mapFeatures features ([ num_traits_0_1_37 ]); + }; + enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); + num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false); + }) [ num_traits_0_1_37_features ]; + error_chain_0_7_2 = { features?(error_chain_0_7_2_features {}) }: error_chain_0_7_2_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.error_chain_0_7_2 or {}); + }; + error_chain_0_7_2_features = f: updateFeatures f (rec { + error_chain_0_7_2.backtrace = + (f.error_chain_0_7_2.backtrace or false) || + (f.error_chain_0_7_2.default or false) || + (error_chain_0_7_2.default or false); + error_chain_0_7_2.default = (f.error_chain_0_7_2.default or true); + error_chain_0_7_2.example_generated = + (f.error_chain_0_7_2.example_generated or false) || + (f.error_chain_0_7_2.default or false) || + (error_chain_0_7_2.default or false); + }) []; + gif_0_9_1 = { features?(gif_0_9_1_features {}) }: gif_0_9_1_ { + dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]); + features = mkFeatures (features.gif_0_9_1 or {}); + }; + gif_0_9_1_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = true; + gif_0_9_1.default = (f.gif_0_9_1.default or true); + gif_0_9_1.libc = + (f.gif_0_9_1.libc or false) || + (f.gif_0_9_1.c_api or false) || + (gif_0_9_1.c_api or false); + gif_0_9_1.raii_no_panic = + (f.gif_0_9_1.raii_no_panic or false) || + (f.gif_0_9_1.default or false) || + (gif_0_9_1.default or false); + lzw_0_10_0.default = true; + }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; + glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; + glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11.default = (f.glob_0_2_11.default or true); + }) []; + image_0_12_3 = { features?(image_0_12_3_features {}) }: image_0_12_3_ { + dependencies = mapFeatures features ([ byteorder_1_0_0 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 ] + ++ (if features.image_0_12_3.gif or false then [ gif_0_9_1 ] else []) + ++ (if features.image_0_12_3.jpeg-decoder or false then [ jpeg_decoder_0_1_11 ] else []) + ++ (if features.image_0_12_3.png or false then [ png_0_6_2 ] else []) + ++ (if features.image_0_12_3.scoped_threadpool or false then [ scoped_threadpool_0_1_7 ] else [])); + features = mkFeatures (features.image_0_12_3 or {}); + }; + image_0_12_3_features = f: updateFeatures f (rec { + byteorder_1_0_0.default = true; + enum_primitive_0_1_1.default = true; + gif_0_9_1.default = true; + glob_0_2_11.default = true; + image_0_12_3.bmp = + (f.image_0_12_3.bmp or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false) || + (f.image_0_12_3.ico or false) || + (image_0_12_3.ico or false); + image_0_12_3.default = (f.image_0_12_3.default or true); + image_0_12_3.gif = + (f.image_0_12_3.gif or false) || + (f.image_0_12_3.gif_codec or false) || + (image_0_12_3.gif_codec or false); + image_0_12_3.gif_codec = + (f.image_0_12_3.gif_codec or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.hdr = + (f.image_0_12_3.hdr or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.ico = + (f.image_0_12_3.ico or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.jpeg = + (f.image_0_12_3.jpeg or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.jpeg-decoder = + (f.image_0_12_3.jpeg-decoder or false) || + (f.image_0_12_3.jpeg or false) || + (image_0_12_3.jpeg or false); + image_0_12_3.png = + (f.image_0_12_3.png or false) || + (f.image_0_12_3.png_codec or false) || + (image_0_12_3.png_codec or false); + image_0_12_3.png_codec = + (f.image_0_12_3.png_codec or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false) || + (f.image_0_12_3.ico or false) || + (image_0_12_3.ico or false); + image_0_12_3.ppm = + (f.image_0_12_3.ppm or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.scoped_threadpool = + (f.image_0_12_3.scoped_threadpool or false) || + (f.image_0_12_3.hdr or false) || + (image_0_12_3.hdr or false); + image_0_12_3.tga = + (f.image_0_12_3.tga or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.tiff = + (f.image_0_12_3.tiff or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + image_0_12_3.webp = + (f.image_0_12_3.webp or false) || + (f.image_0_12_3.default or false) || + (image_0_12_3.default or false); + jpeg_decoder_0_1_11.default = true; + num_iter_0_1_33.default = true; + num_rational_0_1_36.default = (f.num_rational_0_1_36.default or false); + num_traits_0_1_37.default = true; + png_0_6_2.default = true; + scoped_threadpool_0_1_7.default = true; + }) [ byteorder_1_0_0_features enum_primitive_0_1_1_features gif_0_9_1_features glob_0_2_11_features jpeg_decoder_0_1_11_features num_iter_0_1_33_features num_rational_0_1_36_features num_traits_0_1_37_features png_0_6_2_features scoped_threadpool_0_1_7_features ]; + inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { + features = mkFeatures (features.inflate_0_1_1 or {}); + }; + inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1.default = (f.inflate_0_1_1.default or true); + }) []; + jpeg_decoder_0_1_11 = { features?(jpeg_decoder_0_1_11_features {}) }: jpeg_decoder_0_1_11_ { + dependencies = mapFeatures features ([ byteorder_1_0_0 ] + ++ (if features.jpeg_decoder_0_1_11.rayon or false then [ rayon_0_6_0 ] else [])); + features = mkFeatures (features.jpeg_decoder_0_1_11 or {}); + }; + jpeg_decoder_0_1_11_features = f: updateFeatures f (rec { + byteorder_1_0_0.default = true; + jpeg_decoder_0_1_11.default = (f.jpeg_decoder_0_1_11.default or true); + jpeg_decoder_0_1_11.rayon = + (f.jpeg_decoder_0_1_11.rayon or false) || + (f.jpeg_decoder_0_1_11.default or false) || + (jpeg_decoder_0_1_11.default or false); + rayon_0_6_0.default = true; + }) [ byteorder_1_0_0_features rayon_0_6_0_features ]; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + libc_0_2_21 = { features?(libc_0_2_21_features {}) }: libc_0_2_21_ { + features = mkFeatures (features.libc_0_2_21 or {}); + }; + libc_0_2_21_features = f: updateFeatures f (rec { + libc_0_2_21.default = (f.libc_0_2_21.default or true); + libc_0_2_21.use_std = + (f.libc_0_2_21.use_std or false) || + (f.libc_0_2_21.default or false) || + (libc_0_2_21.default or false); + }) []; + lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ { + features = mkFeatures (features.lzw_0_10_0 or {}); + }; + lzw_0_10_0_features = f: updateFeatures f (rec { + lzw_0_10_0.default = (f.lzw_0_10_0.default or true); + lzw_0_10_0.raii_no_panic = + (f.lzw_0_10_0.raii_no_panic or false) || + (f.lzw_0_10_0.default or false) || + (lzw_0_10_0.default or false); + }) []; + metadeps_1_1_1 = { features?(metadeps_1_1_1_features {}) }: metadeps_1_1_1_ { + dependencies = mapFeatures features ([ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]); + }; + metadeps_1_1_1_features = f: updateFeatures f (rec { + error_chain_0_7_2.default = (f.error_chain_0_7_2.default or false); + metadeps_1_1_1.default = (f.metadeps_1_1_1.default or true); + pkg_config_0_3_9.default = true; + toml_0_2_1.default = (f.toml_0_2_1.default or false); + }) [ error_chain_0_7_2_features pkg_config_0_3_9_features toml_0_2_1_features ]; + num_integer_0_1_33 = { features?(num_integer_0_1_33_features {}) }: num_integer_0_1_33_ { + dependencies = mapFeatures features ([ num_traits_0_1_37 ]); + }; + num_integer_0_1_33_features = f: updateFeatures f (rec { + num_integer_0_1_33.default = (f.num_integer_0_1_33.default or true); + num_traits_0_1_37.default = true; + }) [ num_traits_0_1_37_features ]; + num_iter_0_1_33 = { features?(num_iter_0_1_33_features {}) }: num_iter_0_1_33_ { + dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]); + }; + num_iter_0_1_33_features = f: updateFeatures f (rec { + num_integer_0_1_33.default = true; + num_iter_0_1_33.default = (f.num_iter_0_1_33.default or true); + num_traits_0_1_37.default = true; + }) [ num_integer_0_1_33_features num_traits_0_1_37_features ]; + num_rational_0_1_36 = { features?(num_rational_0_1_36_features {}) }: num_rational_0_1_36_ { + dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]); + features = mkFeatures (features.num_rational_0_1_36 or {}); + }; + num_rational_0_1_36_features = f: updateFeatures f (rec { + num_integer_0_1_33.default = true; + num_rational_0_1_36.bigint = + (f.num_rational_0_1_36.bigint or false) || + (f.num_rational_0_1_36.default or false) || + (num_rational_0_1_36.default or false); + num_rational_0_1_36.default = (f.num_rational_0_1_36.default or true); + num_rational_0_1_36.num-bigint = + (f.num_rational_0_1_36.num-bigint or false) || + (f.num_rational_0_1_36.bigint or false) || + (num_rational_0_1_36.bigint or false); + num_rational_0_1_36.rustc-serialize = + (f.num_rational_0_1_36.rustc-serialize or false) || + (f.num_rational_0_1_36.default or false) || + (num_rational_0_1_36.default or false); + num_traits_0_1_37.default = true; + }) [ num_integer_0_1_33_features num_traits_0_1_37_features ]; + num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {}; + num_traits_0_1_37_features = f: updateFeatures f (rec { + num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true); + }) []; + num_cpus_1_3_0 = { features?(num_cpus_1_3_0_features {}) }: num_cpus_1_3_0_ { + dependencies = mapFeatures features ([ libc_0_2_21 ]); + }; + num_cpus_1_3_0_features = f: updateFeatures f (rec { + libc_0_2_21.default = true; + num_cpus_1_3_0.default = (f.num_cpus_1_3_0.default or true); + }) [ libc_0_2_21_features ]; + pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; + pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); + }) []; + png_0_6_2 = { features?(png_0_6_2_features {}) }: png_0_6_2_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_33 ] + ++ (if features.png_0_6_2.deflate or false then [ deflate_0_7_5 ] else [])); + features = mkFeatures (features.png_0_6_2 or {}); + }; + png_0_6_2_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + deflate_0_7_5.default = true; + inflate_0_1_1.default = true; + num_iter_0_1_33.default = true; + png_0_6_2.default = (f.png_0_6_2.default or true); + png_0_6_2.deflate = + (f.png_0_6_2.deflate or false) || + (f.png_0_6_2.png-encoding or false) || + (png_0_6_2.png-encoding or false); + png_0_6_2.png-encoding = + (f.png_0_6_2.png-encoding or false) || + (f.png_0_6_2.default or false) || + (png_0_6_2.default or false); + }) [ bitflags_0_7_0_features deflate_0_7_5_features inflate_0_1_1_features num_iter_0_1_33_features ]; + rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { + dependencies = mapFeatures features ([ libc_0_2_21 ]); + }; + rand_0_3_15_features = f: updateFeatures f (rec { + libc_0_2_21.default = true; + rand_0_3_15.default = (f.rand_0_3_15.default or true); + }) [ libc_0_2_21_features ]; + rayon_0_6_0 = { features?(rayon_0_6_0_features {}) }: rayon_0_6_0_ { + dependencies = mapFeatures features ([ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]); + features = mkFeatures (features.rayon_0_6_0 or {}); + }; + rayon_0_6_0_features = f: updateFeatures f (rec { + deque_0_3_1.default = true; + libc_0_2_21.default = true; + num_cpus_1_3_0.default = true; + rand_0_3_15.default = true; + rayon_0_6_0.default = (f.rayon_0_6_0.default or true); + }) [ deque_0_3_1_features libc_0_2_21_features num_cpus_1_3_0_features rand_0_3_15_features ]; + scoped_threadpool_0_1_7 = { features?(scoped_threadpool_0_1_7_features {}) }: scoped_threadpool_0_1_7_ { + features = mkFeatures (features.scoped_threadpool_0_1_7 or {}); + }; + scoped_threadpool_0_1_7_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_7.default = (f.scoped_threadpool_0_1_7.default or true); + }) []; + strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; + strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + }) []; + term_size_0_2_3 = { features?(term_size_0_2_3_features {}) }: term_size_0_2_3_ { + dependencies = mapFeatures features ([]) + ++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + features = mkFeatures (features.term_size_0_2_3 or {}); + }; + term_size_0_2_3_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_21.default = true; + term_size_0_2_3.clippy = + (f.term_size_0_2_3.clippy or false) || + (f.term_size_0_2_3.lints or false) || + (term_size_0_2_3.lints or false); + term_size_0_2_3.default = (f.term_size_0_2_3.default or true); + term_size_0_2_3.lints = + (f.term_size_0_2_3.lints or false) || + (f.term_size_0_2_3.travis or false) || + (term_size_0_2_3.travis or false); + term_size_0_2_3.nightly = + (f.term_size_0_2_3.nightly or false) || + (f.term_size_0_2_3.lints or false) || + (term_size_0_2_3.lints or false) || + (f.term_size_0_2_3.travis or false) || + (term_size_0_2_3.travis or false); + winapi_0_2_8.default = true; + }) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + toml_0_2_1 = { features?(toml_0_2_1_features {}) }: toml_0_2_1_ { + dependencies = mapFeatures features ([]); + }; + toml_0_2_1_features = f: updateFeatures f (rec { + toml_0_2_1.default = (f.toml_0_2_1.default or true); + toml_0_2_1.rustc-serialize = + (f.toml_0_2_1.rustc-serialize or false) || + (f.toml_0_2_1.default or false) || + (toml_0_2_1.default or false); + }) []; + unicode_segmentation_1_1_0 = { features?(unicode_segmentation_1_1_0_features {}) }: unicode_segmentation_1_1_0_ { + features = mkFeatures (features.unicode_segmentation_1_1_0 or {}); + }; + unicode_segmentation_1_1_0_features = f: updateFeatures f (rec { + unicode_segmentation_1_1_0.default = (f.unicode_segmentation_1_1_0.default or true); + }) []; + unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { + features = mkFeatures (features.unicode_width_0_1_4 or {}); + }; + unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); + }) []; + vec_map_0_7_0 = { features?(vec_map_0_7_0_features {}) }: vec_map_0_7_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.vec_map_0_7_0 or {}); + }; + vec_map_0_7_0_features = f: updateFeatures f (rec { + vec_map_0_7_0.default = (f.vec_map_0_7_0.default or true); + vec_map_0_7_0.serde = + (f.vec_map_0_7_0.serde or false) || + (f.vec_map_0_7_0.eders or false) || + (vec_map_0_7_0.eders or false); + vec_map_0_7_0.serde_derive = + (f.vec_map_0_7_0.serde_derive or false) || + (f.vec_map_0_7_0.eders or false) || + (vec_map_0_7_0.eders or false); + }) []; + wc_grab_0_3_0 = { features?(wc_grab_0_3_0_features {}) }: wc_grab_0_3_0_ { + dependencies = mapFeatures features ([ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]); + }; + wc_grab_0_3_0_features = f: updateFeatures f (rec { + clap_2_22_0.default = true; + dbus_0_5_2.default = true; + image_0_12_3.default = true; + wc_grab_0_3_0.default = (f.wc_grab_0_3_0.default or true); + }) [ clap_2_22_0_features dbus_0_5_2_features image_0_12_3_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; } diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix index 634288cfca8..80775112abc 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix @@ -1,625 +1,1486 @@ -# Generated by carnix 0.5.0: carnix -o wc-lock.nix Cargo.lock +# Generated by carnix 0.6.5: carnix -o wc-lock.nix Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; - hasFeature = feature: - lib.lists.any - (originName: feature.${originName}) - (builtins.attrNames feature); - - hasDefault = feature: - let defaultFeatures = builtins.attrNames (feature."default" or {}); in - (defaultFeatures == []) - || (lib.lists.any (originName: feature."default".${originName}) defaultFeatures); - + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: - if featureName != "" && hasFeature feat.${featureName} then + if feat.${featureName} or false then [ featureName ] ++ features else features - ) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); - ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.9.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; - sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; - inherit dependencies buildDependencies features; - }; - atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.2"; - authors = [ "softprops " ]; - sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; - inherit dependencies buildDependencies features; - }; - bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.7.0"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; - inherit dependencies buildDependencies features; - }; - bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "0.8.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2"; - inherit dependencies buildDependencies features; - }; - byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "byteorder"; - version = "0.5.3"; - authors = [ "Andrew Gallant " ]; - sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx"; - inherit dependencies buildDependencies features; - }; - clap_2_24_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.24.2"; - authors = [ "Kevin K. " ]; - sha256 = "0028bkzafprs6n7ing8lnf7iss2a2zq17qmgadipgdfgvww43rmv"; - inherit dependencies buildDependencies features; - }; - dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dlib"; - version = "0.3.1"; - authors = [ "Victor Berger " ]; - sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; - inherit dependencies buildDependencies features; - }; - dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.1"; - authors = [ "David Tolnay " ]; - sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; - inherit dependencies buildDependencies features; - }; - fs2_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fs2"; - version = "0.2.5"; - authors = [ "Dan Burkert " ]; - sha256 = "0j6l5r95jigbl0lgkm69c82dzq10jipjbm9qnni147hb45gyw790"; - inherit dependencies buildDependencies features; - }; - gcc_0_3_50_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "gcc"; - version = "0.3.50"; - authors = [ "Alex Crichton " ]; - sha256 = "032izcbbyiakv9ck5j3s27p3ddx4468n7qpaxgwi5iswmimjaaj0"; - inherit dependencies buildDependencies features; - }; - itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itoa"; - version = "0.3.1"; - authors = [ "David Tolnay " ]; - sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; - inherit dependencies buildDependencies features; - }; - kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - authors = [ "Peter Atashian " ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "0.1.16"; - authors = [ "Marvin Löbel " ]; - sha256 = "0lc5ixs5bmnc43lfri2ynh9393l7vs0z3sw2v5rkaady2ivnznpc"; - inherit dependencies buildDependencies features; - }; - lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "0.2.8"; - authors = [ "Marvin Löbel " ]; - sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; - inherit dependencies buildDependencies features; - }; - libc_0_2_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.23"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1i29f6k26fmv81c5bjc6hw2j95sd01h9ad66qxdc755b24xfa9jm"; - inherit dependencies buildDependencies features; - }; - libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libloading"; - version = "0.3.4"; - authors = [ "Simonas Kazlauskas " ]; - sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - memmap_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memmap"; - version = "0.4.0"; - authors = [ "Dan Burkert " ]; - sha256 = "0q2gm5p8n9najc8kccbxxkannmnjh85rin4k8d4y1kg5ymdp6kll"; - inherit dependencies buildDependencies features; - }; - num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.1.37"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; - inherit dependencies buildDependencies features; - }; - phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_codegen"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; - inherit dependencies buildDependencies features; - }; - phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_generator"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; - inherit dependencies buildDependencies features; - }; - phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "phf_shared"; - version = "0.7.21"; - authors = [ "Steven Fackler " ]; - sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.3.15"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; - inherit dependencies buildDependencies features; - }; - rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc_version"; - version = "0.1.7"; - authors = [ "Marvin Löbel " ]; - sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; - inherit dependencies buildDependencies features; - }; - semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "semver"; - version = "0.1.20"; - authors = [ "The Rust Project Developers" ]; - sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; - inherit dependencies buildDependencies features; - }; - serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "0.9.15"; - authors = [ "Erick Tryzelaar " ]; - sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; - inherit dependencies buildDependencies features; - }; - serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "0.9.10"; - authors = [ "Erick Tryzelaar " ]; - sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; - inherit dependencies buildDependencies features; - }; - siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "siphasher"; - version = "0.2.2"; - authors = [ "Frank Denis " ]; - sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; - inherit dependencies buildDependencies features; - }; - strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.6.0"; - authors = [ "Danny Guo " ]; - sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; - inherit dependencies buildDependencies features; - }; - target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "target_build_utils"; - version = "0.3.1"; - authors = [ "Simonas Kazlauskas " ]; - sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - tempfile_2_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tempfile"; - version = "2.1.5"; - authors = [ "Steven Allen " ]; - sha256 = "1yz8aaj78z9gsn4b71y0m6fa5bnxhqafcczhxvmwra56k943aqkw"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "term_size"; - version = "0.3.0"; - authors = [ "Kevin K. " "Benjamin Sago " ]; - sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs"; - inherit dependencies buildDependencies features; - }; - unicode_segmentation_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-segmentation"; - version = "1.2.0"; - authors = [ "kwantam " ]; - sha256 = "0yz43x7wrhr3n7a2zsinx3r60yxsdqicg8a5kycyyhdaq1zmiz1y"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - authors = [ "kwantam " ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - inherit dependencies buildDependencies features; - }; - vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vec_map"; - version = "0.8.0"; - authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; - sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; - inherit dependencies buildDependencies features; - }; - wayland_client_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-client"; - version = "0.9.6"; - authors = [ "Victor Berger " ]; - sha256 = "1908h6ilvq2cxph1lxv1vzrb3dcfx4x6pf6pszxwifsfqva8nm34"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - wayland_kbd_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-kbd"; - version = "0.9.0"; - authors = [ "Victor Berger " ]; - sha256 = "1x0f7n79hjwf5fclf62fpzjp05xdzc93xw84zgyrn8f1hill3qhj"; - inherit dependencies buildDependencies features; - }; - wayland_scanner_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-scanner"; - version = "0.9.6"; - authors = [ "Victor Berger " ]; - sha256 = "1w5cyc48g4x5w3rakb4sji5328rl5yph1abmjbh5h4slkm4n76g1"; - inherit dependencies buildDependencies features; - }; - wayland_sys_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-sys"; - version = "0.6.0"; - authors = [ "Victor Berger " ]; - sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl"; - inherit dependencies buildDependencies features; - }; - wayland_sys_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wayland-sys"; - version = "0.9.6"; - authors = [ "Victor Berger " ]; - sha256 = "0izw50pmj1r10hmr29gi8ps01avs6zjwisywijlq7wr268h6yxcg"; - inherit dependencies buildDependencies features; - }; - wc_lock_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wc-lock"; - version = "0.1.0"; - authors = [ "Timidger " ]; - sha256 = "1fwfqzhqa8zqxx18amc129xfp1lrb7y9qxi92jqr856xiq4r8ypk"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - authors = [ "Peter Atashian " ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - inherit dependencies buildDependencies features; - }; - winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - authors = [ "Peter Atashian " ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - inherit dependencies buildDependencies features; - }; - xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "xml-rs"; - version = "0.3.6"; - authors = [ "Vladimir Matveev " ]; - sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15"; - libPath = "src/lib.rs"; - libName = "xml"; - crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; - inherit dependencies buildDependencies features; - }; - + ) [] (builtins.attrNames feat); in rec { - ansi_term_0_9_0 = ansi_term_0_9_0_ rec {}; - atty_0_2_2 = atty_0_2_2_ rec { - dependencies = (if !(kernel == "windows") then [ libc_0_2_23 ] else []) - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + wc_lock = f: wc_lock_0_2_1 { features = wc_lock_0_2_1_features { wc_lock_0_2_1 = f; }; }; + ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.9.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " ]; + sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; + inherit dependencies buildDependencies features; }; - libc_0_2_23_features."default".from_atty_0_2_2__default = true; - kernel32_sys_0_2_2_features."default".from_atty_0_2_2__default = true; - winapi_0_2_8_features."default".from_atty_0_2_2__default = true; - bitflags_0_7_0 = bitflags_0_7_0_ rec {}; - bitflags_0_8_2 = bitflags_0_8_2_ rec { - features = mkFeatures bitflags_0_8_2_features; + atty_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "atty"; + version = "0.2.2"; + authors = [ "softprops " ]; + sha256 = "05c6jvrxljp4s1aycgq2z3y56f7f5yvc56v25cqlmpc1qx65z7ba"; + inherit dependencies buildDependencies features; }; - bitflags_0_8_2_features."i128".self_unstable = hasFeature (bitflags_0_8_2_features."unstable" or {}); - byteorder_0_5_3 = byteorder_0_5_3_ rec { - features = mkFeatures byteorder_0_5_3_features; + bitflags_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.7.0"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; + inherit dependencies buildDependencies features; }; - byteorder_0_5_3_features."std".self_default = hasDefault byteorder_0_5_3_features; - clap_2_24_2 = clap_2_24_2_ rec { - dependencies = [ ansi_term_0_9_0 atty_0_2_2 bitflags_0_8_2 strsim_0_6_0 term_size_0_3_0 unicode_segmentation_1_2_0 unicode_width_0_1_4 vec_map_0_8_0 ] - ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_9_0] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_2] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "term_size") features then [term_size_0_3_0] else []); - features = mkFeatures clap_2_24_2_features; + bitflags_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "bitflags"; + version = "0.8.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0whaj3969ysqxzk620sk1isvq6vh85516f2fplvqjrw3syz44sb2"; + inherit dependencies buildDependencies features; }; - clap_2_24_2_features."".self = true; - clap_2_24_2_features."ansi_term".self_color = hasFeature (clap_2_24_2_features."color" or {}); - clap_2_24_2_features."atty".self_color = hasFeature (clap_2_24_2_features."color" or {}); - clap_2_24_2_features."suggestions".self_default = hasDefault clap_2_24_2_features; - clap_2_24_2_features."color".self_default = hasDefault clap_2_24_2_features; - clap_2_24_2_features."wrap_help".self_default = hasDefault clap_2_24_2_features; - clap_2_24_2_features."clippy".self_lints = hasFeature (clap_2_24_2_features."lints" or {}); - clap_2_24_2_features."strsim".self_suggestions = hasFeature (clap_2_24_2_features."suggestions" or {}); - clap_2_24_2_features."term_size".self_wrap_help = hasFeature (clap_2_24_2_features."wrap_help" or {}); - clap_2_24_2_features."yaml-rust".self_yaml = hasFeature (clap_2_24_2_features."yaml" or {}); - ansi_term_0_9_0_features."default".from_clap_2_24_2__default = true; - atty_0_2_2_features."default".from_clap_2_24_2__default = true; - bitflags_0_8_2_features."default".from_clap_2_24_2__default = true; - clippy_0_0_0_features."default".from_clap_2_24_2__default = true; - strsim_0_6_0_features."default".from_clap_2_24_2__default = true; - term_size_0_3_0_features."default".from_clap_2_24_2__default = true; - unicode_segmentation_1_2_0_features."default".from_clap_2_24_2__default = true; - unicode_width_0_1_4_features."default".from_clap_2_24_2__default = true; - vec_map_0_8_0_features."default".from_clap_2_24_2__default = true; - yaml_rust_0_0_0_features."default".from_clap_2_24_2__default = true; - dlib_0_3_1 = dlib_0_3_1_ rec { - dependencies = [ libloading_0_3_4 ]; - features = mkFeatures dlib_0_3_1_features; + byteorder_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "0.5.3"; + authors = [ "Andrew Gallant " ]; + sha256 = "0zsr6b0m0yl5c0yy92nq7srfpczd1dx1xqcx3rlm5fbl8si9clqx"; + inherit dependencies buildDependencies features; }; - dlib_0_3_1_features."".self = true; - libloading_0_3_4_features."default".from_dlib_0_3_1__default = true; - dtoa_0_4_1 = dtoa_0_4_1_ rec {}; - fs2_0_2_5 = fs2_0_2_5_ rec { - dependencies = [ kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]; + byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "byteorder"; + version = "1.1.0"; + authors = [ "Andrew Gallant " ]; + sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp"; + inherit dependencies buildDependencies features; }; - kernel32_sys_0_2_2_features."default".from_fs2_0_2_5__default = true; - libc_0_2_23_features."default".from_fs2_0_2_5__default = true; - winapi_0_2_8_features."default".from_fs2_0_2_5__default = true; - gcc_0_3_50 = gcc_0_3_50_ rec { - dependencies = []; - features = mkFeatures gcc_0_3_50_features; + cc_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "cc"; + version = "1.0.0"; + authors = [ "Alex Crichton " ]; + sha256 = "1s5ha0k6cdy1049a5kpzvhnjc9hjvi18zrcr5dmbqpd03ag751g1"; + inherit dependencies buildDependencies features; }; - gcc_0_3_50_features."rayon".self_parallel = hasFeature (gcc_0_3_50_features."parallel" or {}); - rayon_0_0_0_features."default".from_gcc_0_3_50__default = true; - itoa_0_3_1 = itoa_0_3_1_ rec {}; - kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { - dependencies = [ winapi_0_2_8 ]; - buildDependencies = [ winapi_build_0_1_1 ]; + clap_2_24_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.24.2"; + authors = [ "Kevin K. " ]; + sha256 = "0028bkzafprs6n7ing8lnf7iss2a2zq17qmgadipgdfgvww43rmv"; + inherit dependencies buildDependencies features; }; - winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; - lazy_static_0_1_16 = lazy_static_0_1_16_ rec { - features = mkFeatures lazy_static_0_1_16_features; + coco_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "coco"; + version = "0.1.1"; + authors = [ "Stjepan Glavina " ]; + sha256 = "0hvj4jaj9y6i38c4dkii8nqq98cgx3kyx78cjqkdvk0aqq5sfr94"; + inherit dependencies buildDependencies features; }; - lazy_static_0_1_16_features."".self = true; - lazy_static_0_2_8 = lazy_static_0_2_8_ rec { - dependencies = []; - features = mkFeatures lazy_static_0_2_8_features; + color_quant_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "color_quant"; + version = "1.0.0"; + authors = [ "nwin " ]; + sha256 = "0jwr40lr115zm2bydk1wja12gcxrmgsx0n1z1pipq00sab71maaj"; + inherit dependencies buildDependencies features; }; - lazy_static_0_2_8_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); - lazy_static_0_2_8_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_8_features."spin_no_std" or {}); - spin_0_0_0_features."default".from_lazy_static_0_2_8__default = true; - libc_0_2_23 = libc_0_2_23_ rec { - features = mkFeatures libc_0_2_23_features; + dbus_0_5_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dbus"; + version = "0.5.4"; + authors = [ "David Henningsson " ]; + sha256 = "0qr62splq38b8vfjvpcpk9ph21d63ya7vd2vifs5wc8jzwc309yn"; + inherit dependencies buildDependencies features; }; - libc_0_2_23_features."use_std".self_default = hasDefault libc_0_2_23_features; - libloading_0_3_4 = libloading_0_3_4_ rec { - dependencies = [ lazy_static_0_2_8 ] - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); - buildDependencies = [ target_build_utils_0_3_1 ]; + dlib_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dlib"; + version = "0.3.1"; + authors = [ "Victor Berger " ]; + sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr"; + inherit dependencies buildDependencies features; }; - lazy_static_0_2_8_features."default".from_libloading_0_3_4__default = true; - kernel32_sys_0_2_2_features."default".from_libloading_0_3_4__default = true; - winapi_0_2_8_features."default".from_libloading_0_3_4__default = true; - memmap_0_4_0 = memmap_0_4_0_ rec { - dependencies = [ fs2_0_2_5 kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]; + dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "dtoa"; + version = "0.4.1"; + authors = [ "David Tolnay " ]; + sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw"; + inherit dependencies buildDependencies features; }; - fs2_0_2_5_features."default".from_memmap_0_4_0__default = true; - kernel32_sys_0_2_2_features."default".from_memmap_0_4_0__default = true; - libc_0_2_23_features."default".from_memmap_0_4_0__default = true; - winapi_0_2_8_features."default".from_memmap_0_4_0__default = true; - num_traits_0_1_37 = num_traits_0_1_37_ rec {}; - phf_0_7_21 = phf_0_7_21_ rec { - dependencies = [ phf_shared_0_7_21 ]; - features = mkFeatures phf_0_7_21_features; + either_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.2.0"; + authors = [ "bluss" ]; + sha256 = "0l72xaf1kwzgbl3andf3d2ggz7km9059rbmp90iywww8inlnqppp"; + inherit dependencies buildDependencies features; }; - phf_0_7_21_features."".self = true; - phf_shared_0_7_21_features."core".from_phf_0_7_21__core = hasFeature (phf_0_7_21_features."core" or {}); - phf_shared_0_7_21_features."unicase".from_phf_0_7_21__unicase = hasFeature (phf_0_7_21_features."unicase" or {}); - phf_shared_0_7_21_features."default".from_phf_0_7_21__default = true; - phf_codegen_0_7_21 = phf_codegen_0_7_21_ rec { - dependencies = [ phf_generator_0_7_21 phf_shared_0_7_21 ]; + enum_primitive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "enum_primitive"; + version = "0.1.1"; + authors = [ "Anders Kaseorg " ]; + sha256 = "1a225rlsz7sz3nn14dar71kp2f9v08s3rwl6j55xp51mv01f695y"; + inherit dependencies buildDependencies features; }; - phf_generator_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; - phf_shared_0_7_21_features."default".from_phf_codegen_0_7_21__default = true; - phf_generator_0_7_21 = phf_generator_0_7_21_ rec { - dependencies = [ phf_shared_0_7_21 rand_0_3_15 ]; + error_chain_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "error-chain"; + version = "0.10.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "1xxbzd8cjlpzsb9fsih7mdnndhzrvykj0w77yg90qc85az1xwy5z"; + inherit dependencies buildDependencies features; }; - phf_shared_0_7_21_features."default".from_phf_generator_0_7_21__default = true; - rand_0_3_15_features."default".from_phf_generator_0_7_21__default = true; - phf_shared_0_7_21 = phf_shared_0_7_21_ rec { - dependencies = [ siphasher_0_2_2 ]; - features = mkFeatures phf_shared_0_7_21_features; + flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "flate2"; + version = "0.2.20"; + authors = [ "Alex Crichton " ]; + sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; + inherit dependencies buildDependencies features; }; - phf_shared_0_7_21_features."".self = true; - siphasher_0_2_2_features."default".from_phf_shared_0_7_21__default = true; - unicase_0_0_0_features."default".from_phf_shared_0_7_21__default = true; - rand_0_3_15 = rand_0_3_15_ rec { - dependencies = [ libc_0_2_23 ]; + fs2_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "fs2"; + version = "0.2.5"; + authors = [ "Dan Burkert " ]; + sha256 = "0j6l5r95jigbl0lgkm69c82dzq10jipjbm9qnni147hb45gyw790"; + inherit dependencies buildDependencies features; }; - libc_0_2_23_features."default".from_rand_0_3_15__default = true; - rustc_version_0_1_7 = rustc_version_0_1_7_ rec { - dependencies = [ semver_0_1_20 ]; + futures_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "futures"; + version = "0.1.16"; + authors = [ "Alex Crichton " ]; + sha256 = "0ndk8cl6l600a95q8il2c3y38jz50nhfsczps0nziadqdd45gy2b"; + inherit dependencies buildDependencies features; }; - semver_0_1_20_features."default".from_rustc_version_0_1_7__default = true; - semver_0_1_20 = semver_0_1_20_ rec {}; - serde_0_9_15 = serde_0_9_15_ rec { - dependencies = []; - features = mkFeatures serde_0_9_15_features; + gcc_0_3_50_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gcc"; + version = "0.3.50"; + authors = [ "Alex Crichton " ]; + sha256 = "032izcbbyiakv9ck5j3s27p3ddx4468n7qpaxgwi5iswmimjaaj0"; + inherit dependencies buildDependencies features; }; - serde_0_9_15_features."unstable".self_alloc = hasFeature (serde_0_9_15_features."alloc" or {}); - serde_0_9_15_features."alloc".self_collections = hasFeature (serde_0_9_15_features."collections" or {}); - serde_0_9_15_features."std".self_default = hasDefault serde_0_9_15_features; - serde_0_9_15_features."serde_derive".self_derive = hasFeature (serde_0_9_15_features."derive" or {}); - serde_0_9_15_features."serde_derive".self_playground = hasFeature (serde_0_9_15_features."playground" or {}); - serde_0_9_15_features."unstable".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {}); - serde_0_9_15_features."std".self_unstable-testing = hasFeature (serde_0_9_15_features."unstable-testing" or {}); - serde_derive_0_0_0_features."default".from_serde_0_9_15__default = true; - serde_json_0_9_10 = serde_json_0_9_10_ rec { - dependencies = [ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_15 ]; - features = mkFeatures serde_json_0_9_10_features; + gif_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "gif"; + version = "0.9.2"; + authors = [ "nwin " ]; + sha256 = "0dl76jrn6127w3bdg2b58p5psf8fpnbzdxdkw1i35ac8dn4vxcqa"; + inherit dependencies buildDependencies features; }; - serde_json_0_9_10_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_0_9_10_features."preserve_order" or {}); - dtoa_0_4_1_features."default".from_serde_json_0_9_10__default = true; - itoa_0_3_1_features."default".from_serde_json_0_9_10__default = true; - linked_hash_map_0_0_0_features."default".from_serde_json_0_9_10__default = true; - num_traits_0_1_37_features."default".from_serde_json_0_9_10__default = true; - serde_0_9_15_features."default".from_serde_json_0_9_10__default = true; - siphasher_0_2_2 = siphasher_0_2_2_ rec { - dependencies = []; + glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "glob"; + version = "0.2.11"; + authors = [ "The Rust Project Developers" ]; + sha256 = "104389jjxs8r2f5cc9p0axhjmndgln60ih5x4f00ccgg9d3zarlf"; + inherit dependencies buildDependencies features; }; - clippy_0_0_0_features."default".from_siphasher_0_2_2__default = true; - strsim_0_6_0 = strsim_0_6_0_ rec {}; - target_build_utils_0_3_1 = target_build_utils_0_3_1_ rec { - dependencies = [ phf_0_7_21 serde_json_0_9_10 ] - ++ (if lib.lists.any (x: x == "serde_json") features then [serde_json_0_9_10] else []); - buildDependencies = [ phf_codegen_0_7_21 ]; - features = mkFeatures target_build_utils_0_3_1_features; + image_0_10_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "image"; + version = "0.10.4"; + authors = [ "ccgn" "bvssvni " "nwin" "TyOverby " ]; + sha256 = "1pwrs7k5760b38i1lg872x9q2zc6xvhs7mjhlzvjnr5p85zx2fbw"; + libPath = "./src/lib.rs"; + inherit dependencies buildDependencies features; }; - target_build_utils_0_3_1_features."".self = true; - target_build_utils_0_3_1_features."serde_json".self_default = hasDefault target_build_utils_0_3_1_features; - phf_0_7_21_features."default".from_target_build_utils_0_3_1__default = true; - serde_json_0_9_10_features."default".from_target_build_utils_0_3_1__default = true; - tempfile_2_1_5 = tempfile_2_1_5_ rec { - dependencies = [ rand_0_3_15 ] - ++ (if (kernel == "linux" || kernel == "darwin") then [ libc_0_2_23 ] else []) - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); - buildDependencies = [ rustc_version_0_1_7 ]; + inflate_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "inflate"; + version = "0.1.1"; + authors = [ "nwin " ]; + sha256 = "112kh9hjcjjxdybl032mdhpwnr3qxw8j0ch6hwanwpcf3gz42g1h"; + inherit dependencies buildDependencies features; }; - rand_0_3_15_features."default".from_tempfile_2_1_5__default = true; - libc_0_2_23_features."default".from_tempfile_2_1_5__default = true; - kernel32_sys_0_2_2_features."default".from_tempfile_2_1_5__default = true; - winapi_0_2_8_features."default".from_tempfile_2_1_5__default = true; - term_size_0_3_0 = term_size_0_3_0_ rec { - dependencies = [] - ++ (if !(kernel == "windows") then [ libc_0_2_23 ] else []) - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); - features = mkFeatures term_size_0_3_0_features; + itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itoa"; + version = "0.3.1"; + authors = [ "David Tolnay " ]; + sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k"; + inherit dependencies buildDependencies features; }; - term_size_0_3_0_features."clippy".self_lints = hasFeature (term_size_0_3_0_features."lints" or {}); - term_size_0_3_0_features."nightly".self_lints = hasFeature (term_size_0_3_0_features."lints" or {}); - term_size_0_3_0_features."lints".self_travis = hasFeature (term_size_0_3_0_features."travis" or {}); - term_size_0_3_0_features."nightly".self_travis = hasFeature (term_size_0_3_0_features."travis" or {}); - clippy_0_0_0_features."default".from_term_size_0_3_0__default = true; - libc_0_2_23_features."default".from_term_size_0_3_0__default = true; - kernel32_sys_0_2_2_features."default".from_term_size_0_3_0__default = true; - winapi_0_2_8_features."default".from_term_size_0_3_0__default = true; - unicode_segmentation_1_2_0 = unicode_segmentation_1_2_0_ rec { - features = mkFeatures unicode_segmentation_1_2_0_features; + jpeg_decoder_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "jpeg-decoder"; + version = "0.1.13"; + authors = [ "Ulf Nilsson " ]; + sha256 = "0w16gbywlm9p0p3wx34b85q4d1izrx89afcsxlc6g11cx2js4fa2"; + inherit dependencies buildDependencies features; }; - unicode_segmentation_1_2_0_features."".self = true; - unicode_width_0_1_4 = unicode_width_0_1_4_ rec { - features = mkFeatures unicode_width_0_1_4_features; + kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - unicode_width_0_1_4_features."".self = true; - vec_map_0_8_0 = vec_map_0_8_0_ rec { - dependencies = []; - features = mkFeatures vec_map_0_8_0_features; + lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl"; + inherit dependencies buildDependencies features; }; - vec_map_0_8_0_features."serde".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); - vec_map_0_8_0_features."serde_derive".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); - serde_0_0_0_features."default".from_vec_map_0_8_0__default = true; - serde_derive_0_0_0_features."default".from_vec_map_0_8_0__default = true; - wayland_client_0_9_6 = wayland_client_0_9_6_ rec { - dependencies = [ bitflags_0_7_0 libc_0_2_23 wayland_sys_0_9_6 ]; - buildDependencies = [ wayland_scanner_0_9_6 ]; - features = mkFeatures wayland_client_0_9_6_features; + libc_0_2_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libc"; + version = "0.2.23"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1i29f6k26fmv81c5bjc6hw2j95sd01h9ad66qxdc755b24xfa9jm"; + inherit dependencies buildDependencies features; }; - wayland_client_0_9_6_features."egl".self_default = hasDefault wayland_client_0_9_6_features; - wayland_client_0_9_6_features."cursor".self_default = hasDefault wayland_client_0_9_6_features; - bitflags_0_7_0_features."default".from_wayland_client_0_9_6__default = true; - libc_0_2_23_features."default".from_wayland_client_0_9_6__default = true; - wayland_sys_0_9_6_features."client".from_wayland_client_0_9_6 = true; - wayland_sys_0_9_6_features."cursor".from_wayland_client_0_9_6__cursor = hasFeature (wayland_client_0_9_6_features."cursor" or {}); - wayland_sys_0_9_6_features."dlopen".from_wayland_client_0_9_6__dlopen = hasFeature (wayland_client_0_9_6_features."dlopen" or {}); - wayland_sys_0_9_6_features."egl".from_wayland_client_0_9_6__egl = hasFeature (wayland_client_0_9_6_features."egl" or {}); - wayland_sys_0_9_6_features."default".from_wayland_client_0_9_6__default = true; - wayland_kbd_0_9_0 = wayland_kbd_0_9_0_ rec { - dependencies = [ bitflags_0_7_0 dlib_0_3_1 lazy_static_0_2_8 memmap_0_4_0 wayland_client_0_9_6 ]; + libdbus_sys_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libdbus-sys"; + version = "0.1.1"; + authors = [ "David Henningsson " ]; + sha256 = "14kpislv2zazmgv5f8by4zkgkjxd0cwab8z6621kskjdwyir1wpy"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - bitflags_0_7_0_features."default".from_wayland_kbd_0_9_0__default = true; - dlib_0_3_1_features."default".from_wayland_kbd_0_9_0__default = true; - lazy_static_0_2_8_features."default".from_wayland_kbd_0_9_0__default = true; - memmap_0_4_0_features."default".from_wayland_kbd_0_9_0__default = true; - wayland_client_0_9_6_features."default".from_wayland_kbd_0_9_0__default = true; - wayland_scanner_0_9_6 = wayland_scanner_0_9_6_ rec { - dependencies = [ xml_rs_0_3_6 ]; + libloading_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libloading"; + version = "0.3.4"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - xml_rs_0_3_6_features."default".from_wayland_scanner_0_9_6__default = true; - wayland_sys_0_6_0 = wayland_sys_0_6_0_ rec { - dependencies = [ dlib_0_3_1 lazy_static_0_1_16 ] - ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_1_16] else []); - features = mkFeatures wayland_sys_0_6_0_features; + lzw_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "lzw"; + version = "0.10.0"; + authors = [ "nwin " ]; + sha256 = "1cfsy2w26kbz9bjaqp9dh1wyyh47rpmhwvj4jpc1rmffbf438fvb"; + inherit dependencies buildDependencies features; }; - wayland_sys_0_6_0_features."".self = true; - wayland_sys_0_6_0_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); - wayland_sys_0_6_0_features."libc".self_server = hasFeature (wayland_sys_0_6_0_features."server" or {}); - dlib_0_3_1_features."dlopen".from_wayland_sys_0_6_0__dlopen = hasFeature (wayland_sys_0_6_0_features."dlopen" or {}); - dlib_0_3_1_features."default".from_wayland_sys_0_6_0__default = true; - lazy_static_0_1_16_features."default".from_wayland_sys_0_6_0__default = true; - libc_0_0_0_features."default".from_wayland_sys_0_6_0__default = true; - wayland_sys_0_9_6 = wayland_sys_0_9_6_ rec { - dependencies = [ dlib_0_3_1 lazy_static_0_2_8 ] - ++ (if lib.lists.any (x: x == "lazy_static") features then [lazy_static_0_2_8] else []); - features = mkFeatures wayland_sys_0_9_6_features; + memmap_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "memmap"; + version = "0.4.0"; + authors = [ "Dan Burkert " ]; + sha256 = "0q2gm5p8n9najc8kccbxxkannmnjh85rin4k8d4y1kg5ymdp6kll"; + inherit dependencies buildDependencies features; }; - wayland_sys_0_9_6_features."".self = true; - wayland_sys_0_9_6_features."lazy_static".self_dlopen = hasFeature (wayland_sys_0_9_6_features."dlopen" or {}); - wayland_sys_0_9_6_features."libc".self_server = hasFeature (wayland_sys_0_9_6_features."server" or {}); - dlib_0_3_1_features."dlopen".from_wayland_sys_0_9_6__dlopen = hasFeature (wayland_sys_0_9_6_features."dlopen" or {}); - dlib_0_3_1_features."default".from_wayland_sys_0_9_6__default = true; - lazy_static_0_2_8_features."default".from_wayland_sys_0_9_6__default = true; - libc_0_0_0_features."default".from_wayland_sys_0_9_6__default = true; - wc_lock_0_1_0 = wc_lock_0_1_0_ rec { - dependencies = [ byteorder_0_5_3 clap_2_24_2 libc_0_2_23 tempfile_2_1_5 wayland_client_0_9_6 wayland_kbd_0_9_0 wayland_sys_0_6_0 ]; - buildDependencies = [ gcc_0_3_50 ]; + metadeps_1_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "metadeps"; + version = "1.1.2"; + authors = [ "Josh Triplett " ]; + sha256 = "00dpxjls9fq6fs5gr9v3hkqxmb1zwnhh8b56q3dnzghppjf3ivk3"; + inherit dependencies buildDependencies features; }; - byteorder_0_5_3_features."default".from_wc_lock_0_1_0__default = true; - clap_2_24_2_features."default".from_wc_lock_0_1_0__default = true; - libc_0_2_23_features."default".from_wc_lock_0_1_0__default = true; - tempfile_2_1_5_features."default".from_wc_lock_0_1_0__default = true; - wayland_client_0_9_6_features."cursor".from_wc_lock_0_1_0 = true; - wayland_client_0_9_6_features."dlopen".from_wc_lock_0_1_0 = true; - wayland_client_0_9_6_features."default".from_wc_lock_0_1_0__default = true; - wayland_kbd_0_9_0_features."default".from_wc_lock_0_1_0__default = true; - wayland_sys_0_6_0_features."client".from_wc_lock_0_1_0 = true; - wayland_sys_0_6_0_features."dlopen".from_wc_lock_0_1_0 = true; - wayland_sys_0_6_0_features."default".from_wc_lock_0_1_0__default = true; - winapi_0_2_8 = winapi_0_2_8_ rec {}; - winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; - xml_rs_0_3_6 = xml_rs_0_3_6_ rec { - dependencies = [ bitflags_0_7_0 ]; + miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "miniz-sys"; + version = "0.1.10"; + authors = [ "Alex Crichton " ]; + sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; + libPath = "lib.rs"; + libName = "miniz_sys"; + build = "build.rs"; + inherit dependencies buildDependencies features; }; - bitflags_0_7_0_features."default".from_xml_rs_0_3_6__default = true; + num_bigint_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-bigint"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0pkxd9mb4chdbipprxjc8ll7kjh79n278s2z663zmd80yg5xi788"; + inherit dependencies buildDependencies features; + }; + num_integer_0_1_35_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-integer"; + version = "0.1.35"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc"; + inherit dependencies buildDependencies features; + }; + num_iter_0_1_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-iter"; + version = "0.1.34"; + authors = [ "The Rust Project Developers" ]; + sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9"; + inherit dependencies buildDependencies features; + }; + num_rational_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-rational"; + version = "0.1.39"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1qsacdfp97zgpajc2pgbrbga3yag1f0k7yz0gi78vd165gxdwk3m"; + inherit dependencies buildDependencies features; + }; + num_traits_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.37"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rwzfmdjq6iz6plva2gi7agvy1w9sjs7aqjh0p115w57xiix2224"; + inherit dependencies buildDependencies features; + }; + num_cpus_1_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num_cpus"; + version = "1.6.2"; + authors = [ "Sean McArthur " ]; + sha256 = "0wxfzxsk05xbkph5qcvdqyi334zn0pnpahzi7n7iagxbb68145rm"; + inherit dependencies buildDependencies features; + }; + phf_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + phf_codegen_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_codegen"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; + inherit dependencies buildDependencies features; + }; + phf_generator_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_generator"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; + inherit dependencies buildDependencies features; + }; + phf_shared_0_7_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "phf_shared"; + version = "0.7.21"; + authors = [ "Steven Fackler " ]; + sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; + libPath = "src/lib.rs"; + inherit dependencies buildDependencies features; + }; + pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.9"; + authors = [ "Alex Crichton " ]; + sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; + inherit dependencies buildDependencies features; + }; + png_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "png"; + version = "0.5.2"; + authors = [ "nwin " ]; + sha256 = "1pgann3f1ysgf8y1acw86v4s3ji1xk85ri353biyvh4i1cpn1g3q"; + inherit dependencies buildDependencies features; + }; + rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rand"; + version = "0.3.15"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8"; + inherit dependencies buildDependencies features; + }; + rayon_0_8_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon"; + version = "0.8.2"; + authors = [ "Niko Matsakis " "Josh Stone " ]; + sha256 = "0d0mddg1k75hb9138pn8lysy2095jijrinskqbpgfr73s0jx6dq8"; + inherit dependencies buildDependencies features; + }; + rayon_core_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rayon-core"; + version = "1.2.1"; + authors = [ "Niko Matsakis " "Josh Stone " ]; + sha256 = "12xv2r0dqrgvla24bl5mfvcw0599dlhrj0mx620nq95nyds753kk"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + rustc_serialize_0_3_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-serialize"; + version = "0.3.24"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn"; + inherit dependencies buildDependencies features; + }; + rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc_version"; + version = "0.1.7"; + authors = [ "Marvin Löbel " ]; + sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p"; + inherit dependencies buildDependencies features; + }; + scoped_threadpool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.8"; + authors = [ "Marvin Löbel " ]; + sha256 = "1al42hqbbijpah9bc6hw9c49nhnyrc0sj274ja1q3k9305c3s5a6"; + inherit dependencies buildDependencies features; + }; + scopeguard_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "scopeguard"; + version = "0.3.2"; + authors = [ "bluss" ]; + sha256 = "0xlvfawva4fnp6kwr5xjwf0q2d1w6di81nhfby1sa55xj1ia5zs2"; + inherit dependencies buildDependencies features; + }; + semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "semver"; + version = "0.1.20"; + authors = [ "The Rust Project Developers" ]; + sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n"; + inherit dependencies buildDependencies features; + }; + serde_0_9_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "0.9.15"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b"; + inherit dependencies buildDependencies features; + }; + serde_json_0_9_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "0.9.10"; + authors = [ "Erick Tryzelaar " ]; + sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005"; + inherit dependencies buildDependencies features; + }; + siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "siphasher"; + version = "0.2.2"; + authors = [ "Frank Denis " ]; + sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; + inherit dependencies buildDependencies features; + }; + strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "strsim"; + version = "0.6.0"; + authors = [ "Danny Guo " ]; + sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; + inherit dependencies buildDependencies features; + }; + target_build_utils_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "target_build_utils"; + version = "0.3.1"; + authors = [ "Simonas Kazlauskas " ]; + sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + tempfile_2_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "tempfile"; + version = "2.1.5"; + authors = [ "Steven Allen " ]; + sha256 = "1yz8aaj78z9gsn4b71y0m6fa5bnxhqafcczhxvmwra56k943aqkw"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + term_size_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "term_size"; + version = "0.3.0"; + authors = [ "Kevin K. " "Benjamin Sago " ]; + sha256 = "054d5avad49sy5nfaaaphai4kv4rmdh6q0npchnvdhpxp02lcfhs"; + inherit dependencies buildDependencies features; + }; + toml_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "toml"; + version = "0.2.1"; + authors = [ "Alex Crichton " ]; + sha256 = "0p4rkaqhmk4fp6iqpxfgp3p98hxhbs2wmla3fq531n875h922yqs"; + inherit dependencies buildDependencies features; + }; + unicode_segmentation_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-segmentation"; + version = "1.2.0"; + authors = [ "kwantam " ]; + sha256 = "0yz43x7wrhr3n7a2zsinx3r60yxsdqicg8a5kycyyhdaq1zmiz1y"; + inherit dependencies buildDependencies features; + }; + unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + inherit dependencies buildDependencies features; + }; + vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.0"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; + inherit dependencies buildDependencies features; + }; + way_cooler_client_helpers_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "way-cooler-client-helpers"; + version = "0.1.0"; + authors = [ "Timidger " ]; + sha256 = "0749lh5crd0rhq4dxij9mb3y5902laazjd01l6ci5782bjfk4s39"; + inherit dependencies buildDependencies features; + }; + wayland_client_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-client"; + version = "0.9.6"; + authors = [ "Victor Berger " ]; + sha256 = "1908h6ilvq2cxph1lxv1vzrb3dcfx4x6pf6pszxwifsfqva8nm34"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + wayland_kbd_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-kbd"; + version = "0.9.0"; + authors = [ "Victor Berger " ]; + sha256 = "1x0f7n79hjwf5fclf62fpzjp05xdzc93xw84zgyrn8f1hill3qhj"; + inherit dependencies buildDependencies features; + }; + wayland_scanner_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-scanner"; + version = "0.9.6"; + authors = [ "Victor Berger " ]; + sha256 = "1w5cyc48g4x5w3rakb4sji5328rl5yph1abmjbh5h4slkm4n76g1"; + inherit dependencies buildDependencies features; + }; + wayland_sys_0_9_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wayland-sys"; + version = "0.9.6"; + authors = [ "Victor Berger " ]; + sha256 = "0izw50pmj1r10hmr29gi8ps01avs6zjwisywijlq7wr268h6yxcg"; + inherit dependencies buildDependencies features; + }; + wc_lock_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "wc-lock"; + version = "0.2.1"; + authors = [ "Timidger " ]; + sha256 = "0ikmir7azihxiyzgb0wnvk81yinmn2l6k93bnb1qg4k704zcyq84"; + build = "build.rs"; + inherit dependencies buildDependencies features; + }; + winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + inherit dependencies buildDependencies features; + }; + winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + inherit dependencies buildDependencies features; + }; + xml_rs_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "xml-rs"; + version = "0.3.6"; + authors = [ "Vladimir Matveev " ]; + sha256 = "1g1cclib7fj900m4669vxlz45lxcq0m36g7cd8chl494c2xsgj15"; + libPath = "src/lib.rs"; + libName = "xml"; + crateBin = [ { name = "xml-analyze"; path = "src/analyze.rs"; } ]; + inherit dependencies buildDependencies features; + }; + ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {}; + ansi_term_0_9_0_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true); + }) []; + atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ { + dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + }; + atty_0_2_2_features = f: updateFeatures f (rec { + atty_0_2_2.default = (f.atty_0_2_2.default or true); + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + winapi_0_2_8.default = true; + }) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {}; + bitflags_0_7_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true); + }) []; + bitflags_0_8_2 = { features?(bitflags_0_8_2_features {}) }: bitflags_0_8_2_ { + features = mkFeatures (features.bitflags_0_8_2 or {}); + }; + bitflags_0_8_2_features = f: updateFeatures f (rec { + bitflags_0_8_2.default = (f.bitflags_0_8_2.default or true); + bitflags_0_8_2.i128 = + (f.bitflags_0_8_2.i128 or false) || + (f.bitflags_0_8_2.unstable or false) || + (bitflags_0_8_2.unstable or false); + }) []; + byteorder_0_5_3 = { features?(byteorder_0_5_3_features {}) }: byteorder_0_5_3_ { + features = mkFeatures (features.byteorder_0_5_3 or {}); + }; + byteorder_0_5_3_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = (f.byteorder_0_5_3.default or true); + byteorder_0_5_3.std = + (f.byteorder_0_5_3.std or false) || + (f.byteorder_0_5_3.default or false) || + (byteorder_0_5_3.default or false); + }) []; + byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ { + features = mkFeatures (features.byteorder_1_1_0 or {}); + }; + byteorder_1_1_0_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true); + byteorder_1_1_0.std = + (f.byteorder_1_1_0.std or false) || + (f.byteorder_1_1_0.default or false) || + (byteorder_1_1_0.default or false); + }) []; + cc_1_0_0 = { features?(cc_1_0_0_features {}) }: cc_1_0_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.cc_1_0_0 or {}); + }; + cc_1_0_0_features = f: updateFeatures f (rec { + cc_1_0_0.default = (f.cc_1_0_0.default or true); + cc_1_0_0.rayon = + (f.cc_1_0_0.rayon or false) || + (f.cc_1_0_0.parallel or false) || + (cc_1_0_0.parallel or false); + }) []; + clap_2_24_2 = { features?(clap_2_24_2_features {}) }: clap_2_24_2_ { + dependencies = mapFeatures features ([ bitflags_0_8_2 unicode_segmentation_1_2_0 unicode_width_0_1_4 vec_map_0_8_0 ] + ++ (if features.clap_2_24_2.ansi_term or false then [ ansi_term_0_9_0 ] else []) + ++ (if features.clap_2_24_2.atty or false then [ atty_0_2_2 ] else []) + ++ (if features.clap_2_24_2.strsim or false then [ strsim_0_6_0 ] else []) + ++ (if features.clap_2_24_2.term_size or false then [ term_size_0_3_0 ] else [])); + features = mkFeatures (features.clap_2_24_2 or {}); + }; + clap_2_24_2_features = f: updateFeatures f (rec { + ansi_term_0_9_0.default = true; + atty_0_2_2.default = true; + bitflags_0_8_2.default = true; + clap_2_24_2.ansi_term = + (f.clap_2_24_2.ansi_term or false) || + (f.clap_2_24_2.color or false) || + (clap_2_24_2.color or false); + clap_2_24_2.atty = + (f.clap_2_24_2.atty or false) || + (f.clap_2_24_2.color or false) || + (clap_2_24_2.color or false); + clap_2_24_2.clippy = + (f.clap_2_24_2.clippy or false) || + (f.clap_2_24_2.lints or false) || + (clap_2_24_2.lints or false); + clap_2_24_2.color = + (f.clap_2_24_2.color or false) || + (f.clap_2_24_2.default or false) || + (clap_2_24_2.default or false); + clap_2_24_2.default = (f.clap_2_24_2.default or true); + clap_2_24_2.strsim = + (f.clap_2_24_2.strsim or false) || + (f.clap_2_24_2.suggestions or false) || + (clap_2_24_2.suggestions or false); + clap_2_24_2.suggestions = + (f.clap_2_24_2.suggestions or false) || + (f.clap_2_24_2.default or false) || + (clap_2_24_2.default or false); + clap_2_24_2.term_size = + (f.clap_2_24_2.term_size or false) || + (f.clap_2_24_2.wrap_help or false) || + (clap_2_24_2.wrap_help or false); + clap_2_24_2.wrap_help = + (f.clap_2_24_2.wrap_help or false) || + (f.clap_2_24_2.default or false) || + (clap_2_24_2.default or false); + clap_2_24_2.yaml-rust = + (f.clap_2_24_2.yaml-rust or false) || + (f.clap_2_24_2.yaml or false) || + (clap_2_24_2.yaml or false); + strsim_0_6_0.default = true; + term_size_0_3_0.default = true; + unicode_segmentation_1_2_0.default = true; + unicode_width_0_1_4.default = true; + vec_map_0_8_0.default = true; + }) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_2_features strsim_0_6_0_features term_size_0_3_0_features unicode_segmentation_1_2_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ]; + coco_0_1_1 = { features?(coco_0_1_1_features {}) }: coco_0_1_1_ { + dependencies = mapFeatures features ([ either_1_2_0 scopeguard_0_3_2 ]); + features = mkFeatures (features.coco_0_1_1 or {}); + }; + coco_0_1_1_features = f: updateFeatures f (rec { + coco_0_1_1.default = (f.coco_0_1_1.default or true); + either_1_2_0.default = true; + scopeguard_0_3_2.default = true; + }) [ either_1_2_0_features scopeguard_0_3_2_features ]; + color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {}; + color_quant_1_0_0_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true); + }) []; + dbus_0_5_4 = { features?(dbus_0_5_4_features {}) }: dbus_0_5_4_ { + dependencies = mapFeatures features ([ libc_0_2_23 libdbus_sys_0_1_1 ]); + features = mkFeatures (features.dbus_0_5_4 or {}); + }; + dbus_0_5_4_features = f: updateFeatures f (rec { + dbus_0_5_4.default = (f.dbus_0_5_4.default or true); + libc_0_2_23.default = true; + libdbus_sys_0_1_1.default = true; + }) [ libc_0_2_23_features libdbus_sys_0_1_1_features ]; + dlib_0_3_1 = { features?(dlib_0_3_1_features {}) }: dlib_0_3_1_ { + dependencies = mapFeatures features ([ libloading_0_3_4 ]); + features = mkFeatures (features.dlib_0_3_1 or {}); + }; + dlib_0_3_1_features = f: updateFeatures f (rec { + dlib_0_3_1.default = (f.dlib_0_3_1.default or true); + libloading_0_3_4.default = true; + }) [ libloading_0_3_4_features ]; + dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {}; + dtoa_0_4_1_features = f: updateFeatures f (rec { + dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true); + }) []; + either_1_2_0 = { features?(either_1_2_0_features {}) }: either_1_2_0_ { + features = mkFeatures (features.either_1_2_0 or {}); + }; + either_1_2_0_features = f: updateFeatures f (rec { + either_1_2_0.default = (f.either_1_2_0.default or true); + either_1_2_0.use_std = + (f.either_1_2_0.use_std or false) || + (f.either_1_2_0.default or false) || + (either_1_2_0.default or false); + }) []; + enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ { + dependencies = mapFeatures features ([ num_traits_0_1_37 ]); + }; + enum_primitive_0_1_1_features = f: updateFeatures f (rec { + enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true); + num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false); + }) [ num_traits_0_1_37_features ]; + error_chain_0_10_0 = { features?(error_chain_0_10_0_features {}) }: error_chain_0_10_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.error_chain_0_10_0 or {}); + }; + error_chain_0_10_0_features = f: updateFeatures f (rec { + error_chain_0_10_0.backtrace = + (f.error_chain_0_10_0.backtrace or false) || + (f.error_chain_0_10_0.default or false) || + (error_chain_0_10_0.default or false); + error_chain_0_10_0.default = (f.error_chain_0_10_0.default or true); + error_chain_0_10_0.example_generated = + (f.error_chain_0_10_0.example_generated or false) || + (f.error_chain_0_10_0.default or false) || + (error_chain_0_10_0.default or false); + }) []; + flate2_0_2_20 = { features?(flate2_0_2_20_features {}) }: flate2_0_2_20_ { + dependencies = mapFeatures features ([ libc_0_2_23 ] + ++ (if features.flate2_0_2_20.miniz-sys or false then [ miniz_sys_0_1_10 ] else [])); + features = mkFeatures (features.flate2_0_2_20 or {}); + }; + flate2_0_2_20_features = f: updateFeatures f (rec { + flate2_0_2_20.default = (f.flate2_0_2_20.default or true); + flate2_0_2_20.futures = + (f.flate2_0_2_20.futures or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + flate2_0_2_20.libz-sys = + (f.flate2_0_2_20.libz-sys or false) || + (f.flate2_0_2_20.zlib or false) || + (flate2_0_2_20.zlib or false); + flate2_0_2_20.miniz-sys = + (f.flate2_0_2_20.miniz-sys or false) || + (f.flate2_0_2_20.default or false) || + (flate2_0_2_20.default or false); + flate2_0_2_20.tokio-io = + (f.flate2_0_2_20.tokio-io or false) || + (f.flate2_0_2_20.tokio or false) || + (flate2_0_2_20.tokio or false); + libc_0_2_23.default = true; + miniz_sys_0_1_10.default = true; + }) [ libc_0_2_23_features miniz_sys_0_1_10_features ]; + fs2_0_2_5 = { features?(fs2_0_2_5_features {}) }: fs2_0_2_5_ { + dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]); + }; + fs2_0_2_5_features = f: updateFeatures f (rec { + fs2_0_2_5.default = (f.fs2_0_2_5.default or true); + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + winapi_0_2_8.default = true; + }) [ kernel32_sys_0_2_2_features libc_0_2_23_features winapi_0_2_8_features ]; + futures_0_1_16 = { features?(futures_0_1_16_features {}) }: futures_0_1_16_ { + features = mkFeatures (features.futures_0_1_16 or {}); + }; + futures_0_1_16_features = f: updateFeatures f (rec { + futures_0_1_16.default = (f.futures_0_1_16.default or true); + futures_0_1_16.use_std = + (f.futures_0_1_16.use_std or false) || + (f.futures_0_1_16.default or false) || + (futures_0_1_16.default or false); + futures_0_1_16.with-deprecated = + (f.futures_0_1_16.with-deprecated or false) || + (f.futures_0_1_16.default or false) || + (futures_0_1_16.default or false); + }) []; + gcc_0_3_50 = { features?(gcc_0_3_50_features {}) }: gcc_0_3_50_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.gcc_0_3_50 or {}); + }; + gcc_0_3_50_features = f: updateFeatures f (rec { + gcc_0_3_50.default = (f.gcc_0_3_50.default or true); + gcc_0_3_50.rayon = + (f.gcc_0_3_50.rayon or false) || + (f.gcc_0_3_50.parallel or false) || + (gcc_0_3_50.parallel or false); + }) []; + gif_0_9_2 = { features?(gif_0_9_2_features {}) }: gif_0_9_2_ { + dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]); + features = mkFeatures (features.gif_0_9_2 or {}); + }; + gif_0_9_2_features = f: updateFeatures f (rec { + color_quant_1_0_0.default = true; + gif_0_9_2.default = (f.gif_0_9_2.default or true); + gif_0_9_2.libc = + (f.gif_0_9_2.libc or false) || + (f.gif_0_9_2.c_api or false) || + (gif_0_9_2.c_api or false); + gif_0_9_2.raii_no_panic = + (f.gif_0_9_2.raii_no_panic or false) || + (f.gif_0_9_2.default or false) || + (gif_0_9_2.default or false); + lzw_0_10_0.default = true; + }) [ color_quant_1_0_0_features lzw_0_10_0_features ]; + glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; + glob_0_2_11_features = f: updateFeatures f (rec { + glob_0_2_11.default = (f.glob_0_2_11.default or true); + }) []; + image_0_10_4 = { features?(image_0_10_4_features {}) }: image_0_10_4_ { + dependencies = mapFeatures features ([ byteorder_0_5_3 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_34 num_rational_0_1_39 num_traits_0_1_37 ] + ++ (if features.image_0_10_4.gif or false then [ gif_0_9_2 ] else []) + ++ (if features.image_0_10_4.jpeg-decoder or false then [ jpeg_decoder_0_1_13 ] else []) + ++ (if features.image_0_10_4.png or false then [ png_0_5_2 ] else []) + ++ (if features.image_0_10_4.scoped_threadpool or false then [ scoped_threadpool_0_1_8 ] else [])); + features = mkFeatures (features.image_0_10_4 or {}); + }; + image_0_10_4_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = true; + enum_primitive_0_1_1.default = true; + gif_0_9_2.default = true; + glob_0_2_11.default = true; + image_0_10_4.bmp = + (f.image_0_10_4.bmp or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false) || + (f.image_0_10_4.ico or false) || + (image_0_10_4.ico or false); + image_0_10_4.default = (f.image_0_10_4.default or true); + image_0_10_4.gif = + (f.image_0_10_4.gif or false) || + (f.image_0_10_4.gif_codec or false) || + (image_0_10_4.gif_codec or false); + image_0_10_4.gif_codec = + (f.image_0_10_4.gif_codec or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.hdr = + (f.image_0_10_4.hdr or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.ico = + (f.image_0_10_4.ico or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.jpeg = + (f.image_0_10_4.jpeg or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.jpeg-decoder = + (f.image_0_10_4.jpeg-decoder or false) || + (f.image_0_10_4.jpeg or false) || + (image_0_10_4.jpeg or false); + image_0_10_4.png = + (f.image_0_10_4.png or false) || + (f.image_0_10_4.png_codec or false) || + (image_0_10_4.png_codec or false); + image_0_10_4.png_codec = + (f.image_0_10_4.png_codec or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false) || + (f.image_0_10_4.ico or false) || + (image_0_10_4.ico or false); + image_0_10_4.ppm = + (f.image_0_10_4.ppm or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.scoped_threadpool = + (f.image_0_10_4.scoped_threadpool or false) || + (f.image_0_10_4.hdr or false) || + (image_0_10_4.hdr or false); + image_0_10_4.tga = + (f.image_0_10_4.tga or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.tiff = + (f.image_0_10_4.tiff or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + image_0_10_4.webp = + (f.image_0_10_4.webp or false) || + (f.image_0_10_4.default or false) || + (image_0_10_4.default or false); + jpeg_decoder_0_1_13.default = true; + num_iter_0_1_34.default = true; + num_rational_0_1_39.default = true; + num_traits_0_1_37.default = true; + png_0_5_2.default = true; + scoped_threadpool_0_1_8.default = true; + }) [ byteorder_0_5_3_features enum_primitive_0_1_1_features gif_0_9_2_features glob_0_2_11_features jpeg_decoder_0_1_13_features num_iter_0_1_34_features num_rational_0_1_39_features num_traits_0_1_37_features png_0_5_2_features scoped_threadpool_0_1_8_features ]; + inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ { + features = mkFeatures (features.inflate_0_1_1 or {}); + }; + inflate_0_1_1_features = f: updateFeatures f (rec { + inflate_0_1_1.default = (f.inflate_0_1_1.default or true); + }) []; + itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {}; + itoa_0_3_1_features = f: updateFeatures f (rec { + itoa_0_3_1.default = (f.itoa_0_3_1.default or true); + }) []; + jpeg_decoder_0_1_13 = { features?(jpeg_decoder_0_1_13_features {}) }: jpeg_decoder_0_1_13_ { + dependencies = mapFeatures features ([ byteorder_1_1_0 ] + ++ (if features.jpeg_decoder_0_1_13.rayon or false then [ rayon_0_8_2 ] else [])); + features = mkFeatures (features.jpeg_decoder_0_1_13 or {}); + }; + jpeg_decoder_0_1_13_features = f: updateFeatures f (rec { + byteorder_1_1_0.default = true; + jpeg_decoder_0_1_13.default = (f.jpeg_decoder_0_1_13.default or true); + jpeg_decoder_0_1_13.rayon = + (f.jpeg_decoder_0_1_13.rayon or false) || + (f.jpeg_decoder_0_1_13.default or false) || + (jpeg_decoder_0_1_13.default or false); + rayon_0_8_2.default = true; + }) [ byteorder_1_1_0_features rayon_0_8_2_features ]; + kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { + dependencies = mapFeatures features ([ winapi_0_2_8 ]); + buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); + }; + kernel32_sys_0_2_2_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true); + winapi_0_2_8.default = true; + winapi_build_0_1_1.default = true; + }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + lazy_static_0_2_8 = { features?(lazy_static_0_2_8_features {}) }: lazy_static_0_2_8_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.lazy_static_0_2_8 or {}); + }; + lazy_static_0_2_8_features = f: updateFeatures f (rec { + lazy_static_0_2_8.default = (f.lazy_static_0_2_8.default or true); + lazy_static_0_2_8.nightly = + (f.lazy_static_0_2_8.nightly or false) || + (f.lazy_static_0_2_8.spin_no_std or false) || + (lazy_static_0_2_8.spin_no_std or false); + lazy_static_0_2_8.spin = + (f.lazy_static_0_2_8.spin or false) || + (f.lazy_static_0_2_8.spin_no_std or false) || + (lazy_static_0_2_8.spin_no_std or false); + }) []; + libc_0_2_23 = { features?(libc_0_2_23_features {}) }: libc_0_2_23_ { + features = mkFeatures (features.libc_0_2_23 or {}); + }; + libc_0_2_23_features = f: updateFeatures f (rec { + libc_0_2_23.default = (f.libc_0_2_23.default or true); + libc_0_2_23.use_std = + (f.libc_0_2_23.use_std or false) || + (f.libc_0_2_23.default or false) || + (libc_0_2_23.default or false); + }) []; + libdbus_sys_0_1_1 = { features?(libdbus_sys_0_1_1_features {}) }: libdbus_sys_0_1_1_ { + buildDependencies = mapFeatures features ([ metadeps_1_1_2 ]);}; + libdbus_sys_0_1_1_features = f: updateFeatures f (rec { + libdbus_sys_0_1_1.default = (f.libdbus_sys_0_1_1.default or true); + metadeps_1_1_2.default = true; + }) [ metadeps_1_1_2_features ]; + libloading_0_3_4 = { features?(libloading_0_3_4_features {}) }: libloading_0_3_4_ { + dependencies = mapFeatures features ([ lazy_static_0_2_8 ]) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ target_build_utils_0_3_1 ]); + }; + libloading_0_3_4_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + lazy_static_0_2_8.default = true; + libloading_0_3_4.default = (f.libloading_0_3_4.default or true); + target_build_utils_0_3_1.default = true; + winapi_0_2_8.default = true; + }) [ lazy_static_0_2_8_features target_build_utils_0_3_1_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ { + features = mkFeatures (features.lzw_0_10_0 or {}); + }; + lzw_0_10_0_features = f: updateFeatures f (rec { + lzw_0_10_0.default = (f.lzw_0_10_0.default or true); + lzw_0_10_0.raii_no_panic = + (f.lzw_0_10_0.raii_no_panic or false) || + (f.lzw_0_10_0.default or false) || + (lzw_0_10_0.default or false); + }) []; + memmap_0_4_0 = { features?(memmap_0_4_0_features {}) }: memmap_0_4_0_ { + dependencies = mapFeatures features ([ fs2_0_2_5 kernel32_sys_0_2_2 libc_0_2_23 winapi_0_2_8 ]); + }; + memmap_0_4_0_features = f: updateFeatures f (rec { + fs2_0_2_5.default = true; + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + memmap_0_4_0.default = (f.memmap_0_4_0.default or true); + winapi_0_2_8.default = true; + }) [ fs2_0_2_5_features kernel32_sys_0_2_2_features libc_0_2_23_features winapi_0_2_8_features ]; + metadeps_1_1_2 = { features?(metadeps_1_1_2_features {}) }: metadeps_1_1_2_ { + dependencies = mapFeatures features ([ error_chain_0_10_0 pkg_config_0_3_9 toml_0_2_1 ]); + }; + metadeps_1_1_2_features = f: updateFeatures f (rec { + error_chain_0_10_0.default = (f.error_chain_0_10_0.default or false); + metadeps_1_1_2.default = (f.metadeps_1_1_2.default or true); + pkg_config_0_3_9.default = true; + toml_0_2_1.default = (f.toml_0_2_1.default or false); + }) [ error_chain_0_10_0_features pkg_config_0_3_9_features toml_0_2_1_features ]; + miniz_sys_0_1_10 = { features?(miniz_sys_0_1_10_features {}) }: miniz_sys_0_1_10_ { + dependencies = mapFeatures features ([ libc_0_2_23 ]); + buildDependencies = mapFeatures features ([ cc_1_0_0 ]); + }; + miniz_sys_0_1_10_features = f: updateFeatures f (rec { + cc_1_0_0.default = true; + libc_0_2_23.default = true; + miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true); + }) [ libc_0_2_23_features cc_1_0_0_features ]; + num_bigint_0_1_40 = { features?(num_bigint_0_1_40_features {}) }: num_bigint_0_1_40_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ] + ++ (if features.num_bigint_0_1_40.rand or false then [ rand_0_3_15 ] else []) + ++ (if features.num_bigint_0_1_40.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.num_bigint_0_1_40 or {}); + }; + num_bigint_0_1_40_features = f: updateFeatures f (rec { + num_bigint_0_1_40.default = (f.num_bigint_0_1_40.default or true); + num_bigint_0_1_40.rand = + (f.num_bigint_0_1_40.rand or false) || + (f.num_bigint_0_1_40.default or false) || + (num_bigint_0_1_40.default or false); + num_bigint_0_1_40.rustc-serialize = + (f.num_bigint_0_1_40.rustc-serialize or false) || + (f.num_bigint_0_1_40.default or false) || + (num_bigint_0_1_40.default or false); + num_integer_0_1_35.default = true; + num_traits_0_1_37.default = true; + rand_0_3_15.default = true; + rustc_serialize_0_3_24.default = true; + }) [ num_integer_0_1_35_features num_traits_0_1_37_features rand_0_3_15_features rustc_serialize_0_3_24_features ]; + num_integer_0_1_35 = { features?(num_integer_0_1_35_features {}) }: num_integer_0_1_35_ { + dependencies = mapFeatures features ([ num_traits_0_1_37 ]); + }; + num_integer_0_1_35_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = (f.num_integer_0_1_35.default or true); + num_traits_0_1_37.default = true; + }) [ num_traits_0_1_37_features ]; + num_iter_0_1_34 = { features?(num_iter_0_1_34_features {}) }: num_iter_0_1_34_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ]); + }; + num_iter_0_1_34_features = f: updateFeatures f (rec { + num_integer_0_1_35.default = true; + num_iter_0_1_34.default = (f.num_iter_0_1_34.default or true); + num_traits_0_1_37.default = true; + }) [ num_integer_0_1_35_features num_traits_0_1_37_features ]; + num_rational_0_1_39 = { features?(num_rational_0_1_39_features {}) }: num_rational_0_1_39_ { + dependencies = mapFeatures features ([ num_integer_0_1_35 num_traits_0_1_37 ] + ++ (if features.num_rational_0_1_39.num-bigint or false then [ num_bigint_0_1_40 ] else []) + ++ (if features.num_rational_0_1_39.rustc-serialize or false then [ rustc_serialize_0_3_24 ] else [])); + features = mkFeatures (features.num_rational_0_1_39 or {}); + }; + num_rational_0_1_39_features = f: updateFeatures f (rec { + num_bigint_0_1_40.default = true; + num_integer_0_1_35.default = true; + num_rational_0_1_39.bigint = + (f.num_rational_0_1_39.bigint or false) || + (f.num_rational_0_1_39.default or false) || + (num_rational_0_1_39.default or false); + num_rational_0_1_39.default = (f.num_rational_0_1_39.default or true); + num_rational_0_1_39.num-bigint = + (f.num_rational_0_1_39.num-bigint or false) || + (f.num_rational_0_1_39.bigint or false) || + (num_rational_0_1_39.bigint or false); + num_rational_0_1_39.rustc-serialize = + (f.num_rational_0_1_39.rustc-serialize or false) || + (f.num_rational_0_1_39.default or false) || + (num_rational_0_1_39.default or false); + num_traits_0_1_37.default = true; + rustc_serialize_0_3_24.default = true; + }) [ num_bigint_0_1_40_features num_integer_0_1_35_features num_traits_0_1_37_features rustc_serialize_0_3_24_features ]; + num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {}; + num_traits_0_1_37_features = f: updateFeatures f (rec { + num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true); + }) []; + num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ { + dependencies = mapFeatures features ([ libc_0_2_23 ]); + }; + num_cpus_1_6_2_features = f: updateFeatures f (rec { + libc_0_2_23.default = true; + num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true); + }) [ libc_0_2_23_features ]; + phf_0_7_21 = { features?(phf_0_7_21_features {}) }: phf_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 ]); + features = mkFeatures (features.phf_0_7_21 or {}); + }; + phf_0_7_21_features = f: updateFeatures f (rec { + phf_0_7_21.default = (f.phf_0_7_21.default or true); + phf_shared_0_7_21.core = + (f.phf_shared_0_7_21.core or false) || + (phf_0_7_21.core or false) || + (f.phf_0_7_21.core or false); + phf_shared_0_7_21.default = true; + phf_shared_0_7_21.unicase = + (f.phf_shared_0_7_21.unicase or false) || + (phf_0_7_21.unicase or false) || + (f.phf_0_7_21.unicase or false); + }) [ phf_shared_0_7_21_features ]; + phf_codegen_0_7_21 = { features?(phf_codegen_0_7_21_features {}) }: phf_codegen_0_7_21_ { + dependencies = mapFeatures features ([ phf_generator_0_7_21 phf_shared_0_7_21 ]); + }; + phf_codegen_0_7_21_features = f: updateFeatures f (rec { + phf_codegen_0_7_21.default = (f.phf_codegen_0_7_21.default or true); + phf_generator_0_7_21.default = true; + phf_shared_0_7_21.default = true; + }) [ phf_generator_0_7_21_features phf_shared_0_7_21_features ]; + phf_generator_0_7_21 = { features?(phf_generator_0_7_21_features {}) }: phf_generator_0_7_21_ { + dependencies = mapFeatures features ([ phf_shared_0_7_21 rand_0_3_15 ]); + }; + phf_generator_0_7_21_features = f: updateFeatures f (rec { + phf_generator_0_7_21.default = (f.phf_generator_0_7_21.default or true); + phf_shared_0_7_21.default = true; + rand_0_3_15.default = true; + }) [ phf_shared_0_7_21_features rand_0_3_15_features ]; + phf_shared_0_7_21 = { features?(phf_shared_0_7_21_features {}) }: phf_shared_0_7_21_ { + dependencies = mapFeatures features ([ siphasher_0_2_2 ]); + features = mkFeatures (features.phf_shared_0_7_21 or {}); + }; + phf_shared_0_7_21_features = f: updateFeatures f (rec { + phf_shared_0_7_21.default = (f.phf_shared_0_7_21.default or true); + siphasher_0_2_2.default = true; + }) [ siphasher_0_2_2_features ]; + pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; + pkg_config_0_3_9_features = f: updateFeatures f (rec { + pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); + }) []; + png_0_5_2 = { features?(png_0_5_2_features {}) }: png_0_5_2_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_34 ] + ++ (if features.png_0_5_2.flate2 or false then [ flate2_0_2_20 ] else [])); + features = mkFeatures (features.png_0_5_2 or {}); + }; + png_0_5_2_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + flate2_0_2_20.default = true; + inflate_0_1_1.default = true; + num_iter_0_1_34.default = true; + png_0_5_2.default = (f.png_0_5_2.default or true); + png_0_5_2.flate2 = + (f.png_0_5_2.flate2 or false) || + (f.png_0_5_2.png-encoding or false) || + (png_0_5_2.png-encoding or false); + png_0_5_2.png-encoding = + (f.png_0_5_2.png-encoding or false) || + (f.png_0_5_2.default or false) || + (png_0_5_2.default or false); + }) [ bitflags_0_7_0_features flate2_0_2_20_features inflate_0_1_1_features num_iter_0_1_34_features ]; + rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ { + dependencies = mapFeatures features ([ libc_0_2_23 ]); + }; + rand_0_3_15_features = f: updateFeatures f (rec { + libc_0_2_23.default = true; + rand_0_3_15.default = (f.rand_0_3_15.default or true); + }) [ libc_0_2_23_features ]; + rayon_0_8_2 = { features?(rayon_0_8_2_features {}) }: rayon_0_8_2_ { + dependencies = mapFeatures features ([ rayon_core_1_2_1 ]); + }; + rayon_0_8_2_features = f: updateFeatures f (rec { + rayon_0_8_2.default = (f.rayon_0_8_2.default or true); + rayon_core_1_2_1.default = true; + }) [ rayon_core_1_2_1_features ]; + rayon_core_1_2_1 = { features?(rayon_core_1_2_1_features {}) }: rayon_core_1_2_1_ { + dependencies = mapFeatures features ([ coco_0_1_1 futures_0_1_16 lazy_static_0_2_8 libc_0_2_23 num_cpus_1_6_2 rand_0_3_15 ]); + }; + rayon_core_1_2_1_features = f: updateFeatures f (rec { + coco_0_1_1.default = true; + futures_0_1_16.default = true; + lazy_static_0_2_8.default = true; + libc_0_2_23.default = true; + num_cpus_1_6_2.default = true; + rand_0_3_15.default = true; + rayon_core_1_2_1.default = (f.rayon_core_1_2_1.default or true); + }) [ coco_0_1_1_features futures_0_1_16_features lazy_static_0_2_8_features libc_0_2_23_features num_cpus_1_6_2_features rand_0_3_15_features ]; + rustc_serialize_0_3_24 = { features?(rustc_serialize_0_3_24_features {}) }: rustc_serialize_0_3_24_ {}; + rustc_serialize_0_3_24_features = f: updateFeatures f (rec { + rustc_serialize_0_3_24.default = (f.rustc_serialize_0_3_24.default or true); + }) []; + rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ { + dependencies = mapFeatures features ([ semver_0_1_20 ]); + }; + rustc_version_0_1_7_features = f: updateFeatures f (rec { + rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true); + semver_0_1_20.default = true; + }) [ semver_0_1_20_features ]; + scoped_threadpool_0_1_8 = { features?(scoped_threadpool_0_1_8_features {}) }: scoped_threadpool_0_1_8_ { + features = mkFeatures (features.scoped_threadpool_0_1_8 or {}); + }; + scoped_threadpool_0_1_8_features = f: updateFeatures f (rec { + scoped_threadpool_0_1_8.default = (f.scoped_threadpool_0_1_8.default or true); + }) []; + scopeguard_0_3_2 = { features?(scopeguard_0_3_2_features {}) }: scopeguard_0_3_2_ { + features = mkFeatures (features.scopeguard_0_3_2 or {}); + }; + scopeguard_0_3_2_features = f: updateFeatures f (rec { + scopeguard_0_3_2.default = (f.scopeguard_0_3_2.default or true); + scopeguard_0_3_2.use_std = + (f.scopeguard_0_3_2.use_std or false) || + (f.scopeguard_0_3_2.default or false) || + (scopeguard_0_3_2.default or false); + }) []; + semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {}; + semver_0_1_20_features = f: updateFeatures f (rec { + semver_0_1_20.default = (f.semver_0_1_20.default or true); + }) []; + serde_0_9_15 = { features?(serde_0_9_15_features {}) }: serde_0_9_15_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.serde_0_9_15 or {}); + }; + serde_0_9_15_features = f: updateFeatures f (rec { + serde_0_9_15.alloc = + (f.serde_0_9_15.alloc or false) || + (f.serde_0_9_15.collections or false) || + (serde_0_9_15.collections or false); + serde_0_9_15.default = (f.serde_0_9_15.default or true); + serde_0_9_15.serde_derive = + (f.serde_0_9_15.serde_derive or false) || + (f.serde_0_9_15.derive or false) || + (serde_0_9_15.derive or false) || + (f.serde_0_9_15.playground or false) || + (serde_0_9_15.playground or false); + serde_0_9_15.std = + (f.serde_0_9_15.std or false) || + (f.serde_0_9_15.default or false) || + (serde_0_9_15.default or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + serde_0_9_15.unstable = + (f.serde_0_9_15.unstable or false) || + (f.serde_0_9_15.alloc or false) || + (serde_0_9_15.alloc or false) || + (f.serde_0_9_15.unstable-testing or false) || + (serde_0_9_15.unstable-testing or false); + }) []; + serde_json_0_9_10 = { features?(serde_json_0_9_10_features {}) }: serde_json_0_9_10_ { + dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_37 serde_0_9_15 ]); + features = mkFeatures (features.serde_json_0_9_10 or {}); + }; + serde_json_0_9_10_features = f: updateFeatures f (rec { + dtoa_0_4_1.default = true; + itoa_0_3_1.default = true; + num_traits_0_1_37.default = true; + serde_0_9_15.default = true; + serde_json_0_9_10.default = (f.serde_json_0_9_10.default or true); + serde_json_0_9_10.linked-hash-map = + (f.serde_json_0_9_10.linked-hash-map or false) || + (f.serde_json_0_9_10.preserve_order or false) || + (serde_json_0_9_10.preserve_order or false); + }) [ dtoa_0_4_1_features itoa_0_3_1_features num_traits_0_1_37_features serde_0_9_15_features ]; + siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ { + dependencies = mapFeatures features ([]); + }; + siphasher_0_2_2_features = f: updateFeatures f (rec { + siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true); + }) []; + strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {}; + strsim_0_6_0_features = f: updateFeatures f (rec { + strsim_0_6_0.default = (f.strsim_0_6_0.default or true); + }) []; + target_build_utils_0_3_1 = { features?(target_build_utils_0_3_1_features {}) }: target_build_utils_0_3_1_ { + dependencies = mapFeatures features ([ phf_0_7_21 ] + ++ (if features.target_build_utils_0_3_1.serde_json or false then [ serde_json_0_9_10 ] else [])); + buildDependencies = mapFeatures features ([ phf_codegen_0_7_21 ]); + features = mkFeatures (features.target_build_utils_0_3_1 or {}); + }; + target_build_utils_0_3_1_features = f: updateFeatures f (rec { + phf_0_7_21.default = true; + phf_codegen_0_7_21.default = true; + serde_json_0_9_10.default = true; + target_build_utils_0_3_1.default = (f.target_build_utils_0_3_1.default or true); + target_build_utils_0_3_1.serde_json = + (f.target_build_utils_0_3_1.serde_json or false) || + (f.target_build_utils_0_3_1.default or false) || + (target_build_utils_0_3_1.default or false); + }) [ phf_0_7_21_features serde_json_0_9_10_features phf_codegen_0_7_21_features ]; + tempfile_2_1_5 = { features?(tempfile_2_1_5_features {}) }: tempfile_2_1_5_ { + dependencies = mapFeatures features ([ rand_0_3_15 ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_23 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]); + }; + tempfile_2_1_5_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + rand_0_3_15.default = true; + rustc_version_0_1_7.default = true; + tempfile_2_1_5.default = (f.tempfile_2_1_5.default or true); + winapi_0_2_8.default = true; + }) [ rand_0_3_15_features rustc_version_0_1_7_features libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + term_size_0_3_0 = { features?(term_size_0_3_0_features {}) }: term_size_0_3_0_ { + dependencies = mapFeatures features ([]) + ++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_23 ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []); + features = mkFeatures (features.term_size_0_3_0 or {}); + }; + term_size_0_3_0_features = f: updateFeatures f (rec { + kernel32_sys_0_2_2.default = true; + libc_0_2_23.default = true; + term_size_0_3_0.clippy = + (f.term_size_0_3_0.clippy or false) || + (f.term_size_0_3_0.lints or false) || + (term_size_0_3_0.lints or false); + term_size_0_3_0.default = (f.term_size_0_3_0.default or true); + term_size_0_3_0.lints = + (f.term_size_0_3_0.lints or false) || + (f.term_size_0_3_0.travis or false) || + (term_size_0_3_0.travis or false); + term_size_0_3_0.nightly = + (f.term_size_0_3_0.nightly or false) || + (f.term_size_0_3_0.lints or false) || + (term_size_0_3_0.lints or false) || + (f.term_size_0_3_0.travis or false) || + (term_size_0_3_0.travis or false); + winapi_0_2_8.default = true; + }) [ libc_0_2_23_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + toml_0_2_1 = { features?(toml_0_2_1_features {}) }: toml_0_2_1_ { + dependencies = mapFeatures features ([]); + }; + toml_0_2_1_features = f: updateFeatures f (rec { + toml_0_2_1.default = (f.toml_0_2_1.default or true); + toml_0_2_1.rustc-serialize = + (f.toml_0_2_1.rustc-serialize or false) || + (f.toml_0_2_1.default or false) || + (toml_0_2_1.default or false); + }) []; + unicode_segmentation_1_2_0 = { features?(unicode_segmentation_1_2_0_features {}) }: unicode_segmentation_1_2_0_ { + features = mkFeatures (features.unicode_segmentation_1_2_0 or {}); + }; + unicode_segmentation_1_2_0_features = f: updateFeatures f (rec { + unicode_segmentation_1_2_0.default = (f.unicode_segmentation_1_2_0.default or true); + }) []; + unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { + features = mkFeatures (features.unicode_width_0_1_4 or {}); + }; + unicode_width_0_1_4_features = f: updateFeatures f (rec { + unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); + }) []; + vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { + dependencies = mapFeatures features ([]); + features = mkFeatures (features.vec_map_0_8_0 or {}); + }; + vec_map_0_8_0_features = f: updateFeatures f (rec { + vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true); + vec_map_0_8_0.serde = + (f.vec_map_0_8_0.serde or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + vec_map_0_8_0.serde_derive = + (f.vec_map_0_8_0.serde_derive or false) || + (f.vec_map_0_8_0.eders or false) || + (vec_map_0_8_0.eders or false); + }) []; + way_cooler_client_helpers_0_1_0 = { features?(way_cooler_client_helpers_0_1_0_features {}) }: way_cooler_client_helpers_0_1_0_ { + dependencies = mapFeatures features ([ wayland_client_0_9_6 wayland_sys_0_9_6 ]); + }; + way_cooler_client_helpers_0_1_0_features = f: updateFeatures f (rec { + way_cooler_client_helpers_0_1_0.default = (f.way_cooler_client_helpers_0_1_0.default or true); + wayland_client_0_9_6.cursor = true; + wayland_client_0_9_6.default = true; + wayland_client_0_9_6.dlopen = true; + wayland_sys_0_9_6.client = true; + wayland_sys_0_9_6.default = true; + wayland_sys_0_9_6.dlopen = true; + }) [ wayland_client_0_9_6_features wayland_sys_0_9_6_features ]; + wayland_client_0_9_6 = { features?(wayland_client_0_9_6_features {}) }: wayland_client_0_9_6_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 libc_0_2_23 wayland_sys_0_9_6 ]); + buildDependencies = mapFeatures features ([ wayland_scanner_0_9_6 ]); + features = mkFeatures (features.wayland_client_0_9_6 or {}); + }; + wayland_client_0_9_6_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + libc_0_2_23.default = true; + wayland_client_0_9_6.cursor = + (f.wayland_client_0_9_6.cursor or false) || + (f.wayland_client_0_9_6.default or false) || + (wayland_client_0_9_6.default or false); + wayland_client_0_9_6.default = (f.wayland_client_0_9_6.default or true); + wayland_client_0_9_6.egl = + (f.wayland_client_0_9_6.egl or false) || + (f.wayland_client_0_9_6.default or false) || + (wayland_client_0_9_6.default or false); + wayland_scanner_0_9_6.default = true; + wayland_sys_0_9_6.client = true; + wayland_sys_0_9_6.cursor = + (f.wayland_sys_0_9_6.cursor or false) || + (wayland_client_0_9_6.cursor or false) || + (f.wayland_client_0_9_6.cursor or false); + wayland_sys_0_9_6.default = true; + wayland_sys_0_9_6.dlopen = + (f.wayland_sys_0_9_6.dlopen or false) || + (wayland_client_0_9_6.dlopen or false) || + (f.wayland_client_0_9_6.dlopen or false); + wayland_sys_0_9_6.egl = + (f.wayland_sys_0_9_6.egl or false) || + (wayland_client_0_9_6.egl or false) || + (f.wayland_client_0_9_6.egl or false); + }) [ bitflags_0_7_0_features libc_0_2_23_features wayland_sys_0_9_6_features wayland_scanner_0_9_6_features ]; + wayland_kbd_0_9_0 = { features?(wayland_kbd_0_9_0_features {}) }: wayland_kbd_0_9_0_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 dlib_0_3_1 lazy_static_0_2_8 memmap_0_4_0 wayland_client_0_9_6 ]); + }; + wayland_kbd_0_9_0_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + dlib_0_3_1.default = true; + lazy_static_0_2_8.default = true; + memmap_0_4_0.default = true; + wayland_client_0_9_6.default = true; + wayland_kbd_0_9_0.default = (f.wayland_kbd_0_9_0.default or true); + }) [ bitflags_0_7_0_features dlib_0_3_1_features lazy_static_0_2_8_features memmap_0_4_0_features wayland_client_0_9_6_features ]; + wayland_scanner_0_9_6 = { features?(wayland_scanner_0_9_6_features {}) }: wayland_scanner_0_9_6_ { + dependencies = mapFeatures features ([ xml_rs_0_3_6 ]); + }; + wayland_scanner_0_9_6_features = f: updateFeatures f (rec { + wayland_scanner_0_9_6.default = (f.wayland_scanner_0_9_6.default or true); + xml_rs_0_3_6.default = true; + }) [ xml_rs_0_3_6_features ]; + wayland_sys_0_9_6 = { features?(wayland_sys_0_9_6_features {}) }: wayland_sys_0_9_6_ { + dependencies = mapFeatures features ([ dlib_0_3_1 ] + ++ (if features.wayland_sys_0_9_6.lazy_static or false then [ lazy_static_0_2_8 ] else [])); + features = mkFeatures (features.wayland_sys_0_9_6 or {}); + }; + wayland_sys_0_9_6_features = f: updateFeatures f (rec { + dlib_0_3_1.default = true; + dlib_0_3_1.dlopen = + (f.dlib_0_3_1.dlopen or false) || + (wayland_sys_0_9_6.dlopen or false) || + (f.wayland_sys_0_9_6.dlopen or false); + lazy_static_0_2_8.default = true; + wayland_sys_0_9_6.default = (f.wayland_sys_0_9_6.default or true); + wayland_sys_0_9_6.lazy_static = + (f.wayland_sys_0_9_6.lazy_static or false) || + (f.wayland_sys_0_9_6.dlopen or false) || + (wayland_sys_0_9_6.dlopen or false); + wayland_sys_0_9_6.libc = + (f.wayland_sys_0_9_6.libc or false) || + (f.wayland_sys_0_9_6.server or false) || + (wayland_sys_0_9_6.server or false); + }) [ dlib_0_3_1_features lazy_static_0_2_8_features ]; + wc_lock_0_2_1 = { features?(wc_lock_0_2_1_features {}) }: wc_lock_0_2_1_ { + dependencies = mapFeatures features ([ byteorder_0_5_3 clap_2_24_2 dbus_0_5_4 image_0_10_4 libc_0_2_23 rand_0_3_15 tempfile_2_1_5 way_cooler_client_helpers_0_1_0 wayland_client_0_9_6 wayland_kbd_0_9_0 wayland_sys_0_9_6 ]); + buildDependencies = mapFeatures features ([ gcc_0_3_50 wayland_scanner_0_9_6 ]); + }; + wc_lock_0_2_1_features = f: updateFeatures f (rec { + byteorder_0_5_3.default = true; + clap_2_24_2.default = true; + dbus_0_5_4.default = true; + gcc_0_3_50.default = true; + image_0_10_4.default = true; + libc_0_2_23.default = true; + rand_0_3_15.default = true; + tempfile_2_1_5.default = true; + way_cooler_client_helpers_0_1_0.default = true; + wayland_client_0_9_6.cursor = true; + wayland_client_0_9_6.default = true; + wayland_client_0_9_6.dlopen = true; + wayland_kbd_0_9_0.default = true; + wayland_scanner_0_9_6.default = true; + wayland_sys_0_9_6.client = true; + wayland_sys_0_9_6.default = true; + wayland_sys_0_9_6.dlopen = true; + wc_lock_0_2_1.default = (f.wc_lock_0_2_1.default or true); + }) [ byteorder_0_5_3_features clap_2_24_2_features dbus_0_5_4_features image_0_10_4_features libc_0_2_23_features rand_0_3_15_features tempfile_2_1_5_features way_cooler_client_helpers_0_1_0_features wayland_client_0_9_6_features wayland_kbd_0_9_0_features wayland_sys_0_9_6_features gcc_0_3_50_features wayland_scanner_0_9_6_features ]; + winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {}; + winapi_0_2_8_features = f: updateFeatures f (rec { + winapi_0_2_8.default = (f.winapi_0_2_8.default or true); + }) []; + winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {}; + winapi_build_0_1_1_features = f: updateFeatures f (rec { + winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true); + }) []; + xml_rs_0_3_6 = { features?(xml_rs_0_3_6_features {}) }: xml_rs_0_3_6_ { + dependencies = mapFeatures features ([ bitflags_0_7_0 ]); + }; + xml_rs_0_3_6_features = f: updateFeatures f (rec { + bitflags_0_7_0.default = true; + xml_rs_0_3_6.default = (f.xml_rs_0_3_6.default or true); + }) [ bitflags_0_7_0_features ]; } diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index f4020ab3096..658548135aa 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, - openssl, sqlite, zlib, ... }: + openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, ... }: let inherit (darwin.apple_sdk.frameworks) CoreFoundation; @@ -36,4 +36,28 @@ in openssl-sys = attrs: { buildInputs = [ pkgconfig openssl ]; }; + dbus = attrs: { + buildInputs = [ pkgconfig dbus_libs ]; + }; + libdbus-sys = attrs: { + buildInputs = [ pkgconfig dbus_libs ]; + }; + gobject-sys = attrs: { + buildInputs = [ dbus_glib ]; + }; + gio-sys = attrs: { + buildInputs = [ dbus_glib ]; + }; + gdk-pixbuf-sys = attrs: { + buildInputs = [ dbus_glib ]; + }; + gdk-pixbuf = attrs: { + buildInputs = [ gdk_pixbuf ]; + }; + cairo-rs = attrs: { + buildInputs = [ cairo ]; + }; + xcb = attrs: { + buildInputs = [ python3 ]; + }; } From ac4ffde5ab88c62b01c6e5c0bfc010e861b38f93 Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sat, 3 Feb 2018 20:19:42 -0600 Subject: [PATCH 454/797] notmuch: fix version wildcard talloc is now 2.1.11 and the find '?' only matches one digit so it fails on 11. This switches it to use the '*' wildcard. --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 0c0f55e6337..c23c264559f 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { [[ -s "$lib" ]] || die "couldn't find libnotmuch" badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')" - goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')" + goodname="$(find "${talloc}/lib" -name 'libtalloc.*.*.*.dylib')" [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary" [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store" From c00cc986e8e7ca1b95dd1c6f81032521957d591d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 4 Feb 2018 11:50:58 +0800 Subject: [PATCH 455/797] wp-cli: 1.4.1 -> 1.5.0 --- pkgs/development/tools/wp-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 674b172b371..e35bdd22e2d 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -2,11 +2,11 @@ let name = "wp-cli-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "0fyfwpsbm9s3khxq8876ah85vjwfd5r4a59aix3zjmhq2v7j8n9j"; + sha256 = "17dgbcalvz5gw6xqgcywh6jrybj0qlglm16cgbshjsp6axwxa5gn"; }; completion = fetchurl { @@ -26,7 +26,7 @@ let ini = writeText "wp-cli.ini" '' [PHP] - memory_limit = -1 ; composer uses a lot of memory + memory_limit = -1 ; no limit as composer uses a lot of memory [Phar] phar.readonly = Off From 2fa14f3d5ca01780096bef0c714b40995af05349 Mon Sep 17 00:00:00 2001 From: DarkScythe97 Date: Sun, 4 Feb 2018 17:50:54 +1030 Subject: [PATCH 456/797] hwdata: 0.300 -> 0.308 --- pkgs/os-specific/linux/hwdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index b058aa692f0..8ebce196530 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.300"; + version = "0.308"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/hwdata/v0.300.tar.gz/sha512/34294fcf65c3cb17c19d625732d1656ec1992dde254a68ee35681ad2f310bc05028a85889efa2c1d1e8a2d10885ccc00185475a00f6f2fb82d07e2349e604a51/v0.300.tar.gz"; - sha256 = "03xlj05qyixhnsybq1qnr7j5q2nvirs4jxpgg4sbw8swsqj3dgqi"; + url = "https://github.com/vcrhonek/hwdata/archive/v0.308.tar.gz"; + sha256 = "17zcwplw41dfwb2l9jfgvm65rjzlsbv30f56d6vgiix042f92vcq"; }; preConfigure = "patchShebangs ./configure"; From f6a48c21d2e7efadeee6c0b65836765b69f65e47 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sun, 4 Feb 2018 10:13:06 +0100 Subject: [PATCH 457/797] lgi: Fix cairo bindings search path Since commit e44038bccab0cae, cairo-1.0.typelib contains an absolute path to cairo in the nix store so that no $LD_LIBRARY_PATH hacks are needed. However, this did not yet work for lgi, because lgi does dlopen("libcairo.so.2") without a full path, too. To make this work, this commit ensures that lgi first uses gobject-introspection to load libcairo. This uses the full path provided by the typelib. Afterwards, dlopen("libcairo.so.2") does not hit the filesystem anymore since the library is already loaded. This commit adds a patch that reorders some code in lgi's cairo initialisation. Previously, this started with core.module('cairo', 2), which is where the dlopen happens. Now, this code is moved down and instead core.gi.cairo.resolve is used to load the definitions of some enums first. This part of the code goes through gobject-introspection and causes libcairo to be loaded. Signed-off-by: Uli Schlachter --- .../lgi-find-cairo-through-typelib.patch | 47 +++++++++++++++++++ pkgs/top-level/lua-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/top-level/lgi-find-cairo-through-typelib.patch diff --git a/pkgs/top-level/lgi-find-cairo-through-typelib.patch b/pkgs/top-level/lgi-find-cairo-through-typelib.patch new file mode 100644 index 00000000000..613b2eda0b5 --- /dev/null +++ b/pkgs/top-level/lgi-find-cairo-through-typelib.patch @@ -0,0 +1,47 @@ +Reorder some code so that the cairo-gobject library is used before this tries to +dlopen("libcairo.so.2"). Since cairo-gobject depends (RT_DEPEND) on cairo, this +causes cairo to be used and so the missing search path for the dlopen() call is +not a problem. + +diff --git a/lgi/override/cairo.lua b/lgi/override/cairo.lua +index ca8193f..019239b 100644 +--- a/lgi/override/cairo.lua ++++ b/lgi/override/cairo.lua +@@ -20,18 +20,8 @@ local record = require 'lgi.record' + local enum = require 'lgi.enum' + local ti = ffi.types + +-cairo._module = core.module('cairo', 2) + local module_gobject = core.gi.cairo.resolve + +--- Versioning support. +-function cairo.version_encode(major, minor, micro) +- return 10000 * major + 100 * minor + micro +-end +-cairo.version = core.callable.new { +- addr = cairo._module.cairo_version, ret = ti.int } () +-cairo.version_string = core.callable.new { +- addr = cairo._module.cairo_version_string, ret = ti.utf8 } () +- + -- Load some constants. + cairo._constant = { + MIME_TYPE_JP2 = 'image/jp2', +@@ -58,6 +48,18 @@ for _, name in pairs { + end + end + ++-- Load libcairo.so directly; this has to happen after the typelib was used ++cairo._module = core.module('cairo', 2) ++ ++-- Versioning support. ++function cairo.version_encode(major, minor, micro) ++ return 10000 * major + 100 * minor + micro ++end ++cairo.version = core.callable.new { ++ addr = cairo._module.cairo_version, ret = ti.int } () ++cairo.version_string = core.callable.new { ++ addr = cairo._module.cairo_version_string, ret = ti.utf8 } () ++ + -- Load definitions of all boxed records. + cairo._struct = cairo._struct or {} + for index, struct in pairs { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index b91f9dae9f0..d4822b72e24 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -671,6 +671,8 @@ let sed -i "s|/usr/local|$out|" lgi/Makefile ''; + patches = [ ./lgi-find-cairo-through-typelib.patch ]; + meta = with stdenv.lib; { description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; homepage = https://github.com/pavouk/lgi; From be964d00ea05aeba33cb45ec29a6662d263cfd71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Feb 2018 10:16:46 +0100 Subject: [PATCH 458/797] python.pkgs.pyqt5: minor improvements --- pkgs/development/python-modules/pyqt/5.x.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 54471f64e30..225da204e21 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -13,7 +13,6 @@ in buildPythonPackage { pname = pname; version = version; format = "other"; - name = pname + "-" + version; meta = with lib; { description = "Python bindings for Qt5"; @@ -28,7 +27,7 @@ in buildPythonPackage { sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; }; - nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs @@ -43,10 +42,10 @@ in buildPythonPackage { lndir ${dbus-python} $out rm -rf "$out/nix-support" - export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages + export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ + --replace 'install_dir=pydbusmoddir' "install_dir='$out/${python.sitePackages}/dbus/mainloop'" \ --replace "ModuleMetadata(qmake_QT=['webkitwidgets'])" "ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport'])" ${python.executable} configure.py -w \ From aaa50d506e7170a1681efa0d567e058ccc084783 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Feb 2018 10:17:35 +0100 Subject: [PATCH 459/797] python.pkgs.spyder: fix expression Note I still get ``` This application failed to start because it could not find or load the Qt platform plugin "xcb" in "". ``` but that may be because I run it from the store which is not support for Qt5 applications. --- pkgs/applications/science/spyder/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 3163c7cb40f..04a5def81e6 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem # mandatory -, qtpy, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil -, pyflakes, rope, sphinx, nbconvert, mccabe +, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil +, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle # optional , numpy ? null, scipy ? null, matplotlib ? null # optional @@ -11,16 +11,20 @@ buildPythonApplication rec { pname = "spyder"; version = "3.2.6"; - namePrefix = ""; src = fetchPypi { inherit pname version; sha256 = "87d6a4f5ee1aac4284461ee3584c3ade50cb53feb3fe35abebfdfb9be18c526a"; }; + # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing? + postPatch = '' + substituteInPlace setup.py --replace 'pyqt5;python_version>="3"' ' ' + ''; + propagatedBuildInputs = [ - jedi pycodestyle psutil qtpy pyflakes rope numpy scipy matplotlib pylint - numpydoc qtconsole qtawesome nbconvert mccabe + jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint + numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle ]; # There is no test for spyder From d6e1c7bd945c26120365a4f3816b6d76ca4eb0b8 Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Sun, 4 Feb 2018 04:50:30 -0500 Subject: [PATCH 460/797] loccount: 1.1 -> 1.2 --- pkgs/development/tools/misc/loccount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index ad4e5d112d1..9205f6caf0d 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { name = "loccount-${version}"; - version = "1.1"; + version = "1.2"; goPackagePath = "gitlab.com/esr/loccount"; excludedPackages = "tests"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "esr"; repo = "loccount"; rev = version; - sha256 = "1wx31hraxics8x8w42jy5b10wdx1368zp2p6gplcfmpjssf9pacr"; + sha256 = "18z7ai7wy2k9yd3w65d37apfqs3h9bc2c15y7v1bydppi44zfsdk"; }; meta = with stdenv.lib; { From 3ac304963c162688a4f9ca79a1daa2b60636bd92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jan 2018 16:56:24 +0100 Subject: [PATCH 461/797] hackage2nix: use latest version of weeder by default --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b0d7c77dd32..b8839184c31 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2534,7 +2534,6 @@ default-package-overrides: - websockets-rpc ==0.6.0 - websockets-simple ==0.0.6.3 - websockets-snap ==0.10.2.4 - - weeder ==0.1.13 - weigh ==0.0.7 - wide-word ==0.1.0.5 - wikicfp-scraper ==0.1.0.9 From 77e074829bef0b55725de030dbd78c9c556dbdd9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jan 2018 16:57:44 +0100 Subject: [PATCH 462/797] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/2499b1e31fd364f303b96ddcbe0bfff55410ea51. --- .../haskell-modules/hackage-packages.nix | 2455 +++++++++++++++-- 1 file changed, 2154 insertions(+), 301 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d2e3281bbba..796cc5262dc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1825,8 +1825,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.5"; - sha256 = "0xcliysj78z51vapjbndwdh39gn3vcwqxnylqb3501i15rmsfm63"; + version = "0.8.6.1"; + sha256 = "1hnw8lzbrhpjwjvy19ppkybxmw9v88rgc8y0sp4z056i2fki09jw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3554,6 +3554,37 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "DAV_1_3_2" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , data-default, exceptions, haskeline, http-client, http-client-tls + , http-types, lens, mtl, network, network-uri, optparse-applicative + , transformers, transformers-base, transformers-compat, utf8-string + , xml-conduit, xml-hamlet + }: + mkDerivation { + pname = "DAV"; + version = "1.3.2"; + sha256 = "0sai0b7bxwif5czmmdik5dx318drx18inid87wfrxckrflsi8cv1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers data-default exceptions + http-client http-client-tls http-types lens mtl transformers + transformers-base transformers-compat utf8-string xml-conduit + xml-hamlet + ]; + executableHaskellDepends = [ + base bytestring case-insensitive containers data-default exceptions + haskeline http-client http-client-tls http-types lens mtl network + network-uri optparse-applicative transformers transformers-base + transformers-compat utf8-string xml-conduit xml-hamlet + ]; + homepage = "http://floss.scru.org/hDAV"; + description = "RFC 4918 WebDAV support"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DBlimited" = callPackage ({ mkDerivation, base, containers, parsec }: mkDerivation { @@ -11502,6 +11533,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Learning" = callPackage + ({ mkDerivation, base, hmatrix, vector }: + mkDerivation { + pname = "Learning"; + version = "0.0.0"; + sha256 = "18fh7gbpb4pm3cfsz3sxynippg6khf9cj4ijbk6q0xa107czy9w6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hmatrix vector ]; + executableHaskellDepends = [ base hmatrix vector ]; + testHaskellDepends = [ base hmatrix vector ]; + homepage = "https://github.com/masterdezign/Learning#readme"; + description = "Most frequently used machine learning tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Level0" = callPackage ({ mkDerivation, base, directory, random, SDL, SDL-ttf }: mkDerivation { @@ -12359,6 +12406,8 @@ self: { pname = "MiniAgda"; version = "0.2017.2.18"; sha256 = "0s3xp18y4kcjd1qq87vbhijbbpi9d1p08dgxw7521xlr3gmxkqxw"; + revision = "1"; + editedCabalFile = "0n4sd1b0c9fmgn7xqbhbms6y3ffkdgpa4fw7xcx31vgql2adxb0n"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -14608,8 +14657,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.12.1.0"; - sha256 = "08210lfmbzaazk5d0j9gw81m7416hk0ldiyahp7g9kpj49nhpmrg"; + version = "0.12.2.0"; + sha256 = "1hy641q1qjjlig5xs2v3l2nj3mc10zrxsipr24x6b2750lhakbr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15121,12 +15170,13 @@ self: { }) {}; "QuickCheckVariant" = callPackage - ({ mkDerivation, base, QuickCheck }: + ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "QuickCheckVariant"; - version = "0.2.0.0"; - sha256 = "10nnwyks1gx9claaagljrplgsyyxkvmz7a17rkx00gbrd5x5bn2s"; + version = "1.0.0.0"; + sha256 = "0gxq90fh1bgy2vcpyzbdgnly7q88bbqx06dq44rmv3fwjs61rc82"; libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/sanjorgek/QuickCheckVariant"; description = "Generator of \"valid\" and \"invalid\" data in a type class"; license = stdenv.lib.licenses.gpl3; @@ -16847,17 +16897,22 @@ self: { }) {}; "Sit" = callPackage - ({ mkDerivation, array, base, containers, data-lens-light, mtl }: + ({ mkDerivation, alex, array, base, containers, data-lens-light + , happy, mtl + }: mkDerivation { pname = "Sit"; version = "0.2017.5.2"; sha256 = "1hal35bp7jw2dwmnd68p27hn19mgpdf28lpf8nh0qja59gxk4lff"; + revision = "2"; + editedCabalFile = "1chbiyvp02yn03pvqd4r4z3yprb7yiwmxmw2kl6gr5aml9923w41"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ array base containers data-lens-light mtl ]; + executableToolDepends = [ alex happy ]; homepage = "https://github.com/andreasabel/Sit"; description = "Prototypical type checker for Type Theory with Sized Natural Numbers"; license = "unknown"; @@ -21755,6 +21810,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson_1_2_4_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, base-orphans + , base16-bytestring, bytestring, containers, deepseq, directory + , dlist, filepath, generic-deriving, ghc-prim, hashable + , hashable-time, HUnit, integer-logarithms, QuickCheck + , quickcheck-instances, scientific, tagged, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, th-abstraction, time, time-locale-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.2.4.0"; + sha256 = "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l"; + libraryHaskellDepends = [ + attoparsec base base-compat bytestring containers deepseq dlist + ghc-prim hashable scientific tagged template-haskell text + th-abstraction time time-locale-compat unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers directory dlist filepath generic-deriving + ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck + quickcheck-instances scientific tagged template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 text + time time-locale-compat unordered-containers uuid-types vector + ]; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -22854,8 +22943,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "1.0"; - sha256 = "1nc0qhmkh75jda3id4wndhs5gmjiqcqi0gwpmwafm5czzg3g6lch"; + version = "1.1.1"; + sha256 = "0xwbyh1q32xl6xcv8fl49n98b40ma0ycfls21x0l9fjx15wk95ac"; libraryHaskellDepends = [ aivika aivika-transformers array base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -29450,8 +29539,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.5"; - sha256 = "1b5sawd2i890cnj5wkp99psfgk0l52wv82xa00vr25nb708k8pkw"; + version = "0.2.0.9"; + sha256 = "07vbqwdlhnbqman07yh53s3fsdvpvphbj6s5cr9cr7pb6l3s3m13"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -29462,33 +29551,33 @@ self: { ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; - homepage = "https://hub.darcs.net/vmchale/ats-format#readme"; description = "A source-code formatter for ATS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ats-pkg" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal, cli-setup - , composition-prelude, dhall, directory, filemanip, http-client - , http-client-tls, lens, optparse-applicative, parallel-io, process - , shake, shake-ats, shake-ext, tar, temporary, text, unix, zlib + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Cabal + , cli-setup, composition-prelude, dhall, directory, filemanip + , http-client, http-client-tls, lens, optparse-applicative + , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary + , text, unix, zlib }: mkDerivation { pname = "ats-pkg"; - version = "1.4.0.6"; - sha256 = "0lh6blxawz9crx7sgb2ih9ls7ca9z0lid15viczrzws44d6s3s2g"; + version = "2.1.0.8"; + sha256 = "05ipwj3ihds2q8amvxxj02jzqpbmyjvd55a69z7bmx9vmz8j3pal"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring composition-prelude dhall directory - filemanip http-client http-client-tls lens optparse-applicative - parallel-io process shake shake-ats shake-ext tar temporary text - unix zlib + ansi-wl-pprint base binary bytestring composition-prelude dhall + directory filemanip http-client http-client-tls lens + optparse-applicative parallel-io process shake shake-ats shake-ext + tar temporary text unix zlib ]; executableHaskellDepends = [ base ]; - homepage = "https://github.com/vmchale/ats-pkg#readme"; + homepage = "https://github.com/vmchale/atspkg#readme"; description = "Package manager for ATS"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -29499,8 +29588,8 @@ self: { }: mkDerivation { pname = "ats-setup"; - version = "0.1.0.2"; - sha256 = "0si95yvwmjxy79z1ifqqxmps289l8xfqdzm9y430s341638ajivj"; + version = "0.2.0.0"; + sha256 = "1jkavd5dvsk6nbkik9xcdnlp3ry6jcmvkdk0lhm94f53cwz23xi5"; libraryHaskellDepends = [ base Cabal directory http-client http-client-tls parallel-io tar zlib @@ -32334,6 +32423,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "battleship-combinatorics" = callPackage + ({ mkDerivation, base, combinatorial, containers, deepseq + , directory, filepath, non-empty, pooled-io, prelude-compat + , QuickCheck, random, set-cover, storable-record, storablevector + , temporary, transformers, utility-ht + }: + mkDerivation { + pname = "battleship-combinatorics"; + version = "0.0"; + sha256 = "19yc53w1n2clml8gv6h48235kgjzxmg98d8bkjm33k6hcfbx6897"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base combinatorial containers deepseq directory filepath non-empty + pooled-io prelude-compat QuickCheck random set-cover + storable-record storablevector temporary transformers utility-ht + ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "http://hub.darcs.net/thielema/battleship-combinatorics/"; + description = "Compute number of possible arrangements in the battleship game"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "battleships" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, base64-bytestring , blaze-svg, bytestring, cereal, colour, containers, cookie @@ -32532,6 +32645,8 @@ self: { pname = "beam"; version = "0.3.2.0"; sha256 = "0nkbn87i6pk2cmmcmzlcydlqwk95b7znncsyn135nl8r07vsqvqs"; + revision = "1"; + editedCabalFile = "1nh4hh7cslr75jwsj3dwfdphqm51bl7v0k1qvbaxkiac7wh3f19p"; libraryHaskellDepends = [ base conduit containers convertible HDBC HDBC-sqlite3 microlens mtl pretty semigroups tagged text time uniplate @@ -33080,15 +33195,15 @@ self: { }: mkDerivation { pname = "bhoogle"; - version = "0.1.2.4"; - sha256 = "0r19z0ywxnzymd23kr9skl287w1d0g4420rxwdpq087gw77a67wl"; + version = "0.1.2.5"; + sha256 = "16i5gf8iv0l10zira8wi9lgbz0q1f7lxp35ml9yz4j8cihn7z7ji"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base brick bytestring containers directory filepath hoogle lens process protolude text time vector vty ]; - homepage = "https://github.com/githubuser/bhoogle#readme"; + homepage = "https://github.com/andrevdm/bhoogle#readme"; description = "Simple terminal GUI for local hoogle"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -33490,6 +33605,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "binary-conduit_1_3" = callPackage + ({ mkDerivation, base, binary, bytestring, conduit, exceptions + , hspec, QuickCheck, quickcheck-assertions, resourcet, vector + }: + mkDerivation { + pname = "binary-conduit"; + version = "1.3"; + sha256 = "1kfc421r8p0zxn5dkm9kzj4n9pharnl809hkjnr55dbrnr3vvya3"; + revision = "1"; + editedCabalFile = "0y08nw3y5jgrw5waa25b75iwsibnd1m9rbpqrvz5j4xq6baqw6kx"; + libraryHaskellDepends = [ + base binary bytestring conduit exceptions vector + ]; + testHaskellDepends = [ + base binary bytestring conduit hspec QuickCheck + quickcheck-assertions resourcet + ]; + homepage = "http://github.com/qnikst/binary-conduit/"; + description = "data serialization/deserialization conduit library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-derive" = callPackage ({ mkDerivation, base, binary, ghc-prim }: mkDerivation { @@ -36190,8 +36328,8 @@ self: { }: mkDerivation { pname = "blaze-colonnade"; - version = "1.1.0"; - sha256 = "0yxkb5qmlgrkz5fciac9qfrznfg7j1xz77929x5vw7ci7n7d2kqr"; + version = "1.2.1"; + sha256 = "0bsax9fw3bmj32a0dsrmp7zrpfp2pgilq3nss6qfa1zh1kdyj1xy"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade text ]; @@ -41143,8 +41281,8 @@ self: { }: mkDerivation { pname = "canteven-log"; - version = "2.0.1.0"; - sha256 = "0w7hzhb13g62l08ggld3rj9aamw1jhjkir1bpzc73bl59ls4gdgy"; + version = "2.0.2.1"; + sha256 = "0i4lf46rj4yy8j7xr311kypi1kmmpldh914glzyp2gim08fwy10c"; libraryHaskellDepends = [ aeson base bytestring directory fast-logger filepath monad-logger template-haskell text time transformers yaml @@ -41251,21 +41389,22 @@ self: { }) {}; "capataz" = callPackage - ({ mkDerivation, async, base, bytestring, data-default, pretty-show - , protolude, safe-exceptions, stm, tasty, tasty-hunit, tasty-rerun - , tasty-smallcheck, teardown, text, time, unordered-containers - , uuid, vector + ({ mkDerivation, async, base, bytestring, data-default, microlens + , pretty-show, protolude, safe-exceptions, stm, tasty, tasty-hunit + , tasty-rerun, tasty-smallcheck, teardown, text, time + , unordered-containers, uuid, vector }: mkDerivation { pname = "capataz"; - version = "0.0.0.2"; - sha256 = "0d6k13qqm30rcs27qr6q8p0a4wlqw75qyfmk9x2s6zhydl4cwb85"; + version = "0.1.0.0"; + sha256 = "1bz9yazxwdasbdbr9hrfpvjaqd4lax8kqinlj4rxyiq1517rsqrk"; libraryHaskellDepends = [ - async base bytestring data-default protolude safe-exceptions stm - teardown text time unordered-containers uuid vector + async base bytestring data-default microlens protolude + safe-exceptions stm teardown text time unordered-containers uuid + vector ]; testHaskellDepends = [ - async base bytestring data-default pretty-show protolude + async base bytestring data-default microlens pretty-show protolude safe-exceptions stm tasty tasty-hunit tasty-rerun tasty-smallcheck teardown text time unordered-containers uuid vector ]; @@ -42684,6 +42823,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cereal-conduit_0_8_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl + , resourcet, transformers + }: + mkDerivation { + pname = "cereal-conduit"; + version = "0.8.0"; + sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r"; + libraryHaskellDepends = [ + base bytestring cereal conduit resourcet transformers + ]; + testHaskellDepends = [ + base bytestring cereal conduit HUnit mtl transformers + ]; + homepage = "https://github.com/snoyberg/conduit"; + description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cereal-derive" = callPackage ({ mkDerivation, base, cereal, ghc-prim }: mkDerivation { @@ -44960,6 +45119,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude_1_4_0" = callPackage + ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, deepseq, dlist, ghc-prim, hashable + , hspec, mono-traversable, mono-traversable-instances, mtl + , mutable-containers, primitive, QuickCheck, say, semigroups, stm + , stm-chans, text, time, transformers, unliftio + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "1.4.0"; + sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb"; + libraryHaskellDepends = [ + async base basic-prelude bifunctors bytestring chunked-data + containers deepseq dlist ghc-prim hashable mono-traversable + mono-traversable-instances mtl mutable-containers primitive say + semigroups stm stm-chans text time transformers unliftio + unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "A typeclass-based Prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-prelude-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet @@ -44981,6 +45168,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude-conduit_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec + , monad-control, QuickCheck, resourcet, transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "1.4.0"; + sha256 = "096466cyyxxmg3jpq705xjjc4r7v9b607hgbys8vybjlldkjbvrr"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit monad-control resourcet + transformers void + ]; + testHaskellDepends = [ + base bytestring conduit hspec QuickCheck transformers + ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "classy-prelude together with conduit functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-prelude-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -45000,6 +45208,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude-yesod_1_4_0" = callPackage + ({ mkDerivation, aeson, base, classy-prelude + , classy-prelude-conduit, data-default, http-conduit, http-types + , persistent, yesod, yesod-newsfeed, yesod-static + }: + mkDerivation { + pname = "classy-prelude-yesod"; + version = "1.4.0"; + sha256 = "0a4y9fipcikndzqqna5694f1wcwwin5ir076pjj1nm638a7silhc"; + libraryHaskellDepends = [ + aeson base classy-prelude classy-prelude-conduit data-default + http-conduit http-types persistent yesod yesod-newsfeed + yesod-static + ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "Provide a classy prelude including common Yesod functionality"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classyplate" = callPackage ({ mkDerivation, base, criterion, parallel, template-haskell , uniplate @@ -45041,8 +45269,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0.4"; - sha256 = "0xpv3qb7w1bzszbnmzriai9dv9qfajnv1pv9y3jdaih4gj73c9ny"; + version = "0.24.0.6"; + sha256 = "0yswcldqwrpk7z5ww95nyvsb6qdpl2171zxy4fkpnqscma3sf54r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring @@ -45403,12 +45631,15 @@ self: { }) {}; "cli-setup" = callPackage - ({ mkDerivation, base, bytestring, directory, process }: + ({ mkDerivation, base, bytestring, directory, file-embed, process + }: mkDerivation { pname = "cli-setup"; - version = "0.1.0.3"; - sha256 = "1w41pdprifdgp7h2z08m78jg058i49530pfvgmr53lmch5dkk4vf"; - libraryHaskellDepends = [ base bytestring directory process ]; + version = "0.2.0.1"; + sha256 = "056y5sphj2zn455wyhjxcr0c6hb502bhrazhd7nij9mg8d8761dk"; + libraryHaskellDepends = [ + base bytestring directory file-embed process + ]; homepage = "https://github.com/vmchale/cli-setup#readme"; description = "Helper setup scripts for packaging command-line tools"; license = stdenv.lib.licenses.bsd3; @@ -46031,20 +46262,20 @@ self: { "clustering" = callPackage ({ mkDerivation, base, binary, containers, criterion - , hierarchical-clustering, matrices, mwc-random, parallel - , primitive, Rlang-QQ, split, tasty, tasty-hunit, tasty-quickcheck + , hierarchical-clustering, inline-r, matrices, mwc-random, parallel + , primitive, split, tasty, tasty-hunit, tasty-quickcheck , unordered-containers, vector }: mkDerivation { pname = "clustering"; - version = "0.3.1"; - sha256 = "11kzx27m7r58zq2izg781vyi895530frgw5i6bnzgiylhf028sdw"; + version = "0.4.0"; + sha256 = "16zhg2jb4a823gf8pdbm9y9yknpf1w6l3983563vk3wjna3ypfcn"; libraryHaskellDepends = [ base binary containers matrices mwc-random parallel primitive unordered-containers vector ]; testHaskellDepends = [ - base binary hierarchical-clustering matrices mwc-random Rlang-QQ + base binary hierarchical-clustering inline-r matrices mwc-random split tasty tasty-hunit tasty-quickcheck vector ]; benchmarkHaskellDepends = [ @@ -47022,8 +47253,8 @@ self: { }: mkDerivation { pname = "colonnade"; - version = "1.1.1"; - sha256 = "1qivzd143lk68k6dp8flj1265x8gw9zhs76bsvmhx6kq139qldhf"; + version = "1.2.0"; + sha256 = "0a9xh1vg64wyby370djsdcvrhg0vx2bdrwdh7csqri9nbxpzj8jn"; libraryHaskellDepends = [ base bytestring contravariant profunctors semigroups text vector ]; @@ -49045,6 +49276,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hspec, kan-extensions + , mono-traversable, mtl, mwc-random, primitive, QuickCheck + , resourcet, safe, silently, split, text, transformers, unix + , unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.3.0"; + sha256 = "1520pdyb8lawcbqapr1v8lj9zzxnm6d20zfgawa6ds0dxskz1kyp"; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath mono-traversable mtl + primitive resourcet text transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hspec + mono-traversable mtl QuickCheck resourcet safe silently split text + transformers unliftio vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq gauge hspec kan-extensions mwc-random + transformers vector + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq @@ -49167,6 +49428,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-combinators_1_3_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "conduit-combinators"; + version = "1.3.0"; + sha256 = "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "DEPRECATED Functionality merged into the conduit package itself"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-connection" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, HUnit , network, resourcet, test-framework, test-framework-hunit @@ -49219,6 +49494,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-extra_1_3_0" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring + , bytestring-builder, conduit, directory, exceptions, filepath + , gauge, hspec, network, primitive, process, QuickCheck, resourcet + , stm, streaming-commons, text, transformers, transformers-base + , typed-process, unliftio-core + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.3.0"; + sha256 = "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c"; + libraryHaskellDepends = [ + async attoparsec base bytestring conduit directory filepath network + primitive process resourcet stm streaming-commons text transformers + typed-process unliftio-core + ]; + testHaskellDepends = [ + async attoparsec base bytestring bytestring-builder conduit + directory exceptions hspec process QuickCheck resourcet stm + streaming-commons text transformers transformers-base + ]; + benchmarkHaskellDepends = [ + base bytestring bytestring-builder conduit gauge transformers + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Batteries included conduit: adapters for common libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -59094,26 +59399,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_9_0" = callPackage + "dhall_1_9_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring , bytestring, case-insensitive, charset, containers, contravariant , cryptohash, deepseq, exceptions, http-client, http-client-tls - , lens, optparse-generic, parsers, prettyprinter, system-fileio - , system-filepath, tasty, tasty-hunit, text, text-format - , transformers, trifecta, unordered-containers, vector + , lens-family-core, optparse-generic, parsers, prettyprinter + , system-fileio, system-filepath, tasty, tasty-hunit, text + , text-format, transformers, trifecta, unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.9.0"; - sha256 = "1i59rvjjkqikz964kzrnbxfwjhwvnwqwvaw9m03yq540qi4kmiaz"; + version = "1.9.1"; + sha256 = "1kwv5mhcabg3bwnp9j7z01xxv1a0xnpc6n0yw02k8xhrhdz60hdq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base base16-bytestring bytestring case-insensitive charset containers contravariant cryptohash exceptions http-client - http-client-tls lens parsers prettyprinter system-fileio - system-filepath text text-format transformers trifecta - unordered-containers vector + http-client-tls lens-family-core parsers prettyprinter + system-fileio system-filepath text text-format transformers + trifecta unordered-containers vector ]; executableHaskellDepends = [ base optparse-generic prettyprinter system-filepath text trifecta @@ -60289,8 +60594,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.22"; - sha256 = "1gsvv8kgjjjq7nlpixq3gz6d1j90l83pmh2r3h18019369fcv3ip"; + version = "1.1.23"; + sha256 = "14mzv2bc7ndqqkx1nqb3km78h1ysjmry9d6s40nic8r2qgf9y2an"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -60810,12 +61115,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_1_5" = callPackage + "directory_1_3_2_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.1.5"; - sha256 = "0zkqihmdfz7bzv3sxh1p9ijl4vra880kfy3qy9h96flq7d2if0f2"; + version = "1.3.2.0"; + sha256 = "0ffhanigxrx5wpin8l0wfp7d24lpgsjwj0hxrfp8bpy2wj1snxny"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -61283,6 +61588,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributed-closure_0_3_5" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, hspec + , QuickCheck, syb, template-haskell + }: + mkDerivation { + pname = "distributed-closure"; + version = "0.3.5"; + sha256 = "0mm3w8l63n9lbifrj32kv5xbb79fiwd4swi2kv2lbnc67b6ig43h"; + libraryHaskellDepends = [ + base binary bytestring constraints syb template-haskell + ]; + testHaskellDepends = [ base binary hspec QuickCheck ]; + homepage = "https://github.com/tweag/distributed-closure"; + description = "Serializable closures for distributed programming"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "distributed-process" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-accessor, deepseq, distributed-static, exceptions, hashable @@ -65445,8 +65768,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.10"; - sha256 = "18108haj2gpgbn3lbsgzb1ixbycijjns1h780hllsb3nbcmqv0gw"; + version = "1.0.11"; + sha256 = "0663m2riq23dwhsvgqi0mcy6h7hb24fgk315h7mi656bj5lzllx6"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -65462,8 +65785,8 @@ self: { }: mkDerivation { pname = "ekg-carbon"; - version = "1.0.8"; - sha256 = "0n65c6yv43gckxlckl9bmmf0ags3pp055lvxpi5rbq1d95b29xqd"; + version = "1.0.9"; + sha256 = "00xdyrvwmd9jp59awh9i1yzbnywndzmjmz8qsn87hrcd2848fdnm"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -66672,15 +66995,15 @@ self: { "engine-io" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring - , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay + , bytestring, errors, free, monad-loops, mwc-random, stm, stm-delay , text, transformers, unordered-containers, vector, websockets }: mkDerivation { pname = "engine-io"; - version = "1.2.17"; - sha256 = "0m5nr1qk15p332dhmiyrpfdm91cf3al2nah6rja55y6gpc2vvvbv"; + version = "1.2.19"; + sha256 = "1z3gnd3cfgp3mlbxlbaqv5m21fv0qqjyzzqi3qkrrggy0y71yq0b"; libraryHaskellDepends = [ - aeson async attoparsec base base64-bytestring bytestring either + aeson async attoparsec base base64-bytestring bytestring errors free monad-loops mwc-random stm stm-delay text transformers unordered-containers vector websockets ]; @@ -67093,6 +67416,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "envy_1_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, mtl + , QuickCheck, quickcheck-instances, text, time, transformers + }: + mkDerivation { + pname = "envy"; + version = "1.5.0.0"; + sha256 = "1gqzfjgy58833vi9b5dlfwwzx7fj2548wb340xyh0q8cmsrrkh6d"; + libraryHaskellDepends = [ + base bytestring containers mtl text time transformers + ]; + testHaskellDepends = [ + base bytestring hspec mtl QuickCheck quickcheck-instances text time + transformers + ]; + description = "An environmentally friendly way to deal with environment variables"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "epanet-haskell" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -68489,7 +68832,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "eventsource-api_1_2_0" = callPackage + "eventsource-api_1_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , enclosed-exceptions, lifted-async, lifted-base, monad-control , monad-loops, mtl, stm, stm-chans, string-conversions, text @@ -68497,8 +68840,8 @@ self: { }: mkDerivation { pname = "eventsource-api"; - version = "1.2.0"; - sha256 = "1hiigk22f5w1bgnvmpi2gs8s1c80x2ddd44rczj5dfrfawvm8jr2"; + version = "1.3.0"; + sha256 = "1xv1j0dyvbl319513ycyl8857jy3gh0dcjvwxfxz4ddsw0sld3bx"; libraryHaskellDepends = [ aeson base bytestring containers enclosed-exceptions lifted-async lifted-base monad-control monad-loops mtl stm stm-chans @@ -68532,15 +68875,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventsource-geteventstore-store_1_0_6" = callPackage + "eventsource-geteventstore-store_1_1_0" = callPackage ({ mkDerivation, aeson, base, eventsource-api , eventsource-store-specs, eventstore, mtl, protolude , string-conversions, tasty, tasty-hspec, transformers-base }: mkDerivation { pname = "eventsource-geteventstore-store"; - version = "1.0.6"; - sha256 = "0fy1sgc43a6d4hrwyc3kawcnvpm4zlmwnznw27zd40hrbzkkkzw2"; + version = "1.1.0"; + sha256 = "00siad63vciymkdql9b3bszb2qfcylb9y32x04ndd19mvpixhdi3"; libraryHaskellDepends = [ aeson base eventsource-api eventstore mtl string-conversions transformers-base @@ -68571,14 +68914,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "eventsource-store-specs_1_1_0" = callPackage + "eventsource-store-specs_1_1_1" = callPackage ({ mkDerivation, aeson, async, base, eventsource-api, mtl, tasty , tasty-hspec, text, transformers-base, uuid }: mkDerivation { pname = "eventsource-store-specs"; - version = "1.1.0"; - sha256 = "0z4c6p8f0w72kz682i7f0zjy3qqz7n2pkgjfb258w7xx642434g0"; + version = "1.1.1"; + sha256 = "1pa4s9y9cgvaadzyp186snhvrgp4jw1xgzxy2w58hxfa2mcxqn4i"; libraryHaskellDepends = [ aeson async base eventsource-api mtl tasty tasty-hspec text transformers-base uuid @@ -68689,7 +69032,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore_1_1_0" = callPackage + "eventstore_1_1_1" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan , ekg-core, exceptions, fast-logger, hashable, http-client @@ -68701,8 +69044,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.1.0"; - sha256 = "0r91vgnq291aq4smbap07agm6bry1xflawihm31d0krzv0j69rx1"; + version = "1.1.1"; + sha256 = "1cvn53nf6igcg3a2sdvihd857vdrhrkcj1bzrbzaixkrxqcyhn9y"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -73074,6 +73417,8 @@ self: { pname = "flat-mcmc"; version = "1.5.0"; sha256 = "1zgi69vgwss7hhv893n5z3av0byb5hiblha7k3ck4bbfmkgakkl7"; + revision = "1"; + editedCabalFile = "1pjkyvs4c6yx6jva08zw2b1qfhhv9q71sy806f5lddjsknnym2fn"; libraryHaskellDepends = [ base formatting mcmc-types monad-par monad-par-extras mwc-probability pipes primitive text transformers vector @@ -73895,6 +74240,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fold-debounce-conduit_0_2_0_0" = callPackage + ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet + , stm, transformers, transformers-base + }: + mkDerivation { + pname = "fold-debounce-conduit"; + version = "0.2.0.0"; + sha256 = "0ba42cxcjr7llsx42qmzg6kc497c35rkm4ndm114p0nf1mijn8nr"; + libraryHaskellDepends = [ + base conduit fold-debounce resourcet stm transformers + transformers-base + ]; + testHaskellDepends = [ + base conduit hspec resourcet stm transformers + ]; + homepage = "https://github.com/debug-ito/fold-debounce-conduit"; + description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, hashable, mwc-random, primitive @@ -73915,6 +74281,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foldl_1_3_7" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, hashable, mwc-random, primitive + , profunctors, semigroups, text, transformers, unordered-containers + , vector, vector-builder + }: + mkDerivation { + pname = "foldl"; + version = "1.3.7"; + sha256 = "113966zyk1jj8l1k1izfix8bc1hmpr9w1zahkz592f56wmvmy8kn"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable + mwc-random primitive profunctors semigroups text transformers + unordered-containers vector vector-builder + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl-incremental" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty @@ -75381,8 +75768,8 @@ self: { }: mkDerivation { pname = "freelude"; - version = "0.3.1.0"; - sha256 = "1rz7xpffyw4nl7iaxfmhzzmn7kyvv8rfh4wvv2d02i2ihfykirxs"; + version = "0.3.2.0"; + sha256 = "1gwgzdpnwjyihmrbq3zx24a9nlcn78g1gjsc091gffszszzf1mxk"; libraryHaskellDepends = [ array base bytestring containers indextype text transformers ]; @@ -75498,15 +75885,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "freer-simple_1_0_1_0" = callPackage + "freer-simple_1_0_1_1" = callPackage ({ mkDerivation, base, criterion, extensible-effects, free, mtl , natural-transformation, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, transformers-base }: mkDerivation { pname = "freer-simple"; - version = "1.0.1.0"; - sha256 = "0vh14z39pk1ni16hcq9yw0x8ckhcbyi8hgndpv7gmqzhvcdd0saf"; + version = "1.0.1.1"; + sha256 = "1fdxj1iyh8jl2nghrm51r7gvlk1qwzrjjhj13f0akwrm2s0la1jb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77736,8 +78123,8 @@ self: { }: mkDerivation { pname = "generic-accessors"; - version = "0.6.0.1"; - sha256 = "1jgl1kklix3y6cdr1776pwc2ip12w532f4v0zyx6h8qs48mgvx66"; + version = "0.6.2.0"; + sha256 = "1id0zc617wskz5p8mbawqin03f73vvqy3d8jm6ywzyw3in5y82hs"; libraryHaskellDepends = [ base binary cereal lens linear spatial-math TypeCompose ]; @@ -79157,6 +79544,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-dump-core" = callPackage + ({ mkDerivation, base, bytestring, filepath, ghc, serialise, text + }: + mkDerivation { + pname = "ghc-dump-core"; + version = "0.1.0.0"; + sha256 = "036hpykq1ibnnb4sm0k4ljcqj2m7qf8kdycdmids9qfhz3kldms2"; + libraryHaskellDepends = [ + base bytestring filepath ghc serialise text + ]; + description = "An AST and compiler plugin for dumping GHC's Core representation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-dump-tree" = callPackage ({ mkDerivation, aeson, base, bytestring, ghc, optparse-applicative , pretty, pretty-show, process, unordered-containers, vector @@ -79183,6 +79584,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-dump-util" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, ghc-dump-core + , hashable, optparse-applicative, regex-tdfa, regex-tdfa-text + , serialise, text, unordered-containers + }: + mkDerivation { + pname = "ghc-dump-util"; + version = "0.1.0.0"; + sha256 = "0d8d5nc9nnfk0qnxjg7mdfc1cfalycwi1bb8x3m1f9ndy29hzrb1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring ghc-dump-core hashable serialise + text unordered-containers + ]; + executableHaskellDepends = [ + ansi-wl-pprint base ghc-dump-core optparse-applicative regex-tdfa + regex-tdfa-text + ]; + description = "Handy tools for working with @ghc-dump@ dumps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-dup" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -79413,6 +79837,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-justdoit" = callPackage + ({ mkDerivation, base, ghc, hashable, inspection-testing }: + mkDerivation { + pname = "ghc-justdoit"; + version = "0.1"; + sha256 = "0qr6ipsq7g1275svdgqcppcb37r387fvap5fyyn6fn4h84dhvkby"; + libraryHaskellDepends = [ base ghc hashable ]; + testHaskellDepends = [ base inspection-testing ]; + homepage = "https://github.com/nomeata/ghc-justdoit"; + description = "A magic typeclass that just does it"; + license = stdenv.lib.licenses.mit; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -81538,7 +81975,6 @@ self: { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -83636,7 +84072,6 @@ self: { homepage = "http://khumba.net/projects/goatee"; description = "A monadic take on a 2,500-year-old board game - GTK+ UI"; license = stdenv.lib.licenses.agpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -87216,6 +87651,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gstorable" = callPackage + ({ mkDerivation, base, generic-storable, ghc-prim, hspec + , QuickCheck + }: + mkDerivation { + pname = "gstorable"; + version = "0.1.0.3"; + sha256 = "0qs18la2w9x44faw9yl6pabcsj7fdrcsapsfhrbhjmbqrdh22rm4"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base generic-storable ghc-prim hspec QuickCheck + ]; + description = "Generic implementation of Storable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, directory, glib , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl @@ -88178,6 +88629,58 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hOpenPGP_2_6" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-conduit, bytestring, bzlib, conduit, conduit-extra + , containers, criterion, crypto-cipher-types, cryptonite + , data-default-class, errors, hashable, incremental-parser + , ixset-typed, lens, memory, monad-loops, nettle, network + , network-uri, newtype, openpgp-asciiarmor, QuickCheck + , quickcheck-instances, resourcet, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , transformers, unliftio-core, unordered-containers + , wl-pprint-extras, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.6"; + sha256 = "0vsrgyzh7zlx9z27fvpjzk4s4gv1zpxwb68n529hvilsphyz35kf"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-conduit bytestring bzlib + conduit conduit-extra containers crypto-cipher-types cryptonite + data-default-class errors hashable incremental-parser ixset-typed + lens memory monad-loops nettle network-uri newtype + openpgp-asciiarmor resourcet semigroups split text time + time-locale-compat transformers unliftio-core unordered-containers + wl-pprint-extras zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype QuickCheck quickcheck-instances + resourcet semigroups split tasty tasty-hunit tasty-quickcheck text + time time-locale-compat transformers unliftio-core + unordered-containers wl-pprint-extras zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bifunctors binary + binary-conduit bytestring bzlib conduit conduit-extra containers + criterion crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype openpgp-asciiarmor resourcet + semigroups split text time time-locale-compat transformers + unliftio-core unordered-containers wl-pprint-extras zlib + ]; + homepage = "https://salsa.debian.org/clint/hOpenPGP"; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPDB" = callPackage ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel @@ -91269,8 +91772,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.3.4.8"; - sha256 = "006prds4bgqmj54j0syyf1y1yyqwfcj2a6mdxpcjj6qj3g3976l1"; + version = "2.3.4.10"; + sha256 = "057mihkspxp78q2gwgyqmqgiy5pzimkzvsj8rk9psmzci09l68qd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -92234,8 +92737,8 @@ self: { }: mkDerivation { pname = "hascar"; - version = "0.2.1.2"; - sha256 = "1x04yddy74vj7sxwsmq411z4s02n5asb17vc5290ha7s257fr81j"; + version = "0.2.2.1"; + sha256 = "1vz24mi0l9fjj2isgzrh4zjjk9srlcshrc3cwz0kz4fcbv44r9nz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92243,8 +92746,8 @@ self: { text time ]; executableHaskellDepends = [ - ansi-wl-pprint base binary bytestring directory filepath gitrev - optparse-applicative path text transformers unix + ansi-wl-pprint base binary bytestring conduit directory exceptions + filepath gitrev optparse-applicative path text transformers unix ]; testHaskellDepends = [ base bytestring conduit cryptohash hex path @@ -93754,6 +94257,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-names_0_9_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , data-lens-light, filemanip, filepath, haskell-src-exts, mtl + , pretty-show, tasty, tasty-golden, transformers + , traverse-with-class, uniplate + }: + mkDerivation { + pname = "haskell-names"; + version = "0.9.1"; + sha256 = "1ybcdxz6y0l5qsq3vd0ii6m1ifysc2k8852lzw0nfs9i4q9pnwhh"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-lens-light filepath + haskell-src-exts mtl transformers traverse-with-class uniplate + ]; + testHaskellDepends = [ + base containers filemanip filepath haskell-src-exts mtl pretty-show + tasty tasty-golden traverse-with-class + ]; + homepage = "http://documentup.com/haskell-suite/haskell-names"; + description = "Name resolution library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-neo4j-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-client, http-client-tls @@ -94112,8 +94640,8 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-sc"; - version = "0.1.0.4"; - sha256 = "00db79f99333viibrzhr77cvhv9ihk7vb5yh1xbsz2lirfajwmr2"; + version = "0.1.0.5"; + sha256 = "15ja2h0flp73f017r1ylr8fmksd3v76v68x8whv37bgy3mrqznx9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskell-src-exts ]; @@ -96996,18 +97524,16 @@ self: { }) {inherit (pkgs) SDL_mixer;}; "hblas" = callPackage - ({ mkDerivation, base, blas, HUnit, liblapack, primitive - , storable-complex, tasty, tasty-hunit, vector + ({ mkDerivation, base, blas, hspec, liblapack, primitive + , storable-complex, vector }: mkDerivation { pname = "hblas"; - version = "0.3.2.2"; - sha256 = "1r38ch9xi02dg4pfngpp3rndrla14w75pijkdb6kkq5r80i7hxmw"; - revision = "2"; - editedCabalFile = "0rvym111j5rpdx8cng1nwy7fg1f84wcfzfbwi8qgcvg29126jbnf"; + version = "0.4.0.1"; + sha256 = "1jclawfvykdsd5b5wmqyz6fb0kx6yr626w4g86w9q1127k8l102k"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ blas liblapack ]; - testHaskellDepends = [ base HUnit tasty tasty-hunit vector ]; + testHaskellDepends = [ base hspec primitive vector ]; homepage = "http://github.com/wellposed/hblas/"; description = "Human friendly BLAS and Lapack bindings for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -100318,6 +100844,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "higher-leveldb_0_5_0_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, data-default, exceptions + , hspec, leveldb-haskell, mtl, process, resourcet, transformers + , transformers-base, unliftio, unliftio-core + }: + mkDerivation { + pname = "higher-leveldb"; + version = "0.5.0.1"; + sha256 = "0p7rsawd4d5cbsxlj8ddgx5blg2yw853zjfqcy78gdqn6kk8vz24"; + libraryHaskellDepends = [ + base bytestring cereal data-default exceptions leveldb-haskell mtl + resourcet transformers transformers-base unliftio-core + ]; + testHaskellDepends = [ + base bytestring cereal hspec leveldb-haskell mtl process resourcet + transformers transformers-base unliftio + ]; + homepage = "https://github.com/jeremyjh/higher-leveldb"; + description = "A rich monadic API for working with leveldb databases"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "higherorder" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -103832,7 +104381,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hopenpgp-tools_0_20" = callPackage + "hopenpgp-tools_0_20_1" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec , base, base16-bytestring, binary, binary-conduit, bytestring , conduit, conduit-extra, containers, crypto-pubkey, cryptohash @@ -103844,8 +104393,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.20"; - sha256 = "1qhx58l6qxs7b5zp76dsy3y0whqnkp919c98lz9n1clla0hfhdgb"; + version = "0.20.1"; + sha256 = "1nidlipz0isj65vg6zhi79ln14i9kxvnn164s0haf086vm81kw32"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104469,36 +105018,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hpack_0_23_0" = callPackage + "hpack_0_24_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec - , http-client, http-client-tls, http-types, interpolate, mockery - , pretty, QuickCheck, scientific, temporary, text, transformers - , unordered-containers, yaml + , http-client, http-client-tls, http-types, HUnit, interpolate + , mockery, pretty, QuickCheck, scientific, template-haskell + , temporary, text, transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "hpack"; - version = "0.23.0"; - sha256 = "1604lr20745kkzbhl2ski74p6swjgvarsbaxcpj5wldhk65add6y"; + version = "0.24.0"; + sha256 = "074pzminhv59br5w2xy3d8mhi2cwj5m10lwlqkq990w0gfcfhy46"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bifunctors bytestring Cabal containers cryptonite deepseq directory filepath Glob http-client http-client-tls http-types pretty scientific text transformers unordered-containers - yaml + vector yaml ]; executableHaskellDepends = [ aeson base bifunctors bytestring Cabal containers cryptonite deepseq directory filepath Glob http-client http-client-tls http-types pretty scientific text transformers unordered-containers - yaml + vector yaml ]; testHaskellDepends = [ aeson base bifunctors bytestring Cabal containers cryptonite deepseq directory filepath Glob hspec http-client http-client-tls - http-types interpolate mockery pretty QuickCheck scientific - temporary text transformers unordered-containers yaml + http-types HUnit interpolate mockery pretty QuickCheck scientific + template-haskell temporary text transformers unordered-containers + vector yaml ]; homepage = "https://github.com/sol/hpack#readme"; description = "An alternative format for Haskell packages"; @@ -104539,6 +105089,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hpack-dhall" = callPackage + ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec + , interpolate, mockery, text, transformers, trifecta + }: + mkDerivation { + pname = "hpack-dhall"; + version = "0.1.0"; + sha256 = "1yz1ypq88lmxdz9728w8q0ag1whwzlkwcdvx8dhyav5k3ifgp2x0"; + revision = "1"; + editedCabalFile = "1432yrvrd0dlnn4lzyb4s5akvb85mx0anbxd1j9b4l1zl37d2bmn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base dhall dhall-json hpack text transformers trifecta + ]; + testHaskellDepends = [ + aeson base dhall dhall-json hpack hspec interpolate mockery text + transformers trifecta + ]; + homepage = "https://github.com/sol/hpack-dhall#readme"; + description = "Dhall support for Hpack"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "hpaco" = callPackage ({ mkDerivation, aeson, base, cmdargs, filepath, hpaco-lib, strict , utf8-string, yaml @@ -105982,6 +106556,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hs2ats" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, cases, composition-prelude + , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream + , language-ats, lens, optparse-generic, system-filepath, text + }: + mkDerivation { + pname = "hs2ats"; + version = "0.2.0.4"; + sha256 = "0yji8np53qgwfhmamfkmc4bbvkivwhrkjrwr9aqly9gyadbsw89m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base cases composition-prelude deepseq + haskell-src-exts language-ats lens optparse-generic text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hspec hspec-dirstream language-ats system-filepath + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/vmchale/hs2ats#readme"; + description = "Create ATS types from Haskell types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs2bf" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , haskell-src, mtl @@ -106841,8 +107440,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.1.0"; - sha256 = "04k2yq4a5q87yj8z9h2qzmw32p0c8snc5ccaqyyk24kxa9p26av8"; + version = "0.3.1.1"; + sha256 = "1bj9zhkikspf73xha8vcx3ads5fp33f1ail0fns9iyra5zl0g612"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107489,6 +108088,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hsluv-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, colour, containers }: + mkDerivation { + pname = "hsluv-haskell"; + version = "0.1.0.0"; + sha256 = "1pdp1qfhqjv33mfgayay2by7bf5p1acw5791kgay20a8r5wvalab"; + libraryHaskellDepends = [ base colour ]; + testHaskellDepends = [ aeson base bytestring colour containers ]; + description = "HSLuv conversion utility"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hsmagick" = callPackage ({ mkDerivation, base, bytestring, bzip2, directory, filepath , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2 @@ -108602,8 +109213,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheckVariant }: mkDerivation { pname = "hspecVariant"; - version = "0.1.0.1"; - sha256 = "0vl6l8mkx3lmkr12340v3zh64nxs3i07jrcf10r8fw9wahgcqkym"; + version = "1.0.0.0"; + sha256 = "0y45jizkf2kfj3yjjkq96kavkfp74vf5dyyjvi9pj3kshf8sx8il"; libraryHaskellDepends = [ base hspec QuickCheckVariant ]; homepage = "https://github.com/sanjorgek/hspecVariant"; description = "Spec for testing properties for variant types"; @@ -109650,6 +110261,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "html-conduit_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers, hspec + , HUnit, resourcet, tagstream-conduit, text, transformers + , xml-conduit, xml-types + }: + mkDerivation { + pname = "html-conduit"; + version = "1.3.0"; + sha256 = "15pf15w55g39h2fwl4wlq1f0jbfknajb6qyk1l7xv6q7fphhkgvq"; + libraryHaskellDepends = [ + base bytestring conduit containers resourcet tagstream-conduit text + transformers xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring containers hspec HUnit xml-conduit + ]; + homepage = "https://github.com/snoyberg/xml"; + description = "Parse HTML documents using xml-conduit datatypes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "html-email-validate" = callPackage ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck , regex-pcre-builtin, text @@ -109668,21 +110301,16 @@ self: { }) {}; "html-entities" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, Cabal - , cabal-doctest, directory, doctest, filepath, text + ({ mkDerivation, attoparsec, base, base-prelude, text , unordered-containers }: mkDerivation { pname = "html-entities"; - version = "1.1.4.1"; - sha256 = "1x6z5fv1sdhdmhwd10kwahvjjkhrza3dm7xzk9ypfkkmyi1piwpi"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "1.1.4.2"; + sha256 = "1ryfslp60s0d0ygmnxfgw9p8s7l2xq1i5kmj86g2ghdljf8hq6hn"; libraryHaskellDepends = [ attoparsec base base-prelude text unordered-containers ]; - testHaskellDepends = [ - base base-prelude directory doctest filepath - ]; homepage = "https://github.com/nikita-volkov/html-entities"; description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; @@ -110116,6 +110744,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client_0_5_10" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , deepseq, directory, exceptions, filepath, ghc-prim, hspec + , http-types, mime-types, monad-control, network, network-uri + , random, stm, streaming-commons, text, time, transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.5.10"; + sha256 = "1hmshs97smigqy334rfkgv3vri5fas3cj8zz2gqlby9jsrp6kygm"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie deepseq exceptions filepath + ghc-prim http-types mime-types network network-uri random stm + streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base base64-bytestring blaze-builder bytestring + case-insensitive containers deepseq directory hspec http-types + monad-control network network-uri streaming-commons text time + transformers zlib + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -110289,6 +110947,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-tls_0_3_5_2" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, connection + , containers, cryptonite, data-default-class, exceptions, gauge + , hspec, http-client, http-types, memory, network, network-uri + , text, tls, transformers + }: + mkDerivation { + pname = "http-client-tls"; + version = "0.3.5.2"; + sha256 = "1ynkwm77sb7djfflnz7v6gfli8zh1sdw4yjqpnb74slrh112ngh9"; + libraryHaskellDepends = [ + base bytestring case-insensitive connection containers cryptonite + data-default-class exceptions http-client http-types memory network + network-uri text tls transformers + ]; + testHaskellDepends = [ + base connection hspec http-client http-types + ]; + benchmarkHaskellDepends = [ base gauge http-client ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "http-client backend using the connection package and tls library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-common" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, directory, mtl, network, text, transformers @@ -110957,14 +111641,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-types_0_12" = callPackage + "http-types_0_12_1" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, doctest , hspec, QuickCheck, quickcheck-instances, text }: mkDerivation { pname = "http-types"; - version = "0.12"; - sha256 = "1fb7hn8d4zkf1q0kyj7p02js15n4mw48bbr43bym9v5v8xj3lyk3"; + version = "0.12.1"; + sha256 = "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz"; libraryHaskellDepends = [ array base bytestring case-insensitive text ]; @@ -116211,14 +116895,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "inspection-testing_0_2" = callPackage + "inspection-testing_0_2_0_1" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: mkDerivation { pname = "inspection-testing"; - version = "0.2"; - sha256 = "0dnnsmzi6k548fgyigzmif26g1yia8m5aqaf7fxj06171i6fihx2"; + version = "0.2.0.1"; + sha256 = "1551dvk63xb4lr2zsyg3ri8v1nsjs050k2jsf8v0vfasx7w9ns8z"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -117631,6 +118315,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-client_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, containers + , contravariant, exceptions, irc-conduit, irc-ctcp, mtl + , network-conduit-tls, old-locale, profunctors, stm, stm-chans + , text, time, tls, transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "irc-client"; + version = "1.1.0.0"; + sha256 = "0xg4carlcrzjh8igvnqwmxp64ha7x2wjp5d5lvadbml36zvq189y"; + libraryHaskellDepends = [ + base bytestring conduit connection containers contravariant + exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale + profunctors stm stm-chans text time tls transformers x509 + x509-store x509-validation + ]; + homepage = "https://github.com/barrucadu/irc-client"; + description = "An IRC client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-colors" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -117661,6 +118367,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-conduit_0_3_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text + , time, tls, transformers, x509-validation + }: + mkDerivation { + pname = "irc-conduit"; + version = "0.3.0.0"; + sha256 = "166p6a3kxrr2cgkdw39pdkc9myzn60411bpg2v23bs01np0336j4"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra connection irc irc-ctcp + network-conduit-tls profunctors text time tls transformers + x509-validation + ]; + homepage = "https://github.com/barrucadu/irc-conduit"; + description = "Streaming IRC message library using conduits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-core" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , hashable, HUnit, primitive, text, time, vector @@ -117851,8 +118577,8 @@ self: { }: mkDerivation { pname = "iri"; - version = "0.2"; - sha256 = "0rldjjfdrg5sv96aig5y4yb13633yy3dcxq659i2drmipyll8iw0"; + version = "0.3"; + sha256 = "008ydrls1gyh0jvcjc51zlgzbkq7ajd8pvyfc4zqgprv9naym9zm"; libraryHaskellDepends = [ attoparsec base base-prelude bug bytestring contravariant ip profunctors ptr punycode semigroups template-haskell text @@ -119891,8 +120617,8 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.9"; - sha256 = "02wq1xxcvg8yf2sjdvn1wh0yyfiykjlqn7ghvcm913b3b4snw12s"; + version = "1.0.10"; + sha256 = "1rhg6hrk0pzy9xx6hhy39xmnpz931a6wq93sjgpvlzlm3hyfwq0x"; libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; @@ -120397,6 +121123,8 @@ self: { pname = "json-sop"; version = "0.2.0.3"; sha256 = "0ay2cymy4aar23cixcyqam91bs9x4z0vqiw2k0nvgy9nyqfz2r9h"; + revision = "1"; + editedCabalFile = "1bvmfl6fqdr8fklv8zai5jgzlnv1jf9xy8i656lfz1ys95q9yr48"; libraryHaskellDepends = [ aeson base generics-sop lens-sop tagged text time transformers unordered-containers vector @@ -122245,6 +122973,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "key-state" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "key-state"; + version = "0.0.0"; + sha256 = "182j5kmaxwvnhaa98bkiwb62ga8ylrdyyjs9vkvh2rvm4vjildrp"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/jxv/key-state#readme"; + description = "Manage key and button states and statuses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keycode" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { @@ -123993,8 +124734,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "0.1.1.6"; - sha256 = "1463z1xpjdm6cziib10w7x7n5ch77mjgy73h7rik3ybawj8njswd"; + version = "0.1.1.18"; + sha256 = "0ahby04g56wgz73r8k51v8afrvwn898crdbx9scbklh0by5cjfpj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base composition-prelude deepseq @@ -126352,6 +127093,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-named" = callPackage + ({ mkDerivation, base, lens, template-haskell }: + mkDerivation { + pname = "lens-named"; + version = "0.1.0.2"; + sha256 = "1w6y1caah0yr7gilwsv7ji7pp3mz1m9wlx5zpq0n0z1q2wbdsmfp"; + libraryHaskellDepends = [ base lens template-haskell ]; + homepage = "https://github.com/vmchale/lens-named#readme"; + description = "Helper for use with lens"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-prelude" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , either, hashable, lens, mtl, text, time, transformers @@ -127461,18 +128214,16 @@ self: { }) {}; "libssh2" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libssh2, network, select - , syb, time + ({ mkDerivation, base, bytestring, c2hs, libssh2, network, syb + , time, unix }: mkDerivation { pname = "libssh2"; - version = "0.2.0.5"; - sha256 = "0l224pd8bb9d29043qdy40dbknnhmwnjc95r3yyc93lhwd5fsqma"; + version = "0.2.0.6"; + sha256 = "17v006ixkn9wblhnq1nyx1xi7sc9lshyh1ma2y82483w18n849s1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base bytestring network select syb time - ]; + libraryHaskellDepends = [ base bytestring network syb time unix ]; librarySystemDepends = [ libssh2 ]; libraryPkgconfigDepends = [ libssh2 ]; libraryToolDepends = [ c2hs ]; @@ -129213,8 +129964,8 @@ self: { }: mkDerivation { pname = "listenbrainz-client"; - version = "1.0.1"; - sha256 = "0xrya35nwfkcx0dd5pislm8kw0pxfsh2azjk0yd7yn1668y2zrxd"; + version = "1.1.1"; + sha256 = "0lp72jg1ndahc4jxzg2wk1amb3mbbbgs1w7sirangw864j477q4m"; libraryHaskellDepends = [ aeson base free freer-effects http-client kan-extensions mtl servant servant-client text time transformers @@ -130373,28 +131124,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "log-warper_1_8_6" = callPackage + "log-warper_1_8_7" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers , data-default, deepseq, directory, filepath, fmt, hspec - , hspec-discover, HUnit, markdown-unlit, microlens, microlens-mtl - , microlens-platform, mmorph, monad-control, monad-loops, mtl - , QuickCheck, text, time, transformers, transformers-base - , universum, unix, unordered-containers, vector, yaml + , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens + , microlens-mtl, microlens-platform, mmorph, monad-control + , monad-loops, mtl, o-clock, QuickCheck, text, time, transformers + , transformers-base, universum, unix, unordered-containers, vector + , yaml }: mkDerivation { pname = "log-warper"; - version = "1.8.6"; - sha256 = "11lh26fkmyx5hzpjhjm1198g6gy1qpsix2srp1w7laim3kxbl4rb"; + version = "1.8.7"; + sha256 = "0bwk9wg2dhc56h7hwbnlxmw22pwswdlcf2bpjx62f9135q2cs7d8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base containers deepseq directory filepath fmt - microlens-platform mmorph monad-control monad-loops mtl text time - transformers transformers-base universum unix unordered-containers - vector yaml + lifted-async microlens-platform mmorph monad-control monad-loops + mtl o-clock text time transformers transformers-base universum unix + unordered-containers vector yaml ]; executableHaskellDepends = [ - base markdown-unlit microlens mtl text universum yaml + base markdown-unlit microlens monad-control mtl o-clock text + universum yaml ]; testHaskellDepends = [ async base data-default directory filepath hspec HUnit @@ -130578,6 +131331,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "logging-effect-extra_1_2_2" = callPackage + ({ mkDerivation, base, logging-effect, logging-effect-extra-file + , logging-effect-extra-handler, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect-extra"; + version = "1.2.2"; + sha256 = "0jra1fxz3880ds8pip1mlibiss8ihd1a9dpi3mv1py7lnc6ikjzw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base logging-effect logging-effect-extra-file + logging-effect-extra-handler wl-pprint-text + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/jship/logging-effect-extra#readme"; + description = "Supplemental packages for `logging-effect`"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra-file" = callPackage ({ mkDerivation, base, logging-effect, template-haskell , wl-pprint-text @@ -130597,6 +131371,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "logging-effect-extra-file_1_1_2" = callPackage + ({ mkDerivation, base, logging-effect, template-haskell + , wl-pprint-text + }: + mkDerivation { + pname = "logging-effect-extra-file"; + version = "1.1.2"; + sha256 = "1dxi4rq734zmjf2ljlh771ivr45i2cwz94vym3gw38ji4s0k8cym"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base logging-effect template-haskell wl-pprint-text + ]; + executableHaskellDepends = [ base logging-effect wl-pprint-text ]; + homepage = "https://github.com/jship/logging-effect-extra#readme"; + description = "TH splices to augment log messages with file info"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra-handler" = callPackage ({ mkDerivation, base, exceptions, logging-effect, time , wl-pprint-text @@ -130616,6 +131410,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "logging-effect-extra-handler_1_1_2" = callPackage + ({ mkDerivation, base, exceptions, logging-effect, time + , wl-pprint-text + }: + mkDerivation { + pname = "logging-effect-extra-handler"; + version = "1.1.2"; + sha256 = "1688vdlzyy8ikz2r96czyk0ganpv6h37x02sp930fmrj2qlwbvql"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base exceptions logging-effect time wl-pprint-text + ]; + executableHaskellDepends = [ base logging-effect wl-pprint-text ]; + homepage = "https://github.com/jship/logging-effect-extra#readme"; + description = "Handy logging handler combinators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-facade" = callPackage ({ mkDerivation, base, call-stack, hspec, transformers }: mkDerivation { @@ -132256,8 +133070,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "2"; - editedCabalFile = "1k62b3h2xklv170wdxf607s4h7vmjjj4dscgnv54gfbwi224cysq"; + revision = "3"; + editedCabalFile = "0cpy7gpli4xzlzmxfi2rpmlpb39x88zrsxrp6597lxb1cmvrixkh"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -135116,6 +135930,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mega-sdist_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude-conduit + , conduit-extra, directory, filepath, http-conduit, optparse-simple + , tar-conduit, temporary, text, typed-process, yaml + }: + mkDerivation { + pname = "mega-sdist"; + version = "0.3.1"; + sha256 = "06sgnkia5fwlsmy6m88mdklsabqv8vixgjbfzmyfln3aqhvwqk23"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring classy-prelude-conduit conduit-extra directory + filepath http-conduit optparse-simple tar-conduit temporary text + typed-process yaml + ]; + homepage = "https://github.com/snoyberg/mega-sdist#readme"; + description = "Handles uploading to Hackage from mega repos"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "megaparsec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl @@ -137447,7 +138283,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_5_3" = callPackage + "mmark_0_0_5_4" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid @@ -137457,8 +138293,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.5.3"; - sha256 = "0i5x3rpsq9diqb1nagnswzcgi0sj8jwp73xi46hfwjnc656r955k"; + version = "0.0.5.4"; + sha256 = "0qzw37cj7481vpix8wfgv3ljv10jinfymjpcbzxi4m67fxxjmsf7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -141935,6 +142771,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mutable-containers_0_3_4" = callPackage + ({ mkDerivation, base, containers, gauge, ghc-prim, hspec + , mono-traversable, primitive, QuickCheck, vector + }: + mkDerivation { + pname = "mutable-containers"; + version = "0.3.4"; + sha256 = "0zhkhlvg9yw45fg3srvzx7j81547djpkfw7higdvlj7fmph6c6b4"; + libraryHaskellDepends = [ + base containers ghc-prim mono-traversable primitive vector + ]; + testHaskellDepends = [ + base containers hspec primitive QuickCheck vector + ]; + benchmarkHaskellDepends = [ base containers gauge vector ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "Abstactions and concrete implementations of mutable containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mutable-iter" = callPackage ({ mkDerivation, base, iteratee, MonadCatchIO-transformers , transformers, vector @@ -143887,6 +144744,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "netrium" = callPackage + ({ mkDerivation, base, containers, directory, filepath, HaXml + , pretty, process, time + }: + mkDerivation { + pname = "netrium"; + version = "0.6.0"; + sha256 = "1cs6fxg0cpd2d1vhkzaazpzxya6n6cxlsnnwy3lnvqbaz68sipc0"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers HaXml process time ]; + executableHaskellDepends = [ + base containers directory filepath HaXml pretty process + ]; + description = "Contract normaliser and simulator"; + license = stdenv.lib.licenses.mit; + }) {}; + "netspec" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, mtl, network , template-haskell, text, transformers @@ -144338,6 +145214,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-carbon_1_0_11" = callPackage + ({ mkDerivation, base, bytestring, network, text, time, vector }: + mkDerivation { + pname = "network-carbon"; + version = "1.0.11"; + sha256 = "1nkyj9114k2b6gwdd93yfrmf9zbziymbnbh3wxnz0vnk1hl2j5yq"; + libraryHaskellDepends = [ + base bytestring network text time vector + ]; + homepage = "http://github.com/ocharles/network-carbon"; + description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-conduit" = callPackage ({ mkDerivation, base, conduit }: mkDerivation { @@ -144373,6 +145264,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "network-conduit-tls_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , connection, data-default-class, HUnit, mtl, network + , streaming-commons, tls, transformers, unliftio-core + }: + mkDerivation { + pname = "network-conduit-tls"; + version = "1.3.0"; + sha256 = "11a9s8spqccnv2x41846pqgkwvb554lrq7qdas78p7biw1d28vbl"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra connection data-default-class + network streaming-commons tls transformers unliftio-core + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra connection HUnit mtl + ]; + homepage = "https://github.com/snoyberg/conduit"; + description = "Create TLS-aware network code with conduits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-connection" = callPackage ({ mkDerivation, base, bytestring, containers, network , network-bytestring, stm @@ -147713,13 +148626,14 @@ self: { ({ mkDerivation, base, c2hs, hspec, odpic, QuickCheck, text }: mkDerivation { pname = "odpic-raw"; - version = "0.1.7"; - sha256 = "0hwb43si56adsgzjlqlncw3hiq901w2g5d41hjv5b8gyhbhzzkmz"; + version = "0.1.10"; + sha256 = "0kbrlbnav9drmmm8h4228cgrml981cqmxf3dhkbiax3g0rh4gsv0"; libraryHaskellDepends = [ base text ]; librarySystemDepends = [ odpic ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/leptonyu/odpic-raw#readme"; + description = "Oracle Database Bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {odpic = null;}; @@ -148125,6 +149039,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "one-liner-instances" = callPackage + ({ mkDerivation, base, one-liner }: + mkDerivation { + pname = "one-liner-instances"; + version = "0.1.0.0"; + sha256 = "1v5a4szk3497razn7r2d3664w7bxbdcw9bacsc4y7vj3kim4nhca"; + libraryHaskellDepends = [ base one-liner ]; + homepage = "https://github.com/mstksg/one-liner-instances#readme"; + description = "Generics-based implementations for common typeclasses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "one-time-password" = callPackage ({ mkDerivation, base, bytestring, cereal, cryptonite, memory , tasty, tasty-hunit, time @@ -148272,6 +149198,8 @@ self: { pname = "opaleye"; version = "0.6.0.0"; sha256 = "0prwlxp96qpnhdm34slwhp3j8hj961xl99xkl6fbrxgxxjngfg1q"; + revision = "1"; + editedCabalFile = "0hkgrksap5hn0xq86bq9rsm3h9a6vamh6la77z10fdxv7m3xjxf3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -150098,6 +151026,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "overhang" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "overhang"; + version = "1.0.0"; + sha256 = "07iafybg45130jhwin6jj2fnkgcwra367f5df91xn34kaj9zas0x"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/jship/overhang#readme"; + description = "Hang loose with your lambdas!"; + license = stdenv.lib.licenses.mit; + }) {}; + "overload" = callPackage ({ mkDerivation, base, simple-effects, template-haskell , th-expand-syns @@ -150732,7 +151672,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_14" = callPackage + "pandoc-citeproc_0_14_1_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -150741,8 +151681,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14"; - sha256 = "1pbbkfrvwr4qg1p6vdnpg1zlxj48r23bprz48k35jbriw1j6i452"; + version = "0.14.1.3"; + sha256 = "17cwa8h3jwfxrah496vlabz6mxkjys6pjl51iigllqbwj7cm34mp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -151137,6 +152077,23 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) pango;}; + "pangraph" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , hexml, HUnit + }: + mkDerivation { + pname = "pangraph"; + version = "0.1.1.5"; + sha256 = "0p03sm5sna88h1j7gxkwdq0j5zhak38spqyhjlwc2vsrxjc4vjiy"; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers hexml + ]; + testHaskellDepends = [ base bytestring containers HUnit ]; + homepage = "https://github.com/tuura/pangraph#readme"; + description = "A set of parsers for graph languages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "panhandle" = callPackage ({ mkDerivation, aeson, base, containers, derive , lazysmallcheck2012, pandoc, pandoc-types, QuickCheck, syb, tagged @@ -152015,6 +152972,8 @@ self: { pname = "parsec"; version = "3.1.11"; sha256 = "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg"; + revision = "1"; + editedCabalFile = "0prqjj2gxlwh2qhpcck5k6cgk4har9xqxc67yzjqd44mr2xgl7ir"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -152024,6 +152983,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parsec_3_1_12_0" = callPackage + ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework + , test-framework-hunit, text + }: + mkDerivation { + pname = "parsec"; + version = "3.1.12.0"; + sha256 = "0jav9a1hb156qd29n3sclxrb7bk477n89jshqpmlym2z2h880bc2"; + libraryHaskellDepends = [ base bytestring mtl text ]; + testHaskellDepends = [ + base HUnit mtl test-framework test-framework-hunit + ]; + homepage = "https://github.com/haskell/parsec"; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parsec-extra" = callPackage ({ mkDerivation, base, monads-tf, parsec }: mkDerivation { @@ -153734,6 +154711,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pencil" = callPackage + ({ mkDerivation, base, data-default, directory, doctest + , edit-distance, feed, filepath, hashable, hsass, mtl, pandoc + , parsec, semigroups, text, time, unordered-containers, vector, xml + , yaml + }: + mkDerivation { + pname = "pencil"; + version = "0.1.1"; + sha256 = "0k1lcmllfcqnlyidla6icvzx41q0wsykwc7ak68m9lbri1d7g5ry"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default directory edit-distance feed filepath hashable + hsass mtl pandoc parsec semigroups text time unordered-containers + vector xml yaml + ]; + executableHaskellDepends = [ base text unordered-containers ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/elben/pencil"; + description = "Static site generator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "penn-treebank" = callPackage ({ mkDerivation, base, containers, parsec }: mkDerivation { @@ -154179,32 +155180,31 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_7_3_1" = callPackage + "persistent_2_8_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers - , exceptions, fast-logger, haskell-src-meta, hspec, http-api-data - , lifted-base, monad-control, monad-logger, mtl, old-locale - , path-pieces, resource-pool, resourcet, scientific, silently - , tagged, template-haskell, text, time, transformers - , transformers-base, unordered-containers, vector + , fast-logger, haskell-src-meta, hspec, http-api-data + , monad-control, monad-logger, mtl, old-locale, path-pieces + , resource-pool, resourcet, scientific, silently, tagged + , template-haskell, text, time, transformers, unliftio-core + , unordered-containers, vector, void }: mkDerivation { pname = "persistent"; - version = "2.7.3.1"; - sha256 = "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p"; + version = "2.8.0"; + sha256 = "07x73s1icxj3wbw197f7qbj1pk9gg30vk4f7yz1hxs27lzximjfh"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers exceptions fast-logger - haskell-src-meta http-api-data lifted-base monad-control - monad-logger mtl old-locale path-pieces resource-pool resourcet - scientific silently tagged template-haskell text time transformers - transformers-base unordered-containers vector + bytestring conduit containers fast-logger haskell-src-meta + http-api-data monad-logger mtl old-locale path-pieces resource-pool + resourcet scientific silently tagged template-haskell text time + transformers unliftio-core unordered-containers vector void ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data lifted-base - monad-control monad-logger mtl old-locale path-pieces resource-pool - resourcet scientific tagged template-haskell text time transformers + conduit containers fast-logger hspec http-api-data monad-control + monad-logger mtl old-locale path-pieces resource-pool resourcet + scientific tagged template-haskell text time transformers unordered-containers vector ]; homepage = "http://www.yesodweb.com/book/persistent"; @@ -154371,6 +155371,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mongoDB_2_8_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal + , conduit, containers, http-api-data, mongoDB, network, path-pieces + , persistent, resource-pool, resourcet, text, time, transformers + , unliftio-core + }: + mkDerivation { + pname = "persistent-mongoDB"; + version = "2.8.0"; + sha256 = "12hp7cqdz672r5rhad6xvjpxhrs8v1swiz0d9n7xbn41g11a247l"; + libraryHaskellDepends = [ + aeson attoparsec base bson bytestring cereal conduit containers + http-api-data mongoDB network path-pieces persistent resource-pool + resourcet text time transformers unliftio-core + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using mongoDB"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-mysql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, mysql, mysql-simple @@ -154390,6 +155411,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mysql_2_8_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-logger, mysql, mysql-simple, persistent + , resource-pool, resourcet, text, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.8.0"; + sha256 = "0sy9gl2604f3qargvgkqnhdfbnwrq81y2hrhmx4fsknpfkkypya4"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-control, monad-logger, mysql-haskell, network @@ -154471,6 +155512,28 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-postgresql_2_8_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-logger, persistent, postgresql-libpq + , postgresql-simple, resource-pool, resourcet, text, time + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.8.0"; + sha256 = "0dqdgw4sayq76hdib7sf27nzwcg1lbgr4l50kdyq8xlvi8yb5mk8"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + persistent postgresql-libpq postgresql-simple resource-pool + resourcet text time transformers unliftio-core + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -154592,6 +155655,35 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-sqlite_2_8_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, microlens-th, monad-logger, old-locale, persistent + , persistent-template, resource-pool, resourcet, temporary, text + , time, transformers, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.8.0"; + sha256 = "1vdsb271d17b0ip7z6mkbcw4iggafpaaimz6zzknjc4l409yswnb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + old-locale persistent resource-pool resourcet text time + transformers unliftio-core unordered-containers + ]; + executableHaskellDepends = [ base monad-logger ]; + testHaskellDepends = [ + base hspec persistent persistent-template temporary text time + transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -154616,6 +155708,70 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_5_3_1" = callPackage + ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers + , ghc-prim, hspec, http-api-data, monad-control, monad-logger + , path-pieces, persistent, QuickCheck, tagged, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.5.3.1"; + sha256 = "0449piw3n02q7dag7k1pakfmzmf3ms4wk1qmnagczpm1ckajinwd"; + libraryHaskellDepends = [ + aeson aeson-compat base bytestring containers ghc-prim + http-api-data monad-control monad-logger path-pieces persistent + tagged template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + + "persistent-test" = callPackage + ({ mkDerivation, aeson, aeson-compat, attoparsec, base + , base64-bytestring, blaze-builder, blaze-html, blaze-markup + , bytestring, cereal, conduit, containers, exceptions, fast-logger + , hashable, hspec, hspec-expectations, http-api-data, HUnit + , lifted-base, monad-logger, mtl, network, old-locale, path-pieces + , persistent, persistent-sqlite, persistent-template, QuickCheck + , quickcheck-instances, random, resource-pool, resourcet + , scientific, semigroups, silently, system-fileio, system-filepath + , tagged, template-haskell, text, time, transformers + , transformers-base, unliftio, unliftio-core, unordered-containers + , vector + }: + mkDerivation { + pname = "persistent-test"; + version = "2.0.0.3"; + sha256 = "1xjjbr780ipzxkbnj8cly0xl8wxbvqjvm293aqm0rnkyqwndhbn3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-compat attoparsec base base64-bytestring blaze-builder + blaze-html blaze-markup bytestring cereal conduit containers + exceptions fast-logger hashable hspec hspec-expectations + http-api-data HUnit lifted-base monad-logger mtl network old-locale + path-pieces persistent persistent-sqlite persistent-template + QuickCheck quickcheck-instances random resource-pool resourcet + scientific semigroups silently tagged template-haskell text time + transformers transformers-base unliftio unliftio-core + unordered-containers vector + ]; + executableHaskellDepends = [ + base hspec persistent resourcet scientific system-fileio + system-filepath + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Tests for Persistent"; + license = stdenv.lib.licenses.mit; + }) {}; + "persistent-vector" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -160450,6 +161606,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-terminal" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "pretty-terminal"; + version = "0.1.0.0"; + sha256 = "0rr5mwg4j2zw0k1p2y042z5769l53vlxn5c9bf23jw7whi6gfxlf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + executableHaskellDepends = [ base text ]; + homepage = "https://github.com/loganmac/pretty-terminal#readme"; + description = "Styling and coloring terminal output with ANSI escape sequences"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pretty-tree" = callPackage ({ mkDerivation, base, boxes, containers }: mkDerivation { @@ -161097,6 +162268,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "process-extras_0_7_4" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq + , generic-deriving, HUnit, ListLike, mtl, process, text + }: + mkDerivation { + pname = "process-extras"; + version = "0.7.4"; + sha256 = "0klqgr37f1z2z6i0a9b0giapmq0p35l5k9kz1p7f0k1597w7agi9"; + libraryHaskellDepends = [ + base bytestring data-default deepseq generic-deriving ListLike mtl + process text + ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/seereason/process-extras"; + description = "Process extras"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "process-iterio" = callPackage ({ mkDerivation, base, bytestring, cpphs, iterIO, process , transformers @@ -161384,6 +162574,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "product-profunctors_0_9_0_0" = callPackage + ({ mkDerivation, base, bifunctors, contravariant, criterion + , deepseq, profunctors, tagged, template-haskell + }: + mkDerivation { + pname = "product-profunctors"; + version = "0.9.0.0"; + sha256 = "1kzadxbhqyhhihp3m38pckbkyflhgianpvf08ybvry1ng73577jn"; + libraryHaskellDepends = [ + base bifunctors contravariant profunctors tagged template-haskell + ]; + testHaskellDepends = [ base profunctors ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "https://github.com/tomjaguarpaw/product-profunctors"; + description = "product-profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prof2dot" = callPackage ({ mkDerivation, base, containers, filepath, haskell98, parsec }: mkDerivation { @@ -161953,8 +163162,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.2.0"; - sha256 = "06h1q1kx2ifbfpicb0ivp4x8pv1fn15x0v5wn1dygnbf862h9brh"; + version = "5.3.0"; + sha256 = "09qkh6d2jbn8f5miaqh5mlxh36146wpfm61k4xdz3kdxmg78s140"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163940,17 +165149,17 @@ self: { "qr-imager" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory , either, haskell-qrencode, hspec, jose-jwt, JuicyPixels - , libqrencode, microlens, MissingH, optparse-applicative, process + , libqrencode, microlens, optparse-applicative, process, split , vector }: mkDerivation { pname = "qr-imager"; - version = "1.0.1.3"; - sha256 = "0n2y4z6s00b31dj5qwyykncxfi4yyiqvpxq1r7ls2xvv9pa4bhgc"; + version = "1.0.1.5"; + sha256 = "1csgghcv093g8hmkaxyj2vm0ym28yw37d7crj4rgk8fs8qhr5ib4"; libraryHaskellDepends = [ aeson base bytestring cryptonite directory either haskell-qrencode - jose-jwt JuicyPixels microlens MissingH optparse-applicative - process vector + jose-jwt JuicyPixels microlens optparse-applicative process split + vector ]; libraryPkgconfigDepends = [ libqrencode ]; testHaskellDepends = [ base hspec ]; @@ -164570,6 +165779,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-classes_0_3_2" = callPackage + ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck + , transformers, vector + }: + mkDerivation { + pname = "quickcheck-classes"; + version = "0.3.2"; + sha256 = "10z65dxm0jply0zbx1kpxpiir3z85c9133hkiqnra6sqz13njdz4"; + libraryHaskellDepends = [ + aeson base prim-array primitive QuickCheck transformers + ]; + testHaskellDepends = [ aeson base primitive QuickCheck vector ]; + homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; + description = "QuickCheck common typeclasses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -165761,6 +166988,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rando" = callPackage + ({ mkDerivation, base, tf-random }: + mkDerivation { + pname = "rando"; + version = "0.0.0.1"; + sha256 = "09pra2w97jhayzwws8133xvjnrsb0iqzl3cx676pawnlknc1dkkg"; + libraryHaskellDepends = [ base tf-random ]; + description = "Easy-to-use randomness for livecoding"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "random" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -170672,6 +171910,8 @@ self: { pname = "req-conduit"; version = "1.0.0"; sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; + revision = "1"; + editedCabalFile = "14m20b2i0kygminqw35y3wi1na7bfpkyg1yc03a48qy6rrdqgnc2"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -170990,6 +172230,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_2_0" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.0"; + sha256 = "09pscvkfr4cnicipdmx156xbxshg9aqgy0z3h0lcvxbhl5qwjp89"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base hspec transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -171610,25 +172868,25 @@ self: { }) {}; "rfc" = callPackage - ({ mkDerivation, aeson, aeson-diff, async, base, binary, blaze-html - , classy-prelude, containers, data-default, exceptions, hedis - , http-api-data, http-client-tls, http-types, lens, lifted-async - , markdown, monad-control, postgresql-simple, resource-pool - , servant, servant-blaze, servant-client, servant-docs - , servant-server, servant-swagger, simple-logger + ({ mkDerivation, aeson, aeson-diff, async, base, bifunctors, binary + , blaze-html, classy-prelude, containers, data-default, exceptions + , hedis, http-api-data, http-client-tls, http-types, lens + , lifted-async, markdown, monad-control, postgresql-simple + , resource-pool, servant, servant-blaze, servant-client + , servant-docs, servant-server, servant-swagger, simple-logger , string-conversions, swagger2, temporary, text, time-units , unordered-containers, url, uuid-types, vector, wai, wai-cors , wai-extra, wreq }: mkDerivation { pname = "rfc"; - version = "0.0.0.13"; - sha256 = "06bjxgfhqjbgnkvk6vb42v3c8mi934y2dfb4hafzdgknwnlcsy19"; + version = "0.0.0.17"; + sha256 = "0aqw2b2ivk16h156baj21jg5x5via9dn645500zl53zn05py6bng"; libraryHaskellDepends = [ - aeson aeson-diff async base binary blaze-html classy-prelude - containers data-default exceptions hedis http-api-data - http-client-tls http-types lens lifted-async markdown monad-control - postgresql-simple resource-pool servant servant-blaze + aeson aeson-diff async base bifunctors binary blaze-html + classy-prelude containers data-default exceptions hedis + http-api-data http-client-tls http-types lens lifted-async markdown + monad-control postgresql-simple resource-pool servant servant-blaze servant-client servant-docs servant-server servant-swagger simple-logger string-conversions swagger2 temporary text time-units unordered-containers url uuid-types vector wai wai-cors wai-extra @@ -177086,6 +178344,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sendgrid-v3" = callPackage + ({ mkDerivation, aeson, base, lens, semigroups, tasty, tasty-hunit + , text, wreq + }: + mkDerivation { + pname = "sendgrid-v3"; + version = "0.1.0.0"; + sha256 = "0sn1a47155d13w15jjbcbcl5sqnl286mf8q7k39qhir98qlq045s"; + libraryHaskellDepends = [ aeson base lens semigroups text wreq ]; + testHaskellDepends = [ base semigroups tasty tasty-hunit text ]; + homepage = "https://github.com/marcelbuesing/sendgrid-v3"; + description = "Sendgrid v3 API library"; + license = stdenv.lib.licenses.mit; + }) {}; + "sensei" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, bytestring , directory, filepath, fsnotify, hspec, hspec-meta, hspec-wai @@ -177226,14 +178499,15 @@ self: { }) {}; "separated" = callPackage - ({ mkDerivation, base, bifunctors, deriving-compat, directory - , doctest, filepath, lens, parsec, QuickCheck, semigroupoids - , semigroups, template-haskell + ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest + , deriving-compat, directory, doctest, filepath, lens, parsec + , QuickCheck, semigroupoids, semigroups, template-haskell }: mkDerivation { pname = "separated"; - version = "0.3.0"; - sha256 = "1ivgx1iaqs4k4zj4n0l92090zvx9x46j6kp56zf60b1bn9s3fcs0"; + version = "0.3.2.1"; + sha256 = "0xnpxaz9qr2qqg7kmgv1qsbd4943r54m1vva3xivn4cxf1gnxcaw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors deriving-compat lens semigroupoids semigroups ]; @@ -178591,26 +179865,28 @@ self: { "servant-github-webhook" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, github, http-types, memory, servant, servant-server - , string-conversions, text, wai, warp + , cryptonite, github, github-webhooks, http-types, memory, servant + , servant-server, string-conversions, text, unordered-containers + , wai, warp }: mkDerivation { pname = "servant-github-webhook"; - version = "0.3.2.1"; - sha256 = "1yy5hnnj64wgafn60cj4ywwkwpzl506g0fsm9fcsyz4dr7irhpyf"; + version = "0.4.0.0"; + sha256 = "0j18bms75z2p746g5p7kqsn95c80ilrss4nmfhymn2rwgiimdhnr"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite github - http-types memory servant servant-server string-conversions text - wai + github-webhooks http-types memory servant servant-server + string-conversions text unordered-containers wai ]; testHaskellDepends = [ - aeson base bytestring servant-server wai warp + aeson base bytestring servant-server text wai warp ]; homepage = "https://github.com/tsani/servant-github-webhook"; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {github-webhooks = null;}; "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring @@ -178956,8 +180232,8 @@ self: { }: mkDerivation { pname = "servant-proto-lens"; - version = "0.1.0.1"; - sha256 = "1sa3vkr4vd6lvclscb4ki7ph17pdvq8ka22gmymz0yr760nx398a"; + version = "0.1.0.2"; + sha256 = "1p97yp3x8lhdr9z33f0pdaxj1bqjqc36gs54j69laxfq2650v3nx"; libraryHaskellDepends = [ base bytestring http-media proto-lens servant ]; @@ -180503,15 +181779,15 @@ self: { }) {}; "shake-ats" = callPackage - ({ mkDerivation, base, directory, language-ats, shake, shake-ext - , text + ({ mkDerivation, base, binary, directory, hs2ats, language-ats + , shake, shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "0.2.0.4"; - sha256 = "0n4sxla0ribkr2m5bbbh6h0lhp3ddiaan8w1k34ca1qbjwj1xz77"; + version = "1.1.0.2"; + sha256 = "0k15mpd72mmlnshgm2df042kqwzgk49ylf5rb99sdb9sjn0yrdbm"; libraryHaskellDepends = [ - base directory language-ats shake shake-ext text + base binary directory hs2ats language-ats shake shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; description = "Utilities for building ATS projects with shake"; @@ -180536,15 +181812,16 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, composition-prelude, directory, language-ats - , mtl, shake, text + ({ mkDerivation, base, Cabal, composition-prelude, directory + , language-ats, mtl, shake, text }: mkDerivation { pname = "shake-ext"; - version = "1.4.0.7"; - sha256 = "00c4yv2gdrzi4cm9n3k8s33xmv6p78ips1l809qbjpkdpn2dc5jy"; + version = "2.1.0.2"; + sha256 = "0ii1l76ms3b2c6pgclrgpfgpjsmxw5ax9gi7g60jyby9s5cgbgmc"; libraryHaskellDepends = [ - base composition-prelude directory language-ats mtl shake text + base Cabal composition-prelude directory language-ats mtl shake + text ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; @@ -181393,12 +182670,16 @@ self: { }) {}; "show-please" = callPackage - ({ mkDerivation, base, mtl, parsec, template-haskell, time }: + ({ mkDerivation, base, mtl, parsec, template-haskell, th-orphans + , time + }: mkDerivation { pname = "show-please"; - version = "0.4.2"; - sha256 = "16frhvbq395p3n54r5iv0xfjlj679gjm4sgsdbawanp9h1yhiwnl"; - libraryHaskellDepends = [ base mtl parsec template-haskell time ]; + version = "0.5.4"; + sha256 = "0rb6mpbr1qz80zgs4r92ckp28afzlcz9l988y20xhfrvq3bikzkx"; + libraryHaskellDepends = [ + base mtl parsec template-haskell th-orphans time + ]; homepage = "https://github.com/ddssff/show-please"; description = "A wrapper type V with improved Show instances"; license = stdenv.lib.licenses.bsd3; @@ -182341,6 +183622,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-sendfile_0_2_27" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , directory, hspec, HUnit, network, process, resourcet, unix + }: + mkDerivation { + pname = "simple-sendfile"; + version = "0.2.27"; + sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn"; + libraryHaskellDepends = [ base bytestring network unix ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra directory hspec HUnit network + process resourcet unix + ]; + description = "Cross platform library for the sendfile system call"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-server" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , hashtables, network, time, unbounded-delays @@ -185846,8 +187145,8 @@ self: { pname = "soap"; version = "0.2.3.5"; sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs"; - revision = "1"; - editedCabalFile = "0ki4g5520i7bam1gmammbb0nh8ibmjskqfv7kw2qjzzg4i9q3x95"; + revision = "2"; + editedCabalFile = "07283pa4n5mf908zl3az9gy95y49zk65kiwyymsmcz5nvhqvp840"; libraryHaskellDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -186784,8 +188083,8 @@ self: { }: mkDerivation { pname = "spatial-math"; - version = "0.4.0.0"; - sha256 = "1qy5hk2zbjzwgdhl9n0q8p3jlrv2njxm5qflnylawl6ack7rwjz5"; + version = "0.5.0.0"; + sha256 = "0hkvpr9l5x7gjwzskr0ci62mr3mzg0yfdbvdsjwrn37201cajmg2"; libraryHaskellDepends = [ base binary cereal ghc-prim lens linear TypeCompose ]; @@ -188929,8 +190228,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.4.0"; - sha256 = "0qj8v7kdyqsgm518gfrpdsvv7njwzrg2lm3k6cwd3lh50l9vsgcd"; + version = "0.5.0"; + sha256 = "0nqn2sbzig6n3jdzzi8p8kpfmd8npawn448aw9x7zixxav10xz9x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189825,6 +191124,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stm_2_4_5_0" = callPackage + ({ mkDerivation, array, base }: + mkDerivation { + pname = "stm"; + version = "2.4.5.0"; + sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri"; + libraryHaskellDepends = [ array base ]; + homepage = "https://wiki.haskell.org/Software_transactional_memory"; + description = "Software Transactional Memory"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stm-channelize" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -190769,6 +192081,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "streaming-commons_0_1_19" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , deepseq, directory, gauge, hspec, network, process, QuickCheck + , random, stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.1.19"; + sha256 = "19qp8bnnfs31jk08991lmj3dywbjxh9iydriifbdjj2mvy8axz23"; + libraryHaskellDepends = [ + array async base blaze-builder bytestring directory network process + random stm text transformers unix zlib + ]; + testHaskellDepends = [ + array async base blaze-builder bytestring deepseq hspec network + QuickCheck text unix zlib + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring deepseq gauge text + ]; + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-concurrency" = callPackage ({ mkDerivation, base, exceptions, hspec, lifted-async , monad-control, QuickCheck, quickcheck-instances, stm, streaming @@ -191348,6 +192686,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-isos" = callPackage + ({ mkDerivation, base, bytestring, mono-traversable, safe, text + , type-iso + }: + mkDerivation { + pname = "string-isos"; + version = "0.1.0.1"; + sha256 = "0sjla0l2pgc2bz1f0hlaxpzjl6ngpxca7l5x7mfsqi0grs8g4jqw"; + libraryHaskellDepends = [ + base bytestring mono-traversable safe text type-iso + ]; + description = "Tools for working with isomorphisms of strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "string-qq" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -195389,15 +196742,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tar-conduit_0_2_0" = callPackage + "tar-conduit_0_2_1" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , containers, criterion, deepseq, directory, filepath, hspec, unix , weigh }: mkDerivation { pname = "tar-conduit"; - version = "0.2.0"; - sha256 = "01fqvm5wji1rgivqri0prp3k3drhr3gmmlcwy0v4qcwdhwgi0r2r"; + version = "0.2.1"; + sha256 = "09mpkr05f6vwhrk3r8fafs8rsgc10dkkgws356ciy3rz9y8xfjw2"; libraryHaskellDepends = [ base bytestring conduit-combinators directory filepath unix ]; @@ -195623,6 +196976,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-ant-xml_1_1_3" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers + , xml + }: + mkDerivation { + pname = "tasty-ant-xml"; + version = "1.1.3"; + sha256 = "0nxrvxk83mv29yhywswg21q156zdzs02xrwqambnz78pldsrbk4n"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving ghc-prim mtl + stm tagged tasty transformers xml + ]; + homepage = "http://github.com/ocharles/tasty-ant-xml"; + description = "Render tasty output to XML for Jenkins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-auto" = callPackage ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec , tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -196028,6 +197400,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-rerun_1_1_10" = callPackage + ({ mkDerivation, base, containers, mtl, optparse-applicative + , reducers, split, stm, tagged, tasty, transformers + }: + mkDerivation { + pname = "tasty-rerun"; + version = "1.1.10"; + sha256 = "1776fx700wlc9spn0dh3x4nh44x2yg33z9zyqzqlpwrhrkpaz91b"; + libraryHaskellDepends = [ + base containers mtl optparse-applicative reducers split stm tagged + tasty transformers + ]; + homepage = "http://github.com/ocharles/tasty-rerun"; + description = "Run tests by filtering the test tree depending on the result of previous test runs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process @@ -198433,6 +199823,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-ldap_0_1_1_11" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, dlist + , memory, QuickCheck, quickcheck-simple, random, transformers + }: + mkDerivation { + pname = "text-ldap"; + version = "0.1.1.11"; + sha256 = "1921cdq9akvcn0hsgs07g2bvbpdvhb1h389yv9703472d0sz7pfs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers dlist memory transformers + ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-simple random + ]; + description = "Parser and Printer for LDAP text data stream"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-lens" = callPackage ({ mkDerivation, base, extra, hspec, lens, text }: mkDerivation { @@ -199409,6 +200821,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-lift_0_7_8" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-lift"; + version = "0.7.8"; + sha256 = "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c"; + libraryHaskellDepends = [ base ghc-prim template-haskell ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + homepage = "http://github.com/mboes/th-lift"; + description = "Derive Template Haskell's Lift class for datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, vector @@ -199556,19 +200982,27 @@ self: { }) {}; "th-typegraph" = callPackage - ({ mkDerivation, aeson, base, cereal, containers, fgl, lens, mtl - , parsec, pretty, safecopy, split, syb, template-haskell, text - , th-desugar, th-lift, th-lift-instances, th-orphans, time, userid - , web-routes + ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal + , containers, deepseq, dlist, fail, fgl, ghc-prim, hashable, HUnit + , lens, mtl, network-uri, parsec, pretty, safecopy, scientific + , semigroups, split, sr-extra, syb, tagged, template-haskell, text + , th-desugar, th-lift, th-lift-instances, th-orphans, time + , transformers, unordered-containers, userid, vector, web-routes }: mkDerivation { pname = "th-typegraph"; - version = "1.0.2"; - sha256 = "09yf7igwki0h7mv946x066955bj9154pfvqkmr3fy5j9j69gwin1"; + version = "1.4"; + sha256 = "0nfcsmv7dsh28c9smp2vwm9r43c5ann98rxdvyp7w96gpawjwwz4"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base cereal containers fgl lens mtl parsec pretty safecopy - split syb template-haskell text th-desugar th-lift - th-lift-instances th-orphans time userid web-routes + attoparsec base bytestring cereal containers deepseq dlist fail fgl + ghc-prim hashable lens mtl parsec pretty safecopy scientific + semigroups split sr-extra syb tagged template-haskell text + th-desugar th-lift th-lift-instances th-orphans time transformers + unordered-containers userid vector web-routes + ]; + testHaskellDepends = [ + aeson base HUnit network-uri syb template-haskell th-lift ]; homepage = "https://github.com/seereason/th-typegraph"; description = "Graph of the subtype relation"; @@ -201668,6 +203102,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tldr_0_3_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory + , filepath, optparse-applicative, semigroups, text, typed-process + }: + mkDerivation { + pname = "tldr"; + version = "0.3.0"; + sha256 = "1wnc1l1c9d56y64d5hlkj2z1m4vl87shfya7ix49h22l77df0jq7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmark text + ]; + executableHaskellDepends = [ + base directory filepath optparse-applicative semigroups + typed-process + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/psibi/tldr-hs#readme"; + description = "Haskell tldr client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, criterion, cryptonite, data-default-class, hourglass @@ -207498,7 +208956,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_0_4" = callPackage + "universum_1_0_4_1" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , doctest, ghc-prim, Glob, hashable, microlens, microlens-mtl, mtl , safe-exceptions, semigroups, stm, text, text-format, transformers @@ -207506,8 +208964,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.0.4"; - sha256 = "1r5hwmwj5s2xpnjy9r0a6wpz9hv63bwqs7m96zj0rkip9f6nvpyv"; + version = "1.0.4.1"; + sha256 = "1xsachyf52km3awrpqmqhlwncz55mbc29xjwvsci01vrd6swz9c0"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text text-format transformers @@ -214752,26 +216210,6 @@ self: { }) {}; "weeder" = callPackage - ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq - , directory, extra, filepath, foundation, hashable, process, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "weeder"; - version = "0.1.13"; - sha256 = "0a0zfp1g5mh393v4d1js5a0fnkj03q5kzycsyp3x4nk37dnc67fy"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring cmdargs deepseq directory extra filepath - foundation hashable process text unordered-containers vector yaml - ]; - homepage = "https://github.com/ndmitchell/weeder#readme"; - description = "Detect dead code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "weeder_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq , directory, extra, filepath, foundation, hashable, process, text , unordered-containers, vector, yaml @@ -214789,7 +216227,6 @@ self: { homepage = "https://github.com/ndmitchell/weeder#readme"; description = "Detect dead code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "weigh" = callPackage @@ -215448,6 +216885,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "withdependencies_0_2_4_2" = callPackage + ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl + , profunctors + }: + mkDerivation { + pname = "withdependencies"; + version = "0.2.4.2"; + sha256 = "04pk5giqlnls1p62fz9p0sb1288c9qk3ivsq2kb5207cjifyslgz"; + libraryHaskellDepends = [ + base conduit containers mtl profunctors + ]; + testHaskellDepends = [ base conduit hspec HUnit mtl ]; + homepage = "https://github.com/bartavelle/withdependencies"; + description = "Run computations that depend on one or more elements in a stream"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witherable" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable , transformers, unordered-containers, vector @@ -215736,8 +217191,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.40"; - sha256 = "1ns6dy76m5sw4rzi98ah29g21car7hlkmbfxdiawwsaq0x4bn4ph"; + version = "0.3.41"; + sha256 = "06w55qgsp2jvic8f70rr7dl4shqx64hiqr15vk104vvf7xiy2asr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216609,6 +218064,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wsjtx-udp" = callPackage + ({ mkDerivation, aeson, base, binary, binary-parsers, bytestring + , network, text, time + }: + mkDerivation { + pname = "wsjtx-udp"; + version = "0.1.0.6"; + sha256 = "04c44jbpnplil3l69s1bvn2dk2jbs4vkf82vlxpfrljnpfckllbc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary binary-parsers bytestring network text time + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/MarcFontaine/wsjtx-udp"; + description = "WSJT-X UDP protocol"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wtk" = callPackage ({ mkDerivation, base, old-locale, time, transformers }: mkDerivation { @@ -217729,6 +219203,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xlsx-tabular_0_2_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , lens, text, xlsx + }: + mkDerivation { + pname = "xlsx-tabular"; + version = "0.2.2.1"; + sha256 = "0bgxs1a0prnq6ljvv1g3rs39565w4609hv3ckq0gk0fz85yqkpa8"; + libraryHaskellDepends = [ + aeson base bytestring containers data-default lens text xlsx + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/kkazuo/xlsx-tabular"; + description = "Xlsx table cell value extraction utility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsx-templater" = callPackage ({ mkDerivation, base, bytestring, conduit, containers , data-default, parsec, text, time, transformers, xlsx @@ -217818,6 +219310,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-conduit_1_8_0" = callPackage + ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup + , bytestring, conduit, conduit-extra, containers + , data-default-class, deepseq, hspec, HUnit, monad-control + , resourcet, text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.8.0"; + sha256 = "0di0ll2p4ykqnlipf2jrlalirxdf9wkli292245rgr3vcb9vz0h3"; + libraryHaskellDepends = [ + attoparsec base blaze-html blaze-markup bytestring conduit + conduit-extra containers data-default-class deepseq monad-control + resourcet text transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit containers hspec HUnit + resourcet text transformers xml-types + ]; + homepage = "http://github.com/snoyberg/xml"; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types @@ -217954,6 +219471,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xml-hamlet_0_5_0" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, parsec + , shakespeare, template-haskell, text, xml-conduit + }: + mkDerivation { + pname = "xml-hamlet"; + version = "0.5.0"; + sha256 = "18qmj14jzh379fni477h5hrzcy1x7dajfczx1s3w4wiyv2mc1kkv"; + libraryHaskellDepends = [ + base containers parsec shakespeare template-haskell text + xml-conduit + ]; + testHaskellDepends = [ + base containers hspec HUnit parsec shakespeare template-haskell + text xml-conduit + ]; + homepage = "http://www.yesodweb.com/"; + description = "Hamlet-style quasiquoter for XML content"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-helpers" = callPackage ({ mkDerivation, base, xml }: mkDerivation { @@ -218533,21 +220072,21 @@ self: { "xmobar" = callPackage ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring - , containers, dbus, directory, filepath, hinotify, HTTP, libmpd - , libXpm, libXrandr, libXrender, mtl, old-locale, parsec, process - , regex-compat, stm, time, timezone-olson, timezone-series + , containers, dbus, directory, filepath, hinotify, HTTP, iwlib + , libmpd, libXpm, libXrandr, libXrender, mtl, old-locale, parsec + , process, regex-compat, stm, time, timezone-olson, timezone-series , transformers, unix, utf8-string, wirelesstools, X11, X11-xft }: mkDerivation { pname = "xmobar"; - version = "0.24.5"; - sha256 = "0sdzfj2wa4wpig1i2i5n9qpwm90jp88qifsmaa7j37yhhs6snfir"; + version = "0.25"; + sha256 = "0382r4vzqkz76jlp2069rdbwf4gh1a22r9w4rkphcn5qflw0dlb6"; configureFlags = [ "-fall_extensions" ]; isLibrary = false; isExecutable = true; executableHaskellDepends = [ alsa-core alsa-mixer base bytestring containers dbus directory - filepath hinotify HTTP libmpd mtl old-locale parsec process + filepath hinotify HTTP iwlib libmpd mtl old-locale parsec process regex-compat stm time timezone-olson timezone-series transformers unix utf8-string X11 X11-xft ]; @@ -219973,6 +221512,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod_1_6_0" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , conduit, data-default-class, directory, fast-logger, monad-logger + , resourcet, semigroups, shakespeare, streaming-commons + , template-haskell, text, transformers, unix, unordered-containers + , wai, wai-extra, wai-logger, warp, yaml, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.6.0"; + sha256 = "0wx77nbpzdh40p1bm527kimfj48vs9d2avpvvz2w42zi3pz2y94a"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring conduit + data-default-class directory fast-logger monad-logger resourcet + semigroups shakespeare streaming-commons template-haskell text + transformers unix unordered-containers wai wai-extra wai-logger + warp yaml yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-alerts" = callPackage ({ mkDerivation, alerts, base, blaze-html, blaze-markup, safe, text , yesod-core @@ -220079,6 +221643,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_6_0" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptonite, data-default, email-validate, file-embed + , http-client, http-client-tls, http-conduit, http-types, memory + , mime-mail, network-uri, nonce, persistent, persistent-template + , random, resourcet, safe, shakespeare, template-haskell, text + , time, transformers, unliftio, unliftio-core, unordered-containers + , wai, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.0"; + sha256 = "1whjf9hddlv2rymy5frgck6pb9l408lywdnnylnzmkrvrpvlm2nh"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory mime-mail network-uri nonce persistent persistent-template + random resourcet safe shakespeare template-haskell text time + transformers unliftio unliftio-core unordered-containers wai + yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -220358,15 +221953,15 @@ self: { }) {}; "yesod-auth-oauth" = callPackage - ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base - , text, transformers, yesod-auth, yesod-core, yesod-form + ({ mkDerivation, authenticate-oauth, base, bytestring, text + , transformers, unliftio, yesod-auth, yesod-core, yesod-form }: mkDerivation { pname = "yesod-auth-oauth"; - version = "1.4.2"; - sha256 = "09vrr8k3kgwps4n8isl54zm7n3j5xvz82pbphcp688r42k6v05f1"; + version = "1.6.0"; + sha256 = "1czm2zs9w8aicpqxmcn97c6skrhcy7g57q51vvnf40pffblvh33g"; libraryHaskellDepends = [ - authenticate-oauth base bytestring lifted-base text transformers + authenticate-oauth base bytestring text transformers unliftio yesod-auth yesod-core yesod-form ]; homepage = "http://www.yesodweb.com/"; @@ -220490,6 +222085,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_6_0" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder + , bytestring, Cabal, conduit, conduit-extra, containers + , data-default-class, directory, file-embed, filepath, fsnotify + , http-client, http-client-tls, http-reverse-proxy, http-types + , network, optparse-applicative, parsec, process, project-template + , resourcet, say, shakespeare, split, stm, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp + , warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.0"; + sha256 = "096yxpb6dxy44s2ydf137rmd0b7zm5ww4yqkf7mnapslhc25wznn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base base64-bytestring blaze-builder bytestring Cabal + conduit conduit-extra containers data-default-class directory + file-embed filepath fsnotify http-client http-client-tls + http-reverse-proxy http-types network optparse-applicative parsec + process project-template resourcet say shakespeare split stm + streaming-commons tar template-haskell text time transformers + transformers-compat unix-compat unliftio unordered-containers wai + wai-extra warp warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -220513,8 +222141,8 @@ self: { }: mkDerivation { pname = "yesod-colonnade"; - version = "1.1.0"; - sha256 = "0d0apypsy5v48gk5liy5mfky1ncbvzkhb8hbj0bivh0qhqfbwgqn"; + version = "1.2.0"; + sha256 = "1xbcwaklbly80fimmbi04j9wpl06knjdf1zy0m8i8cb1xmd8nh0k"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade text yesod-core ]; @@ -220629,6 +222257,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_0" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec + , hspec-expectations, http-types, HUnit, monad-logger, mtl, network + , old-locale, parsec, path-pieces, primitive, QuickCheck, random + , resourcet, safe, semigroups, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.0"; + sha256 = "0xhg4kjskjpwffnfykhszqyhg9d785r5pnziklswdi6g0qy0zv4z"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq deepseq-generics directory fast-logger + http-types monad-logger mtl old-locale parsec path-pieces primitive + random resourcet safe semigroups shakespeare template-haskell text + time transformers unix-compat unliftio unordered-containers vector + wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces QuickCheck random resourcet shakespeare + streaming-commons template-haskell text transformers unliftio wai + wai-extra + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text transformers + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -220784,6 +222453,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-eventsource_1_6_0" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, transformers, wai + , wai-eventsource, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-eventsource"; + version = "1.6.0"; + sha256 = "12s11q6zga37xyynll7b30gpv02k7jmmzfassshci02y9niyrkkg"; + libraryHaskellDepends = [ + base blaze-builder conduit transformers wai wai-eventsource + wai-extra yesod-core + ]; + homepage = "http://www.yesodweb.com/"; + description = "Server-sent events support for Yesod apps"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-examples" = callPackage ({ mkDerivation, base, blaze-html, bytestring, data-object , data-object-yaml, hamlet, persistent-sqlite, persistent-template @@ -220891,6 +222578,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_6_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.6.0"; + sha256 = "0vvj56pjfaqn7lys8gbb8p7bgnbi67l9a5786gqc3jc1q0b50x8n"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare + template-haskell text time transformers wai xss-sanitize yesod-core + yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + homepage = "http://www.yesodweb.com/"; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: mkDerivation { @@ -221160,6 +222872,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-newsfeed_1_6_1_0" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , containers, shakespeare, text, time, xml-conduit, yesod-core + }: + mkDerivation { + pname = "yesod-newsfeed"; + version = "1.6.1.0"; + sha256 = "05cnyz9g76hnfmhqfav16mghr0x42fqnz1zi0ki4bjkl5mcrf2vd"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring containers shakespeare text + time xml-conduit yesod-core + ]; + homepage = "http://www.yesodweb.com/"; + description = "Helper functions and data types for producing News feeds"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-paginate" = callPackage ({ mkDerivation, base, template-haskell, yesod }: mkDerivation { @@ -221251,6 +222981,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-persistent_1_6_0" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.6.0"; + sha256 = "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + homepage = "http://www.yesodweb.com/"; + description = "Some helpers for using Persistent from Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate @@ -221648,6 +223401,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-sitemap_1_6_0" = callPackage + ({ mkDerivation, base, conduit, containers, data-default, text + , time, xml-conduit, xml-types, yesod-core + }: + mkDerivation { + pname = "yesod-sitemap"; + version = "1.6.0"; + sha256 = "1mnv658z36ja1avig0g4pirb2i9vqriycykhfky74xymvjmhdyp5"; + libraryHaskellDepends = [ + base conduit containers data-default text time xml-conduit + xml-types yesod-core + ]; + homepage = "http://www.yesodweb.com/"; + description = "Generate XML sitemaps"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-static" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra @@ -221683,6 +223454,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-static_1_6_0" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, byteable, bytestring, conduit, containers + , cryptonite, cryptonite-conduit, css-text, data-default, directory + , exceptions, file-embed, filepath, hashable, hjsmin, hspec + , http-types, HUnit, memory, mime-types, old-time, process + , resourcet, template-haskell, text, transformers, unix-compat + , unordered-containers, wai, wai-app-static, wai-extra, yesod-core + , yesod-test + }: + mkDerivation { + pname = "yesod-static"; + version = "1.6.0"; + sha256 = "03l8jjn3pw7j38i91hakf1lgr4lf2lc610a783i7zhmr9f9ga2xx"; + libraryHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder byteable + bytestring conduit containers cryptonite cryptonite-conduit + css-text data-default directory exceptions file-embed filepath + hashable hjsmin http-types memory mime-types old-time process + resourcet template-haskell text transformers unix-compat + unordered-containers wai wai-app-static yesod-core + ]; + testHaskellDepends = [ + async base base64-bytestring byteable bytestring conduit containers + cryptonite cryptonite-conduit data-default directory exceptions + file-embed filepath hjsmin hspec http-types HUnit memory mime-types + old-time process resourcet template-haskell text transformers + unix-compat unordered-containers wai wai-app-static wai-extra + yesod-core yesod-test + ]; + homepage = "http://www.yesodweb.com/"; + description = "Static file serving subsite for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-static-angular" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-markup , bytestring, data-default, directory, filepath, hamlet, hspec @@ -221768,6 +223575,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_0" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , network, persistent, pretty-show, text, time, transformers + , unliftio, wai, wai-extra, xml-conduit, xml-types, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.0"; + sha256 = "0xdl20qm0h6dx6cbzp0d9n0qmpfz3wrn5lwwy2zrpx7bgb967fq6"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit network persistent pretty-show text time + transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit text + unliftio wai xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -221886,6 +223721,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-websockets_0_3_0" = callPackage + ({ mkDerivation, base, conduit, mtl, transformers, unliftio, wai + , wai-websockets, websockets, yesod-core + }: + mkDerivation { + pname = "yesod-websockets"; + version = "0.3.0"; + sha256 = "0ip4fjjxhz79fj1gm0wl23jkkb64hqn9rwn0vaqy69wy4212jr2a"; + libraryHaskellDepends = [ + base conduit mtl transformers unliftio wai wai-websockets + websockets yesod-core + ]; + homepage = "https://github.com/yesodweb/yesod"; + description = "WebSockets support for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-websockets-extra" = callPackage ({ mkDerivation, base, enclosed-exceptions, transformers , websockets, yesod-websockets From af884f5607e90b898e66fe9d5e74252bdbdaf0a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 4 Feb 2018 10:22:56 +0100 Subject: [PATCH 463/797] cabal2nix: update build to hpack 0.24 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 746c00b037d..b46da64c342 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -606,7 +606,7 @@ self: super: { }; # Need newer versions of their dependencies than the ones we have in LTS-10.x. - cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_23_0; }; + cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_24_0; }; hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; }); # https://github.com/bos/configurator/issues/22 From 9a5b545e86fe826da481e93b6792012501ceefb4 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 31 Dec 2017 10:52:30 +0200 Subject: [PATCH 464/797] diskrsync: init at unstable-2017-09-27 --- pkgs/tools/backup/diskrsync/default.nix | 27 +++++++++++++++++++++++++ pkgs/tools/backup/diskrsync/deps.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/tools/backup/diskrsync/default.nix create mode 100644 pkgs/tools/backup/diskrsync/deps.nix diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix new file mode 100644 index 00000000000..b223124dd14 --- /dev/null +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -0,0 +1,27 @@ +{ buildGoPackage, fetchFromGitHub, stdenv }: + +buildGoPackage rec { + + name = "${pname}-${version}"; + pname = "diskrsync"; + version = "unstable-2017-09-27"; + + src = fetchFromGitHub { + owner = "dop251"; + repo = pname; + rev = "45818879a98edceaa915739c1b8ece58e4b34866"; + sha256 = "0jvx5manh1z0shvg616vw0n5cp5v4bljk6h3mmw3bdskg9r076lh"; + }; + + goPackagePath = "github.com/dop251/diskrsync"; + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Rsync for block devices and disk images"; + homepage = https://github.com/dop251/diskrsync; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix new file mode 100644 index 00000000000..65b64f0777a --- /dev/null +++ b/pkgs/tools/backup/diskrsync/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/dop251/spgz"; + fetch = { + type = "git"; + url = "https://github.com/dop251/spgz"; + rev = "ca4328964eba8a1863356b3d927d4f6a10c966b5"; + sha256 = "06m48hfgyj30704my205chw42xkpwfm6lv0jvhgqkkhhhs9sly62"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "95a4943f35d008beabde8c11e5075a1b714e6419"; + sha256 = "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c77658244df..8ec0d31586a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1769,6 +1769,8 @@ with pkgs; dev86 = callPackage ../development/compilers/dev86 { }; + diskrsync = callPackage ../tools/backup/diskrsync { }; + djbdns = callPackage ../tools/networking/djbdns { }; dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { }; From 59eb19224b9aebf3b2f86915ab8e85e4024e9b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Feb 2018 01:30:47 +0100 Subject: [PATCH 465/797] nixos/home-assistant: support platform=... scheme for autoExtraComponents See https://home-assistant.io/components/sensor.luftdaten/ for an example component using that scheme. --- .../modules/services/misc/home-assistant.nix | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 666fa68b01c..cc60a143fa6 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -9,8 +9,27 @@ let availableComponents = pkgs.home-assistant.availableComponents; + # Given component "parentConfig.platform", returns whether config.parentConfig + # is a list containing a set with set.platform == "platform". + # + # For example, the component sensor.luftdaten is used as follows: + # config.sensor = [ { + # platform = "luftdaten"; + # ... + # } ]; + useComponentPlatform = component: + let + path = splitString "." component; + parentConfig = attrByPath (init path) null cfg.config; + platform = last path; + in isList parentConfig && any + (item: item.platform or null == platform) + parentConfig; + # Returns whether component is used in config - useComponent = component: hasAttrByPath (splitString "." component) cfg.config; + useComponent = component: + hasAttrByPath (splitString "." component) cfg.config + || useComponentPlatform component; # List of components used in config extraComponents = filter useComponent availableComponents; From 07edef3dd30cd1d055bea5c8cd7c2f0c91997de3 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 4 Feb 2018 12:03:01 +0200 Subject: [PATCH 466/797] diskrsync: unstable-2017-09-27 -> unstable-2018-02-03 --- pkgs/tools/backup/diskrsync/default.nix | 6 +++--- pkgs/tools/backup/diskrsync/deps.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index b223124dd14..b04a1dab40f 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "diskrsync"; - version = "unstable-2017-09-27"; + version = "unstable-2018-02-03"; src = fetchFromGitHub { owner = "dop251"; repo = pname; - rev = "45818879a98edceaa915739c1b8ece58e4b34866"; - sha256 = "0jvx5manh1z0shvg616vw0n5cp5v4bljk6h3mmw3bdskg9r076lh"; + rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730"; + sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn"; }; goPackagePath = "github.com/dop251/diskrsync"; diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix index 65b64f0777a..684100968e8 100644 --- a/pkgs/tools/backup/diskrsync/deps.nix +++ b/pkgs/tools/backup/diskrsync/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/dop251/spgz"; - rev = "ca4328964eba8a1863356b3d927d4f6a10c966b5"; - sha256 = "06m48hfgyj30704my205chw42xkpwfm6lv0jvhgqkkhhhs9sly62"; + rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5"; + sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "95a4943f35d008beabde8c11e5075a1b714e6419"; - sha256 = "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx"; + rev = "1875d0a70c90e57f11972aefd42276df65e895b9"; + sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q"; }; } ] From 718552eca4196dcc9d20bd2c24a7f1e2857e6518 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sun, 4 Feb 2018 10:13:06 +0100 Subject: [PATCH 467/797] lgi: Fix cairo bindings search path Since commit e44038bccab0cae, cairo-1.0.typelib contains an absolute path to cairo in the nix store so that no $LD_LIBRARY_PATH hacks are needed. However, this did not yet work for lgi, because lgi does dlopen("libcairo.so.2") without a full path, too. To make this work, this commit ensures that lgi first uses gobject-introspection to load libcairo. This uses the full path provided by the typelib. Afterwards, dlopen("libcairo.so.2") does not hit the filesystem anymore since the library is already loaded. This commit adds a patch that reorders some code in lgi's cairo initialisation. Previously, this started with core.module('cairo', 2), which is where the dlopen happens. Now, this code is moved down and instead core.gi.cairo.resolve is used to load the definitions of some enums first. This part of the code goes through gobject-introspection and causes libcairo to be loaded. Signed-off-by: Uli Schlachter --- pkgs/top-level/lua-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index b91f9dae9f0..d80c43b03f5 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -9,7 +9,7 @@ , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , mysql, postgresql, cyrus_sasl -, fetchFromGitHub, libmpack, which +, fetchFromGitHub, libmpack, which, fetchpatch }: let @@ -671,6 +671,14 @@ let sed -i "s|/usr/local|$out|" lgi/Makefile ''; + patches = [ + (fetchpatch { + name = "lgi-find-cairo-through-typelib.patch"; + url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; + sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; + }) + ]; + meta = with stdenv.lib; { description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; homepage = https://github.com/pavouk/lgi; From b8dfab93cb8930ea2426725f035da1c0b3e25e0f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 4 Feb 2018 12:43:13 +0200 Subject: [PATCH 468/797] cifs-utils: 6.6 -> 6.7 --- pkgs/os-specific/linux/cifs-utils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 8c9e7a9ade5..c2bea009ab7 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, kerberos, keyutils, pam, talloc }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { name = "cifs-utils-${version}"; - version = "6.6"; + version = "6.7"; src = fetchurl { url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "09biws1jm23l3mjb9kh99v57z8bgzybrmimwddb40s6y0yl54wfh"; + sha256 = "1ayghnkryy1n1zm5dyvyyr7n3807nsm6glfcbbki5c2a8w91dwmj"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ kerberos keyutils pam talloc ]; makeFlags = "root_sbindir=$(out)/sbin"; From 4b3f0d8873bed1d4252217cbc215b9ac679d7cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 4 Feb 2018 11:50:12 +0100 Subject: [PATCH 469/797] Revert "Merge #34584: lgi: Fix cairo bindings search path" In the end I merged different version than I wanted. This reverts commit f25d21d202fcbbd63e9330edb5e5219332e9aac8, reversing changes made to af884f5607e90b898e66fe9d5e74252bdbdaf0a6. --- .../lgi-find-cairo-through-typelib.patch | 47 ------------------- pkgs/top-level/lua-packages.nix | 2 - 2 files changed, 49 deletions(-) delete mode 100644 pkgs/top-level/lgi-find-cairo-through-typelib.patch diff --git a/pkgs/top-level/lgi-find-cairo-through-typelib.patch b/pkgs/top-level/lgi-find-cairo-through-typelib.patch deleted file mode 100644 index 613b2eda0b5..00000000000 --- a/pkgs/top-level/lgi-find-cairo-through-typelib.patch +++ /dev/null @@ -1,47 +0,0 @@ -Reorder some code so that the cairo-gobject library is used before this tries to -dlopen("libcairo.so.2"). Since cairo-gobject depends (RT_DEPEND) on cairo, this -causes cairo to be used and so the missing search path for the dlopen() call is -not a problem. - -diff --git a/lgi/override/cairo.lua b/lgi/override/cairo.lua -index ca8193f..019239b 100644 ---- a/lgi/override/cairo.lua -+++ b/lgi/override/cairo.lua -@@ -20,18 +20,8 @@ local record = require 'lgi.record' - local enum = require 'lgi.enum' - local ti = ffi.types - --cairo._module = core.module('cairo', 2) - local module_gobject = core.gi.cairo.resolve - ---- Versioning support. --function cairo.version_encode(major, minor, micro) -- return 10000 * major + 100 * minor + micro --end --cairo.version = core.callable.new { -- addr = cairo._module.cairo_version, ret = ti.int } () --cairo.version_string = core.callable.new { -- addr = cairo._module.cairo_version_string, ret = ti.utf8 } () -- - -- Load some constants. - cairo._constant = { - MIME_TYPE_JP2 = 'image/jp2', -@@ -58,6 +48,18 @@ for _, name in pairs { - end - end - -+-- Load libcairo.so directly; this has to happen after the typelib was used -+cairo._module = core.module('cairo', 2) -+ -+-- Versioning support. -+function cairo.version_encode(major, minor, micro) -+ return 10000 * major + 100 * minor + micro -+end -+cairo.version = core.callable.new { -+ addr = cairo._module.cairo_version, ret = ti.int } () -+cairo.version_string = core.callable.new { -+ addr = cairo._module.cairo_version_string, ret = ti.utf8 } () -+ - -- Load definitions of all boxed records. - cairo._struct = cairo._struct or {} - for index, struct in pairs { diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index d4822b72e24..b91f9dae9f0 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -671,8 +671,6 @@ let sed -i "s|/usr/local|$out|" lgi/Makefile ''; - patches = [ ./lgi-find-cairo-through-typelib.patch ]; - meta = with stdenv.lib; { description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; homepage = https://github.com/pavouk/lgi; From 7bf36a8a9a7d4c49cbe11913ecfb47594a60e740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 4 Feb 2018 09:08:17 -0200 Subject: [PATCH 470/797] greybird: 3.22.5 -> 3.22.6 --- 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 c1de0856dce..26c37171642 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.5"; + version = "3.22.6"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0l107q9fcbgp73r4p4fmyy3a7pmc4mi4km5hgp67fm2a4dna7rkd"; + sha256 = "16rifkyy8l4v03rx85j7m6rfdal99l1xdmghysh95r6lx4y6r01i"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; From 645743f1d869d3d1bc1b8202f2729c49f12189a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 4 Feb 2018 12:11:10 +0100 Subject: [PATCH 471/797] normalize: enable libmad to add support mp3 files --- pkgs/applications/audio/normalize/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix index ad4a06cff99..a727160ff29 100644 --- a/pkgs/applications/audio/normalize/default.nix +++ b/pkgs/applications/audio/normalize/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libmad }: stdenv.mkDerivation rec { name = "normalize-${version}"; version = "0.7.7"; src = fetchurl { - url = "mirror://savannah/normalize/normalize-0.7.7.tar.gz"; + url = "mirror://savannah/normalize/${name}.tar.gz"; sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"; }; + buildInputs = [ libmad ]; + meta = with stdenv.lib; { homepage = http://normalize.nongnu.org/; description = "Audio file normalizer"; From db40ca8d0a9e900c93417b9397336cd71dc08f93 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 4 Feb 2018 23:50:14 +1000 Subject: [PATCH 472/797] pick: 1.9.0 -> 2.0.1 --- pkgs/tools/misc/pick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index 747c9837641..0afd28b3c91 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pick-${version}"; - version = "1.9.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "calleerlandsson"; repo = "pick"; rev = "v${version}"; - sha256 = "0s0mn9iz17ldhvahggh9rsmgfrjh0kvk5bh4p9xhxcn7rcp0h5ka"; + sha256 = "0ypawbzpw188rxgv8x044iib3a517j5grgqnxy035ax5zzjavsrr"; }; buildInputs = [ ncurses ]; From bdd0bb241e4bb6ecb81fd302ba1eeecef3c6d155 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 5 Feb 2018 00:28:21 +1100 Subject: [PATCH 473/797] libwhereami: 0.1.1 -> 0.1.3 --- pkgs/development/libraries/libwhereami/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 35e904989c4..a119ae8795b 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libwhereami-${version}"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { - sha256 = "0nhbmxm626cgawprszw6c03a3hasxjn1i9ldhhj5xyvxp8r5l9q4"; + sha256 = "0mpy2rkxcm2nz1qvldih01czxlsksqfkzgh58pnrw8yva31wv9q6"; rev = version; repo = "libwhereami"; owner = "puppetlabs"; From 99aab3dd56f3e9a0ffaf812d0bc84ab336e2c839 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 5 Feb 2018 00:28:46 +1100 Subject: [PATCH 474/797] facter: 3.9.0 -> 3.9.3 --- pkgs/tools/system/facter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index b74f9948418..57cbb44cebf 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.9.0"; + version = "3.9.3"; src = fetchFromGitHub { - sha256 = "1picxrmvka57ph4zqgwqdsqvz3mqppg41wkj8dx37hscwwlbdw0s"; + sha256 = "1qd0xsw49nbj22czddxk90di31gx43hacvnmh08gp3001a8g0qcj"; rev = version; repo = "facter"; owner = "puppetlabs"; From 4db7c04160d784e7bbfe612d74cf5b98b4891393 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 4 Feb 2018 16:15:18 +0100 Subject: [PATCH 475/797] fim: 0.5rc3 -> 0.6 --- pkgs/tools/graphics/fim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index c7a22f00dce..066c181f53c 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "fim-${version}"; - version = "0.5rc3"; + version = "0.6"; src = fetchurl { - url = mirror://savannah/fbi-improved/fim-0.5-rc3.tar.gz; - sha256 = "12aka85h469zfj0zcx3xdpan70gq8nf5rackgb1ldcl9mqjn50c2"; + url = "mirror://savannah/fbi-improved/${name}-trunk.tar.gz"; + sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp"; }; postPatch = '' From dc5bdf22d91f39e296bfec2cbe82f23ff33afd53 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Sun, 4 Feb 2018 10:44:04 -0600 Subject: [PATCH 476/797] gnuradio: fix wrapper gnuradio-with-packages was not running makeWrapper on any of the symlinked executables because `find $out/bin -type f -executable` does not resolve symlinks. I don't understand how the old code ever worked on any system. --- pkgs/applications/misc/gnuradio/wrapper.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix index db2b453913f..ffed3da0318 100644 --- a/pkgs/applications/misc/gnuradio/wrapper.nix +++ b/pkgs/applications/misc/gnuradio/wrapper.nix @@ -1,7 +1,6 @@ -{ stdenv, gnuradio, makeWrapper, python -, extraPackages ? [] }: +{ stdenv, gnuradio, makeWrapper, python, extraPackages ? [] }: -with stdenv.lib; +with { inherit (stdenv.lib) appendToName makeSearchPath; }; stdenv.mkDerivation { name = (appendToName "with-packages" gnuradio).name; @@ -11,13 +10,15 @@ stdenv.mkDerivation { mkdir -p $out/bin ln -s "${gnuradio}"/bin/* $out/bin/ - for file in $(find $out/bin -type f -executable); do - wrapProgram "$file" \ - --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") extraPackages)} \ - --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} + for file in $(find -L $out/bin -type f); do + if test -x "$(readlink -f "$file")"; then + wrapProgram "$file" \ + --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" + (map (path: "$(toPythonPath ${path})") extraPackages)} \ + --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} + fi done - ''; + inherit (gnuradio) meta; } From 8c8e8823bb46c5851aa74f6ff124f7adf60de474 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 4 Feb 2018 17:43:36 +0100 Subject: [PATCH 477/797] chromium: 64.0.3282.119 -> 64.0.3282.140 [security] https://crbug.com/808163 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 3fe73c8669c..7b39eb755ef 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 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; - sha256bin64 = "18833sqqfssjvcmf6v7wj9h9gsc07wr09cms5c0k7f8v9dqysc7r"; - version = "64.0.3282.119"; + sha256 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl"; + sha256bin64 = "0i1g0hv2vji8jx9c973x8nr1ynzsvqjaqcncxj77x6vj9wp0v41p"; + version = "64.0.3282.140"; }; dev = { - sha256 = "04vrcsvlanjljah3pbgfz49ygwr9i6zymr1a09kldrnykv770c5l"; - sha256bin64 = "016s8lh94i0m3zyld32vzqfw1c0s97sa143dyww7x26b2mp93lcc"; - version = "65.0.3322.3"; + sha256 = "1b3gyj55xyqsb439szisfn8c4mnpws3pfzrndrl5kgdd239qrfqz"; + sha256bin64 = "1hmkinzn4gpikjfd8c9j30px3i0x6y8dddn9pyvjzsk6dzfcvknz"; + version = "65.0.3325.31"; }; stable = { - sha256 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; - sha256bin64 = "18a61myi3wlrk9zr7jjad1zi8k0ls9cnl2nyhjibjlwiz3npwbm5"; - version = "64.0.3282.119"; + sha256 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl"; + sha256bin64 = "1zsgcnilip9rxbs51xvnchp87gh4fmgxzrcf9dhfrnldhji17ikj"; + version = "64.0.3282.140"; }; } From f610a780e45f0951bd9b0f4a1303c09fd86ddc15 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 4 Feb 2018 11:59:00 -0600 Subject: [PATCH 478/797] icestorm: 2018.01.10 -> 2018.02.04 Signed-off-by: Austin Seipp --- pkgs/development/tools/icestorm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index efd4265443b..8b3cd17a7b2 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2018.01.10"; + version = "2018.02.04"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "bca8c3c88f5707213a6cc55ec7b06b576ab98809"; - sha256 = "00g1xd70dlgvyfyk5ivj71dpk0vzx3xka60f6x3hm4frl9ahyhj7"; + rev = "722790ad3cdb497e1b13cd1b4368d8380371eb37"; + sha256 = "0l04c6dshhhdcgqg1bdlw215wbn52fsg2fm2cvavhvf64c18lwd1"; }; nativeBuildInputs = [ pkgconfig ]; From 2b5a665bc1ce8f3476c7cd0e54f0eab176071259 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 4 Feb 2018 11:59:11 -0600 Subject: [PATCH 479/797] arachne-pnr: 2018.01.10 -> 2018.02.04 Signed-off-by: Austin Seipp --- pkgs/development/compilers/arachne-pnr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 9629d4eface..8dcebbf442b 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2018.01.10"; + version = "2018.02.04"; src = fetchFromGitHub { owner = "cseed"; repo = "arachne-pnr"; - rev = "24f6b9c341910f6aaca1498872fe2e99ff8210cf"; - sha256 = "0jd91hx16jx0p0jiqhgh1kbh59k82i4979f4xp4wzc249br7lxlv"; + rev = "c21df0062c6ee13e8c8280cefbb7c017823336c0"; + sha256 = "1ah1gn07av3ff5lnay4p7dahaacbyj0mfakbx7g5fs3p1m1m8p1k"; }; enableParallelBuilding = true; From 12037a9e791a590b9881d1f53efafed079fab9d2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 4 Feb 2018 11:59:19 -0600 Subject: [PATCH 480/797] yosys: 2018.01.10 -> 2018.02.04 Signed-off-by: Austin Seipp --- pkgs/development/compilers/yosys/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 4f4a54ef426..eb96acafb9e 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2018.01.10"; + version = "2018.02.04"; srcs = [ (fetchFromGitHub { - owner = "cliffordwolf"; + owner = "yosyshq"; repo = "yosys"; - rev = "9ac560f5d3e5847b7e475195f66b7034e91fd938"; - sha256 = "01p1bcjq030y7g21lsghgkqj23x6yl8cwrcx2xpik45xls6pxrg7"; + rev = "0659d9eac7b546ee6f5acab46dbc83c91d556a34"; + sha256 = "1hy21gxcp3q3hlbh5sh46h2340r11fwalkb9if9sbpc9y3279njj"; name = "yosys"; }) (fetchFromBitbucket { From 0e371a60a5d8216a2cd94f516b28a9f8ef627383 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 4 Feb 2018 11:59:35 -0600 Subject: [PATCH 481/797] symbiyosys: 2018.01.10 -> 2018.02.04 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/symbiyosys/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 6a26ee6e3d6..e8feaa0acc4 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2018.01.10"; + version = "2018.02.04"; src = fetchFromGitHub { - owner = "cliffordwolf"; + owner = "yosyshq"; repo = "symbiyosys"; - rev = "25936009bbc2cffd289c607ddf42a578527aa59c"; - sha256 = "06idd8vbn4s2k6bja4f6lxjc4qwgbak2fhfxj8f18ki1xb3yqfh6"; + rev = "236f6412c1c1afe95d752eaf907f66f19c343134"; + sha256 = "06bsvvkn9yhz9jvgf7a6pf407ab9m5qrr42niww666z967xdw4p0"; }; buildInputs = [ python3 yosys ]; From ca1a55cabdd38a032aa3d393b654789b0a63ef4f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 4 Feb 2018 10:41:36 -0800 Subject: [PATCH 482/797] freeipmi: 1.5.7 -> 1.6.1 --- pkgs/tools/system/freeipmi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 03839339926..fd70dce4edf 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, libgcrypt, readline }: +{ fetchurl, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.5.7"; + version = "1.6.1"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "1rdxs33klk6956rg8mn2dxwkk43y5yilvgvbcka8g6v4x0r98v5l"; + sha256 = "0jdm1nwsnkj0nzjmcqprmjk25449mhjj25khwzpq3mpjw440wmd2"; }; - buildInputs = [ libgcrypt readline ]; + buildInputs = [ libgcrypt readline libgpgerror ]; doCheck = true; From 4e2ff7528b693087d29110ecf9fd788933da9fda Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 4 Feb 2018 20:13:54 +0100 Subject: [PATCH 483/797] =?UTF-8?q?synapse:=200.2.99.2=20=E2=86=92=200.2.9?= =?UTF-8?q?9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/synapse/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 13f3fa98d56..cc267dceaf8 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme, gobjectIntrospection +{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee +, keybinder3, json_glib, zeitgeist, vala_0_38, hicolor_icon_theme, gobjectIntrospection }: let - version = "0.2.99.2"; + version = "0.2.99.3"; in stdenv.mkDerivation rec { name = "synapse-${version}"; src = fetchurl { url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; - sha256 = "04cnsmwf9xa52dh7rpb4ia715c0ls8jg1p7llc9yf3lbg1m0bvzv"; + sha256 = "0rwd42164xqfi40r13yr29cx6zy3bckgxk00y53b376nl5yqacvy"; }; nativeBuildInputs = [ - pkgconfig intltool vala_0_34 + pkgconfig gettext vala_0_38 # For setup hook gobjectIntrospection ]; From d78f9f030b5dc197c90ef279cfa1f69214420d06 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 2 Feb 2018 06:20:32 -0600 Subject: [PATCH 484/797] plasma-integration: Upstream patch for Qt 5.8 font style names Since Qt 5.8, font style names are handled in a way that prevents alternate styles (bold, italic, etc.) from being selected for user interface fonts. See also: https://phabricator.kde.org/D9070 --- pkgs/desktops/plasma-5/default.nix | 2 +- .../plasma-5/plasma-integration/D9070.patch | 24 +++++++++++++++++++ .../default.nix} | 7 ++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/plasma-5/plasma-integration/D9070.patch rename pkgs/desktops/plasma-5/{plasma-integration.nix => plasma-integration/default.nix} (66%) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 0972673b7b8..81f42a2adbe 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -125,7 +125,7 @@ let milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; plasma-desktop = callPackage ./plasma-desktop {}; - plasma-integration = callPackage ./plasma-integration.nix {}; + plasma-integration = callPackage ./plasma-integration {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; plasma-vault = callPackage ./plasma-vault {}; diff --git a/pkgs/desktops/plasma-5/plasma-integration/D9070.patch b/pkgs/desktops/plasma-5/plasma-integration/D9070.patch new file mode 100644 index 00000000000..66fef4712a7 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-integration/D9070.patch @@ -0,0 +1,24 @@ +Index: src/platformtheme/kfontsettingsdata.cpp +=================================================================== +--- src/platformtheme/kfontsettingsdata.cpp ++++ src/platformtheme/kfontsettingsdata.cpp +@@ -70,15 +70,18 @@ + const KFontData &fontData = DefaultFontData[fontType]; + cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight); + cachedFont->setStyleHint(fontData.StyleHint); +- cachedFont->setStyleName(QLatin1String(fontData.StyleName)); + + const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey); + QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString()); + + //If we have serialized information for this font, restore it + //NOTE: We are not using KConfig directly because we can't call QFont::QFont from here + if (!fontInfo.isEmpty()) { + cachedFont->fromString(fontInfo); ++ } else { ++ // set the canonical stylename here, where it cannot override ++ // user-specific font attributes if those do not include a stylename. ++ cachedFont->setStyleName(QLatin1String(fontData.StyleName)); + } + + mFonts[fontType] = cachedFont; diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix similarity index 66% rename from pkgs/desktops/plasma-5/plasma-integration.nix rename to pkgs/desktops/plasma-5/plasma-integration/default.nix index f6964428762..d33ecf05024 100644 --- a/pkgs/desktops/plasma-5/plasma-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -14,4 +14,11 @@ mkDerivation { breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland libXcursor qtquickcontrols2 ]; + patches = [ + # See also: https://phabricator.kde.org/D9070 + # ttuegel: The patch is checked into Nixpkgs because I could not get + # Phabricator to give me a stable link to it. + ./D9070.patch + ]; + patchFlags = "-p0"; } From 77a607aa88d505f5ad54624ebeea83b320792e4a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 2 Feb 2018 06:30:25 -0600 Subject: [PATCH 485/797] nixos/plasma5: Fix font style names in kdeglobals --- .../services/x11/desktop-managers/plasma5.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 17a2cde3a65..4c76ce0bb19 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -47,6 +47,18 @@ in ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ''} + if [ -f "$HOME/.config/kdeglobals" ] + then + # Remove extraneous font style names. + # See also: https://phabricator.kde.org/D9070 + ${getBin pkgs.gnused}/bin/sed -i "$HOME/.config/kdeglobals" \ + -e '/^fixed=/ s/,Regular$//' \ + -e '/^font=/ s/,Regular$//' \ + -e '/^menuFont=/ s/,Regular$//' \ + -e '/^smallestReadableFont=/ s/,Regular$//' \ + -e '/^toolBarFont=/ s/,Regular$//' + fi + exec "${getBin plasma5.plasma-workspace}/bin/startkde" ''; }; From 2d724b68bfa79e967f1887d0c057bff01110fc8d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 5 Feb 2018 03:37:40 +0800 Subject: [PATCH 486/797] airsonic: 10.0.1 -> 10.1.1 --- pkgs/servers/misc/airsonic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 57040f46947..7fc041d8198 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "airsonic-${version}"; - version = "10.0.1"; + version = "10.1.1"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "1qky8dz49200f6100ivkn5g7i0hzkv3gpq2r0cj6z53s8d1ayblc"; + sha256 = "0acj6la88lnbfdp0nilvsll48zfig7sgibgwfjjckialppyg4ir6"; }; buildCommand = '' From 14731b5968c2d102e7dc660b20b30fe5a38e1f54 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 5 Feb 2018 03:46:10 +0800 Subject: [PATCH 487/797] calibre: 3.15.0 -> 3.16.0 --- 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 186cdc6c62e..919f949ff66 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.15.0"; + version = "3.16.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1zvk499g3ddl82f6655ddqzl7r62hj1fq3qjsxpn07an2lizail7"; + sha256 = "0dsnn974lfd6xbnyjhgxl2hd07kjhm1w9plqi28mx8nqa8bwqira"; }; patches = [ From 988bec8774bac1a47b7e68bf20cb21436a28574b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Feb 2018 22:13:11 +0100 Subject: [PATCH 488/797] python3Packages.asynctest: init at 0.11.1 --- .../python-modules/asynctest/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/asynctest/default.nix diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix new file mode 100644 index 00000000000..2b0348a8758 --- /dev/null +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, pythonOlder, python }: + +buildPythonPackage rec { + pname = "asynctest"; + version = "0.11.1"; + + disabled = pythonOlder "3.4"; + + # PyPI tarball doesn't ship test/__init__.py + src = fetchFromGitHub { + owner = "Martiusweb"; + repo = pname; + rev = "v${version}"; + sha256 = "1vvh5vbq2fbz6426figs85z8779r7svb4dp2v3xynhhv05nh2y6v"; + }; + + postPatch = '' + # Skip failing test, probably caused by file system access + substituteInPlace test/test_selector.py \ + --replace "test_events_watched_outside_test_are_ignored" "xtest_events_watched_outside_test_are_ignored" + ''; + + checkPhase = '' + ${python.interpreter} -m unittest test + ''; + + meta = with lib; { + description = "Enhance the standard unittest package with features for testing asyncio libraries"; + homepage = https://github.com/Martiusweb/asynctest; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 681b390ac1d..c655d1e8f52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -623,6 +623,8 @@ in { }; }; + asynctest = callPackage ../development/python-modules/asynctest { }; + async-timeout = callPackage ../development/python-modules/async_timeout { }; asn1ate = callPackage ../development/python-modules/asn1ate { }; From 0cef410c08d00f2d6f774651947d8137a97935ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Feb 2018 22:28:33 +0100 Subject: [PATCH 489/797] pythonPackages.imaplib2: init at 2.45.0 --- .../python-modules/imaplib2/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/imaplib2/default.nix diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/pkgs/development/python-modules/imaplib2/default.nix new file mode 100644 index 00000000000..0ceff353f9a --- /dev/null +++ b/pkgs/development/python-modules/imaplib2/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "imaplib2"; + version = "2.45.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "a35b6d88258696e80aabecfb784e08730b8558fcaaa3061ff2c7f8637afbd0b3"; + }; + + # No tests on PyPI and no tags on GitHub :( + doCheck = false; + + meta = with lib; { + description = "A threaded Python IMAP4 client"; + homepage = https://github.com/bcoe/imaplib2; + # See https://github.com/bcoe/imaplib2/issues/25 + license = licenses.psfl; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c655d1e8f52..e1ffcb8b4f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5285,6 +5285,8 @@ in { }; }; + imaplib2 = callPackage ../development/python-modules/imaplib2 { }; + ipfsapi = buildPythonPackage rec { name = "ipfsapi-${version}"; version = "0.4.2.post1"; From 58e467c850435fd787dec70a6752d852fc6c67fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Feb 2018 22:47:01 +0100 Subject: [PATCH 490/797] python3Packages.aioimaplib: init at 0.7.13 --- .../python-modules/aioimaplib/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/aioimaplib/default.nix diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix new file mode 100644 index 00000000000..d335cbc556c --- /dev/null +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils }: + +buildPythonPackage rec { + pname = "aioimaplib"; + version = "0.7.13"; + + # PyPI tarball doesn't ship tests + src = fetchFromGitHub { + owner = "bamthomas"; + repo = pname; + rev = version; + sha256 = "19yhk4ixfw46d0bvx6a40r23nvia5a83dzn5rzwaq1wdjr186bbn"; + }; + + disbaled = pythonOlder "3.4"; + + checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils ]; + + meta = with lib; { + description = "Python asyncio IMAP4rev1 client library"; + homepage = https://github.com/bamthomas/aioimaplib; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1ffcb8b4f0..858d035d06d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -155,6 +155,8 @@ in { agate-sql = callPackage ../development/python-modules/agate-sql { }; + aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; ansicolor = callPackage ../development/python-modules/ansicolor { }; From e35ca9af500a0198983d1f1b671e5149da90eb4f Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Sun, 4 Feb 2018 16:49:16 -0600 Subject: [PATCH 491/797] edid-decode: init at git-2017-09-18 --- pkgs/tools/misc/edid-decode/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/edid-decode/default.nix diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix new file mode 100644 index 00000000000..ccfa2913b92 --- /dev/null +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "edid-decode-unstable"; + version = "2017-09-18"; + + src = fetchgit { + url = "git://anongit.freedesktop.org/xorg/app/edid-decode"; + rev = "f56f329ed23a25d002352dedba1e8f092a47286f"; + sha256 = "1qzaq342dsdid0d99y7kj60p6bzgp2zjsmspyckddc68mmz4cs9n"; + }; + + installPhase = '' + mkdir -p $out/bin + cp edid-decode $out/bin + ''; + + meta = { + description = "EDID decoder and conformance tester"; + homepage = http://cgit.freedesktop.org/xorg/app/edid-decode/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.chiiruno ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92f81ee2861..21e2b0e1768 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1953,6 +1953,8 @@ with pkgs; ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { }; + edid-decode = callPackage ../tools/misc/edid-decode { }; + editres = callPackage ../tools/graphics/editres { }; edit = callPackage ../applications/editors/edit { }; From 5d2b4a5dc85fe0dfe488be124ff18c043a66a6f6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Feb 2018 01:02:24 +0200 Subject: [PATCH 492/797] picocom: 3.0 -> 3.1 --- pkgs/tools/misc/picocom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index dfd81bd9742..57be275d32a 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "picocom-${version}"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "npat-efault"; repo = "picocom"; rev = version; - sha256 = "1i75ksm44la8kn82v71hzq0q5642y108rascdb94zilhagdhilk2"; + sha256 = "1vvjydqf0ax47nvdyyl67jafw5b3sfsav00xid6qpgia1gs2r72n"; }; buildInputs = [ makeWrapper ]; From ff8b077071d50198e82f2a9c11eb6a7aa0df339f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 2 Feb 2018 10:35:42 -0800 Subject: [PATCH 493/797] mpich2: 3.2 -> 3.2.1 --- pkgs/development/libraries/mpich2/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index d400712a6f9..b7ea23d73bf 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -1,17 +1,33 @@ -{ stdenv, fetchurl, python, perl, gfortran }: +{ stdenv, fetchurl, python, perl, gfortran +, slurm, openssh, hwloc +} : stdenv.mkDerivation rec { name = "mpich-${version}"; - version = "3.2"; + version = "3.2.1"; src = fetchurl { - url = "http://www.mpich.org/static/downloads/3.2/mpich-3.2.tar.gz"; - sha256 = "0bvvk4n9g4rmrncrgs9jnkcfh142i65wli5qp1akn9kwab1q80z6"; + url = "http://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; + sha256 = "1w9h4g7d46d9l5jbcyfxpaqzpjrc5hyvr9d0ns7278psxpr3pdax"; }; - configureFlags = "--enable-shared --enable-sharedlib"; + configureFlags = [ + "--enable-shared" + "--enable-sharedlib" + ]; + + buildInputs = [ perl gfortran slurm openssh hwloc ]; + + doCheck = true; + + preFixup = '' + # /tmp/nix-build... ends up in the RPATH, fix it manually + for entry in $out/bin/mpichversion $out/bin/mpivars; do + echo "fix rpath: $entry" + patchelf --set-rpath "$out/lib" $entry + done + ''; - buildInputs = [ perl gfortran ]; meta = { description = "Implementation of the Message Passing Interface (MPI) standard"; From bd80130fd9eaa07808f481d15489ae35a3aad3e7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 2 Feb 2018 12:08:47 -0800 Subject: [PATCH 494/797] mpich2: add maintainer, update license --- pkgs/development/libraries/mpich2/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index b7ea23d73bf..4b8e2b651e4 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; - meta = { + meta = with stdenv.lib; { description = "Implementation of the Message Passing Interface (MPI) standard"; longDescription = '' @@ -38,9 +38,11 @@ stdenv.mkDerivation rec { version 2. ''; homepage = http://www.mcs.anl.gov/mpi/mpich2/; - license = "free, see http://www.mcs.anl.gov/research/projects/mpich2/downloads/index.php?s=license"; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + license = { + url = http://git.mpich.org/mpich.git/blob/a385d6d0d55e83c3709ae851967ce613e892cd21:/COPYRIGHT; + fullName = "MPICH license (permissive)"; + }; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.unix; }; } From b51454eb54305a446fc8be82eea218d054dbc286 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 5 Feb 2018 01:49:42 +0100 Subject: [PATCH 495/797] pythonPackages.github-cli: removed since upstream declared project non-functional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit also does not work on python3 even thought we provide it there… Note on the upstream repo [1]: > IMPORTANT: github-cli does not function anymore since API v2 has been > replaced by API v3 A possible alternative for github-cli that addresses > API v3 is Stephen Celis' [ghi](https://github.com/stephencelis/ghi) [1] https://github.com/jsmits/github-cli --- pkgs/top-level/python-packages.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 681b390ac1d..6ff71bd216c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2129,26 +2129,6 @@ in { }; }; - github-cli = buildPythonPackage rec { - version = "1.0.0"; - name = "github-cli-${version}"; - src = pkgs.fetchFromGitHub { - owner = "jsmits"; - repo = "github-cli"; - rev = version; - sha256 = "16bwn42wqd76zs97v8p6mqk79p5i2mb06ljk67lf8gy6kvqc1x8y"; - }; - - buildInputs = with self; [ nose pkgs.git ]; - propagatedBuildInputs = with self; [ simplejson ]; - - # skipping test_issues_cli.py since it requires access to the github.com - patchPhase = "rm tests/test_issues_cli.py"; - checkPhase = "nosetests tests/"; - - meta.maintainers = with maintainers; [ garbas ]; - }; - case = buildPythonPackage rec { name = "case-${version}"; version = "1.5.2"; From 1472fa8685706bab65a6807c788604c70094ebb8 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 3 Nov 2017 21:20:52 -0300 Subject: [PATCH 496/797] matrix-synapse: create and connect to local postgresql db --- .../modules/services/misc/matrix-synapse.nix | 58 ++++++++++++++++--- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 80979547d33..33b3b17359c 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.matrix-synapse; + pg = config.services.postgresql; + usePostgresql = cfg.database_type == "psycopg2"; logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}''; mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; @@ -38,7 +40,7 @@ database: { name: "${cfg.database_type}", args: { ${concatStringsSep ",\n " ( - mapAttrsToList (n: v: "\"${n}\": ${v}") cfg.database_args + mapAttrsToList (n: v: "\"${n}\": ${builtins.toJSON v}") cfg.database_args )} } } @@ -155,7 +157,7 @@ in { tls_certificate_path = mkOption { type = types.nullOr types.str; default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.crt"; + example = "${cfg.dataDir}/homeserver.tls.crt"; description = '' PEM encoded X509 certificate for TLS. You can replace the self-signed certificate that synapse @@ -167,7 +169,7 @@ in { tls_private_key_path = mkOption { type = types.nullOr types.str; default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.key"; + example = "${cfg.dataDir}/homeserver.tls.key"; description = '' PEM encoded private key for TLS. Specify null if synapse is not speaking TLS directly. @@ -176,7 +178,7 @@ in { tls_dh_params_path = mkOption { type = types.nullOr types.str; default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.dh"; + example = "${cfg.dataDir}/homeserver.tls.dh"; description = '' PEM dh parameters for ephemeral keys ''; @@ -344,11 +346,32 @@ in { The database engine name. Can be sqlite or psycopg2. ''; }; + create_local_database = mkOption { + type = types.bool; + default = true; + description = '' + Whether to create a local database automatically. + ''; + }; + database_name = mkOption { + type = types.str; + default = "matrix-synapse"; + description = "Database name."; + }; + database_user = mkOption { + type = types.str; + default = "matrix-synapse"; + description = "Database user name."; + }; database_args = mkOption { type = types.attrs; default = { - database = "${cfg.dataDir}/homeserver.db"; - }; + sqlite3 = { database = "${cfg.dataDir}/homeserver.db"; }; + psycopg2 = { + user = cfg.database_user; + database = cfg.database_name; + }; + }."${cfg.database_type}"; description = '' Arguments to pass to the engine. ''; @@ -623,15 +646,36 @@ in { gid = config.ids.gids.matrix-synapse; } ]; + services.postgresql.enable = mkIf usePostgresql (mkDefault true); + systemd.services.matrix-synapse = { description = "Synapse Matrix homeserver"; - after = [ "network.target" ]; + after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; preStart = '' ${cfg.package}/bin/homeserver \ --config-path ${configFile} \ --keys-directory ${cfg.dataDir} \ --generate-keys + '' + optionalString (usePostgresql && cfg.create_local_database) '' + if ! test -e "${cfg.dataDir}/db-created"; then + ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \ + ${pg.package}/bin/createuser \ + --login \ + --no-createdb \ + --no-createrole \ + --encrypted \ + ${cfg.database_user} + ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \ + ${pg.package}/bin/createdb \ + --owner=${cfg.database_user} \ + --encoding=UTF8 \ + --lc-collate=C \ + --lc-ctype=C \ + --template=template0 \ + ${cfg.database_name} + touch "${cfg.dataDir}/db-created" + fi ''; serviceConfig = { Type = "simple"; From a4b7de74a5a7d1be6698063705e2b01850cfaba1 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sat, 4 Nov 2017 10:11:49 -0300 Subject: [PATCH 497/797] matrix-synapse: default to postgresql on 18.03 --- nixos/doc/manual/release-notes/rl-1803.xml | 14 ++++++++++++++ nixos/modules/services/misc/matrix-synapse.nix | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 46cbeb0a158..8391c550afa 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -182,6 +182,20 @@ following incompatible changes: lib.mkOverride can be used. + + + The following changes apply if the stateVersion is changed to 18.03 or higher. + For stateVersion = "17.09" or lower the old behavior is preserved. + + + + + matrix-synapse uses postgresql by default instead of sqlite. + Migration instructions can be found here . + + + + diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 33b3b17359c..b153ebbc98c 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -341,7 +341,9 @@ in { }; database_type = mkOption { type = types.enum [ "sqlite3" "psycopg2" ]; - default = "sqlite3"; + default = if versionAtLeast config.system.stateVersion "18.03" + then "psycopg2" + else "sqlite3"; description = '' The database engine name. Can be sqlite or psycopg2. ''; From fbba0d0ee59a8313177687f6943cf5fca2da6318 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sat, 4 Nov 2017 10:16:31 -0300 Subject: [PATCH 498/797] matrix-synapse: default server_name to hostname --- nixos/modules/services/misc/matrix-synapse.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index b153ebbc98c..7e880ad09b8 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -186,6 +186,7 @@ in { server_name = mkOption { type = types.str; example = "example.com"; + default = config.networking.hostName; description = '' The domain name of the server, with optional explicit port. This is used by remote servers to connect to this server, From e591f11c259acad5d130df8fb1af28bf84de68ce Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sat, 4 Nov 2017 15:21:55 -0300 Subject: [PATCH 499/797] nixos/tests: add matrix-synapse test --- nixos/release.nix | 1 + nixos/tests/matrix-synapse.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 nixos/tests/matrix-synapse.nix diff --git a/nixos/release.nix b/nixos/release.nix index a396eaac9a3..a9c0aae7a52 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -292,6 +292,7 @@ in rec { tests.login = callTest tests/login.nix {}; #tests.logstash = callTest tests/logstash.nix {}; tests.mathics = callTest tests/mathics.nix {}; + tests.matrix-synapse = callTest tests/matrix-synapse.nix {}; tests.mesos = callTest tests/mesos.nix {}; tests.misc = callTest tests/misc.nix {}; tests.mongodb = callTest tests/mongodb.nix {}; diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix new file mode 100644 index 00000000000..113fb622588 --- /dev/null +++ b/nixos/tests/matrix-synapse.nix @@ -0,0 +1,30 @@ +import ./make-test.nix ({ pkgs, ... } : { + + name = "matrix-synapse"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ corngood ]; + }; + + nodes = { + server_postgres = args: { + services.matrix-synapse.enable = true; + services.matrix-synapse.database_type = "psycopg2"; + }; + + server_sqlite = args: { + services.matrix-synapse.enable = true; + services.matrix-synapse.database_type = "sqlite3"; + }; + }; + + testScript = '' + startAll; + $server_postgres->waitForUnit("matrix-synapse.service"); + $server_postgres->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $server_postgres->requireActiveUnit("postgresql.service"); + $server_sqlite->waitForUnit("matrix-synapse.service"); + $server_sqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $server_sqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]"); + ''; + +}) From f36b17305ec08c5cea59a2b77b0bcd0bb617799a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Mon, 5 Feb 2018 04:19:14 +0100 Subject: [PATCH 500/797] grv: 0.1.0 -> 0.1.1 --- .../version-management/git-and-tools/grv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index 386589aaf05..cbcf4cd9aeb 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }: let - version = "0.1.0"; + version = "0.1.1"; in buildGoPackage { name = "grv-${version}"; @@ -16,7 +16,7 @@ buildGoPackage { owner = "rgburke"; repo = "grv"; rev = "v${version}"; - sha256 = "1qd9kq8l29v3gwwls98933bk0rdw44mrbnqgb1r6hm9m6vzjfcn3"; + sha256 = "0q9gvxfw48d4kjpb2jx7lg577vazjg0n961y6ija5saja5n16mk2"; }; meta = with stdenv.lib; { From bbebd26b13d577199ccf5bda28324c53fe99a271 Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Mon, 5 Feb 2018 15:41:19 +0800 Subject: [PATCH 501/797] fastlane: 2.75.1 -> 2.80.0 --- pkgs/tools/admin/fastlane/Gemfile.lock | 22 ++++++++------- pkgs/tools/admin/fastlane/gemset.nix | 38 ++++++++++++++++---------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 5dddccfe78a..a578bb4bca2 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -4,6 +4,7 @@ GEM CFPropertyList (2.3.6) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + atomos (0.1.2) babosa (1.0.2) claide (1.0.2) colored (1.2) @@ -16,7 +17,7 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.2.1) excon (0.60.0) - faraday (0.13.1) + faraday (0.14.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -24,8 +25,8 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.1) - fastlane (2.75.1) - CFPropertyList (>= 2.3, < 3.0.0) + fastlane (2.80.0) + CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) bundler (>= 1.12.0, < 2.0.0) @@ -49,16 +50,16 @@ GEM public_suffix (~> 2.0.0) rubyzip (>= 1.1.0, < 2.0.0) security (= 0.1.3) - slack-notifier (>= 1.3, < 2.0.0) + slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 1.6.2, < 2.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.7.0, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.5.2, < 2.0.0) xcpretty (>= 0.2.4, < 1.0.0) xcpretty-travis-formatter (>= 0.0.3) - gh_inspector (1.0.3) + gh_inspector (1.1.1) google-api-client (0.13.6) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.5) @@ -89,7 +90,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_magick (4.5.1) - multi_json (1.13.0) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.3) @@ -109,13 +110,13 @@ GEM faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - slack-notifier (1.5.1) + slack-notifier (2.3.2) terminal-notifier (1.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) tty-cursor (0.5.0) tty-screen (0.6.4) - tty-spinner (0.7.0) + tty-spinner (0.8.0) tty-cursor (>= 0.5.0) uber (0.1.0) unf (0.1.4) @@ -123,8 +124,9 @@ GEM unf_ext (0.0.7.4) unicode-display_width (1.3.0) word_wrap (1.0.0) - xcodeproj (1.5.4) + xcodeproj (1.5.6) CFPropertyList (~> 2.3.3) + atomos (~> 0.1.2) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.2.3) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index a309de07a11..c9ddb7b77c0 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -8,6 +8,14 @@ }; version = "2.5.2"; }; + atomos = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10z69hjv30r2w5q5wmlf0cq4jv3w744jrac8ylln8sf45ckqj7wk"; + type = "gem"; + }; + version = "0.1.2"; + }; babosa = { source = { remotes = ["https://rubygems.org"]; @@ -102,10 +110,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw"; + sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr"; type = "gem"; }; - version = "0.13.1"; + version = "0.14.0"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -137,18 +145,18 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v5i9wnbmsmvz3xhbkvs1w5qj9b0ib5431i3zlimfasf8h138l9y"; + sha256 = "0saas50qdfipkms66snyg7imvzn1vfngd87dfygj9x8v18bqwvis"; type = "gem"; }; - version = "2.75.1"; + version = "2.80.0"; }; gh_inspector = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x"; + sha256 = "0mpfl279k8yff2ia601b37zw31blwh2plkr501iz6qj8drx3mq3c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.1"; }; google-api-client = { dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; @@ -262,10 +270,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "05rrhxl08qvd37g5q13v6k8qqbr1ixn6g53ld6rxrvj4lxrjvxns"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.13.0"; + version = "1.13.1"; }; multi_xml = { source = { @@ -368,10 +376,10 @@ slack-notifier = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; + sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv"; type = "gem"; }; - version = "1.5.1"; + version = "2.3.2"; }; terminal-notifier = { source = { @@ -410,10 +418,10 @@ dependencies = ["tty-cursor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sblbhnscgchnxpbsxa5xmnxnpw13nd4lgsykazm9mhsxmjmhggw"; + sha256 = "1xv5bycgmiyx00bq0kx2bdixi3h1ffi86mwj858gqbxlpjbzsi94"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; uber = { source = { @@ -457,13 +465,13 @@ version = "1.0.0"; }; xcodeproj = { - dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04kv04y5yz2zniwwywh5ik29gpnjpsp23yr6w07qn3m243icvi76"; + sha256 = "0zqx24qhax7p91rs1114da0v86cy9m7an1bjwxq6dyccp8g6kb50"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; xcpretty = { dependencies = ["rouge"]; From df133ea27a47f44a9580ff0e2639c5a85b574455 Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Mon, 5 Feb 2018 05:45:01 -0500 Subject: [PATCH 502/797] fanficfare: 2.16.0 -> 2.22.0 --- pkgs/tools/text/fanficfare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index 37447d0fb2a..2af9baeb5c5 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python27Packages }: python27Packages.buildPythonApplication rec { - version = "2.16.0"; + version = "2.22.0"; name = "fanficfare-${version}"; nameprefix = ""; src = fetchurl { url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "0c31z7w4b3wz5nahsmnfhvp3srprfsqbp3zyngw4cqw3dm17kvvi"; + sha256 = "1gwr2qk0wff8f69w21ffj6cq8jklqd89vcdhhln6ii1h1kf8k031"; }; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; From 8243d2b96f1f52bb6a7cf9fdf7a350b956d463a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Feb 2018 11:52:42 +0100 Subject: [PATCH 503/797] python34: 3.4.7 -> 3.4.8 --- pkgs/development/interpreters/python/cpython/3.4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 2e8a95e7329..4c0979ca0e3 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.4"; - minorVersion = "7"; + minorVersion = "8"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "06wx2ag0dnixny67jfdl5z10243fjga898cgxhnr4dnxaqmwy547"; + sha256 = "1sn3i9z9m56inlfrqs250qv8snl8w211wpig2pfjlyrcj3x75919"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; From 870e73617740ce95048858ec2991c9af6834c4c4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Feb 2018 11:53:01 +0100 Subject: [PATCH 504/797] python35: 3.5.4 -> 3.5.5 --- pkgs/development/interpreters/python/cpython/3.5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index eb8d0a2df38..a8519a76a23 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.5"; - minorVersion = "4"; + minorVersion = "5"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0k68ai0a204piwibz013ds6ck7hgj9gk4nin2259y41vpgx3pncl"; + sha256 = "02ahsijk3a42sdzfp2il49shx0v4birhy7kkj0dikmh20hxjqg86"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; From 4250f50dc940ff6903313ecacc98aafebb9f52bd Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Mon, 5 Feb 2018 11:10:20 +0000 Subject: [PATCH 505/797] electron: 1.7.9 -> 1.7.11 https://github.com/electron/electron/releases/tag/v1.7.10 https://github.com/electron/electron/releases/tag/v1.7.11 --- pkgs/development/tools/electron/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index fb91989775b..0df2decef2c 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: let - version = "1.7.9"; + version = "1.7.11"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.system}"; @@ -20,15 +20,15 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0m87n7hqimg93z3m8pa1ggs69f3h5mjrsrrl7x80hxmp3w142krc"; + sha256 = "0mxrayczs6fc2a53fzfbgs88l71wm7hadq9ir510kicakblmdbyx"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "17ii0x6326mwjd0x5dj2693r67y0jra88hkqcpddcq08vf1knr2f"; + sha256 = "0v22xhzbq9lcbc83laqs45pbx8gzv648qfkj01pxfsmv3lb4myrl"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "17jkma50d6az8dbyrym8z2lsw2n0r6jhdlm8pb5c928bzgshryqm"; + sha256 = "02n2y69zwzacigqp6f4vg47cmjzf8gvbbispmzkg3pnzk4qc9473"; }; }.${stdenv.system} or throwSystem; @@ -56,7 +56,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1s8kslp101xyaffb3rf8p5cw3p6zij2mn19fa68ykx4naykkwaly"; + sha256 = "19kfb09ap780ayk7miqfr6gmba9rd10f9q9aphj35yk7cl22znbr"; }; buildInputs = [ unzip ]; From 39172792c6ef2717bf7a2b6788aa87fe0598229b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 5 Feb 2018 12:51:42 +0100 Subject: [PATCH 506/797] linuxPackages.cpupower: clean up fixes the build on 17.09 --- pkgs/os-specific/linux/cpupower/default.nix | 28 ++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index d6d529627e2..ba2e9c8c52d 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -7,29 +7,23 @@ stdenv.mkDerivation { buildInputs = [ coreutils pciutils gettext ]; - configurePhase = '' + postPatch = '' cd tools/power/cpupower sed -i 's,/bin/true,${coreutils}/bin/true,' Makefile sed -i 's,/bin/pwd,${coreutils}/bin/pwd,' Makefile sed -i 's,/usr/bin/install,${coreutils}/bin/install,' Makefile ''; - buildPhase = '' - make - ''; - - installPhase = '' - make \ - bindir="$out/bin" \ - sbindir="$out/sbin" \ - mandir="$out/share/man" \ - includedir="$out/include" \ - libdir="$out/lib" \ - localedir="$out/share/locale" \ - docdir="$out/share/doc/cpupower" \ - confdir="$out/etc" \ - install install-man - ''; + installFlags = [ + "bindir=$(out)/bin" + "sbindir=$(out)/sbin" + "mandir=$(out)/share/man" + "includedir=$(out)/include" + "libdir=$(out)/lib" + "localedir=$(out)/share/locale" + "docdir=$(out)/share/doc/cpupower" + "confdir=$(out)/etc" + ]; enableParallelBuilding = true; From ca78dc1704f052bddb38c7188fc93109666cda77 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 5 Feb 2018 13:09:12 +0100 Subject: [PATCH 507/797] wireguard: 0.0.20180118 -> 0.0.20180202 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index db8a510bb59..c5461c06e83 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180118"; + version = "0.0.20180202"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "18x8ndnr4lvl3in5sian6f9q69pk8h4xbwldmk7bfrpb5m03ngs6"; + sha256 = "ee3415b482265ad9e8721aa746aaffdf311058a2d1a4d80e7b6d11bbbf71c722"; }; meta = with stdenv.lib; { From f79fe0c9233b3a02971ca21828765d8106ad111f Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Fri, 2 Feb 2018 10:35:36 +0200 Subject: [PATCH 508/797] idea-community: 2017.3.3 -> 2017.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 6cd68b6f21d..7ffd7fa3df5 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -273,12 +273,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1wxaz25609wri2d91s9wy00gngplyjg7gzix3mzdhgysm00qizf1"; /* updated by script */ + sha256 = "15qsfirzmmjhwzkhx36zr4n0z5lhs021n2n3wim01g309ymr4gl9"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; From 3fc60ef64f7c1350770a97e94244cf416205ab3b Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Fri, 2 Feb 2018 10:35:56 +0200 Subject: [PATCH 509/797] idea-ultimate: 2017.3.3 -> 2017.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 7ffd7fa3df5..d02bfac7fa1 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -286,12 +286,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "01d5a6m927q9bnjlpz8va8bfjnj52k8q6i3im5ygj6lwadbzawyf"; /* updated by script */ + sha256 = "0f937s6zc1sv0gdlxf9kkc8l8rg78a5mxsfr2laab0g37rfy8c99"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; From 44cd5c51a875b6b6d8e5621c6b7c5602c0f76ee7 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Fri, 2 Feb 2018 10:36:20 +0200 Subject: [PATCH 510/797] phpstorm: 2017.3.3 -> 2017.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d02bfac7fa1..3d5775ef039 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -299,12 +299,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0mk4d2c41qvfz7sqxqw7adak86pm95wvhzxrfg32y01r5i5q0av7"; /* updated by script */ + sha256 = "1hxkn0p0lp021bbysypwn8s69iggb76iwq38jv5a1ql7v5r1nwvd"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PS2017.3"; From 0901062480861e75e92ab5bdfb62cddd7f1eea6f Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Fri, 2 Feb 2018 10:36:42 +0200 Subject: [PATCH 511/797] webstorm: 2017.3.3 -> 2017.3.4 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3d5775ef039..430349f37ef 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -364,12 +364,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1fhs13944928rqcqbv8d29qm1y0zzry4drr9gqqmj814y2vkbpnl"; /* updated by script */ + sha256 = "0d5whqa6c76l6g5yj0yq8a3k1x6d9kxwnac1dwsiy5dbr5jk0cyj"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; From 12ccb81570a239a42d315e1483df22c5eba23bf3 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Mon, 5 Feb 2018 14:25:23 +0200 Subject: [PATCH 512/797] clion: 2017.3.2 -> 2017.3.3 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 430349f37ef..0e77094b819 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -234,12 +234,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.3.2"; /* updated by script */ + version = "2017.3.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0lv0nwfgm6h67mxhh0a2154ym7wcbm1qp3k1k1i00lg0lwig1rcw"; /* updated by script */ + sha256 = "0j090863y68ppw34qkldm8h4lpbhalhqn70gb0ifj9bglf17503d"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml From 9d188f908ca4356f1db8cf7ef6a49bcbc23f516f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 4 Feb 2018 13:39:24 +0100 Subject: [PATCH 513/797] pythonPackages.nose-parameterized: create `parameterized` alias `pythonPackages.parameterized` is the successor of `nose-parameterized` as the authors of the module decided to support more testing frameworks and stopped focusing on `noes` only. `nose-parameterized` is still available in `pypi` with version `0.6.0`, but is officially deprecated. However the renaming happened quite recently so it is possible that there are still folks relying on `nose-parameterized`. Therefore I moved the expression to provide a `pythonPackages.parameterized` derivation and added a package override which builds `nose-parameterized` after yielding a deprecation warning. --- .../nose-parameterized/default.nix | 22 ++------------- .../python-modules/parameterized/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 3 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/parameterized/default.nix diff --git a/pkgs/development/python-modules/nose-parameterized/default.nix b/pkgs/development/python-modules/nose-parameterized/default.nix index 3c7cd077cdc..77b540fdef0 100644 --- a/pkgs/development/python-modules/nose-parameterized/default.nix +++ b/pkgs/development/python-modules/nose-parameterized/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: +{ fetchPypi, parameterized }: -buildPythonPackage rec { +parameterized.overrideAttrs (o: rec { pname = "nose-parameterized"; version = "0.6.0"; @@ -8,20 +8,4 @@ buildPythonPackage rec { inherit pname version; sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk"; }; - - # Tests require some python3-isms but code works without. - doCheck = isPy3k; - - buildInputs = [ nose glibcLocales ]; - propagatedBuildInputs = [ six ]; - - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -v - ''; - - meta = with stdenv.lib; { - description = "Parameterized testing with any Python test framework"; - homepage = https://pypi.python.org/pypi/nose-parameterized; - license = licenses.bsd3; - }; -} +}) diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix new file mode 100644 index 00000000000..14b41fe950b --- /dev/null +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: + +buildPythonPackage rec { + pname = "parameterized"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa"; + }; + + # Tests require some python3-isms but code works without. + doCheck = isPy3k; + + checkInputs = [ nose glibcLocales ]; + propagatedBuildInputs = [ six ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -v + ''; + + meta = with stdenv.lib; { + description = "Parameterized testing with any Python test framework"; + homepage = https://pypi.python.org/pypi/parameterized; + license = licenses.bsd3; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a279d96591..b958d217e3c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3839,7 +3839,8 @@ in { }; }); - nose-parameterized = callPackage ../development/python-modules/nose-parameterized {}; + nose-parameterized = warn "Warning: `nose-parameterized` is deprecated! Use `parameterized` instead." + (callPackage ../development/python-modules/nose-parameterized {}); neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; @@ -12397,6 +12398,8 @@ in { }; }; + parameterized = callPackage ../development/python-modules/parameterized { }; + paramz = callPackage ../development/python-modules/paramz { }; parsel = buildPythonPackage rec { From 14da2e22b40d5b9c0978627c2fdc1d76283d3c58 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 4 Feb 2018 14:08:02 +0100 Subject: [PATCH 514/797] pythonPackages.pybase64: init at 0.2.1 `pybase64` is a tiny wrapper for `libbase64` written in python. /cc @ironpinguin --- .../python-modules/pybase64/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pybase64/default.nix diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix new file mode 100644 index 00000000000..c81d60ced4d --- /dev/null +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, stdenv, fetchPypi, parameterized, six, nose }: + +buildPythonPackage rec { + pname = "pybase64"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hggg69s5r8jyqdwyzri5sn3f19p7ayl0fjhjma0qzgfp7bk6zjc"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ parameterized nose ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/pybase64; + description = "Fast Base64 encoding/decoding"; + license = licenses.bsd2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b958d217e3c..e4ae79d8958 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12823,6 +12823,8 @@ in { kmsxx = callPackage ../development/libraries/kmsxx { }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; + pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; version = "0.2.4"; From f565274fe530d2c3008ec6e2f27a1381a0978ce0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 23 Jan 2018 21:11:44 -0600 Subject: [PATCH 515/797] rhash: 1.3.3 -> 1.3.5 1.3.5: https://github.com/rhash/RHash/releases/tag/v1.3.5 1.3.4: https://github.com/rhash/RHash/releases/tag/v1.3.4 * still need makefile bug workarounds * cleanup a bit * port darwin patch-- don't believe still needed but shouldn't hurt. --- pkgs/tools/security/rhash/darwin.patch | 25 ------------------------- pkgs/tools/security/rhash/default.nix | 20 ++++++-------------- 2 files changed, 6 insertions(+), 39 deletions(-) diff --git a/pkgs/tools/security/rhash/darwin.patch b/pkgs/tools/security/rhash/darwin.patch index 76ad8fe9abd..058791cdd88 100644 --- a/pkgs/tools/security/rhash/darwin.patch +++ b/pkgs/tools/security/rhash/darwin.patch @@ -11,28 +11,3 @@ index e40dbc3..e198b93 100644 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 68c3edc4cd2..14121b3bc04 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,31 +1,23 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.3.3"; + version = "1.3.5"; name = "rhash-${version}"; src = fetchurl { url = "mirror://sourceforge/rhash/${name}-src.tar.gz"; - sha1 = "0981bdc98ba7ef923b1a6cd7fd8bb0374cff632e"; - sha256 = "0nii6p4m2x8rkaf8r6smgfwb1q4hpf117kkg64yr6gyqgdchnljv"; + sha256 = "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q"; }; patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; - installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "AR:=$(AR)" "CC:=$(CC)" ]; - # 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 CC=$CC AR=$AR PREFIX=$out - ''; + buildFlags = [ "build-shared" "lib-shared" ]; - # we don't actually want the static library, so we remove it after it - # gets installed installPhase = '' - make DESTDIR="$out" PREFIX="/" install-shared install-lib-shared install-lib-static - rm $out/lib/librhash.a + make $makeFlags -C librhash install-lib-shared install-headers install-so-link + make $makeFlags install-shared ''; meta = with stdenv.lib; { From 10300424924050b037f617bb00070c9b1bfc7b18 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 5 Feb 2018 14:31:43 +0100 Subject: [PATCH 516/797] edid-decode: fixed missing version in name attribute --- pkgs/tools/misc/edid-decode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index ccfa2913b92..e4968b12e6c 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchgit }: - -stdenv.mkDerivation rec { - name = "edid-decode-unstable"; +let version = "2017-09-18"; +in stdenv.mkDerivation rec { + name = "edid-decode-unstable-${version}"; src = fetchgit { url = "git://anongit.freedesktop.org/xorg/app/edid-decode"; From 272e9308278849438fbb0e5a9439f1fda89bf223 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 5 Feb 2018 00:00:11 +0100 Subject: [PATCH 517/797] sage: fix non-deterministic build failures The build was failing on some machines because of a `find` command that touched files in different orders on different machines. That confused `make`s timestamp mechanism. --- .../science/math/sage/spkg-giac.patch | 17 +++++++++++++---- .../science/math/sage/spkg-git.patch | 11 ++++++++--- .../science/math/sage/spkg-singular.patch | 16 +++++++++++----- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/math/sage/spkg-giac.patch b/pkgs/applications/science/math/sage/spkg-giac.patch index 15b91433d25..c79d4422133 100644 --- a/pkgs/applications/science/math/sage/spkg-giac.patch +++ b/pkgs/applications/science/math/sage/spkg-giac.patch @@ -1,10 +1,19 @@ ---- old/build/pkgs/giac/spkg-install 2017-07-21 14:10:00.000000000 -0500 -+++ new/build/pkgs/giac/spkg-install 2017-10-15 15:55:55.321237645 -0500 -@@ -4,6 +4,8 @@ +diff --git a/build/pkgs/giac/spkg-install b/build/pkgs/giac/spkg-install +index bdd8df6cb8..3fd7a3ef8a 100644 +--- a/build/pkgs/giac/spkg-install ++++ b/build/pkgs/giac/spkg-install +@@ -2,6 +2,15 @@ ## Giac ########################################### -+find . -type f -exec sed -e 's@/bin/cp@cp@g' -i '{}' ';' && echo "Patching input parser" && find . -iname 'input_parser.cc' ++# Fix hardcoded paths, while making sure to only update timestamps of actually ++# changed files (otherwise confuses make) ++grep -rlF '/bin/cp' . | while read file ++do ++ sed -e 's@/bin/cp@cp@g' -i "$file" ++done ++ ++# Fix input parser syntax +sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc' if [ "$SAGE_LOCAL" = "" ]; then diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch index ff9a7b2e491..74f552dd3c3 100644 --- a/pkgs/applications/science/math/sage/spkg-git.patch +++ b/pkgs/applications/science/math/sage/spkg-git.patch @@ -1,12 +1,17 @@ diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install -index 8469cb58c2..d0dc9a1db9 100755 +index 87874de3d8..b0906245fa 100644 --- a/build/pkgs/git/spkg-install +++ b/build/pkgs/git/spkg-install -@@ -35,6 +35,8 @@ fi +@@ -33,6 +33,13 @@ fi cd src -+find . -type f -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' ++# Fix hardcoded paths, while making sure to only update timestamps of actually ++# changed files (otherwise confuses make) ++grep -rlF '/usr/bin/perl' . | while read file ++do ++ sed -e 's@/usr/bin/perl@perl@g' -i "$file" ++done + # We don't want to think about Fink or Macports export NO_FINK=1 diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch index d561768600b..606ffcd3ad4 100644 --- a/pkgs/applications/science/math/sage/spkg-singular.patch +++ b/pkgs/applications/science/math/sage/spkg-singular.patch @@ -1,11 +1,17 @@ ---- old/build/pkgs/singular/spkg-install 2017-10-15 10:35:41.826540964 -0500 -+++ new/build/pkgs/singular/spkg-install 2017-10-15 10:36:40.613743443 -0500 -@@ -4,6 +4,9 @@ +diff --git a/build/pkgs/singular/spkg-install b/build/pkgs/singular/spkg-install +index 8caafb1699..3c34e6608a 100644 +--- a/build/pkgs/singular/spkg-install ++++ b/build/pkgs/singular/spkg-install +@@ -2,6 +2,13 @@ ## Singular ########################################### -+find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' -+#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing ++# Fix hardcoded paths, while making sure to only update timestamps of actually ++# changed files (otherwise confuses make) ++grep -rlF '/bin/rm' . | while read file ++do ++ sed -e 's@/bin/rm@rm@g' -i "$file" ++done + if [ -z "$SAGE_LOCAL" ]; then echo >&2 "Error: SAGE_LOCAL undefined -- exiting..." From 8a72d2a3227f6e7db8afdbda9cfb19b4611dc1e9 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 5 Feb 2018 14:43:31 +0100 Subject: [PATCH 518/797] htop: 2.02 -> 2.1.0 --- pkgs/tools/system/htop/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 750ff8e59ef..992067da50f 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,19 +1,24 @@ { lib, fetchurl, stdenv, ncurses, -IOKit }: +IOKit, python }: stdenv.mkDerivation rec { name = "htop-${version}"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - sha256 = "11zlwadm6dpkrlfvf3z3xll26yyffa7qrxd1w72y1kl0rgffk6qp"; url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; + sha256 = "0j07z0xm2gj1vzvbgh4323k4db9mr7drd7gw95mmpqi61ncvwq1j"; }; + nativeBuildInputs = [ python ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + prePatch = '' + patchShebangs scripts/MakeHeader.py + ''; + meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; homepage = https://hisham.hm/htop/; From 088274bf2c22dc97a518a9322be57a20da6b0f2b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Feb 2018 08:43:27 -0600 Subject: [PATCH 519/797] rhash: 1.3.5 -> 2018-02-05 Latest git is much more build-friendly. --- pkgs/tools/security/rhash/default.nix | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 14121b3bc04..485b34cff88 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { - version = "1.3.5"; + version = "2018-02-05"; name = "rhash-${version}"; - src = fetchurl { - url = "mirror://sourceforge/rhash/${name}-src.tar.gz"; - sha256 = "0bhz3xdl6r06k1bqigdjz42l31iqz2qdpg7zk316i7p2ra56iq4q"; + src = fetchFromGitHub { + owner = "rhash"; + repo = "RHash"; + rev = "cc26d54ff5df0f692907a5e3132a5eeca559ed61"; + sha256 = "1ldagp931lmxxpyvsb9rrar4iqwmv94m6lfjzkbkshpmk3p5ng7h"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + nativeBuildInputs = [ which ]; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "AR:=$(AR)" "CC:=$(CC)" ]; + # configure script is not autotools-based, doesn't support these options + configurePlatforms = [ ]; - buildFlags = [ "build-shared" "lib-shared" ]; - - installPhase = '' - make $makeFlags -C librhash install-lib-shared install-headers install-so-link - make $makeFlags install-shared - ''; + installTargets = [ "install" "install-lib-shared" "install-lib-so-link" ]; + postInstall = "make -C librhash install-headers"; meta = with stdenv.lib; { homepage = http://rhash.anz.ru; From 9ccbb2aa37023e834cc5b6bd0e0262e377a23df8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Feb 2018 09:06:24 -0600 Subject: [PATCH 520/797] rhash: Remove unused darwin patch --- pkgs/tools/security/rhash/darwin.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 pkgs/tools/security/rhash/darwin.patch diff --git a/pkgs/tools/security/rhash/darwin.patch b/pkgs/tools/security/rhash/darwin.patch deleted file mode 100644 index 058791cdd88..00000000000 --- a/pkgs/tools/security/rhash/darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 From 65f90f9c67027586d554e9098cfc540386791bcd Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Mon, 5 Feb 2018 16:06:49 +0100 Subject: [PATCH 521/797] assaultcube: init at official master branch , rev = "9f537b0876a39d7686e773040469fbb1417de18b" (#34623) * assaultcube: init at official git master branch --- lib/maintainers.nix | 1 + pkgs/games/assaultcube/assaultcube-next.patch | 11 +++ pkgs/games/assaultcube/default.nix | 82 +++++++++++++++++++ pkgs/games/assaultcube/launcher.sh | 20 +++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 116 insertions(+) create mode 100644 pkgs/games/assaultcube/assaultcube-next.patch create mode 100644 pkgs/games/assaultcube/default.nix create mode 100644 pkgs/games/assaultcube/launcher.sh diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9ff2d53b466..d2c62ef9bb8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -258,6 +258,7 @@ gavin = "Gavin Rogers "; gebner = "Gabriel Ebner "; geistesk = "Alvar Penning "; + genesis = "Ronan Bignaux "; georgewhewell = "George Whewell "; gilligan = "Tobias Pflug "; giogadi = "Luis G. Torres "; diff --git a/pkgs/games/assaultcube/assaultcube-next.patch b/pkgs/games/assaultcube/assaultcube-next.patch new file mode 100644 index 00000000000..92fc7996670 --- /dev/null +++ b/pkgs/games/assaultcube/assaultcube-next.patch @@ -0,0 +1,11 @@ +--- 1.1.0.4/source/src/Makefile ++++ 1.1.0.4/source/src/Makefile +@@ -6,7 +6,7 @@ + # found to have been caused by the g++ compiler in the past. This seems to have + # been fixed now by relaxing the optimization that g++ does, so although we'll + # continue using clang++ (just in case), you can use g++ if you prefer. +-CXX=clang++ ++#CXX=clang++ + + # Changing this to ACDEBUG=yes will compile a debug version of AssaultCube. + ACDEBUG=no diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix new file mode 100644 index 00000000000..cef48978b6d --- /dev/null +++ b/pkgs/games/assaultcube/default.nix @@ -0,0 +1,82 @@ +{ fetchFromGitHub, stdenv, makeDesktopItem, openal, pkgconfig, libogg, + libvorbis, SDL, SDL_image, makeWrapper, zlib, + client ? true, server ? true }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + + # master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix. + pname = "assaultcube"; + version = "01052017"; + name = "${pname}-${version}"; + + meta = { + description = "Fast and fun first-person-shooter based on the Cube fps"; + homepage = http://assault.cubers.net; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; # should work on darwin with a little effort. + license = stdenv.lib.licenses.zlib; + }; + + src = fetchFromGitHub { + owner = "assaultcube"; + repo = "AC"; + rev = "9f537b0876a39d7686e773040469fbb1417de18b"; + sha256 = "0nvckn67mmfaa7x3j41xyxjllxqzfx1dxg8pnqsaak3kkzds34pl"; + }; + + # ${branch} not accepted as a value ? + # TODO: write a functional BUNDLED_ENET option and restore it in deps. + patches = [ ./assaultcube-next.patch ]; + + nativeBuildInputs = [ pkgconfig ]; + + # add optional for server only ? + buildInputs = [ makeWrapper openal SDL SDL_image libogg libvorbis zlib ]; + + #makeFlags = [ "CXX=g++" ]; + + targets = (optionalString server "server") + (optionalString client " client"); + buildPhase = '' + make -C source/src ${targets} + ''; + + desktop = makeDesktopItem { + name = "AssaultCube"; + desktopName = "AssaultCube"; + comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay."; + genericName = "First-person shooter"; + categories = "Application;Game;ActionGame;Shooter"; + icon = "assaultcube.png"; + exec = "${pname}"; + }; + + gamedatadir = "/share/games/${pname}"; + + installPhase = '' + + bindir=$out/bin + + mkdir -p $bindir $out/$gamedatadir + + cp -r config packages $out/$gamedatadir + + # install custom script + substituteAll ${./launcher.sh} $bindir/assaultcube + chmod +x $bindir/assaultcube + + if (test -e source/src/ac_client) then + cp source/src/ac_client $bindir + mkdir -p $out/share/applications + cp ${desktop}/share/applications/* $out/share/applications + install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png + install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png + fi + + if (test -e source/src/ac_server) then + cp source/src/ac_server $bindir + ln -s $bindir/${pname} $bindir/${pname}-server + fi + ''; +} diff --git a/pkgs/games/assaultcube/launcher.sh b/pkgs/games/assaultcube/launcher.sh new file mode 100644 index 00000000000..331cb861f66 --- /dev/null +++ b/pkgs/games/assaultcube/launcher.sh @@ -0,0 +1,20 @@ +#!@shell@ +# original scripts are very awful + +CUBE_DIR=@out@@gamedatadir@ + +case $(basename "$0") in + assaultcube-server) + CUBE_OPTIONS="-Cconfig/servercmdline.txt" + BINARYPATH=@out@/bin/ac_server + ;; + assaultcube) + CUBE_OPTIONS="--home=${HOME}/.assaultcube/v1.2next --init" + BINARYPATH=@out@/bin/ac_client + ;; + *) echo "$0" is not supported. + exit 1 +esac + +cd $CUBE_DIR +exec "${BINARYPATH}" ${CUBE_OPTIONS} "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21e2b0e1768..73f47828055 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18195,6 +18195,8 @@ with pkgs; physfs = physfs_2; }; + assaultcube = callPackage ../games/assaultcube { }; + astromenace = callPackage ../games/astromenace { }; atanks = callPackage ../games/atanks {}; From 4faac207bc3614d0700e33bd175f38fdfe423f0d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 4 Feb 2018 15:58:08 -0600 Subject: [PATCH 522/797] nix: fix config for echo/test on newer busybox Matches https://github.com/NixOS/nix/commit/2f1a1c5a49b50594a4aa9d4729a5b64255dd0932 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 81031c0a547..f733be5fd00 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -16,8 +16,8 @@ let enableMinimal = true; extraConfig = '' CONFIG_ASH y - CONFIG_ASH_BUILTIN_ECHO y - CONFIG_ASH_BUILTIN_TEST y + CONFIG_ASH_ECHO y + CONFIG_ASH_TEST y CONFIG_ASH_OPTIMIZE_FOR_SIZE y ''; }; From 74d928cf8b56fa33baf748d039c89985aa1fb1e7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Feb 2018 09:19:54 -0600 Subject: [PATCH 523/797] nix: enable more features in busybox shell to resolve build failures --- pkgs/tools/package-management/nix/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f733be5fd00..1e53f450964 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -15,10 +15,22 @@ let enableStatic = true; enableMinimal = true; extraConfig = '' + CONFIG_FEATURE_FANCY_ECHO y + CONFIG_FEATURE_SH_MATH y + CONFIG_FEATURE_SH_MATH_64 y + CONFIG_ASH y - CONFIG_ASH_ECHO y - CONFIG_ASH_TEST y CONFIG_ASH_OPTIMIZE_FOR_SIZE y + + CONFIG_ASH_ALIAS y + CONFIG_ASH_BASH_COMPAT y + CONFIG_ASH_CMDCMD y + CONFIG_ASH_ECHO y + CONFIG_ASH_GETOPTS y + CONFIG_ASH_INTERNAL_GLOB y + CONFIG_ASH_JOB_CONTROL y + CONFIG_ASH_PRINTF y + CONFIG_ASH_TEST y ''; }; From 35441b52d97fa66b377488760c807a45660df8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20D=C3=B6rfler?= Date: Mon, 5 Feb 2018 17:06:49 +0100 Subject: [PATCH 524/797] Wrapped ${mailbox.name} in "s to allow for space in mailbox names. --- nixos/modules/services/mail/dovecot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 18101a31225..c5cb06cf54e 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -104,7 +104,7 @@ let }; mailboxConfig = mailbox: '' - mailbox ${mailbox.name} { + mailbox "${mailbox.name}" { auto = ${toString mailbox.auto} '' + optionalString (mailbox.specialUse != null) '' special_use = \${toString mailbox.specialUse} From 6626349a036ee7a1b0170ba665dd18fc1ad75228 Mon Sep 17 00:00:00 2001 From: Varun Patro Date: Tue, 6 Feb 2018 00:35:55 +0800 Subject: [PATCH 525/797] Create default.nix --- pkgs/os-specific/darwin/lsusb/default.nix | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/os-specific/darwin/lsusb/default.nix diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix new file mode 100644 index 00000000000..5d05c1c9084 --- /dev/null +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "1.0"; + name = "lsusb-${version}"; + + src = fetchFromGitHub { + owner = "jlhonora"; + repo = "lsusb"; + rev = "8a6bd7084a55a58ade6584af5075c1db16afadd1"; + sha256 = "0p8pkcgvsx44dd56wgipa8pzi3298qk9h4rl9pwsw1939hjx6h0g"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man8 + install -m 0755 lsusb $out/bin + install -m 0444 man/lsusb.8 $out/share/man/man8 + ''; + + meta = { + homepage = https://github.com/jlhonora/lsusb; + description = "lsusb command for Mac OS X"; + platforms = stdenv.lib.platforms.darwin; + license = stdenv.lib.licenses.mit; + }; +} From db4e82561940703484716398607707522a03082c Mon Sep 17 00:00:00 2001 From: Varun Patro Date: Tue, 6 Feb 2018 00:41:35 +0800 Subject: [PATCH 526/797] Update darwin-packages.nix --- pkgs/top-level/darwin-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index e75c9338f8d..1f8039010d7 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -44,6 +44,8 @@ in }; libobjc = apple-source-releases.objc4; + + lsusb = callPackage ../os-specific/darwin/lsusb { }; opencflite = callPackage ../os-specific/darwin/opencflite { }; From 6ec60e8c4446c5093fff01a810ed30ed94d7603d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Feb 2018 11:26:01 -0600 Subject: [PATCH 527/797] busybox-sandbox-shell: extract basic shell to new attribute Nix will use this shell if the attribute is present, avoiding duplicating changes in the future. --- .../linux/busybox/sandbox-shell.nix | 26 +++++++++++++++++++ pkgs/tools/package-management/nix/default.nix | 26 ++----------------- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 pkgs/os-specific/linux/busybox/sandbox-shell.nix diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix new file mode 100644 index 00000000000..1755bd4f3f7 --- /dev/null +++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix @@ -0,0 +1,26 @@ +{ busybox }: + +# Minimal shell for use as basic /bin/sh in sandbox builds +busybox.override { + useMusl = true; + enableStatic = true; + enableMinimal = true; + extraConfig = '' + CONFIG_FEATURE_FANCY_ECHO y + CONFIG_FEATURE_SH_MATH y + CONFIG_FEATURE_SH_MATH_64 y + + CONFIG_ASH y + CONFIG_ASH_OPTIMIZE_FOR_SIZE y + + CONFIG_ASH_ALIAS y + CONFIG_ASH_BASH_COMPAT y + CONFIG_ASH_CMDCMD y + CONFIG_ASH_ECHO y + CONFIG_ASH_GETOPTS y + CONFIG_ASH_INTERNAL_GLOB y + CONFIG_ASH_JOB_CONTROL y + CONFIG_ASH_PRINTF y + CONFIG_ASH_TEST y + ''; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1e53f450964..3f77e47868b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl -, libseccomp, busybox +, libseccomp, busybox-sandbox-shell , hostPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -10,29 +10,7 @@ let - sh = busybox.override { - useMusl = true; - enableStatic = true; - enableMinimal = true; - extraConfig = '' - CONFIG_FEATURE_FANCY_ECHO y - CONFIG_FEATURE_SH_MATH y - CONFIG_FEATURE_SH_MATH_64 y - - CONFIG_ASH y - CONFIG_ASH_OPTIMIZE_FOR_SIZE y - - CONFIG_ASH_ALIAS y - CONFIG_ASH_BASH_COMPAT y - CONFIG_ASH_CMDCMD y - CONFIG_ASH_ECHO y - CONFIG_ASH_GETOPTS y - CONFIG_ASH_INTERNAL_GLOB y - CONFIG_ASH_JOB_CONTROL y - CONFIG_ASH_PRINTF y - CONFIG_ASH_TEST y - ''; - }; + sh = busybox-sandbox-shell; common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec { inherit name src; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92f81ee2861..f873e682d9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12593,6 +12593,7 @@ with pkgs; bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; + busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { }; cachefilesd = callPackage ../os-specific/linux/cachefilesd { }; From 9d5cce6767b1384d40189fb1d4dc18db64b501df Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Mon, 5 Feb 2018 18:32:35 +0100 Subject: [PATCH 528/797] vimPlugins.targets-vim: init at 2017-12-03 --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d041d6de4f6..0172faaea3d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2035,6 +2035,17 @@ rec { buildInputs = [ python ]; }; + targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "targets-vim-2017-12-03"; + src = fetchgit { + url = "https://github.com/wellle/targets.vim"; + rev = "6f809397526797f8f419a5d2b86d90e5aff68e66"; + sha256 = "0djjm7b41kgrkz447br7qi3w96ayz9lyxd164gyp082qqxxpz63q"; + }; + dependencies = []; + + }; + command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "command-t-2017-11-16"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 661917c955b..a0906e4f3b4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -165,6 +165,7 @@ "github:vim-scripts/wombat256.vim" "github:w0rp/ale" "github:wakatime/vim-wakatime" +"github:wellle/targets.vim" "github:wincent/command-t" "github:will133/vim-dirdiff" "github:xolox/vim-easytags" From 39f62c770b6e93e57240dbca64f5c298398ddaed Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Feb 2018 13:00:12 -0500 Subject: [PATCH 529/797] haxl: Disable non-deterministic tests --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b46da64c342..35a3ab0985e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -281,6 +281,7 @@ self: super: { hashed-storage = dontCheck super.hashed-storage; hashring = dontCheck super.hashring; hath = dontCheck super.hath; + haxl = dontCheck super.haxl; # non-deterministic failure https://github.com/facebook/Haxl/issues/85 haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing hdbi-postgresql = dontCheck super.hdbi-postgresql; hedis = dontCheck super.hedis; From 04769e898f5f453e4a59cda3a908b3fc334705fd Mon Sep 17 00:00:00 2001 From: Elmar Athmer Date: Sat, 3 Feb 2018 00:36:02 +0100 Subject: [PATCH 530/797] hcloud: init at 1.3.0 --- pkgs/development/tools/hcloud/default.nix | 24 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/hcloud/default.nix diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix new file mode 100644 index 00000000000..e56502a4ad0 --- /dev/null +++ b/pkgs/development/tools/hcloud/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "hcloud-${version}"; + version = "1.3.0"; + goPackagePath = "github.com/hetznercloud/cli"; + + src = fetchFromGitHub { + owner = "hetznercloud"; + repo = "cli"; + rev = "v${version}"; + sha256 = "1216qz1kk38vkvfrznjwb65vsbhscqvvrsbp2i6pnf0i85p00pqm"; + }; + + buildFlagsArray = [ "-ldflags=" "-X github.com/hetznercloud/cli.Version=${version}" ]; + + meta = { + description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; + homepage = https://github.com/hetznercloud/cli; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.zauberpony ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73f47828055..42c2e752511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7603,6 +7603,8 @@ with pkgs; guile = guile_2_0; }; + hcloud = callPackage ../development/tools/hcloud { }; + help2man = callPackage ../development/tools/misc/help2man { inherit (perlPackages) LocaleGettext; }; From 9ee6f466064e00f6b4e4fd30fd063e6dba78c987 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Feb 2018 12:19:15 -0600 Subject: [PATCH 531/797] grv: pass in version, fix "grv -version" to at least include that Currently: $ grv -version GRV - Git Repository Viewer Unknown (commit: Unknown, compiled: Unknown) After: $ grv -version GRV - Git Repository Viewer 0.1.1 (commit: Unknown, compiled: Unknown) --- .../version-management/git-and-tools/grv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index cbcf4cd9aeb..d1c722c5446 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -19,6 +19,8 @@ buildGoPackage { sha256 = "0q9gvxfw48d4kjpb2jx7lg577vazjg0n961y6ija5saja5n16mk2"; }; + buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; + meta = with stdenv.lib; { description = " GRV is a terminal interface for viewing git repositories"; homepage = https://github.com/rgburke/grv; From 674b39b048ea3e0538ddb3d83a6d105d269a0998 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Mon, 5 Feb 2018 20:13:28 +0100 Subject: [PATCH 532/797] jenkins: 2.103 -> 2.105 --- .../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 642a6a97bc0..1586d636087 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.103"; + version = "2.105"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1d771q4xjjji7ydh6xjz3j6hz2mszxh0m3zqjh4khlzqhnvydlha"; + sha256 = "0q6xyjkqlrwjgf7rzmyy8m0w7lhqyavici76zzngg159xkyh5cfh"; }; buildCommand = '' From ab664977bb11ebfd3909958eec4ae5d451a89ec5 Mon Sep 17 00:00:00 2001 From: Augustin Borsu Date: Mon, 5 Feb 2018 21:30:08 +0100 Subject: [PATCH 533/797] nextcloud: 12.0.4 -> 12.0.5 --- 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 d2e08932fe1..70c252d395f 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "12.0.4"; + version = "12.0.5"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1dh9knqbw6ph2rfrb5rscdraj4375rqddmrifw6adyga9jkn2hb5"; + sha256 = "0hya524d8wqia5v2wz8cmasi526j97z6d0l1h7l7j442wsn2kgn8"; }; installPhase = '' From ceeacd52052a2ebd27a6648f7604db7aea7e4b69 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Mon, 5 Feb 2018 20:25:43 +0000 Subject: [PATCH 534/797] graphviz: Explicitly specify libltdl directories This should prevent the build from picking up /usr/lib/libltdl.so in non-chroot builds on non-nixOS. --- pkgs/tools/graphics/graphviz/base.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 8a46b302dcd..f61c7923d79 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin) "-I${cairo.dev}/include/cairo"; - configureFlags = optional (xorg == null) "--without-x"; + configureFlags = [ + "--with-ltdl-lib=${libtool.lib}/lib" + "--with-ltdl-include=${libtool}/include" + ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ]; postPatch = '' for f in $(find . -name Makefile.in); do From c08e4b9102f1b1bd7cd23cc84c61292f1f45aa7e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Feb 2018 21:56:43 +0100 Subject: [PATCH 535/797] boost: Don't store absolute path in #line This causes packages to have boost.dev in their runtime closures, via assertion messages. Fixes #34462. --- pkgs/development/libraries/boost/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index c2a59431ac0..14ea512afbd 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation { postFixup = '' # Make boost header paths relative so that they are not runtime dependencies - find "$dev/include" \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ + cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ -exec sed '1i#line 1 "{}"' -i '{}' \; '' + optionalString (hostPlatform.libc == "msvcrt") '' $RANLIB "$out/lib/"*.a From d3b38271548ef66fa880fd3fb131fff00ba02e8a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 5 Feb 2018 21:14:07 +0100 Subject: [PATCH 536/797] libksba: fix darwin build --- pkgs/development/libraries/libksba/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 8bff5a21cd0..3f7a4bed9cc 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror }: +{ stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { name = "libksba-1.3.5"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; propagatedBuildInputs = [ libgpgerror ]; postInstall = '' From 6f868088df5f01d21cd1d5e6a92539862b63e55f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 5 Feb 2018 21:16:04 +0100 Subject: [PATCH 537/797] libassuan: fix darwin build --- pkgs/development/libraries/libassuan/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 94369449ff3..827d3de79ea 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pth, libgpgerror }: +{ fetchurl, stdenv, gettext, pth, libgpgerror }: stdenv.mkDerivation rec { name = "libassuan-2.5.1"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config - buildInputs = [ libgpgerror pth ]; + buildInputs = [ libgpgerror pth ] + ++ stdenv.lib.optional stdenv.isDarwin gettext; doCheck = true; @@ -20,18 +21,16 @@ stdenv.mkDerivation rec { sed -i 's,#include ,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h ''; - meta = { + meta = with stdenv.lib; { description = "IPC library used by GnuPG and related software"; - longDescription = '' Libassuan is a small library implementing the so-called Assuan protocol. This protocol is used for IPC between most newer GnuPG components. Both, server and client side functions are provided. ''; - homepage = http://gnupg.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl2Plus; + platforms = platforms.all; }; } From d5ccec3c4e6d5eb2c8b920dfc98a8de42a86bd1f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 5 Feb 2018 21:17:24 +0100 Subject: [PATCH 538/797] libgcrypt: fix darwin build --- pkgs/development/libraries/libgcrypt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 397000fc7d2..45564d64861 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap }: assert enableCapabilities -> stdenv.isLinux; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; buildInputs = [ libgpgerror ] + ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files From b9f3d49edd0d7a89b92840c54171f8a9ff42e312 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 5 Feb 2018 14:04:49 -0800 Subject: [PATCH 539/797] obs-studio: 20.1.3 -> 21.0.2 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 64bdbd21686..1c7a72d95ae 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -29,13 +29,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "20.1.3"; + version = "21.0.2"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "0qdpa2xxiiw53ksvlrf80jm8gz6kxsn56sffv2v2ijxvy7kw5zcg"; + sha256 = "1yyvxqzxy9dz6rmjcrdn90nfaff4f38mfz2gsq535cr59sg3f8jc"; }; patches = [ ./find-xcb.patch ]; From 37680b046ce6f3760f855a06804f967091b7272b Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Fri, 2 Feb 2018 02:24:06 +0100 Subject: [PATCH 540/797] pysam: init at 0.13.0 A python library to interact with SAM/BAM/CRAM files --- .../python-modules/pysam/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/pysam/default.nix diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix new file mode 100644 index 00000000000..9d6cbacc958 --- /dev/null +++ b/pkgs/development/python-modules/pysam/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, bzip2 +, bcftools +, curl +, cython +, htslib +, lzma +, pytest +, samtools +, zlib +}: + +buildPythonPackage rec { + pname = "pysam"; + version = "0.13.0"; + + # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is + # missing some files which cause test failures. + # Tracked at: https://github.com/pysam-developers/pysam/issues/616 + src = fetchFromGitHub { + owner = "pysam-developers"; + repo = "pysam"; + rev = "v${version}"; + sha256 = "1lwbcl38w1x0gciw5psjp87msmv9zzkgiqikg9b83dqaw2y5az1i"; + }; + + buildInputs = [ bzip2 curl cython lzma zlib ]; + + checkInputs = [ pytest bcftools htslib samtools ]; + + checkPhase = "py.test"; + + preInstall = '' + export HOME=$(mktemp -d) + make -C tests/pysam_data + make -C tests/cbcf_data + ''; + + meta = { + homepage = http://pysam.readthedocs.io/; + description = "A python module for reading, manipulating and writing genome data sets"; + maintainers = with lib.maintainers; [ unode ]; + license = lib.licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a279d96591..0bb304ced4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13226,6 +13226,8 @@ in { }; }; + pysam = callPackage ../development/python-modules/pysam { }; + pysaml2 = buildPythonPackage rec { name = "pysaml2-${version}"; version = "3.0.2"; From f3e87bf50f5c60b8d39862c26039e90dd25173c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Feb 2018 00:49:10 +0100 Subject: [PATCH 541/797] pythonPackages.dateparser: switch to parameterized nose-parameterized is deprecated and yields a warning --- pkgs/development/python-modules/dateparser/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index b73a1e9ec7f..21deadf146d 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, isPy3k , nose -, nose-parameterized +, parameterized , mock , glibcLocales , six @@ -23,10 +23,16 @@ buildPythonPackage rec { sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y"; }; + # Replace nose-parameterized by parameterized + prePatch = '' + sed -i s/nose_parameterized/parameterized/g tests/*.py + sed -i s/nose-parameterized/parameterized/g tests/requirements.txt + ''; + # Upstream Issue: https://github.com/scrapinghub/dateparser/issues/364 disabled = isPy3k; - checkInputs = [ nose nose-parameterized mock glibcLocales ]; + checkInputs = [ nose parameterized mock glibcLocales ]; preCheck ='' # skip because of missing convertdate module, which is an extra requirement rm tests/test_jalali.py From ae1e9fbf870c2b6f4697998f0be38924fd50e143 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Tue, 6 Feb 2018 05:33:07 +0300 Subject: [PATCH 542/797] ghc841 configuration: overrides --- .../configuration-ghc-8.4.x.nix | 858 +++++++++++++++++- 1 file changed, 856 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 49c8ac0d005..ae51b82d394 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -43,7 +43,861 @@ self: super: { xhtml = null; # GHC 8.4.x needs newer versions than LTS-10.x offers by default. - hspec = dontCheck super.hspec_2_4_7; # test suite causes an infinite loop - test-framework = self.test-framework_0_8_2_0; + ## haddock: panic! (the 'impossible' happened) + ## (GHC version 8.4.20180122 for x86_64-unknown-linux): + ## extractDecl + ## Ambiguous decl for Arg in class: + ## class Example e where + ## type Arg e :: * + ## {-# MINIMAL evaluateExample #-} + ## evaluateExample :: + ## e + ## -> Params + ## -> ActionWith Arg e -> IO () -> ProgressCallback -> IO Result + ## Matches: + ## [] + ## Call stack: + ## CallStack (from HasCallStack): + ## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable + ## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create + ## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug + hspec = dontHaddock (dontCheck super.hspec_2_4_7); # test suite causes an infinite loop + ## Setup: Encountered missing dependencies: + ## QuickCheck >=2.3 && <2.10 + ## builder for ‘/nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv’ failed + test-framework = dontCheck self.test-framework_0_8_2_0; + + # Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1: + # Distribution/Simple/CCompiler.hs:64:10: error: + # • No instance for (Semigroup CDialect) + # arising from the superclasses of an instance declaration + # • In the instance declaration for ‘Monoid CDialect’ + # | + # 64 | instance Monoid CDialect where + # | ^^^^^^^^^^^^^^^ + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal; }; #pkgs.haskell.packages.ghc822.jailbreak-cabal; + + ## Shadowed: + + ## Needs bump to a versioned attribute + ## + ## • Could not deduce (Semigroup (Dict a)) + ## arising from the superclasses of an instance declaration + ## from the context: a + constraints = super.constraints_0_10; + + hspec-core = overrideCabal super.hspec-core_2_4_7 (drv: { + ## Needs bump to a versioned attribute + ## + ## • No instance for (Semigroup Summary) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Summary’ + doCheck = false; + }); + + ## Needs bump to a versioned attribute + ## + ## breaks hspec: + ## Setup: Encountered missing dependencies: + ## hspec-discover ==2.4.7 + hspec-discover = super.hspec-discover_2_4_7; + + ## Needs bump to a versioned attribute + ## + ## • No instance for (Semigroup Metadatas) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Metadatas’ + JuicyPixels = super.JuicyPixels_3_2_9_4; + + ## Needs bump to a versioned attribute + ## + ## • Could not deduce (Semigroup (a :->: b)) + ## arising from the superclasses of an instance declaration + ## from the context: (HasTrie a, Monoid b) + MemoTrie = super.MemoTrie_0_6_9; + + semigroupoids = overrideCabal super.semigroupoids_5_2_2 (drv: { + ## Needs bump to a versioned attribute + ## + ## • Variable not in scope: mappend :: Seq a -> Seq a -> Seq a + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + ## Needs bump to a versioned attribute + ## + ## • Could not deduce (Semigroup (Traversal f)) + ## arising from the superclasses of an instance declaration + ## from the context: Applicative f + tasty = super.tasty_1_0_0_1; + + ## Needs bump to a versioned attribute + ## + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.4 && <2.13 + ## builder for ‘/nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv’ failed + th-lift = super.th-lift_0_7_8; + + + ## On Hackage: + + happy = overrideCabal super.happy (drv: { + ## On Hackage, awaiting for import + ## + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘Prelude.<>’, + ## imported from ‘Prelude’ at src/PrettyGrammar.hs:1:8-20 + version = "1.19.9"; + sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; + }); + + + ## Upstreamed + + free = overrideCabal super.free (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • Could not deduce (Semigroup (IterT m a)) + ## arising from the superclasses of an instance declaration + ## from the context: (Monad m, Monoid a) + src = pkgs.fetchFromGitHub { + owner = "ekmett"; + repo = "free"; + rev = "fcefc71ed302f2eaf60f020046bad392338b3109"; + sha256 = "0mfrd7y97pgqmb2i66jn5xwjpcrgnfcqq8dzkxqgx1b5wjdydq70"; + }; + ## Setup: Encountered missing dependencies: + ## transformers-base <0.5 + ## builder for ‘/nix/store/3yvaqx5qcg1fb3nnyc273fkhgfh73pgv-free-4.12.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/3yvaqx5qcg1fb3nnyc273fkhgfh73pgv-free-4.12.4.drv’ failed + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.transformers-base ]; + }); + + haskell-gi = overrideCabal super.haskell-gi (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## Setup: Encountered missing dependencies: + ## haskell-gi-base ==0.20.* + ## builder for ‘/nix/store/q0qkq2gzmdnkvdz6xl7svv5305chbr4b-haskell-gi-0.20.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/q0qkq2gzmdnkvdz6xl7svv5305chbr4b-haskell-gi-0.20.3.drv’ failed + src = pkgs.fetchFromGitHub { + owner = "haskell-gi"; + repo = "haskell-gi"; + rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; + sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; + }; + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + haskell-gi-base = overrideCabal super.haskell-gi-base (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## breaks haskell-gi: + ## Setup: Encountered missing dependencies: + ## haskell-gi-base ==0.21.* + src = pkgs.fetchFromGitHub { + owner = "haskell-gi"; + repo = "haskell-gi"; + rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; + sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; + }; + ## Setup: Encountered missing dependencies: + ## attoparsec ==0.13.*, + ## doctest >=0.8, + ## haskell-gi-base ==0.21.*, + ## pretty-show -any, + ## regex-tdfa >=1.2, + prePatch = "cd base; "; + }); + + haskell-src-exts = overrideCabal super.haskell-src-exts (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • Could not deduce (Semigroup (ParseResult m)) + ## arising from the superclasses of an instance declaration + ## from the context: Monoid m + src = pkgs.fetchFromGitHub { + owner = "haskell-suite"; + repo = "haskell-src-exts"; + rev = "935f6f0915e89c314b686bdbdc6980c72335ba3c"; + sha256 = "1v3c1bd5q07qncqfbikvs8h3r4dr500blm5xv3b4jqqv69f0iam9"; + }; + }); + + hedgehog = overrideCabal super.hedgehog (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## /nix/store/78sxg2kvl2klplqfx22s6b42lds7qq23-stdenv/setup: line 99: cd: hedgehog: No such file or directory + src = pkgs.fetchFromGitHub { + owner = "hedgehogqa"; + repo = "haskell-hedgehog"; + rev = "7a4fab73670bc33838f2b5f25eb824ee550079ce"; + sha256 = "1l8maassmklf6wgairk7llxvlbwxngv0dzx0fwnqx6hsb32sms05"; + }; + ## jailbreak-cabal: dieVerbatim: user error (jailbreak-cabal: Error Parsing: file "hedgehog.cabal" doesn't exist. Cannot + prePatch = "cd hedgehog; "; + }); + + lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## Setup: Encountered missing dependencies: + ## aeson >=0.9 && <0.12, + ## base >=4.7 && <4.10, + ## directory ==1.2.*, + ## megaparsec ==5.0.*, + ## vector ==0.11.* + src = pkgs.fetchFromGitHub { + owner = "lambdacube3d"; + repo = "lambdacube-compiler"; + rev = "ff6e3b136eede172f20ea8a0f7017ad1ecd029b8"; + sha256 = "0srzrq5s7pdbygn7vdipxl12a3gbyb6bpa7frbh8zwhb9fz0jx5m"; + }; + }); + + lambdacube-ir = overrideCabal super.lambdacube-ir (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## /nix/store/78sxg2kvl2klplqfx22s6b42lds7qq23-stdenv/setup: line 99: cd: lambdacube-ir.haskell: No such file or directory + src = pkgs.fetchFromGitHub { + owner = "lambdacube3d"; + repo = "lambdacube-ir"; + rev = "b86318b510ef59606c5b7c882cad33af52ce257c"; + sha256 = "0j4r6b32lcm6jg653xzg9ijxkfjahlb4x026mv5dhs18kvgqhr8x"; + }; + ## Setup: No cabal file found. + prePatch = "cd lambdacube-ir.haskell; "; + }); + + lens = overrideCabal super.lens (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • Could not deduce (Apply f) + ## arising from the superclasses of an instance declaration + ## from the context: (Contravariant f, Applicative f) + src = pkgs.fetchFromGitHub { + owner = "ekmett"; + repo = "lens"; + rev = "4ad49eaf2448d856f0433fe5a4232f1e8fa87eb0"; + sha256 = "0sd08v6syadplhk5d21yi7qffbjncn8z1bqlwz9nyyb0xja8s8wa"; + }; + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.4 && <2.13 + ## builder for ‘/nix/store/fvrc4s96ym33i74y794nap7xai9p69fa-lens-4.15.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/fvrc4s96ym33i74y794nap7xai9p69fa-lens-4.15.4.drv’ failed + jailbreak = true; + }); + + simple-reflect = overrideCabal super.simple-reflect (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • No instance for (Semigroup Expr) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Expr’ + src = pkgs.fetchFromGitHub { + owner = "twanvl"; + repo = "simple-reflect"; + rev = "c357e55da9a712dc5dbbfe6e36394e4ada2db310"; + sha256 = "15q41b00l8y51xzhbj5zhddyh3gi7gvml033w8mm2fih458jf6yq"; + }; + }); + + singletons = overrideCabal super.singletons (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## Setup: Encountered missing dependencies: + ## th-desugar ==1.7.* + ## builder for ‘/nix/store/g5jl22kpq8fnrg8ldphxndri759nxwzf-singletons-2.3.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/g5jl22kpq8fnrg8ldphxndri759nxwzf-singletons-2.3.1.drv’ failed + src = pkgs.fetchFromGitHub { + owner = "goldfirere"; + repo = "singletons"; + rev = "23aa4bdaf05ce025a2493b35ec3c26cc94e3fdce"; + sha256 = "0hw12v4z8jxmykc3j8z6g27swmfpxv40bgnx7nl0ialpwbz9mz27"; + }; + }); + + stringbuilder = overrideCabal super.stringbuilder (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • No instance for (Semigroup Builder) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Builder’ + src = pkgs.fetchFromGitHub { + owner = "sol"; + repo = "stringbuilder"; + rev = "4a1b689d3c8a462b28e0d21224b96165f622e6f7"; + sha256 = "0h3nva4mwxkdg7hh7b7a3v561wi1bvmj0pshhd3sl7dy3lpvnrah"; + }; + }); + + th-desugar = overrideCabal super.th-desugar (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • Could not deduce (MonadIO (DsM q)) + ## arising from the 'deriving' clause of a data type declaration + ## from the context: Quasi q + src = pkgs.fetchFromGitHub { + owner = "goldfirere"; + repo = "th-desugar"; + rev = "4ca98c6492015e6ad063d3ad1a2ad6c4f0a56837"; + sha256 = "1n3myd3gia9qsgdvrwqa023d3g7wkrhyv0wc8czwzz0lj9xzh7lw"; + }; + }); + + unordered-containers = overrideCabal super.unordered-containers (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## Module ‘Data.Semigroup’ does not export ‘Monoid(..)’ + ## | + ## 80 | import Data.Semigroup (Semigroup(..), Monoid(..)) + src = pkgs.fetchFromGitHub { + owner = "tibbe"; + repo = "unordered-containers"; + rev = "0a6b84ec103e28b73458f385ef846a7e2d3ea42f"; + sha256 = "128q8k4py2wr1v0gmyvqvzikk6sksl9aqj0lxzf46763lis8x9my"; + }; + }); + + websockets = overrideCabal super.websockets (drv: { + ## Upstreamed, awaiting a Hackage release + ## + ## • No instance for (Semigroup SizeLimit) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid SizeLimit’ + src = pkgs.fetchFromGitHub { + owner = "jaspervdj"; + repo = "websockets"; + rev = "11ba6d15cf47bace1936b13a58192e37908b0300"; + sha256 = "1swphhnqvs5kh0wlqpjjgx9q91yxi6lasid8akdxp3gqll5ii2hf"; + }; + }); + + + ## Unmerged + + blaze-builder = overrideCabal super.blaze-builder (drv: { + ## Unmerged. PR: https://github.com/lpsmith/blaze-builder/pull/10 + ## + ## • No instance for (Semigroup Poke) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Poke’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "blaze-builder"; + rev = "b7195f160795a081adbb9013810d843f1ba5e062"; + sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00"; + }; + }); + + bytestring-trie = overrideCabal super.bytestring-trie (drv: { + ## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3 + ## + ## • Could not deduce (Semigroup (Trie a)) + ## arising from the superclasses of an instance declaration + ## from the context: Monoid a + src = pkgs.fetchFromGitHub { + owner = "RyanGlScott"; + repo = "bytestring-trie"; + rev = "e0ae0cb1ad40dedd560090d69cc36f9760797e29"; + sha256 = "1jkdchvrca7dgpij5k4h1dy4qr1rli3fzbsqajwxmx9865rgiksl"; + }; + ## Setup: Encountered missing dependencies: + ## HUnit >=1.3.1.1 && <1.7, + ## QuickCheck >=2.4.1 && <2.11, + ## lazysmallcheck ==0.6.*, + ## smallcheck >=1.1.1 && <1.2 + doCheck = false; + ## Setup: Encountered missing dependencies: + ## data-or ==1.0.* + ## builder for ‘/nix/store/iw3xsljnygsv9q2jglcv54mqd94fig7n-bytestring-trie-0.2.4.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/iw3xsljnygsv9q2jglcv54mqd94fig7n-bytestring-trie-0.2.4.1.drv’ failed + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-or ]; + }); + + gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: { + ## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233 + ## + ## /nix/store/78sxg2kvl2klplqfx22s6b42lds7qq23-stdenv/setup: line 99: cd: tools: No such file or directory + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "gtk2hs"; + rev = "08c68d5afc22dd5761ec2c92ebf49c6d252e545b"; + sha256 = "06prn5wqq8x225n9wlbyk60f50jyjj8fm2hf181dyqjpf8wq75xa"; + }; + ## Setup: No cabal file found. + prePatch = "cd tools; "; + }); + + hashtables = overrideCabal super.hashtables (drv: { + ## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46 + ## + ## • No instance for (Semigroup Slot) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Slot’ + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "hashtables"; + rev = "b9eb4b10a50bd6250330422afecc065339a32412"; + sha256 = "0l4nplpvnzzf397zyh7j2k6yiqb46k6bdy00m4zzvhlfp7p1xkaw"; + }; + }); + + language-c = overrideCabal super.language-c (drv: { + ## Unmerged. PR: https://github.com/visq/language-c/pull/45 + ## + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘Prelude.<>’, + ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "language-c"; + rev = "03b120c64c12946d134017f4922b55c6ab4f52f8"; + sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r"; + }; + ## /bin/sh: cabal: command not found + doCheck = false; + }); + + language-c_0_7_0 = overrideCabal super.language-c_0_7_0 (drv: { + ## Unmerged. PR: https://github.com/visq/language-c/pull/45 + ## + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘Prelude.<>’, + ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "language-c"; + rev = "03b120c64c12946d134017f4922b55c6ab4f52f8"; + sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r"; + }; + ## /bin/sh: cabal: command not found + doCheck = false; + }); + + monadplus = overrideCabal super.monadplus (drv: { + ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 + ## + ## • No instance for (Semigroup (Partial a b)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (Partial a b)’ + src = pkgs.fetchFromGitHub { + owner = "asr"; + repo = "monadplus"; + rev = "aa09f2473e2c906f2707b8a3fdb0a087405fd6fb"; + sha256 = "0g37s3rih4i3vrn4kjwj12nq5lkpckmjw33xviva9gly2vg6p3xc"; + }; + }); + + reflex = overrideCabal super.reflex (drv: { + ## Unmerged. PR: https://github.com/reflex-frp/reflex/pull/158 + ## + ## • Could not deduce (Semigroup (Event t a)) + ## arising from the superclasses of an instance declaration + ## from the context: (Semigroup a, Reflex t) + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "reflex"; + rev = "4fb50139db45a37493b91973eeaad9885b4c63ca"; + sha256 = "0i7pp6cw394m2vbwcqv9z5ngdarp01sabqr1jkkgchxdkkii94nx"; + }; + ## mergeIncrementalWithMove :: + ## GCompare k => + ## Incremental t (PatchDMapWithMove k (Event t)) + ## -> Event t (DMap k Identity) + ## currentIncremental :: + ## Patch p => Incremental t p -> Behavior t (PatchTarget p) + ## updatedIncremental :: Patch p => Incremental t p -> Event t p + ## incrementalToDynamic :: + ## Patch p => Incremental t p -> Dynamic t (PatchTarget p) + ## behaviorCoercion :: + ## Coercion a b -> Coercion (Behavior t a) (Behavior t b) + ## eventCoercion :: Coercion a b -> Coercion (Event t a) (Event t b) + ## dynamicCoercion :: + ## Coercion a b -> Coercion (Dynamic t a) (Dynamic t b) + ## mergeIntIncremental :: + ## Incremental t (PatchIntMap (Event t a)) -> Event t (IntMap a) + ## fanInt :: Event t (IntMap a) -> EventSelectorInt t a + ## {-# MINIMAL never, constant, push, pushCheap, pull, merge, fan, + ## switch, coincidence, current, updated, unsafeBuildDynamic, + ## unsafeBuildIncremental, mergeIncremental, mergeIncrementalWithMove, + ## currentIncremental, updatedIncremental, incrementalToDynamic, + ## behaviorCoercion, eventCoercion, dynamicCoercion, + ## mergeIntIncremental, fanInt #-} + ## Matches: + ## [] + ## Call stack: + ## CallStack (from HasCallStack): + ## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable + ## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create + ## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug + doHaddock = false; + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11, bifunctors >=5.2 && <5.5 + ## builder for ‘/nix/store/93ka24600m4mipsgn2cq8fwk124q97ca-reflex-0.4.0.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/93ka24600m4mipsgn2cq8fwk124q97ca-reflex-0.4.0.1.drv’ failed + jailbreak = true; + ## Setup: Encountered missing dependencies: + ## data-default -any, + ## lens -any, + ## monad-control -any, + ## prim-uniq -any, + ## reflection -any, + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-default self.haskell-src-exts self.lens self.monad-control self.prim-uniq self.reflection self.split self.template-haskell self.unbounded-delays ]; + }); + + regex-tdfa = overrideCabal super.regex-tdfa (drv: { + ## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13 + ## + ## • No instance for (Semigroup (CharMap a)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (CharMap a)’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "regex-tdfa"; + rev = "34f4593a520176a917b74b8c7fcbbfbd72fb8178"; + sha256 = "1aiklvf08w1hx2jn9n3sm61mfvdx4fkabszkjliapih2yjpmi3hq"; + }; + }); + + text-format = overrideCabal super.text-format (drv: { + ## Unmerged. PR: https://github.com/bos/text-format/pull/21 + ## + ## • No instance for (Semigroup Format) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Format’ + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "text-format"; + rev = "a1cda87c222d422816f956c7272e752ea12dbe19"; + sha256 = "0lyrx4l57v15rvazrmw0nfka9iyxs4wyaasjj9y1525va9s1z4fr"; + }; + }); + + wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { + ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 + ## + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘PP.<>’, + ## imported from ‘Prelude.Compat’ at Text/PrettyPrint/Leijen/Text/Monadic.hs:73:1-36 + src = pkgs.fetchFromGitHub { + owner = "deepfire"; + repo = "wl-pprint-text"; + rev = "615b83d1e5be52d1448aa1ab2517b431a617027b"; + sha256 = "1p67v9s878br0r152h4n37smqhkg78v8zxhf4qm6d035s4rzj76i"; + }; + }); + + + ## Non-code, configuration-only change + + adjunctions = overrideCabal super.adjunctions (drv: { + ## Setup: Encountered missing dependencies: + ## free ==4.* + ## builder for ‘/nix/store/64pvqslahgby4jlg9rpz29n8w4njb670-adjunctions-4.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/64pvqslahgby4jlg9rpz29n8w4njb670-adjunctions-4.3.drv’ failed + jailbreak = true; + }); + + async = overrideCabal super.async (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.3 && <4.11 + ## builder for ‘/nix/store/2xf491hgsmckz2akrn765kvvy2k8crbd-async-2.1.1.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/2xf491hgsmckz2akrn765kvvy2k8crbd-async-2.1.1.1.drv’ failed + jailbreak = true; + }); + + bifunctors = overrideCabal super.bifunctors (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.4 && <2.13 + ## builder for ‘/nix/store/dy1hzdy14pz96cvx37yggbv6a88sgxq4-bifunctors-5.5.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/dy1hzdy14pz96cvx37yggbv6a88sgxq4-bifunctors-5.5.drv’ failed + jailbreak = true; + }); + + bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.10 && <2.13 + ## builder for ‘/nix/store/ykc786r2bby5kkbpqjg0y10wb9jhmsa9-bindings-GLFW-3.1.2.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/ykc786r2bby5kkbpqjg0y10wb9jhmsa9-bindings-GLFW-3.1.2.3.drv’ failed + jailbreak = true; + }); + + bytes = overrideCabal super.bytes (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + cabal-doctest = overrideCabal super.cabal-doctest (drv: { + ## Setup: Encountered missing dependencies: + ## Cabal >=1.10 && <2.1, base >=4.3 && <4.11 + ## builder for ‘/nix/store/zy3l0ll0r9dq29lgxajv12rz1jzjdkrn-cabal-doctest-1.0.5.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/zy3l0ll0r9dq29lgxajv12rz1jzjdkrn-cabal-doctest-1.0.5.drv’ failed + jailbreak = true; + }); + + ChasingBottoms = overrideCabal super.ChasingBottoms (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.2 && <4.11 + ## builder for ‘/nix/store/wsyjjf4x6pmx84kxnjaka7zwakyrca03-ChasingBottoms-1.3.1.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/wsyjjf4x6pmx84kxnjaka7zwakyrca03-ChasingBottoms-1.3.1.3.drv’ failed + jailbreak = true; + }); + + comonad = overrideCabal super.comonad (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + distributive = overrideCabal super.distributive (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + exception-transformers = overrideCabal super.exception-transformers (drv: { + ## Setup: Encountered missing dependencies: + ## HUnit >=1.2 && <1.6 + ## builder for ‘/nix/store/qs4g7lzq1ixcgg5rw4xb5545g7r34md8-exception-transformers-0.4.0.5.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/qs4g7lzq1ixcgg5rw4xb5545g7r34md8-exception-transformers-0.4.0.5.drv’ failed + jailbreak = true; + }); + + hashable = overrideCabal super.hashable (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.4 && <4.11 + ## builder for ‘/nix/store/4qlxxypfhbwcv227cmsja1asgqnq37gf-hashable-1.2.6.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/4qlxxypfhbwcv227cmsja1asgqnq37gf-hashable-1.2.6.1.drv’ failed + jailbreak = true; + }); + + hashable-time = overrideCabal super.hashable-time (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11 + ## builder for ‘/nix/store/38dllcgxpmkd2fgvs6wd7ji86py0wbnh-hashable-time-0.2.0.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/38dllcgxpmkd2fgvs6wd7ji86py0wbnh-hashable-time-0.2.0.1.drv’ failed + jailbreak = true; + }); + + haskell-src-meta = overrideCabal super.haskell-src-meta (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.6 && <4.11, template-haskell >=2.8 && <2.13 + ## builder for ‘/nix/store/g5wkb14sydvyv484agvaa7hxl84a0wr9-haskell-src-meta-0.8.0.2.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/g5wkb14sydvyv484agvaa7hxl84a0wr9-haskell-src-meta-0.8.0.2.drv’ failed + jailbreak = true; + }); + + hspec-meta = overrideCabal super.hspec-meta (drv: { + ## Linking dist/build/hspec-meta-discover/hspec-meta-discover ... + ## running tests + ## Package has no test suites. + ## haddockPhase + ## Running hscolour for hspec-meta-2.4.6... + ## Preprocessing library for hspec-meta-2.4.6.. + ## Preprocessing executable 'hspec-meta-discover' for hspec-meta-2.4.6.. + ## Preprocessing library for hspec-meta-2.4.6.. + ## Running Haddock on library for hspec-meta-2.4.6.. + ## Haddock coverage: + ## haddock: panic! (the 'impossible' happened) + ## (GHC version 8.4.20180122 for x86_64-unknown-linux): + ## extractDecl + ## Ambiguous decl for Arg in class: + ## class Example e where + ## type Arg e + ## type Arg e = () + ## evaluateExample :: + ## e + ## -> Params + ## -> (ActionWith (Arg e) -> IO ()) -> ProgressCallback -> IO Result + ## {-# MINIMAL evaluateExample #-} + ## Matches: + ## [] + ## Call stack: + ## CallStack (from HasCallStack): + ## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable + ## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create + ## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug + doHaddock = false; + }); + + integer-logarithms = overrideCabal super.integer-logarithms (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.3 && <4.11 + ## builder for ‘/nix/store/zdiicv0jmjsw6bprs8wxxaq5m0z0a75f-integer-logarithms-1.0.2.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/zdiicv0jmjsw6bprs8wxxaq5m0z0a75f-integer-logarithms-1.0.2.drv’ failed + jailbreak = true; + }); + + kan-extensions = overrideCabal super.kan-extensions (drv: { + ## Setup: Encountered missing dependencies: + ## free ==4.* + ## builder for ‘/nix/store/kvnlcj6zdqi2d2yq988l784hswjwkk4c-kan-extensions-5.0.2.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/kvnlcj6zdqi2d2yq988l784hswjwkk4c-kan-extensions-5.0.2.drv’ failed + jailbreak = true; + }); + + keys = overrideCabal super.keys (drv: { + ## Setup: Encountered missing dependencies: + ## free ==4.* + ## builder for ‘/nix/store/khkbn7wmjr10nyq0wwkmn888bj1l4fmh-keys-3.11.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/khkbn7wmjr10nyq0wwkmn888bj1l4fmh-keys-3.11.drv’ failed + jailbreak = true; + }); + + lambdacube-gl = overrideCabal super.lambdacube-gl (drv: { + ## Setup: Encountered missing dependencies: + ## vector ==0.11.* + ## builder for ‘/nix/store/a98830jm4yywfg1d6264p4yngbiyvssp-lambdacube-gl-0.5.2.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/a98830jm4yywfg1d6264p4yngbiyvssp-lambdacube-gl-0.5.2.4.drv’ failed + jailbreak = true; + }); + + lifted-async = overrideCabal super.lifted-async (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/l3000vil24jyq66a5kfqvxfdmy7agwic-lifted-async-0.9.3.3.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/l3000vil24jyq66a5kfqvxfdmy7agwic-lifted-async-0.9.3.3.drv’ failed + jailbreak = true; + }); + + linear = overrideCabal super.linear (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + newtype-generics = overrideCabal super.newtype-generics (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.6 && <4.11 + ## builder for ‘/nix/store/l3rzsjbwys4rjrpv1703iv5zwbd4bwy6-newtype-generics-0.5.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/l3rzsjbwys4rjrpv1703iv5zwbd4bwy6-newtype-generics-0.5.1.drv’ failed + jailbreak = true; + }); + + parallel = overrideCabal super.parallel (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.3 && <4.11 + ## builder for ‘/nix/store/c16gcgn7d7gql8bbjqngx7wbw907hnwb-parallel-3.2.1.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/c16gcgn7d7gql8bbjqngx7wbw907hnwb-parallel-3.2.1.1.drv’ failed + jailbreak = true; + }); + + quickcheck-instances = overrideCabal super.quickcheck-instances (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/r3fx9f7ksp41wfn6cp4id3mzgv04pwij-quickcheck-instances-0.3.16.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/r3fx9f7ksp41wfn6cp4id3mzgv04pwij-quickcheck-instances-0.3.16.1.drv’ failed + jailbreak = true; + }); + + tasty-ant-xml = overrideCabal super.tasty-ant-xml (drv: { + ## Setup: Encountered missing dependencies: + ## tasty >=0.10 && <1.0 + ## builder for ‘/nix/store/86dlb96cdw9jpq95xbndf4axj1z542d6-tasty-ant-xml-1.1.2.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/86dlb96cdw9jpq95xbndf4axj1z542d6-tasty-ant-xml-1.1.2.drv’ failed + jailbreak = true; + }); + + tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/gdm01qb8ppxgrl6dgzhlj8fzmk4x8dj3-tasty-expected-failure-0.11.0.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/gdm01qb8ppxgrl6dgzhlj8fzmk4x8dj3-tasty-expected-failure-0.11.0.4.drv’ failed + jailbreak = true; + }); + + tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.8 && <4.11, tasty ==0.11.* + ## builder for ‘/nix/store/bpxyzzbmb03n88l4xz4k2rllj4227fwv-tasty-hedgehog-0.1.0.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/bpxyzzbmb03n88l4xz4k2rllj4227fwv-tasty-hedgehog-0.1.0.1.drv’ failed + jailbreak = true; + }); + + text-lens = overrideCabal super.text-lens (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.9.0.0 && <4.10, + ## extra >=1.4.10 && <1.5, + ## hspec >=2.2.4 && <2.3, + ## lens ==4.14.* + jailbreak = true; + }); + + th-abstraction = overrideCabal super.th-abstraction (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.5 && <2.13 + ## builder for ‘/nix/store/la3zdphp3nqzl590n25zyrgj62ga8cl6-th-abstraction-0.2.6.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/la3zdphp3nqzl590n25zyrgj62ga8cl6-th-abstraction-0.2.6.0.drv’ failed + jailbreak = true; + }); + + these = overrideCabal super.these (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/1wwqq67pinjj95fgqg13bchh0kbyrb83-these-0.7.4.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/1wwqq67pinjj95fgqg13bchh0kbyrb83-these-0.7.4.drv’ failed + jailbreak = true; + }); + + trifecta = overrideCabal super.trifecta (drv: { + ## CABAL-MISSING-DEPS + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## builder for ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/yklyv4lw4d02316p31x7a2pni1z6gjgk-doctest-0.13.0.drv’ failed + doCheck = false; + }); + + unliftio-core = overrideCabal super.unliftio-core (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## builder for ‘/nix/store/bn8w06wlq7zzli0858hfwlai7wbj6dmq-unliftio-core-0.1.1.0.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/bn8w06wlq7zzli0858hfwlai7wbj6dmq-unliftio-core-0.1.1.0.drv’ failed + jailbreak = true; + }); + + vector-algorithms = overrideCabal super.vector-algorithms (drv: { + ## • Ambiguous type variable ‘mv0’ + doCheck = false; + }); + + wavefront = overrideCabal super.wavefront (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.8 && <4.11 + ## builder for ‘/nix/store/iy6ccxh4dvp6plalx4ww81qrnhxm7jgr-wavefront-0.7.1.1.drv’ failed with exit code 1 + ## error: build of ‘/nix/store/iy6ccxh4dvp6plalx4ww81qrnhxm7jgr-wavefront-0.7.1.1.drv’ failed + jailbreak = true; + }); } From 84ea1ba8902fb1e9d72de94245343dd35c350737 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 5 Feb 2018 20:29:26 -0800 Subject: [PATCH 543/797] bossa: 2014-08-18 -> 1.8 --- pkgs/development/tools/misc/bossa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 8035388c5f0..bb81a461188 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - name = "bossa-2014-08-18"; + name = "bossa-1.8"; src = fetchgit { url = https://github.com/shumatech/BOSSA; - rev = "0f0a41cb1c3a65e909c5c744d8ae664e896a08ac"; /* arduino branch */ - sha256 = "0xg79kli1ypw9zyl90mm6vfk909jinmk3lnl8sim6v2yn8shs9cn"; + rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62"; + sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm"; }; patches = [ ./bossa-no-applet-build.patch ]; From 636968b3ec06899725873cd9dbfc45b9becc2686 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 5 Feb 2018 20:50:02 -0800 Subject: [PATCH 544/797] binaryen: 33 -> 42 --- pkgs/development/compilers/binaryen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 72eaae99877..3f9ee17ca27 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "33"; + version = "42"; rev = "version_${version}"; name = "binaryen-${version}"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; - sha256 = "0zijs2mcgfv0iynwdb0l4zykm0891b1zccf6r8w35ipxvcdwbsbp"; + sha256 = "0b8qc9cd7ncshgfjwv4hfapmwa81gmniaycnxmdkihq9bpm26x2k"; inherit rev; }; From 9801326d32b56d9d6f52e9f921f8020c0fdfbcad Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 5 Feb 2018 20:56:47 -0800 Subject: [PATCH 545/797] autorandr: 1.1 -> 1.4 --- pkgs/tools/misc/autorandr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 405eb29f6bf..b744e70a4e2 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -8,7 +8,7 @@ let python = python3Packages.python; wrapPython = python3Packages.wrapPython; - version = "1.1"; + version = "1.4"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -49,7 +49,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "05jlzxlrdyd4j90srr71fv91c2hf32diw40n9rmybgcdvy45kygd"; + sha256 = "08i71r221ilc8k1c59w89g3iq5m7zwhnjjzapavhqxlr8y9dcpf5"; }; meta = { From 295934adda0932cba7aefdd78c86d259408ba3d5 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 5 Feb 2018 21:13:54 -0800 Subject: [PATCH 546/797] bear: 2.2.1 -> 2.3.11 --- .../tools/build-managers/bear/default.nix | 5 +-- .../build-managers/bear/ignore_wrapper.patch | 40 ++++++++----------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 2bfec89aa66..6afec72de5f 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.2.1"; + version = "2.3.11"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "1rwar5nvvhfqws4nwyifaysqs3nxpphp48lx9mdg5n6l4z7drz0n"; + sha256 = "0r6ykvclq9ws055ssd8w33dicmk5l9pisv0fpzkks700n8d3z9f3"; }; nativeBuildInputs = [ cmake ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; }; } - diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch index 16d7a9bfd3e..f70e3811f65 100644 --- a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch +++ b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch @@ -1,31 +1,23 @@ ---- Bear-2.2.1-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 -+++ Bear-2.2.1-src-patch/bear/main.py.in 2016-11-02 20:23:38.050134984 +0100 -@@ -48,6 +48,7 @@ +--- Bear-2.3.11-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 ++++ Bear-2.3.11-src-patch/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 +@@ -49,6 +49,7 @@ import shutil import contextlib import logging +from distutils.spawn import find_executable - # Ignored compiler options map for compilation database creation. - # The map is used in `split_command` method. (Which does ignore and classify -@@ -447,7 +448,6 @@ - # do extra check on number of source files - return result if result.files else None + # Map of ignored compiler option for the creation of a compilation database. + # This map is used in _split_command method, which classifies the parameters +@@ -540,7 +541,11 @@ + any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX) -- - def split_compiler(command): - """ A predicate to decide the command is a compiler call or not. - -@@ -467,7 +467,11 @@ - for pattern in COMPILER_CPP_PATTERNS) - - if command: # not empty list will allow to index '0' and '1:' -- executable = os.path.basename(command[0]) -+ absolute_executable = os.path.realpath(find_executable(command[0])) -+ if 'wrapper' in absolute_executable: -+ return None + if command: # not empty list will allow to index '0' and '1:' +- executable = os.path.basename(command[0]) # type: str ++ absolute_executable = os.path.realpath(find_executable(command[0])) ++ if 'wrapper' in absolute_executable: ++ return None + -+ executable = os.path.basename(absolute_executable) - parameters = command[1:] - # 'wrapper' 'parameters' and - # 'wrapper' 'compiler' 'parameters' are valid. ++ executable = os.path.basename(absolute_executable) # type: str + parameters = command[1:] # type: List[str] + # 'wrapper' 'parameters' and + # 'wrapper' 'compiler' 'parameters' are valid. \ No newline at end of file From ae604faabbc5550183335d0a3005626f655c184b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 5 Feb 2018 19:16:08 +0800 Subject: [PATCH 547/797] nmapsi4: init at 0.5-alpha1 --- pkgs/tools/security/nmap/qt.nix | 53 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/tools/security/nmap/qt.nix diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix new file mode 100644 index 00000000000..c15d9bf2528 --- /dev/null +++ b/pkgs/tools/security/nmap/qt.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper +, dnsutils, nmap +, qtbase, qtscript, qtwebkit }: + +stdenv.mkDerivation rec { + name = "nmapsi4-${version}"; + version = "0.5-alpha1"; + + src = fetchurl { + url = "mirror://sourceforge/nmapsi/${name}.tar.xz"; + sha256 = "18v9a3l2nmij3gb4flscigxr5c44nphkjfmk07qpyy73fy61mzrs"; + }; + + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + + buildInputs = [ qtbase qtscript qtwebkit ]; + + enableParallelBuilding = true; + + postPatch = '' + for f in \ + src/platform/digmanager.cpp \ + src/platform/discover.cpp \ + src/platform/monitor/monitor.cpp \ + src/platform/nsemanager.cpp ; do + + substituteInPlace $f \ + --replace '"dig"' '"${dnsutils}/bin/dig"'\ + --replace '"nmap"' '"${nmap}/bin/nmap"' \ + --replace '"nping"' '"${nmap}/bin/nping"' + done + ''; + + postInstall = '' + mv $out/share/applications/kde4/*.desktop $out/share/applications + rmdir $out/share/applications/kde4 + + for f in $out/share/applications/* ; do + substituteInPlace $f \ + --replace Qt4 Qt5 \ + --replace Exec=nmapsi4 Exec=$out/bin/nmapsi4 \ + --replace "Exec=kdesu nmapsi4" "Exec=kdesu $out/bin/nmapsi4" + done + ''; + + meta = with stdenv.lib; { + description = "Qt frontend for nmap"; + homepage = https://www.nmapsi4.org/; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d89ab305966..a61062fb15c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3769,6 +3769,8 @@ with pkgs; graphicalSupport = true; }; + nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; + nnn = callPackage ../applications/misc/nnn { }; notary = callPackage ../tools/security/notary { }; From 448fdc221c1464317f6dbe44b531d6c2f282be30 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Mon, 5 Feb 2018 18:59:34 +0100 Subject: [PATCH 548/797] keepalived: 1.3.6 -> 1.4.1 --- pkgs/tools/networking/keepalived/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index fe8988dc41d..140ea6860fc 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "keepalived-${version}"; - version = "1.3.6"; + version = "1.4.1"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "05088vv510dlflzyg8sh8l8qfscnvxl6n6pw9ycp27zhb6r5cr5y"; + sha256 = "1d3jnfhj9mpnc27wvgsiz2vr4lnvvccw3v128z16jpyibyv20ph0"; }; buildInputs = [ From 28417250346a2e502624c4cba411b511f8daa8f0 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Mon, 5 Feb 2018 18:55:50 +0100 Subject: [PATCH 549/797] unifi: 5.6.29 -> 5.6.30 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d4a0145e9b9..040a2ece303 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.6.29"; + version = "5.6.30"; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "05na94mrd1dy95vnwd1ycqx4i38wf0lg67sjg263ilq5l1prdmz8"; + sha256 = "083bh29i7dpn0ajc6h584vhkybiavnln3xndpb670chfrbywxyj4"; }; buildInputs = [ dpkg ]; From 77218de812171b20cab961de0eaa784bf2d98699 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Tue, 6 Feb 2018 09:55:45 +0100 Subject: [PATCH 550/797] zookeeper.service: option for package and add to environment --- nixos/modules/services/misc/zookeeper.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index d85b5e4ec50..91539592511 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -106,10 +106,19 @@ in { ''; }; + package = mkOption { + description = "The zookeeper package to use"; + default = pkgs.zookeeper; + defaultText = "pkgs.zookeeper"; + type = types.package; + }; + }; config = mkIf cfg.enable { + environment.systemPackages = [cfg.package]; + systemd.services.zookeeper = { description = "Zookeeper Daemon"; wantedBy = [ "multi-user.target" ]; @@ -118,7 +127,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.jre}/bin/java \ - -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \ + -cp "${cfg.package}/lib/*:${cfg.package}/${cfg.package.name}.jar:${configDir}" \ ${escapeShellArgs cfg.extraCmdLineOptions} \ -Dzookeeper.datadir.autocreate=false \ ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \ From a6ee80aa18a193c1914ff1bf917de235d995d032 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Fri, 2 Feb 2018 00:06:17 +0100 Subject: [PATCH 551/797] dendropy: init at 4.3.0 --- .../python-modules/dendropy/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/dendropy/default.nix diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix new file mode 100644 index 00000000000..a455db96c22 --- /dev/null +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -0,0 +1,34 @@ +{ lib +, pkgs +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "DendroPy"; + version = "4.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bd5b35ce1a1c9253209b7b5f3939ac22beaa70e787f8129149b4f7ffe865d510"; + }; + + prePatch = '' + # Test removed/disabled and reported upstream: https://github.com/jeetsukumaran/DendroPy/issues/74 + rm -f dendropy/test/test_dataio_nexml_reader_tree_list.py + ''; + + preCheck = '' + # Needed for unicode python tests + export LC_ALL="en_US.UTF-8" + ''; + + checkInputs = [ pkgs.glibcLocales ]; + + meta = { + homepage = http://dendropy.org/; + description = "A Python library for phylogenetic computing"; + maintainers = with lib.maintainers; [ unode ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a279d96591..7159fad5491 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -201,6 +201,8 @@ in { bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; + dendropy = callPackage ../development/python-modules/dendropy { }; + dbf = callPackage ../development/python-modules/dbf { }; dbfread = callPackage ../development/python-modules/dbfread { }; From f4a031c63f3684544cdb08da1df5d9a6d8cb40e8 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Mon, 5 Feb 2018 22:15:12 +0900 Subject: [PATCH 552/797] R: add libcxx to default LDFLAGS and CPPFLAGS on Darwin --- pkgs/applications/science/math/R/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 725b3f342c3..7bd19cfc520 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas -, curl, Cocoa, Foundation, cf-private, libobjc, tzdata, fetchpatch +, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pango pcre perl readline texLive xz zlib less texinfo graphviz icu pkgconfig bison imake which jdk openblas curl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch ]; @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { --without-aqua --disable-R-framework OBJC="clang" + CPPFLAGS="-isystem ${libcxx}/include/c++/v1" + LDFLAGS="-L${libcxx}/lib" '' + '' ) echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib" From c055b010df63bae3705a2f42b577a6499e61068e Mon Sep 17 00:00:00 2001 From: Thorsten Weber Date: Tue, 6 Feb 2018 11:50:37 +0100 Subject: [PATCH 553/797] slic3r-prusa3d: init at 1.38.7 --- .../misc/slic3r-prusa3d/default.nix | 93 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 95 insertions(+) create mode 100644 pkgs/applications/misc/slic3r-prusa3d/default.nix diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix new file mode 100644 index 00000000000..ef8bfb1b2be --- /dev/null +++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix @@ -0,0 +1,93 @@ +{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu }: +let + AlienWxWidgets = perlPackages.buildPerlPackage rec { + name = "Alien-wxWidgets-0.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr"; + }; + propagatedBuildInputs = [ + pkgconfig perlPackages.ModulePluggable perlPackages.ModuleBuild + gtk2 gtk3 wxGTK30 + ]; + }; + + Wx = perlPackages.Wx.overrideAttrs (oldAttrs: { + propagatedBuildInputs = [ + perlPackages.ExtUtilsXSpp + AlienWxWidgets + ]; + }); + + WxGLCanvas = perlPackages.buildPerlPackage rec { + name = "Wx-GLCanvas-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; + sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; + }; + propagatedBuildInputs = [ Wx perlPackages.OpenGL mesa_glu ]; + doCheck = false; + }; +in +stdenv.mkDerivation rec { + name = "slic3r-prusa-edition-${version}"; + version = "1.38.7"; + + buildInputs = [ + cmake + perl + makeWrapper + tbb + which + Wx + WxGLCanvas + ] ++ (with perlPackages; [ + boost + ClassXSAccessor + EncodeLocale + ExtUtilsMakeMaker + ExtUtilsXSpp + GrowlGNTP + ImportInto + IOStringy + locallib + LWP + MathClipper + MathConvexHullMonotoneChain + MathGeometryVoronoi + MathPlanePath + ModuleBuild + Moo + NetDBus + OpenGL + threads + XMLSAX + ]); + + postInstall = '' + echo 'postInstall' + wrapProgram "$out/bin/slic3r-prusa3d" \ + --prefix PERL5LIB : "$out/lib/slic3r-prusa3d:$PERL5LIB" + + # it seems we need to copy the icons... + mkdir -p $out/bin/var + cp ../resources/icons/* $out/bin/var/ + cp -r ../resources $out/bin/ + ''; + + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "Slic3r"; + sha256 = "1nrryd2bxmk4y59bq5fp7n2alyvc5a9xvnbx5j4fg4mqr91ccs5c"; + rev = "version_${version}"; + }; + + meta = with stdenv.lib; { + description = "G-code generator for 3D printer"; + homepage = https://github.com/prusa3d/Slic3r; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ tweber ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73f47828055..eaab439bd8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17141,6 +17141,8 @@ with pkgs; slic3r = callPackage ../applications/misc/slic3r { }; + slic3r-prusa3d = callPackage ../applications/misc/slic3r-prusa3d { }; + curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; cura_stable = callPackage ../applications/misc/cura/stable.nix { curaengine = curaengine_stable; From 029fa375c8188c561eb74d8a08d12a78b4a34f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Feb 2018 09:37:26 +0100 Subject: [PATCH 554/797] pythonPackages.nose-parameterized: uninit because deprecated --- .../python-modules/nose-parameterized/default.nix | 11 ----------- pkgs/top-level/python-packages.nix | 3 --- 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/python-modules/nose-parameterized/default.nix diff --git a/pkgs/development/python-modules/nose-parameterized/default.nix b/pkgs/development/python-modules/nose-parameterized/default.nix deleted file mode 100644 index 77b540fdef0..00000000000 --- a/pkgs/development/python-modules/nose-parameterized/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ fetchPypi, parameterized }: - -parameterized.overrideAttrs (o: rec { - pname = "nose-parameterized"; - version = "0.6.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk"; - }; -}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcf64b9629d..7db8d5c2cd9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3842,9 +3842,6 @@ in { }; }); - nose-parameterized = warn "Warning: `nose-parameterized` is deprecated! Use `parameterized` instead." - (callPackage ../development/python-modules/nose-parameterized {}); - neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; version = "0.3.1"; From eca3e88e6343a8a0ac69652e9dcb10ac0cbd6690 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Tue, 6 Feb 2018 14:12:36 +0100 Subject: [PATCH 555/797] openafs: 1.6.22.1 -> 1.6.22.2 Minor update. Adds support for linux kernel up to 4.15. --- pkgs/servers/openafs/srcs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/openafs/srcs.nix b/pkgs/servers/openafs/srcs.nix index 4f2bb190f85..9e9ff623e5c 100644 --- a/pkgs/servers/openafs/srcs.nix +++ b/pkgs/servers/openafs/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.6.22.1"; + version = "1.6.22.2"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "19nfbksw7b34jc3mxjk7cbz26zg9k5myhzpv2jf0fnmznr47jqaw"; + sha256 = "15j17igignsfzv5jb47ryczsrz3zsmiqwnj38dx9gzz95807rkyf"; }; srcs = [ src (fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "1875hn8rvlxj4icja8k6hprxprvp2k1f3iilb15lsafhmfz1scg3"; + sha256 = "1lpydca95nx5pmqvplb9n3akmxbzvhhypswh0s589ywxpv3zynxm"; })]; } From 17210fee46826873a623ffd6b691da3d897277e3 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Tue, 6 Feb 2018 15:03:39 +0100 Subject: [PATCH 556/797] squashfuse: init at 0.1.101 --- pkgs/tools/filesystems/squashfuse/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/tools/filesystems/squashfuse/default.nix diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix new file mode 100644 index 00000000000..8a8bc5396fc --- /dev/null +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, fuse, pkgconfig, pcre, + +# Optional Dependencies +lz4 ? null, xz ? null, zlib ? null, lzo ? null, zstd ? null}: + +with stdenv.lib; +let + mkFlag = trueStr: falseStr: cond: name: val: "--" + + (if cond then trueStr else falseStr) + + name + + optionalString (val != null && cond != false) "=${val}"; + mkEnable = mkFlag "enable-" "disable-"; + mkWith = mkFlag "with-" "--without-"; + mkOther = mkFlag "" "" true; + + shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + + optLz4 = shouldUsePkg lz4; + optLzma = shouldUsePkg xz; + optZlib = shouldUsePkg zlib; + optLzo = shouldUsePkg lzo; + optZstd = shouldUsePkg zstd; +in + +stdenv.mkDerivation rec { + + pname = "squashfuse"; + version = "0.1.101"; + name = "${pname}-${version}"; + + meta = { + description = "FUSE filesystem to mount squashfs archives"; + homepage = https://github.com/vasi/squashfuse; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux ++ platforms.darwin; + license = "BSD-2-Clause"; + }; + + src = fetchurl { + url = "https://github.com/vasi/squashfuse/archive/${version}.tar.gz"; + sha256 = "08d1j1a73dhhypbk0q20qkrz564zpmvkpk3k3s8xw8gd9nvy2xa2"; + }; + + nativeBuildInputs = [ automake autoconf libtool pkgconfig]; + buildInputs = [ optLz4 optLzma optZlib optLzo optZstd fuse ]; + + # We can do it far better i guess, ignoring -with option + # but it should be safer like that. + # TODO: Improve writing nix expression mkWithLib. + configureFlags = [ + (mkWith (optLz4 != null) "lz4=${lz4}/lib" null) + (mkWith (optLzma != null) "xz=${xz}/lib" null) + (mkWith (optZlib != null) "zlib=${zlib}/lib" null) + (mkWith (optLzo != null) "lzo=${lzo}/lib" null) + (mkWith (optZstd != null) "zstd=${zstd}/lib" null) + ]; + + preConfigure = '' + ./autogen.sh + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73f47828055..c89384e037f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4690,6 +4690,8 @@ with pkgs; squashfsTools = callPackage ../tools/filesystems/squashfs { }; + squashfuse = callPackage ../tools/filesystems/squashfuse { }; + srcml = callPackage ../applications/version-management/srcml { }; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; From a48222b3e115c172719be2848dc6333f25d3e24d Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 6 Feb 2018 06:19:01 -0800 Subject: [PATCH 557/797] augeas: 1.10.0 -> 1.10.1 --- pkgs/tools/system/augeas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index dca6d37d9af..93ce4864463 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "augeas-${version}"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "http://download.augeas.net/${name}.tar.gz"; - sha256 = "04q2hr3xj71rdbjdj3jiygi8dbiq1x4szlyavxj1xjiw9jcgd41a"; + sha256 = "0k9nssn7lk58cl5zv3c8kv2zx9cm2yks3sj7q4fd6qdjz9m2bnsj"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libxml2 ]; From 94e449b6996b152a59bba97df1e1dbecd89e733c Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 6 Feb 2018 06:26:48 -0800 Subject: [PATCH 558/797] archivemount: 0.8.3 -> 0.8.7 --- pkgs/tools/filesystems/archivemount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index f4133f12541..72403bd3dc0 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.8.3"; + name = "archivemount-0.8.7"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "1zv1fvik76kpp1q5f2dz01f4fwg1m5a8rl168px47jy9nyl9k277"; + sha256 = "1diiw6pnlnrnikn6l5ld92dx59lhrxjlqms8885vwbynsjl5q127"; }; nativeBuildInputs = [ pkgconfig ]; From e2bf162f04b81222550d5f0574ef72f32d68125f Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Tue, 6 Feb 2018 15:34:51 +0100 Subject: [PATCH 559/797] remove platforms.darwin support --- pkgs/tools/filesystems/squashfuse/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 8a8bc5396fc..75b6deccc83 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -32,10 +32,14 @@ stdenv.mkDerivation rec { description = "FUSE filesystem to mount squashfs archives"; homepage = https://github.com/vasi/squashfuse; maintainers = [ maintainers.genesis ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; license = "BSD-2-Clause"; }; + # platforms.darwin should be supported : see PLATFORMS file in src. + # we could use a nix fuseProvider, and let the derivation choose the OS + # specific implementation. + src = fetchurl { url = "https://github.com/vasi/squashfuse/archive/${version}.tar.gz"; sha256 = "08d1j1a73dhhypbk0q20qkrz564zpmvkpk3k3s8xw8gd9nvy2xa2"; From b2284e0454f111d54299221263aaa3a2afe81f23 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Tue, 6 Feb 2018 15:37:50 +0100 Subject: [PATCH 560/797] htslib: 1.6 -> 1.7 --- pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index b3c6d9f26d4..2144a7f7893 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "htslib"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2"; - sha256 = "1jsca3hg4rbr6iqq6imkj4lsvgl8g9768bcmny3hlff2w25vx24m"; + sha256 = "be3d4e25c256acdd41bebb8a7ad55e89bb18e2fc7fc336124b1e2c82ae8886c6"; }; # perl is only used during the check phase. From 154d1d2f1923e223f1e409de6a17a1209e9719e1 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Tue, 6 Feb 2018 15:38:00 +0100 Subject: [PATCH 561/797] samtools: 1.6 -> 1.7 --- pkgs/applications/science/biology/samtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 640f32671bb..365057414e9 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "17p4vdj2j2qr3b2c0v4100h6cg4jj3zrb4dmdnd9d9aqs74d4p7f"; + sha256 = "e7b09673176aa32937abd80f95f432809e722f141b5342186dfef6a53df64ca1"; }; nativeBuildInputs = [ perl ]; From 104551ed0b93f79556bb01a6660121cbc8f18e15 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 6 Feb 2018 06:47:12 -0800 Subject: [PATCH 562/797] bcunit: 3.0 -> 3.0.2 --- pkgs/tools/misc/bcunit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index b1ca28a7ca9..1c681d4986d 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; baseName = "bcunit"; - version = "3.0"; + version = "3.0.2"; buildInputs = [cmake]; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "1kdq9w8i3nypfz7d43rmv1csqrqpip9p8xfa7vyp52aqkmhrby9l"; + sha256 = "063yl7kxkix76r49qrj0h1qpz2p538d1yw8aih0x4i47g35k00y7"; }; meta = { From 977b996516a8d93c8e8829ff707159344e1b6b10 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 6 Feb 2018 07:01:01 -0800 Subject: [PATCH 563/797] antimony: 0.9.2 -> 0.9.3 --- pkgs/applications/graphics/antimony/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index b7d9f4a8159..f9ea2b9aa84 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, libpng, python3, boost, mesa, qtbase, ncurses, cmake, flex, lemon }: let - gitRev = "e8480c718e8c49ae3cc2d7af10ea93ea4c2fff9a"; + gitRev = "020910c25614a3752383511ede5a1f5551a8bd39"; gitBranch = "master"; - gitTag = "0.9.2"; -in + gitTag = "0.9.3"; +in stdenv.mkDerivation rec { name = "antimony-${version}"; version = gitTag; @@ -13,7 +13,7 @@ in owner = "mkeeter"; repo = "antimony"; rev = gitTag; - sha256 = "0fpgy5cb4knz2z9q078206k8wzxfs8b9g76mf4bz1ic77931ykjz"; + sha256 = "1vm5h5py8l3b8h4pbmm8s3wlxvlw492xfwnlwx0nvl0cjs8ba6r4"; }; patches = [ ./paths-fix.patch ]; From 8930a14422ad8c698cd9607dccf27ca1aa6c20a3 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 6 Feb 2018 06:09:44 -0800 Subject: [PATCH 564/797] autoconf-archive: 2017.03.21 -> 2017.09.28 --- pkgs/development/tools/misc/autoconf-archive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 1b19a1caff6..0225a3f8141 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2017.03.21"; + version = "2017.09.28"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "0rfpapadka2023qhy8294ca5awxpb8d4904js6kv7piby5ax8siq"; + sha256 = "00gsh9hkrgg291my98plkrwlcpxkfrpq64pglf18kciqbf2bb7sw"; }; buildInputs = [ xz ]; From d4df7aadf9a992b153928534499af1408da9730a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 7 Feb 2018 00:28:52 +0800 Subject: [PATCH 565/797] cryfs: 0.9.8 -> 0.9.9 --- pkgs/tools/filesystems/cryfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 7bbfafef819..dfd522f5a09 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cryfs-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = "${version}"; - sha256 = "1lrzmzjakv08qjq09a3krllfw5vrgblfxzijpf3lm3yjgih63r1k"; + sha256 = "07f2k2b595m3vkwwlmlc0m7px0nwrrzrph3z6sss9354m0b0lcri"; }; prePatch = '' From f620b1b693ec25af1aadcb0508710dc22e92453a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 29 Jan 2018 03:50:18 +0900 Subject: [PATCH 566/797] kernel: buildLinux replaces import ./generic.nix - defined buildLinux as generic.nix instead of manual-config.nix. This makes kernel derivations a tad more similar to your typical derivations. - moved $buildRoot to within the source folder, this way it doesn't have to be created before the unpackPhase and make it easier to work on kernel source without running the unpackPhase --- .../linux/kernel/common-config.nix | 3 +- .../linux/kernel/generate-config.pl | 14 ++++---- pkgs/os-specific/linux/kernel/generic.nix | 34 +++++++++++++------ pkgs/os-specific/linux/kernel/linux-4.13.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.14.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.15.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.4.nix | 2 +- pkgs/os-specific/linux/kernel/linux-4.9.nix | 2 +- .../linux/kernel/linux-beagleboard.nix | 2 +- .../kernel/linux-hardened-copperhead.nix | 2 +- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 5 +-- pkgs/os-specific/linux/kernel/linux-rpi.nix | 2 +- .../linux/kernel/linux-samus-4.12.nix | 2 +- .../linux/kernel/linux-testing-bcachefs.nix | 2 +- .../linux/kernel/linux-testing.nix | 2 +- .../linux/kernel/manual-config.nix | 34 +++++++++++++++---- pkgs/os-specific/linux/kernel/update.sh | 6 ++-- pkgs/top-level/all-packages.nix | 2 +- 18 files changed, 76 insertions(+), 44 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 82a092cd539..8fb40475bd7 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -16,7 +16,7 @@ */ -{ stdenv, version, kernelPlatform, extraConfig, features }: +{ stdenv, version, extraConfig, features }: with stdenv.lib; @@ -682,6 +682,5 @@ with stdenv.lib; WW_MUTEX_SELFTEST? n ''} - ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} '' diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 5bce3af9429..f886fcfdc35 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -13,18 +13,18 @@ use strict; use IPC::Open2; use Cwd; -my $wd = getcwd; - +# exported via nix my $debug = $ENV{'DEBUG'}; my $autoModules = $ENV{'AUTO_MODULES'}; my $preferBuiltin = $ENV{'PREFER_BUILTIN'}; - +my $ignoreConfigErrors = $ENV{'ignoreConfigErrors'}; +my $buildRoot = $ENV{'BUILD_ROOT'}; $SIG{PIPE} = 'IGNORE'; # Read the answers. my %answers; my %requiredAnswers; -open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die; +open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die "Could not open answer file"; while () { chomp; s/#.*//; @@ -40,7 +40,7 @@ close ANSWERS; sub runConfig { # Run `make config'. - my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$wd config SHELL=bash ARCH=$ENV{ARCH}"); + my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH}"); # Parse the output, look for questions and then send an # appropriate answer. @@ -122,7 +122,7 @@ runConfig; # there. `make config' often overrides answers if later questions # cause options to be selected. my %config; -open CONFIG, "<.config" or die; +open CONFIG, "<$buildRoot/.config" or die "Could not read .config"; while () { chomp; if (/^CONFIG_([A-Za-z0-9_]+)="(.*)"$/) { @@ -137,7 +137,7 @@ while () { close CONFIG; foreach my $name (sort (keys %answers)) { - my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1" + my $f = $requiredAnswers{$name} && $ignoreConfigErrors ne "1" ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; }; &$f("unused option: $name\n") unless defined $config{$name}; &$f("option not set correctly: $name (wanted '$answers{$name}', got '$config{$name}')\n") diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index e00bda692b3..5a5081e5efb 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,3 +1,11 @@ +{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl +, ncurses +, libelf +, utillinux +, writeTextFile, ubootTools +, callPackage +}: + { stdenv, buildPackages, perl, buildLinux , # The kernel source tarball. @@ -28,7 +36,7 @@ , extraMeta ? {} , hostPlatform , ... -}: +} @ args: assert stdenv.isLinux; @@ -45,8 +53,10 @@ let } // features) kernelPatches; config = import ./common-config.nix { - inherit stdenv version extraConfig; - kernelPlatform = hostPlatform; + inherit stdenv version ; + # append extraConfig for backwards compatibility but also means the user can't override the kernelExtraConfig part + extraConfig = extraConfig + lib.optionalString (hostPlatform ? kernelExtraConfig ) hostPlatform.kernelExtraConfig; + features = kernelFeatures; # Ensure we know of all extra patches, etc. }; @@ -68,7 +78,9 @@ let nativeBuildInputs = [ perl ]; platformName = hostPlatform.platform.name; + # e.g. "defconfig" kernelBaseConfig = hostPlatform.platform.kernelBaseConfig; + # e.g. "bzImage" kernelTarget = hostPlatform.platform.kernelTarget; autoModules = hostPlatform.platform.kernelAutoModules; preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false; @@ -83,25 +95,25 @@ let inherit (kernel) src patches preUnpack; buildPhase = '' - cd $buildRoot + export buildRoot="''${buildRoot:-build}" # Get a basic config file for later refinement with $generateConfig. - make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C ../$sourceRoot O=$PWD $kernelBaseConfig ARCH=$arch + make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$arch # Create the config file. echo "generating kernel configuration..." - echo "$kernelConfig" > kernel-config - DEBUG=1 ARCH=$arch KERNEL_CONFIG=kernel-config AUTO_MODULES=$autoModules \ - PREFER_BUILTIN=$preferBuiltin SRC=../$sourceRoot perl -w $generateConfig + echo "$kernelConfig" > "$buildRoot/kernel-config" + DEBUG=1 ARCH=$arch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ + PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig ''; - installPhase = "mv .config $out"; + installPhase = "mv $buildRoot/.config $out"; enableParallelBuilding = true; }; - kernel = buildLinux { - inherit version modDirVersion src kernelPatches stdenv extraMeta configfile; + kernel = (callPackage ./manual-config.nix {}) { + inherit version modDirVersion src kernelPatches stdenv extraMeta configfile hostPlatform; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 506682479c7..e89222b2c62 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.13.16"; extraMeta.branch = "4.13"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 413e3ea32dc..d4d4b3ff24e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -2,7 +2,7 @@ with stdenv.lib; -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.14.17"; # branchVersion needs to be x.y diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index fa9d0b4bcda..2719dd1da99 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -2,7 +2,7 @@ with stdenv.lib; -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.15.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index c1c989e28c8..4316ba4cf4b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.4.115"; extraMeta.branch = "4.4"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cc02908fb89..da3f07e845d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.9.80"; extraMeta.branch = "4.9"; diff --git a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix index 097408d61d9..4f0ff53c59c 100644 --- a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix +++ b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix @@ -4,7 +4,7 @@ let modDirVersion = "4.14.12"; tag = "r23"; in -stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { +stdenv.lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-ti-${tag}"; inherit modDirVersion; diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index d87ed3e8082..8283029efb0 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -15,7 +15,7 @@ let modDirVersion = "${modVersion}-hardened"; in -import ./generic.nix (args // { +buildLinux (args // { inherit modDirVersion; version = "${version}-${revision}"; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 9720e3c0e4a..c4bade2abed 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,9 +1,10 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: -import ./generic.nix (rec { +buildLinux (rec { mptcpVersion = "0.93"; modDirVersion = "4.9.60"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; + # autoModules= true; extraMeta = { branch = "4.4"; @@ -43,4 +44,4 @@ import ./generic.nix (rec { TCP_CONG_BALIA m '' + (args.extraConfig or ""); -} // args // (args.argsOverride or {})) +} // args) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 1efb11435e2..a96a910c68c 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -4,7 +4,7 @@ let modDirVersion = "4.9.59"; tag = "1.20171029"; in -stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { +stdenv.lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-${tag}"; inherit modDirVersion; diff --git a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix index c65182271dc..442c8967511 100644 --- a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.12.2"; extraMeta.branch = "4.12-2"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index ac13835afdd..69dfed1bd04 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.11.2017.08.23"; modDirVersion = "4.11.0"; extraMeta.branch = "master"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1a309ff6376..ab838f546c1 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: -import ./generic.nix (args // rec { +buildLinux (args // rec { version = "4.15-rc9"; modDirVersion = "4.15.0-rc9"; extraMeta.branch = "4.15"; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 9a7e9609410..d0d90adb8b6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,8 +1,8 @@ { buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl +, ncurses ? null , libelf , utillinux , writeTextFile, ubootTools -, hostPlatform }: let @@ -34,7 +34,9 @@ in { # Use defaultMeta // extraMeta extraMeta ? {}, # Whether to utilize the controversial import-from-derivation feature to parse the config - allowImportFromDerivation ? false + allowImportFromDerivation ? false, + + hostPlatform }: let @@ -86,8 +88,6 @@ let inherit src; preUnpack = '' - mkdir build - export buildRoot="$(pwd)/build" ''; patches = map (p: p.patch) kernelPatches; @@ -102,7 +102,25 @@ let configurePhase = '' runHook preConfigure + + mkdir build + export buildRoot="$(pwd)/build" + + echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD" + + if [[ -z "$buildRoot" || ! -d "$buildRoot" ]]; then + echo "set $buildRoot to the build folder please" + exit 1 + fi + + if [ -f "$buildRoot/.config" ]; then + echo "Could not link $buildRoot/.config : file exists" + exit 1 + fi ln -sv ${configfile} $buildRoot/.config + + # reads the existing .config file and prompts the user for options in + # the current kernel source that are not found in the file. make $makeFlags "''${makeFlagsArray[@]}" oldconfig runHook postConfigure @@ -115,6 +133,8 @@ let # Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged. buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)") + + cd $buildRoot ''; buildFlags = [ @@ -136,7 +156,7 @@ let postInstall = '' mkdir -p $dev - cp $buildRoot/vmlinux $dev/ + cp vmlinux $dev/ '' + (optionalString installsFirmware '' mkdir -p $out/lib/firmware '') + (if (platform ? kernelDTB && platform.kernelDTB) then '' @@ -151,7 +171,7 @@ let unlink $out/lib/modules/${modDirVersion}/source mkdir -p $dev/lib/modules/${modDirVersion}/build - cp -dpR ../$sourceRoot $dev/lib/modules/${modDirVersion}/source + cp -dpR .. $dev/lib/modules/${modDirVersion}/source cd $dev/lib/modules/${modDirVersion}/source cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build @@ -170,7 +190,7 @@ let # from drivers/ in the future; it adds 50M to keep all of its # headers on 3.10 though. - chmod u+w -R ../source + chmod u+w -R .. arch=$(cd $dev/lib/modules/${modDirVersion}/build/arch; ls) # Remove unused arches diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index d9db7f9f916..878c3c14fe4 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -50,13 +50,13 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do # Rewrite the expression sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then - sed -i "\#import ./generic.nix (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + sed -i "\#buildLinux (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE fi - sed -i "\#import ./generic.nix (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE + sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Commit the changes git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE git commit -m "kernel: $OLDVER -> $V" >/dev/null 2>&1 - + echo "Updated $OLDVER -> $V" done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92f81ee2861..d48336fa4e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13197,7 +13197,7 @@ with pkgs; # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; - buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); + buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/generic.nix {}); keyutils = callPackage ../os-specific/linux/keyutils { }; From cc2c594a9bfb8d2ab20c0a71c38f402fcfefc0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Tue, 6 Feb 2018 09:07:39 +0800 Subject: [PATCH 567/797] hledger*: build correctly on darwin - mkdir -p $out/share/info rather than assuming $out/share is there - find .info and .man* files correctly on darwin -- don't try to match the specific system name, there is nothing to gain from that nix calls darwin darwin, but ghc calls it osx in its directory names. closes #34644 --- .../haskell-modules/configuration-common.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b46da64c342..75c22e720dc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -965,37 +965,37 @@ self: super: { hledger = overrideCabal super.hledger (drv: { postInstall = '' for i in $(seq 1 9); do - for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do + for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do mkdir -p $out/share/man/man$i cp $j $out/share/man/man$i/ done done - mkdir $out/share/info - cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ + mkdir -p $out/share/info + cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/ ''; }); hledger-ui = overrideCabal super.hledger-ui (drv: { postInstall = '' for i in $(seq 1 9); do - for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do + for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do mkdir -p $out/share/man/man$i cp $j $out/share/man/man$i/ done done - mkdir $out/share/info - cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ + mkdir -p $out/share/info + cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/ ''; }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' for i in $(seq 1 9); do - for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do + for j in $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/*-${self.ghc.name}/*/.otherdocs/*.$i; do mkdir -p $out/share/man/man$i cp $j $out/share/man/man$i/ done done - mkdir $out/share/info - cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ + mkdir -p $out/share/info + cp $data/share/${self.ghc.name}/*-${self.ghc.name}/*/*.info $out/share/info/ ''; }); From b963f06f5ab5a80a020c3a2133c3f06adb173284 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 6 Feb 2018 11:57:55 -0600 Subject: [PATCH 568/797] diff-pdf: init at 2017-12-30. --- pkgs/applications/misc/diff-pdf/default.nix | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/diff-pdf/default.nix diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix new file mode 100644 index 00000000000..d6eed6d6033 --- /dev/null +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK }: + +stdenv.mkDerivation rec { + name = "diff-pdf-${version}"; + version = "2017-12-30"; + + src = fetchFromGitHub { + owner = "vslavik"; + repo = "diff-pdf"; + rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc"; + sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + buildInputs = [ cairo poppler wxGTK ]; + + preConfigure = "./bootstrap"; + + meta = with stdenv.lib; { + homepage = http://vslavik.github.io/diff-pdf; + description = "Simple tool for visually comparing two PDF files"; + license = licenses.gpl2; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73f47828055..ae87c763dd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16444,6 +16444,8 @@ with pkgs; diffpdf = callPackage ../applications/misc/diffpdf { }; + diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; + mlocate = callPackage ../tools/misc/mlocate { }; mypaint = callPackage ../applications/graphics/mypaint { }; From 9e2993e75a4c74c381706631c8a0c60940b08046 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 6 Feb 2018 12:57:52 -0600 Subject: [PATCH 569/797] diff-pdf: Try to fix darwin build --- pkgs/applications/misc/diff-pdf/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index d6eed6d6033..467c2b3c2d5 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK }: +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: +let + wxInputs = + if stdenv.isDarwin then + [ wxmac darwin.apple_sdk.frameworks.Cocoa ] + else + [ wxGTK ]; +in stdenv.mkDerivation rec { name = "diff-pdf-${version}"; version = "2017-12-30"; @@ -12,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = [ cairo poppler wxGTK ]; + buildInputs = [ cairo poppler ] ++ wxInputs; preConfigure = "./bootstrap"; From 64196647938e1436cd6ba110662485a47048ca58 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Tue, 6 Feb 2018 21:58:32 +0300 Subject: [PATCH 570/797] ghc841: bump to alpha3 --- pkgs/development/compilers/ghc/8.4.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index 17dc24e567f..1bade6e2060 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -24,7 +24,7 @@ # platform). Static libs are always built. enableShared ? true -, version ? "8.4.20180122" +, version ? "8.4.0.20180204" }: assert !enableIntegerSimple -> gmp != null; @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; - rev = "61db0b8941cfb7ed8941ed29bdb04bd8ef3b71a5"; - sha256 = "15sbpgkal4854jc1xn3sprvpnxwdj0fyy43y5am0h9vja3pjhjyi"; + rev = "111737cd218751f06ea58d3cf2c7c144265b5dfc"; + sha256 = "0ksp0k3sp928aq2cv6whgbfmjnr7l2j10diha13nncksp4byf0s9"; }; enableParallelBuilding = true; From 2e0540f346bd25da0c5605ef5261350716151917 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 6 Feb 2018 13:49:09 -0600 Subject: [PATCH 571/797] bfg-repo-cleaner: 1.12.15 -> 1.13.0 --- .../git-and-tools/bfg-repo-cleaner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index b2a4bc66c69..7bf83b5621b 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: let - version = "1.12.15"; + version = "1.13.0"; jarName = "bfg-${version}.jar"; mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}"; in @@ -12,7 +12,7 @@ in src = fetchurl { url = mavenUrl; - sha256 = "17dh25jambkk55khknlhy8wa9s1i1xmh9hdgj72j1lzyl0ag42ik"; + sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz"; }; buildInputs = [ jre makeWrapper ]; From 44509195e5b9c21c6a1185703dc31724e36ddc05 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 6 Feb 2018 20:55:20 +0200 Subject: [PATCH 572/797] pythonPackages.pytest-cram: 0.1.1 -> 0.2.0 This fixes pytest-cram after the recent pytest upgrading broke it. --- pkgs/development/python-modules/pytest-cram/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index fdd2b2316e2..4555479af43 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -1,8 +1,7 @@ {lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}: buildPythonPackage rec { - name = "${pname}-${version}"; - version = "0.1.1"; + version = "0.2.0"; pname = "pytest-cram"; buildInputs = [ pytest ]; @@ -10,7 +9,8 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0ad05999iqzyjay9y5lc0cnd3jv8qxqlzsvxzp76shslmhrv0c4f"; + sha256 = "006p5dr3q794sbwwmxmdls3nwq0fvnyrxxmc03pgq8n74chl71qn"; + extension = "zip"; }; postPatch = '' From 685ceb999e71352caf333a9c779828bff0ebe64e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 2 Feb 2018 18:13:41 +0200 Subject: [PATCH 573/797] kernel: Fix missing config options from platform common-config.nix has: ${kernelPlatform.kernelExtraConfig or ""} and indeed kernelExtraConfig is in hostPlatform.platform, and not in hostPlatform. (Ugh.). --- pkgs/os-specific/linux/kernel/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index e00bda692b3..24d5ed30ec4 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -46,7 +46,7 @@ let config = import ./common-config.nix { inherit stdenv version extraConfig; - kernelPlatform = hostPlatform; + kernelPlatform = hostPlatform.platform; features = kernelFeatures; # Ensure we know of all extra patches, etc. }; From c9d1bf3e7663bf5486cbb7332d748085594247e0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 2 Feb 2018 18:13:37 +0200 Subject: [PATCH 574/797] platforms.nix: Include RPi 3 serial port in the kernel config --- lib/systems/platforms.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index fd43ceaa0df..282fb0994b5 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -479,6 +479,11 @@ rec { kernelPreferBuiltin = true; kernelTarget = "zImage"; kernelExtraConfig = '' + # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig. + SERIAL_8250_BCM2835AUX y + SERIAL_8250_EXTENDED y + SERIAL_8250_SHARE_IRQ y + # Fix broken sunxi-sid nvmem driver. TI_CPTS y From edeacd00ada72c70661c4f421146134b42feb815 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Tue, 6 Feb 2018 22:08:57 +0100 Subject: [PATCH 575/797] security.acme: default name value via module system (#34388) --- nixos/modules/security/acme.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 5940f471883..aacdcbdd53d 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -6,10 +6,11 @@ let cfg = config.security.acme; - certOpts = { ... }: { + certOpts = { name, ... }: { options = { webroot = mkOption { type = types.str; + example = "/var/lib/acme/acme-challenges"; description = '' Where the webroot of the HTTP vhost is located. .well-known/acme-challenge/ directory @@ -20,8 +21,8 @@ let }; domain = mkOption { - type = types.nullOr types.str; - default = null; + type = types.str; + default = name; description = "Domain to fetch certificate for (defaults to the entry name)"; }; @@ -48,7 +49,7 @@ let default = false; description = '' Give read permissions to the specified group - () to read SSL private certificates. + () to read SSL private certificates. ''; }; @@ -87,7 +88,7 @@ let } ''; description = '' - Extra domain names for which certificates are to be issued, with their + A list of extra domain names, which are included in the one certificate to be issued, with their own server roots if needed. ''; }; @@ -193,10 +194,9 @@ in servicesLists = mapAttrsToList certToServices cfg.certs; certToServices = cert: data: let - domain = if data.domain != null then data.domain else cert; cpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; - cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ] + cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) From 4e63119c540e4b732d61f1753b9f6dda3194a69e Mon Sep 17 00:00:00 2001 From: Raitis Date: Tue, 6 Feb 2018 21:09:22 +0000 Subject: [PATCH 576/797] terraform: add the version component to terraform provider paths (#34497) Terraform checks the provider versions, but this breaks if the versions are not provided, as they can be, if the plugins are provided by nix. --- .../networking/cluster/terraform/providers/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index 72da1dd77d5..40117b45855 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -11,6 +11,10 @@ let inherit owner repo sha256; rev = "v${version}"; }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/${repo}{,_v${version}}"; }; maybeDrv = name: data: From 4de7e5cae048d348ef90c7f1e4451b37147f8d16 Mon Sep 17 00:00:00 2001 From: Luke Sandell Date: Sun, 31 Dec 2017 14:57:44 -0600 Subject: [PATCH 577/797] dump1090: fix html path Use correct variable syntax for GNU Make so that HTML resources can be found when running `dump1090 --net`. Additionally, add view1090 binary to output. --- pkgs/applications/misc/dump1090/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/misc/dump1090/default.nix index 3e9fe133d93..29f6c608560 100644 --- a/pkgs/applications/misc/dump1090/default.nix +++ b/pkgs/applications/misc/dump1090/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ libusb rtl-sdr ]; - makeFlags = [ "PREFIX=$out" ]; + makeFlags = [ "PREFIX=$(out)" ]; installPhase = '' mkdir -p $out/bin $out/share - cp -v dump1090 $out/bin/dump1090 + cp -v dump1090 view1090 $out/bin cp -vr public_html $out/share/dump1090 ''; From 4b481684b18c0859994e97595fd3805a0c640d4b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Feb 2018 21:30:36 +0000 Subject: [PATCH 578/797] Add a date to name --- pkgs/applications/video/subdl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix index 5f800ed8414..32bd731f16e 100644 --- a/pkgs/applications/video/subdl/default.nix +++ b/pkgs/applications/video/subdl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - name = "subdl"; + name = "subdl-0.0pre.2017.11.06"; src = fetchFromGitHub { owner = "alexanderwink"; From 44dd0b6adb9d1894eacf48b6eb6bef092d246ff5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 6 Feb 2018 22:49:25 +0100 Subject: [PATCH 579/797] svn2git_kde: remove marked as broken anyways --- .../git-and-tools/default.nix | 1 - .../git-and-tools/svn2git-kde/default.nix | 28 ------------------- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 96e2220f582..33a055e624e 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -117,7 +117,6 @@ rec { git = gitSVN; }; - svn2git_kde = callPackage ./svn2git-kde { }; tig = callPackage ./tig { }; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix deleted file mode 100644 index e52fdb6375b..00000000000 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchgit, qt4, qmake4Hook, subversion, apr }: - -stdenv.mkDerivation rec { - name = "svn2git-kde-1.0.5"; - - src = fetchgit { - url = http://git.gitorious.org/svn2git/svn2git.git; - rev = "149d6c6e14a1724c96999328683a9264fc508264"; - sha256 = "0gjxhnraizlwyidn66rczwc01f6sfx4ndmsj86ssqml3p0d4sl6q"; - }; - - NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ]; - - patchPhase = '' - sed -i 's|/bin/cat|cat|' ./src/repository.cpp - ''; - - installPhase = '' - mkdir -p $out/bin - cp svn-all-fast-export $out/bin - ''; - - buildInputs = [ subversion apr qt4 ]; - - nativeBuildInputs = [ qmake4Hook ]; - - meta.broken = true; -} From 72cd8c09ce17397b66da455381a371bf6d4bd436 Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Tue, 6 Feb 2018 17:53:34 -0500 Subject: [PATCH 580/797] v8_3_16_14: fix on darwin This was switched to use gcc5 for all platforms due to a mkSnapshot error, which fixes Linux but currently fails for Darwin. I'm unsure if there are other runtime failures, but this hasn't been building for quite some time. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18717a3780a..45f976c5404 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11310,7 +11310,7 @@ with pkgs; v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (python2Packages) python gyp; cctools = darwin.cctools; - stdenv = overrideCC stdenv gcc5; + stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5; }; v8_6_x = callPackage ../development/libraries/v8/6_x.nix { From b5ecdfa977a38759ca8049bde57a98309f003357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Feb 2018 00:27:28 +0100 Subject: [PATCH 581/797] nixos/acme: Fix xml (#34683) --- nixos/modules/security/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index aacdcbdd53d..0736239ed2c 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -49,7 +49,7 @@ let default = false; description = '' Give read permissions to the specified group - () to read SSL private certificates. + () to read SSL private certificates. ''; }; From 1cc8ea4ec9fdb8c1c5f08974764278adc5c015d6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 7 Feb 2018 00:28:51 +0100 Subject: [PATCH 582/797] afew: 1.2.0 -> 1.3.0 --- pkgs/applications/networking/mailreaders/afew/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 7fbdf0f6a64..e2b3d073dd3 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -2,17 +2,17 @@ pythonPackages.buildPythonApplication rec { pname = "afew"; - version = "1.2.0"; + version = "1.3.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "121w7bd53xyibllxxbfykjj76n81kn1vgjqd22izyh67y8qyyk5r"; + sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz"; }; buildInputs = with pythonPackages; [ setuptools_scm ]; propagatedBuildInputs = with pythonPackages; [ - pythonPackages.notmuch chardet + pythonPackages.notmuch chardet dkimpy ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; makeWrapperArgs = [ From a9264dbeab359a4cca5490aa2887c22cd55a7846 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Mon, 8 Jan 2018 16:56:46 +0100 Subject: [PATCH 583/797] cassandra: 2.1.15 -> 2.1.19 --- pkgs/servers/nosql/cassandra/2.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 3514ae84350..fd3b2d3aa28 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "2.1.15"; - sha256 = "1yc6r4gmxz9c4zghzn6bz5wswz7dz61w7p4x9s5gqnixfp2mlapp"; + version = "2.1.19"; + sha256 = "1qlc62j3hf5831yrrbydn3z19zrn6bpirarinys6bmhshr7mhpyr"; }) From 798c6cdacaac04a35e3f2cd20921d1d0b4428d7e Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Mon, 8 Jan 2018 16:56:46 +0100 Subject: [PATCH 584/797] cassandra: 2.2.9 -> 2.2.11 --- pkgs/servers/nosql/cassandra/2.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix index b467fcfdff5..3d276128c00 100644 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ b/pkgs/servers/nosql/cassandra/2.2.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "2.2.9"; - sha256 = "1wc2l8l7i43r0yc6qqi3wj4pm0969kjkh2pgx80wglzxm7275hv5"; + version = "2.2.11"; + sha256 = "0r39mm5ibdn9dqv11n4x33vcb5247r6fl6r07l6frqp6i36ilvl6"; }) From 30c71376c9bf55df9e0473c17e093c9072918368 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Mon, 8 Jan 2018 16:56:46 +0100 Subject: [PATCH 585/797] cassandra: 3.0.9 -> 3.0.15 --- pkgs/servers/nosql/cassandra/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index 04348568baf..b6621ec9548 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.9"; - sha256 = "16jdh20cr4h47ldjqlnp2cdnb9zshqvnll6995s2a75d8m030c0g"; + version = "3.0.15"; + sha256 = "1n92wpp5gm41r4agjwjw9ymnnn114pmaqf04c1dx3fksk100wd5g"; }) From bfa1390b47634c0a9af7c34df515cc1d12f4e8ba Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Tue, 6 Feb 2018 21:18:35 +0100 Subject: [PATCH 586/797] burp: 2.0.54 -> 2.1.28 --- pkgs/tools/backup/burp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 783a0796e91..5540822c99b 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.0.54"; + version = "2.1.28"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "1z1w013hqxbfjgri0fan2570qwhgwvm4k4ghajbzqg8kly4fgk5x"; + sha256 = "1i8j15pmnn9cn6cd4dnp28qbisq8cl9l4y3chsmil4xqljr9fi5x"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ librsync ncurses openssl zlib uthash ] ++ stdenv.lib.optional (!stdenv.isDarwin) acl; From d3f76d7747b990b252353c7a97905a26322aae9b Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Tue, 6 Feb 2018 18:06:23 -0800 Subject: [PATCH 587/797] Fix build failures with DBD-SQLite This passes the correct compilation flags to the builder so we pick up the path to sqlite, and (despite the fact that it's a development version), also updates to version 1.55_07 to fix https://github.com/DBD-SQLite/DBD-SQLite/issues/28 --- pkgs/development/perl-modules/DBD-SQLite/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index a2a439b295b..2737ad95d4b 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -2,11 +2,11 @@ buildPerlPackage rec { name = "DBD-SQLite-${version}"; - version = "1.54"; + version = "1.55_07"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; - sha256 = "3929a6dbd8d71630f0cb57f85dcef9588cd7ac4c9fa12db79df77b9d3a4d7269"; + url = "https://github.com/DBD-SQLite/DBD-SQLite/archive/${version}.tar.gz"; + sha256 = "0213a31eb7b5afc2d7b3775ca2d1717d07fc7e9ed21ae73b2513a8d54ca222d8"; }; propagatedBuildInputs = [ DBI ]; @@ -17,8 +17,7 @@ buildPerlPackage rec { ./external-sqlite.patch ]; - SQLITE_INC = sqlite.dev + "/include"; - SQLITE_LIB = sqlite.out + "/lib"; + makeMakerFlags = "SQLITE_INC=${sqlite.dev}/include SQLITE_LIB=${sqlite.out}/lib"; preBuild = '' From 2b8e900403ac104ae0ae3c0f5c04379a115b5777 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 6 Feb 2018 19:56:54 -0600 Subject: [PATCH 588/797] zsh: set configureFlags and checkFlags at nix level, also fix cross As-is the use of 'configureFlags="..."' breaks cross compilation as it drops the configure platforms arguments. Set zprofile separately to handle $out. --- pkgs/shells/zsh/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 4b2b79a2104..43b766fdaf2 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -20,15 +20,19 @@ stdenv.mkDerivation { buildInputs = [ ncurses pcre ]; + configureFlags = [ + "--enable-maildir-support" + "--enable-multibyte" + "--with-tcsetpgrp" + "--enable-pcre" + ]; preConfigure = '' - configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre" + configureFlagsArray+=(--enable-zprofile=$out/etc/zprofile) ''; # the zsh/zpty module is not available on hydra # so skip groups Y Z - checkFlagsArray = '' - (TESTNUM=A TESTNUM=B TESTNUM=C TESTNUM=D TESTNUM=E TESTNUM=V TESTNUM=W) - ''; + checkFlags = map (T: "TESTNUM=${T}") (stdenv.lib.stringToCharacters "ABCDEVW"); # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' From c6aa69f48c0e8ec656919c9b7dc8075e68f62979 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Sat, 27 Jan 2018 13:54:19 -0500 Subject: [PATCH 589/797] curl: Enable http2Support for darwin http2Support was disabled due to a bootstrapping issue involving xz. Now that xz is available in the bootstrap environment for all platforms, http2Support can be enabled globally. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0db748b4d2..601a784ce84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1719,7 +1719,7 @@ with pkgs; curl = callPackage ../tools/networking/curl rec { fetchurl = fetchurlBoot; - http2Support = !stdenv.isDarwin; + http2Support = true; zlibSupport = true; sslSupport = zlibSupport; scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; From a008a9cb3bcde88482ae1d7bb13999b5128275c8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 7 Feb 2018 06:30:34 +0200 Subject: [PATCH 590/797] nixos/sd-image-armv7l-multiplatform: Port RPi config.txt changes from aarch64 image As was done in commit cd2e740dde9541ad5f1d9efd93bcb5a967379ece. --- .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index f23275bc16d..08903ba397a 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -43,11 +43,18 @@ in sdImage = { populateBootCommands = let configTxt = pkgs.writeText "config.txt" '' + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel + # when attempting to show low-voltage or overtemperature warnings. + avoid_warnings=1 + [pi2] kernel=u-boot-rpi2.bin [pi3] kernel=u-boot-rpi3.bin + + # U-Boot used to need this to work, regardless of whether UART is actually used or not. + # TODO: check when/if this can be removed. enable_uart=1 ''; in '' From e8f480fb6cc9fbb286c640ed9d386e68ffb2ef42 Mon Sep 17 00:00:00 2001 From: Varun Patro Date: Wed, 7 Feb 2018 13:59:34 +0800 Subject: [PATCH 591/797] Add 'varunpatro' as a maintainer. --- pkgs/os-specific/darwin/lsusb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix index 5d05c1c9084..0b59ecb2299 100644 --- a/pkgs/os-specific/darwin/lsusb/default.nix +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "lsusb command for Mac OS X"; platforms = stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.varunpatro ]; }; } From 768fe4f230608f34b92ff78ba014f257f0fbd96f Mon Sep 17 00:00:00 2001 From: Varun Patro Date: Wed, 7 Feb 2018 14:00:46 +0800 Subject: [PATCH 592/797] Add 'varunpatro' to maintainers list. --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d2c62ef9bb8..249040247ab 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -717,6 +717,7 @@ vandenoever = "Jos van den Oever "; vanschelven = "Klaas van Schelven "; vanzef = "Ivan Solyankin "; + varunpatro = "Varun Patro "; vbgl = "Vincent Laporte "; vbmithr = "Vincent Bernardoff "; vcunat = "Vladimír Čunát "; From 95f4d6ba1caec48ea28df06a456cfcecc0c91825 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 7 Feb 2018 10:01:16 +0100 Subject: [PATCH 593/797] mpv: fix CVE-2018-6460 Upstream has fixed this in a series of commits ontop of 0.28.0. Debian has backported the fixes to 0.27.0. Upstream issue: https://github.com/mpv-player/mpv/issues/5456 Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888654#8 --- pkgs/applications/video/mpv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index dcbafd8594d..403fc7e4ee1 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -95,6 +95,11 @@ in stdenv.mkDerivation rec { url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch"; sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb"; }) + (fetchpatch { + name = "CVE-2018-6360.patch"; + url = https://salsa.debian.org/multimedia-team/mpv/raw/ddface85a1adfdfe02ffb25b5ac7fac715213b97/debian/patches/09_ytdl-hook-whitelist-protocols.patch; + sha256 = "1gb1lkjbr8rv4v9ji6w5z97kbxbi16dbwk2255ajbvngjrc7vivv"; + }) ]; postPatch = '' From 99167e34c99e97613b924a2907a0a697f163bbc1 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 6 Feb 2018 23:17:53 +0100 Subject: [PATCH 594/797] mopidy-iris: 3.11.0 -> 3.12.4 --- pkgs/applications/audio/mopidy-iris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 1f309c4503b..219b04b4ec4 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.11.0"; + version = "3.12.4"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "1a9pn35vv1b9v0s30ajjg7gjjvcfjwgfyp7z61m567nv6cr37vhq"; + sha256 = "0k64rfnp5b4rybb396zzx12wnnca43a8l1s6s6dr6cflgk9aws87"; }; propagatedBuildInputs = [ From ef727716cf7707dfe4dcf8cc05d7efaddd6b211e Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 7 Feb 2018 11:38:58 +0100 Subject: [PATCH 595/797] uudeview: init at 0.5.20 --- pkgs/tools/misc/uudeview/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/uudeview/default.nix diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix new file mode 100644 index 00000000000..e66580f25ff --- /dev/null +++ b/pkgs/tools/misc/uudeview/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, tcl, tk }: + +stdenv.mkDerivation rec { + name = "uudeview-0.5.20"; + src = fetchurl { + url = "http://www.fpx.de/fp/Software/UUDeview/download/${name}.tar.gz"; + sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4"; + }; + + buildInputs = [ tcl tk ]; + hardeningDisable = [ "format" ]; + configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ]; + postPatch = '' + substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish" + ''; + + meta = { + description = "The Nice and Friendly Decoder"; + homepage = http://www.fpx.de/fp/Software/UUDeview/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ woffs ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 908d1a8f7bb..087a33b0336 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1969,6 +1969,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + uudeview = callPackage ../tools/misc/uudeview { }; + zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; ### DEVELOPMENT / EMSCRIPTEN From 291b05ee21a6b822e999566febf9e419e45936da Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 7 Feb 2018 11:37:30 +0100 Subject: [PATCH 596/797] squid4: hack to detect our libxml2 --- pkgs/servers/squid/4.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index 62f0b7c001b..4a4502a6939 100644 --- a/pkgs/servers/squid/4.nix +++ b/pkgs/servers/squid/4.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; + prePatch = '' + substituteInPlace configure --replace "/usr/local/include/libxml2" "${libxml2.dev}/include/libxml2" + ''; + configureFlags = [ "--enable-ipv6" "--disable-strict-error-checking" From ea817d7b6fa0d0cf4644973d7cf89ad4e23d2f6a Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 4 Feb 2018 09:29:08 +0100 Subject: [PATCH 597/797] squid: fix CVE-2018-1000024 & CVE-2018-1000027 --- pkgs/servers/squid/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 7f1c97bd642..95f4233df10 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap +{ stdenv, fetchurl, fetchpatch, perl, openldap, pam, db, cyrus_sasl, libcap , expat, libxml2, openssl }: stdenv.mkDerivation rec { @@ -13,6 +13,19 @@ stdenv.mkDerivation rec { perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; + patches = [ + (fetchpatch { + name = "CVE-2018-1000024.patch"; + url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_1.patch; + sha256 = "0vzxr4rmybz0w4c1hi3szvqawbzl4r4b8wyvq9vgq1mzkk5invpg"; + }) + (fetchpatch { + name = "CVE-2018-1000027.patch"; + url = http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_2.patch; + sha256 = "1a8hwk9z7h1j0c57anfzp3bwjd4pjbyh8aks4ca79nwz4d0y6wf3"; + }) + ]; + configureFlags = [ "--enable-ipv6" "--disable-strict-error-checking" From 5118b868007212b8632b27a54563c98812b2d86c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 5 Feb 2018 22:02:14 +0100 Subject: [PATCH 598/797] nixos/monero: init --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/monero.nix | 238 +++++++++++++++++++ 3 files changed, 241 insertions(+) create mode 100644 nixos/modules/services/networking/monero.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 28ed10a5ece..c0c6a6ef924 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -303,6 +303,7 @@ restya-board = 284; mighttpd2 = 285; hass = 286; + monero = 287; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -574,6 +575,7 @@ restya-board = 284; mighttpd2 = 285; hass = 286; + monero = 287; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d9d80bcff81..91dd0529d3c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -492,6 +492,7 @@ ./services/networking/minidlna.nix ./services/networking/miniupnpd.nix ./services/networking/mosquitto.nix + ./services/networking/monero.nix ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/murmur.nix diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix new file mode 100644 index 00000000000..31379189f5d --- /dev/null +++ b/nixos/modules/services/networking/monero.nix @@ -0,0 +1,238 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.monero; + dataDir = "/var/lib/monero"; + + listToConf = option: list: + concatMapStrings (value: "${option}=${value}\n") list; + + login = (cfg.rpc.user != null && cfg.rpc.password != null); + + configFile = with cfg; pkgs.writeText "monero.conf" '' + log-file=/dev/stdout + data-dir=${dataDir} + + ${optionalString mining.enable '' + start-mining=${mining.address} + mining-threads=${toString mining.threads} + ''} + + rpc-bind-ip=${rpc.address} + rpc-bind-port=${toString rpc.port} + ${optionalString login '' + rpc-login=${rpc.user}:${rpc.password} + ''} + ${optionalString rpc.restricted '' + restrict-rpc=1 + ''} + + limit-rate-up=${toString limits.upload} + limit-rate-down=${toString limits.download} + max-concurrency=${toString limits.threads} + block-sync-size=${toString limits.syncSize} + + ${listToConf "add-peer" extraNodes} + ${listToConf "add-priority-node" priorityNodes} + ${listToConf "add-exclusive-node" exclusiveNodes} + + ${extraConfig} + ''; + +in + +{ + + ###### interface + + options = { + + services.monero = { + + enable = mkEnableOption "Monero node daemon."; + + mining.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to mine moneroj. + ''; + }; + + mining.address = mkOption { + type = types.str; + default = ""; + description = '' + Monero address where to send mining rewards. + ''; + }; + + mining.threads = mkOption { + type = types.addCheck types.int (x: x>=0); + default = 0; + description = '' + Number of threads used for mining. + Set to 0 to use all available. + ''; + }; + + rpc.user = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + User name for RPC connections. + ''; + }; + + rpc.password = mkOption { + type = types.str; + default = null; + description = '' + Password for RPC connections. + ''; + }; + + rpc.address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + IP address the RPC server will bind to. + ''; + }; + + rpc.port = mkOption { + type = types.int; + default = 18081; + description = '' + Port the RPC server will bind to. + ''; + }; + + rpc.restricted = mkOption { + type = types.bool; + default = false; + description = '' + Whether to restrict RPC to view only commands. + ''; + }; + + limits.upload = mkOption { + type = types.addCheck types.int (x: x>=-1); + default = -1; + description = '' + Limit of the upload rate in kB/s. + Set to -1 to leave unlimited. + ''; + }; + + limits.download = mkOption { + type = types.addCheck types.int (x: x>=-1); + default = -1; + description = '' + Limit of the download rate in kB/s. + Set to -1 to leave unlimited. + ''; + }; + + limits.threads = mkOption { + type = types.addCheck types.int (x: x>=0); + default = 0; + description = '' + Maximum number of threads used for a parallel job. + Set to 0 to leave unlimited. + ''; + }; + + limits.syncSize = mkOption { + type = types.addCheck types.int (x: x>=0); + default = 0; + description = '' + Maximum number of blocks to sync at once. + Set to 0 for adaptive. + ''; + }; + + extraNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of additional peer IP addresses to add to the local list. + ''; + }; + + priorityNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of peer IP addresses to connect to and + attempt to keep the connection open. + ''; + }; + + exclusiveNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of peer IP addresses to connect to *only*. + If given the other peer options will be ignored. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra lines to be added verbatim to monerod configuration. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = "monero"; + uid = config.ids.uids.monero; + description = "Monero daemon user"; + home = dataDir; + createHome = true; + }; + + users.extraGroups = singleton { + name = "monero"; + gid = config.ids.gids.monero; + }; + + systemd.services.monero = { + description = "monero daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "monero"; + Group = "monero"; + ExecStart = "${pkgs.monero}/bin/monerod --config-file=${configFile} --non-interactive"; + Restart = "always"; + SuccessExitStatus = [ 0 1 ]; + }; + }; + + assertions = singleton { + assertion = cfg.mining.enable -> cfg.mining.address != ""; + message = '' + You need a Monero address to receive mining rewards: + specify one using option monero.mining.address. + ''; + }; + + }; + +} + From 9e55e5a07e250401b78701dadbcb59b357fb7df2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Feb 2018 23:21:16 +0800 Subject: [PATCH 599/797] firefox-beta-bin: 59.0b6 -> 59.0b7 --- .../browsers/firefox-bin/beta_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index ccdbdabc764..b1fc3672369 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b6"; + version = "59.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ach/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ach/firefox-59.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3a18ca13a211bc1b88fb37992b3aee43c6782d2fc5032c9ca469b28561e36dea81390e1c1d5c66d5c0a7c75c18c4f0cd65da6059969123d82a46ed10654dddd7"; + sha512 = "3e65d2c444354930d29b7dc783cd97c221c7f953ad896e4eb64d641ab5d4a402fff5cfb2cddcbbe90697ad2d3acd44440451d0cb23f9578affc2664216eba874"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/af/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/af/firefox-59.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "db896d865820a91e6627a6b7ef55bd1e05858df0a57f7089b5695ee9bb259c9d611511c3f6429e1d090c0bf84c078c0f5a7539a40b34566df6692a55e49f5db6"; + sha512 = "d8d5fbd2399bd0d49a588cb3c4d727e7eca5521da15bd0d7730ea08a188d4bef69d23428d856afa454fcbc9242e0515ebeddc14d67ad6587366b263a3d8c7ebd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/an/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/an/firefox-59.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "395410c7104f398d76b69af355573c150b192fc943ef3474923f67c6d82445941b8e4908af9fe77de45f091cec3924fa62d205f3c69aa40df2dc0bd4cac10782"; + sha512 = "52a52c510b708817e0bf4e920330de88e5bc0f318fdfcf5c159f97f6a0ae86f2c4c0ff91dc40a13f0a0ca90aa1e244d8406a5fc3899fe67f071579b4aed04110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ar/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ar/firefox-59.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "c0b4943bd521ac1311a23f44c86d89d0a63d07aaa6e918576a6efd2d097801f1051eaa52d170bc84cb7d80869e7bbc89a3ea655436879854e9572094a91c3067"; + sha512 = "2e8636ba9d87262d499bfc39653d88c9f0aa7cc1dd23741c822b2404a290cdf0830934599b822f903b64b705160349964a8dee558a0ff5ecb478d2954a82bf51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/as/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/as/firefox-59.0b7.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "4be3a37453179f2a4784fa9df0634bd59d85dee27087d117204e6da059573c6a786a1c422ee0b7731f7fd5300b42dd42d0aaf741482f61239674ecee35e85145"; + sha512 = "98e773fcfabb91df80d8840f36aa0846347aa4a7ffce0c0822a60a0cff98bdcbed354ec1a9be595a1f7bb62650c87e9c9d4effafb4f6ed38aa334a6e6b2ed5d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ast/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ast/firefox-59.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9949ee9172d3004dbb28fef6216b7716568f98b4b52096479cdc4c85c12b0da6fc0774c6c169103b86cb3b60d0da36ed998058e86e473213a19977c4d2bdbf8c"; + sha512 = "f287cce2e529fdfc3226bd2bc8b022b59512f5209bf883a0993c7a342c065e21418bdf1846155d96ecc48f78ac1abf29109a2785d955b66715eaaf0bcafd113e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/az/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/az/firefox-59.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "de5d19ea82dcbe4b53f78d33474249342ec659dcc263f44725ec92b491e9b43158809d6df87a9d6c86395e5e3fbd1e09b3bba7c5feff85c4b46438fce7318a7d"; + sha512 = "049401d9ac0572ac8a90e915334803a00c301a86dd328cb8724d3361914d98f98ae6dfb8dd1156b4c3c5ca5d59bab7a054b4499edf8c5cc7a74fd1cb31228992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/be/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/be/firefox-59.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "97437da34da251863b2bf1426eacaea62845f00916d81db48220dca540195d24d1d890a60ec6ca816c0fa5d22966e2095afba03ec242059ddc0e3e297a5a3084"; + sha512 = "f20b6aa2fa8cf5b7b9eec16ba89586e27ac383af9a7092b555e56df5d7f582fd5256e9cccc85c3c086c63296937bf76f1c906ea17570b73e0426577984258be4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bg/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/bg/firefox-59.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a003a5c23c011c696552ed83e0672e6a066bfac9a3aa4e13feaff472cb27e0a858b0e5986022f4c7db343ab056a2fad46176be08658f0bb595deca08ec06058a"; + sha512 = "5d84f7ea9fd24602afa0895a77542a09f5e4f631141c8881d46c4f8736349f10c4ad0e33c1a0eced92d4c39f7f426ad03b99c626be5ea51a0d773450c4fadc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bn-BD/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/bn-BD/firefox-59.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "404377cff86dc5fbc8db67567565cd64ce79d1a322547c70b2a210a034c5a6a0669a82e717a21fe33340f34838da2352be7615bd7752cfbd300825f161101ef5"; + sha512 = "80a7225cf9627590c4c670022b4e58855220587907ef46490d3ad84cbfbc57ad28e7e58eb6d1504c0fb4be96ae8e6097cd2b429da80965f36193d08b897049a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bn-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/bn-IN/firefox-59.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "dcea89eefbbef9a54002cdb85d2589511e00ba06b729574106f03447ebde36202ce70f8648de433337a3da8945c26c7834c240d64a7fd11b032c234c7e2fcaa5"; + sha512 = "279d04ca1f681db821bdbdb2738d72b7af3a9758ca28740247bd91b9954cbda7266195832a2531dafeef29e8b73f8f76d663480eeebb4cad2b8337cd374eae77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/br/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/br/firefox-59.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "69dce79cf9cb72dc9f32db11932b8d542aaccdd96baf4b20cb425f395580db51382cb8c48338c292ced1df5ff0a83c80bf9b7176cbd9efef69a48f3bae01f51a"; + sha512 = "d67c3ade13bfc56f3faed53cc3c7b0855077285a1ae0b496fde764878eacea7841f4a5abeceb44bfcf8ecde996e702b584b04fefbcfcdfc616e9995fe2877145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/bs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/bs/firefox-59.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fde4ad44e5de766ad5ebcace976f134fb1cffcb99669913e7d8ecddd986637c30cab3e06cacda26eb4bcfd4c7077d7fb6fe67a2eaf8f3c06f7d74cf322f4a5a0"; + sha512 = "a18ce7d17baae587d85dcc4a4f61d9ef32a9495599b47bf85d89c18393669afe9e951e35625f00185e3763b02634528fda08be5e0d0c5b7aba9834acb118e40d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ca/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ca/firefox-59.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "17373f55bb22c42b9b3fd2b82a1e8cc3258e33c924f2afbcc6f881a928e96587e76a705cada437b5ab83478b48e0fdefbff226b65efe1e94a34b1019f6e8e673"; + sha512 = "685cccbbf74215dbbdabe38fd363539f8e271e5098de54e2b7ee5a6574cda8a5fc769b53c304416fbed1cebb8fe2abb6eb58a524fee090065de86ad7230a99b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/cak/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/cak/firefox-59.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a946c519d1e8f6e87da9524c3082248eb799e225ecafe61df145c315a9525fccc24495d148bbc081127735e301e70cb5f8ee7d44f54835d95cd0814e5b92fbd1"; + sha512 = "d5a6090bc511f14c16ecb27a9d4f7e7010a219a9cb31d97ba86a84948a704d3c606addb62c7e512a09d7d3f4cb6864d389448932052d1bd273569ca5ea6922ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/cs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/cs/firefox-59.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4eb26d3c2c4e7122aeffc7a1ffb41f2d2ac91fb10193d0bca336f2a78f635b5644caa0c63dcdf4051d6863189c157fbc755f636570348162562478e4e743b937"; + sha512 = "e8694358003a728a1407571c9367367cfe06bba7aedcbc3f85d6becc0a6187c18acbbf42cafac79b1f75f497a3aa71c064e2386bf87a28e2781760d1557e91b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/cy/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/cy/firefox-59.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a55e9419142eefd3229835e028a05c75d10371ba079a092cf8c380c4c66aa8215825dc7959df52153c3ec90ae9fb15d94f212b5e8f5353efd887b5f21252eb25"; + sha512 = "196315b1ebe44f8d2f30c462768070c4abd09c07760460a8b9d1f615b9ffa8b35174460d3423c5672d3854cd9c19b918d8d3de88699f557c547daf3696de8b26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/da/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/da/firefox-59.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d0f444e429feed08b6ef4d559c158ee5ecb6dc6f6e18da5b04f31e27db0bfbb35b9b5221c8308f4ff83a9a895810198298580041397e39c8538a2306ec105bc0"; + sha512 = "98f50f26ec4491e6a26c42d1419785652d9265a8359b61e8808289683ed3a8571ba03efcd9ee3ead4c5a11bc4797d9da6532ed396984710160165ad568e44ac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/de/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/de/firefox-59.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ac8feb9d54eecc49f7091f558b64032132aa29acd3bc6936d42c376a4dbc3d5c14a7ea673d4aad0b107be7891fb17efcfb09b7696d2201c8f492519800a812ee"; + sha512 = "cef7bb0ef85aadfc94b347d9468be7d31e619e3f45d352e4e5a4fb5cee47da875a6414f7e1123d4bf4d890e95f318ddb9345a2523fc198d848107104c7912057"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/dsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/dsb/firefox-59.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "70458cba5023661bc407f291df1f2d6a1134be50268e1e07c7daf3e3f8ea14dc0ffb49796d4d63855713aed4939033a3aeba6af6e526af28a37cf7f0786442fa"; + sha512 = "0f577f81f2e7e2c0e006d9b2bae14a16f0f39f40fd31cbc20e0ad2ea114bd1c9f77e657805804a8b6268d79becb2a5985f01a2ab4ab1acd900e99bb1a2f0c8d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/el/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/el/firefox-59.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6eef9891adaa4cdf02a986c03efde0766827cf41a988d73b9d68b40bbd4006713c250166d5b9b879da0b38830e3f65a007ee6172f8deaabaaf096ac7a17f2aa6"; + sha512 = "66bbd80dd17a4dd4997b5069ac8f647c73e008e9f9dc77d7d96a45a98b25c27a5b94006d47cdf7533bbbb8643be459b03a97bf358dbd09de704a62d1e7eb31ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/en-GB/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/en-GB/firefox-59.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a89e247620943907c1b42c3d24c327fd68f1e6daf71f83e589baf2996c9cdeb2b28b5286d335c87d66a781e39001a76252b88206de03f8e37354fef64f756cb7"; + sha512 = "12004229b82b6da02e3aca50091dceba699a0b18951832396143ec2363094d49172e9e7b69ff93e39fc6139f4a07f92ae54a97dd2a40efd09d95c884fb987c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/en-US/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/en-US/firefox-59.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d79b2292ac77f1edd7fb8c0b1d779454b7b82b97d25bb7558ac6416df2d499a97370b537d70457e7fd9096c0087c86aaca755c694b3968d081f2211837b87002"; + sha512 = "46adc60ef2d377275df83fbaf84d2f0ceff4309546e233b35784f0e4f0c3f12a34cf63c58515b97ead5b77528598a760773650232273c91bd370dff1dacc4b9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/en-ZA/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/en-ZA/firefox-59.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "e6efecdd6508759d390554775ee3201eca560bb31b468b4a53a9f2e39d059656cc2aa3b23068ea376eaa9a8921f9a6532b8325be0c6b41aeaf3bff3cf6aca5f2"; + sha512 = "a2b3b7474164cad6b67af21b0a3a4d2c3ee7d43e5fc7dd2955839ab2da05e04d2b8f317a0fa51905dfb2fe44b83c79f0f3b3dc40bc3d611811d5fde1f981ae5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/eo/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/eo/firefox-59.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "eb23bde124ab1f6f169d8e7489887c4a09251ccee9b99cc0eaa6fc914c8cc239ace351245625c5cac225ee35f5c5d2839ee3286b60360c2476dbe94748f52312"; + sha512 = "40b648e0634c26877573cb20c1647e1f21ce443ce661f60cdefb649eb63118d9e3985ab4e990d4c21c16ee2a411f72081ab2ba72a5fc7d946370f087a78cc226"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-AR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/es-AR/firefox-59.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "1ac5abe11415d8d2525cb7552d0d42bc9cbf1d76652d315a65916fbac77c13e839fe21cffcc9aae610a9b0d8d6e183a546c43b545bf9c81f44437adda34c3a8e"; + sha512 = "0d4ffba6fd279195242ec7a8763afaffbdaf3e8067ddb15f8ab4f364d667fa5d75e7ece71ff463c654983a22b252e326860d128a35307c0e083e4b87ee110cc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-CL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/es-CL/firefox-59.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e1939280beefd553f9062c07c97196826ed910ad205a76b69fb58513b50cb98eec80e3350b5fd82208c3bf696806cbf8f99b755b08baed32f7357d4f09610c10"; + sha512 = "b68c59a82ac1baf51101f852e88ab05bf5c4e12f287599e42a4b4651478db98855bc0c91c4f8b883b808054849fec7d1dceb51307bc586b0406f821783fc2865"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-ES/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/es-ES/firefox-59.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "0439ba49de9bae85f3baa1849fa04a31945448371cdfab0e34432ebd9b8de9e71d73c80119b552f373c9d18ff64714d1f29fe1c8db3a60a8f81e0d2d3c3fe0c5"; + sha512 = "1860e94c2fd22d4e8ee3e7f0cda996beab77bac7ae71c979fa09b76ecd82ac881793aa487b5c8c9689842d6ba5a483969dc53bcb786fe2785908aadf99611037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/es-MX/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/es-MX/firefox-59.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "bcd4626159388909d38377b593ceeb505c56a335c8967d5ec8a8871395134a77f639cb134a0295c6a07416daadd5b72f7ca4d3ef5ac6e09421c02d7d1982007a"; + sha512 = "8f3142a498c86ebe1ed87dfc9ed639a752f74cb2a2dbfcd7321926b6361de7d5323c6fd6da2753970711e0a5b3b3856ee833b5e5d1cc43b6f44fbe7bd7c4f999"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/et/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/et/firefox-59.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d589915cae325e6a78cf75a49229819873a7451cab4e6fb82744e83e3c1a0476e61f75b7f0433745f460cce0a8588fdca113e2805554aca92fb33962468c2814"; + sha512 = "5214ae6b0903b7471d3fcd0c7dc7912048f227a0ae41fcaf642fa967b8a2bc9363eddba3901bad6214a846c4d4fb754c120db8c439d82687f1822f5375fbefa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/eu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/eu/firefox-59.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "7fcabb04d73d485287b9dfbcc5311616d6ab7a762102b7c7a7cdc241ecb304bf26c0d2f0d8c3a7bc36579ebfdcbd75d98924689995c78452c5e73f713d8066cc"; + sha512 = "f3ce78c131f3bc6ac970e85c2b609a5c23d623b7698437714d58c9156410dd78ed0fc80387360f53079247d7344ad0edbdfd2ce2e0bed1646ec10a5dd4f1ff41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fa/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/fa/firefox-59.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "dc11ad29ee9cd33b6c35215151665782485801bff4fb6db73e011f6cfd3935c900380d74624b180b29cefac07fd779a316e7eb4d4c806ae4a981ad249858ac9b"; + sha512 = "16bc896ab4f79cbb2ecb58fe316b8e7c14eb88845818171a29f17bcac3858c4a9d81d240b20cbc0a4ecb086f40b9d391f840880fd886ef00bb6a67f9734b3cc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ff/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ff/firefox-59.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "cb38b54caf810e8b0a85a8f51ceab3527fc5bf915a16538b6e5655b49df44dbb369d356888ae5f9c13006bfc1c641709c1f5e11cf7efe16b75676e7766b93b9f"; + sha512 = "daf3afebeac97a8856954821f9641a1beb603e72a744f19cb0aee1002f7a111082f8acf42ba8dd6838638542b74673799add7e968c56225e8f427cba2ee23b79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/fi/firefox-59.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "d4aa61d1c0fe71cc1ae12718f7f1c3226259592ba7a3b4bebe78383b29220028816b2489d237119f94ff583bc1ace1f218c3831009122470a791a3681f804584"; + sha512 = "e54ec25a8940bcee63cff4aee8a1997090283aeecf187050f7ceadd12003e39af7e88c66b971d1ee74ba047f07b08cccfc99758134418b6d1279d1fa857d33fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/fr/firefox-59.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "de15b09970066ba64b56a01940c8c31593e5277d0b95042519bf65ef79eb1fed122dc2013a6d0de8e16832f75f9f135e0d737a6d9ffd72dfbe212965b1752d8e"; + sha512 = "b7111be3579ea977130e16754537f9cea9e0fd3367f012d1f07dad4eac9d3e3e2824ec62a6aebead60ee93808381305e8b018b1ea619e45cb40bc58e46088574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/fy-NL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/fy-NL/firefox-59.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3ba6ef5eaf244ff9f8049835366e904fe8e8e13ee42cdab5c9463a5e5f8523f9f0d5387dc64d980f3dfddca3e799461eddfecd8b12fd4674fcf45e10f385be97"; + sha512 = "8a9119f30ffa587f19f9090a230623c0023215b321ef446789abe12f62939580445dffbedb55e9f0056c9a28529f77c0209a8190ba26a4a052a372dd8e26d925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ga-IE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ga-IE/firefox-59.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c7e47e5d37c8cbdd96440a0247d2428f8638dd4fe2fdced93fac5222e2aefca47863957efc3a0031cd6160732e1d1f4e46a850d964dad97ac42f44422927a4c1"; + sha512 = "d91a3b6059a599af0ffafdb42750e09d180494c8014a8d21096c732cc8a0130c742f3a81f455aaa1cdb7e523fb05e6c15903a80ada19734005aebbce8f9a46b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gd/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/gd/firefox-59.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "58b306dab4cb1244bfdc2cd707d70fd600427e4758ed0c2373ffa296618406d814320dd4be0ee4bbdfd396d432a945e0944a9da8a9c44a189844b2f7d21d67b4"; + sha512 = "600a4192e86441011126eee380c471962d8e1835e66284ecb297ca7aecffc85606de887f0c5c9b29fa65847b79c3cf97e9334db7a7a176b5325591651f3bfcc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/gl/firefox-59.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "cc71cb150df0bc38e26313224c826b089e133782b26fb903a8ac38bed15dd67d7813cce19947acdf962f7587209e26ed1d4731abfedcad07c468ff69bae94940"; + sha512 = "bbcd942f72ac78835d5ab063d5714008a2dc3476257fb39fe3dbb52ec0e865806a3da19cd54bd5fa02dd96b5cee6d4535f156d74db81b398c0dd9691293ed624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/gn/firefox-59.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "4b58193020a1d85103e3a5014f3ad9252293813f52d588392dc262c1a29ca0fc873f2397aeab62db493a97d96f26fbe8b753001dac97e33c203beea8675825e2"; + sha512 = "da51bdcfda6521ae2c78364a9149064391d2c3538fdbee6420b3741526b56e5efb19faf9c0803be6739f82b59352e82531993b77d7f669ddb5a1fd3303e3f4b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/gu-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/gu-IN/firefox-59.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "d39ed52652cc39bb9fb74b469d69ac4be87aa5b220b711687032d711d5d2a245160aba305fa7b3797799e030ee31816fddcc6cdec090acdc1b894c23515aa2f3"; + sha512 = "ae9f123c7360a3e40dc44a10f02e271606bc81948a80a758416c389691bee29e95c4309cc6c405b39ce2035b662c14057cd59411a6e0b3e7a704c4d3073f5ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/he/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/he/firefox-59.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "efe709b15dc4bfc5787a0ef1e3f1cd95fec8fb87dab188ea557bab6447d76f7bd4d543250b6b0583f08ad6c64ae0959ce3a18c124c4b510fcc7849a2439b5a24"; + sha512 = "e80ba21f7f49e4bd301d0d1126aa8ff001fde7de9d9ed062fabc2b0acdc3a03026664b3326d824cdca04ef175883e68ae7ffea51ce0bf901a8e4a62a7b66e491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hi-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hi-IN/firefox-59.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f057052c8785839c1831f4c707bc78b4f416edcc4417527007de75f5c1bbddd3a4adbe76497e74741eee86de66870f79d5d0b716a0e149a9ce15ea912f4863ab"; + sha512 = "3106758a39991a5aaaede77c0096f5a075cf01168991f13511dc76ac51c8f2482c35db60c9c09f957816fef7ee05128900ef33c22f4d2f02d0a0ef9976cba79b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hr/firefox-59.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e8502da3ed7d93249e75c96e82986d874c461a39ff96e0132e0ad5b479bae26ebdcff7dc9cf404dbeb253c1fd63e544f7dbc1e52cd54004b2bc840b14875d503"; + sha512 = "ba38912a2a52edd6e0e593efaffb2814a1ae1172f4b9a218e23e2813a63fc19357e0f25cf1a95433ca2bcd62c66bf7e586f9ae0c0148469100061484ce1e3385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hsb/firefox-59.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c854066fb4e1117b7911f3e47c38af8d674f70de42d9497ad0a3dfb602159bf81de858d70da931370386d228de54317caaa8729e356fc6fcd8bd59199a974eb0"; + sha512 = "9a6b5f20273c15ef9a6b4b6bae8937275fd60fc07f1a0cfa84645250d4164dc463c5856d0cf89d1a8185a855043e858c159dd125cbbfaeea7dd4dc23342ede4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hu/firefox-59.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "586af0c143ce23b2eb67421651e537edd25af4ef08944f43956b93ae38a761c9aadbd8bf597fedbc059ea5d5e5c18aff0534ae14728a757cd206e035fa114945"; + sha512 = "3e4f112cdb3bb0c001decac6d6d962ca889619397cfc29bb669cf3ade9b0bd027eb32ac9f403e993662e11af2753f892de5b6c92f621d848bc6c7313ffb2dc9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/hy-AM/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hy-AM/firefox-59.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "9238e5352cb87c738bf41306093c294bce00dffe0522cf44e3aebb5f1260b9898e8046942841fffa7fafd2400c05e7b5616c4e5196dccd46299a5b2e5ca6c040"; + sha512 = "754504af24990c27ac58c2ee7c2ee7fddaf993f27c51a90d3e670a07d9f56b374c5ec714cd58e9ffe85a27a927d7c7f0e56cdfdac0b2b9b3addddf02f576a97f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ia/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ia/firefox-59.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b7bf282acfb553eff7e400b76e75b5b26ca1c727ac65d4db78fe7bea41da533e4a31f6d9d9c65d5410f738f21d0a21b6ba31dac465eea698a5871812c3ca44ea"; + sha512 = "01f45a179832050cc58b604d7aaa7e4dbdd2070cd7114d05451ac92a065770b8b330729a0eba67e631fc3fe0a80c5b5b531f7c7cce6a1baba9ccec4b942439dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/id/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/id/firefox-59.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "50a0800c1b88ab2edd38b696f5fa47ffb68dfa0bacd566f0d43bfb3fe6e86384cd736f300520202fc2a85616c38885a5ccd9215d51f8c85bc935633615667531"; + sha512 = "68dd5621de1108b0467bcd4757311e110f3ef6033b1a80e115a5f6557b9fc7e2bea54369eb435c64169d0c5ab565f70862bb058cbfafd300522172053286f483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/is/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/is/firefox-59.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "dd59dab53c7869d2c353c002d455ac5b30491051697f417bc8c16a9e79c2e5198394c6470d2843d4698052528ff4cf8e5dd4ed77379415471512379c2cf312c0"; + sha512 = "f084fdabded21fef8d540ffd8ed601e1cc1ea635ece52e84aa9a98dee4e598792d17f6556be1425694e6e0e22a1fcbae8f8eb3ce35289b7bdb13a53498fd0d77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/it/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/it/firefox-59.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2eb4c38ec5190dbfe15c671b9c8df6bc224b6a820d3cefd88c737ee1a6a20546200fa3b499a8e9670b394d7cdbc2eec6afa0505e52f503b700a1bffd1f5089c1"; + sha512 = "2e9804302e6693fdd00bdc90b0f86990ee6ef9e4a22b5c9dd00b06421cbd7acb858cf1f0bd3a5ce2804908ede5007dce5932bcbff8e4680c9aa73fae32a04ec5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ja/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ja/firefox-59.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ca02dbc95eb53ca8b8e70afb539acb3d3efc339ddd0b4b4a594cf98f2330fda1bea42ba4e616ad6868cb9c1099d7fe441603b61c2d3f602d01cda9fc953504e1"; + sha512 = "0d1aa8fcc51517b39047cc75cd8a31ce92a76bb2b55b5e45f84309bc8d4a98c77a9ffe8f6c0373683dcf158a5d3105cf0022b57c653f651f1670144e9e24a3f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ka/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ka/firefox-59.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "81b55418121cf91f524d4b26fcc6e919de8b86cf50c283c367244b1707c389aa18f969f4d26e24d1e5a2055c4bc6aac69b0692375f63c99ca8b425922cd0ed25"; + sha512 = "24dfe34f7cefc72cb203964b3ba9bdae478a00ae2dd6f3b696d2ba9068f97a1a572f0ca3758e103c1d7db091d3bbcd1394d761725f7826aa5c54b0e6fa764f57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/kab/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/kab/firefox-59.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "479ea71fac233895ef1acdbaed08d5e5471d5302df06c028ee5406832d941cce2fb56eb4cfa528e07a184de1c5bd9fda91effcab4cda4e6a98ef6535600477ca"; + sha512 = "d4a29601d95ae248b0bf8600e3b41a6556d1545bfbbdda6c6a7a121d62133000464e91da7b093f6d3363f3e605d867201afd98abc1bd8923ae09384a8d9a8c3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/kk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/kk/firefox-59.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "426edc66d052828485f1ca18c81bc36a8b9a9373b580fd5aff135bcafba88849b0fa45d308eef80b48b459b4a251350fa292632b1e4d8f639dada9850b3786d9"; + sha512 = "7e88143c60f7ebfcace8755f4256531e3c8d4e2938a73f1c87e3f0b1a2abc66bee6afc0371b7e2ecb4886edd99076fe75f02603a6e66399f1ba2d0d8ddbdc6c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/km/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/km/firefox-59.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "d4416cec8788b988dd854382ba2ad3d8f6a47f966fd45e9639b0756135c6d7d3067b82692c5fa190d6b9c3e7f4eb02350c63096b737cb172194f8e8246e57bf6"; + sha512 = "eb99cbe22484b5d22dce43fb94c3007f405d33c63bce26a6cdff6007b2d766460a8eb1efb1e7f361fc8c5790eeec043f33d906bdcbb97aaab5adf77ec02312ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/kn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/kn/firefox-59.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6e9a27b9459ce9a11b67f8a54fc962dc8eb845270d91aaaeca6698895eb4d7ae7ff760f7b2be8506599bea62077eab7ca29c2d35118cf7631e98cfe3cc0a3b02"; + sha512 = "c0ec9419d38ccfb454c3110337983eca1e1880879d2931a8b5f3e8afa5db8971ed9aee749e3f39aafba93fb8e3a00315e04c3195768c79612e28d3ce761db897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ko/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ko/firefox-59.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d31646237319080c608749425fb77a70de36689e3211d4975b065ebc6a282f4a82fef2275b42e51805d1a2be1553968b64294666c11fb7c9e857af9b09397c34"; + sha512 = "216d95c9c072899a8068da5380a0392ea8d4177e8b10650513e40dd321cf3cf7fc4c610128e0ba4a3b1d1c5827518dd12215a659563c8795d42fa72a49ea50c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/lij/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/lij/firefox-59.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "6cb52b9a5acd18df0aca62ac719e73cc2c4462a2501fc0f104d0181ac989bd54a2cee209cc3af41ad666b857e014d15adb9fbf00c18843962f7bd9ddbffe2c2b"; + sha512 = "c241539eff21d2254b1d814872c3a286a66bccaee816dd1349304b3cce5283c9f7632734dcecd6d244a16ecb85ada87f17d87e8e29730f7be87c93feed20c16d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/lt/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/lt/firefox-59.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "64a31dec1bddb6d0355d2b30cba9b500fe12b75c8e0b43a1dc340213ed560b005c21fdc0620334935dcd1e138a9f14f1ebb03b9ccfaf007fdc823ebde0f39638"; + sha512 = "a6d62935ab22d643e9fb9fc1efa483adf4dd712e7d1f03fbd9f671fd36855be40a3d0174f74de5a9f04cf1759b7575b7c4fb7e51c102c354bf03acca4b232e59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/lv/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/lv/firefox-59.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "843a3aa53f01703b848dd2774d448dfd04d4e73839117b8a1d78bd25221814182391f0bb7e3bfbbe5fb9ea4eff030fba8f7bee6730e12ca151f7ce3fc5108173"; + sha512 = "4142142354d50628a37205c7d574ef4f658631812443ae80f1bfb5d91bad06c9d19a4abf623f275618dcd8b2a480e66e996eb64a0355eb41464b52354d7c52bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/mai/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/mai/firefox-59.0b7.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "b0bd010e6ec2c6e75785efdcea348a98afb935934f346aa615a86fa488d5b824c612b4ba9a1ca75a7f4e7ef75f0b25970be193ffd81fff6bdd2b4fc7989c4a7a"; + sha512 = "be10c9342e80e790f784c587d01b487f2cd46c6c42c1b47f7beb4530e334b7c049fa9b47fb90096f8b09516c2187b94b9235c29e9c3cd7bebd2ee5227584f499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/mk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/mk/firefox-59.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f23a48ca15f3bccece9ce771a4a99049ef843a03eb21914b57424872c6ab411732da8fb2162e59c1fdb28d54a4e51d13fef0b428db3e92f5fa87497c81b917c3"; + sha512 = "5abece65b4d84b0598e15f07d733225b6df44b26e33f423385ebd29913085ca3d55ffea434996f225c851a52f5b2578798b041d7b54e75c47b3359bac0649e9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ml/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ml/firefox-59.0b7.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "741bf5dd0989e7288c836ac738901e0a2b10eb75a47abb4d01eff6ee941e8bea28229b333ff59d798e781da6170343d3ec80e4c4633faf5f2b4c6898f7adfb71"; + sha512 = "68681a27512d1b3a74401ca6e20764d445ba7c5e5f0185bb85eca2b41d02af646cc588d0b26ba74f5498b57f7cd7a340d8367d231b3322da6a396f17ec8eb1ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/mr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/mr/firefox-59.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "fbf2226029386276defe4169b2595814f69073a9fdfa5c0748dc1ff806cade2565f4821afa3cfeff4f8cb9021bed8bb29dfead4ea6bd9e524c935d88306b040e"; + sha512 = "2faebaa271ec1f8e8c20a8f4435600e85e05fce3fbd84a71c8344418a38cf86e5dba7044ab0b63b258c0eea941acc853c56450794ce55924f351488561a1a950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ms/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ms/firefox-59.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ac405b0472e4febd43e8c725a855a6b75711637dd594a3a6ed1578f2bf042396b7f4c062efe3107db4e8a255ec02fc0eaaf5a329fc5538e5638bf3289b9cab31"; + sha512 = "404dbe7b486451f829a0de61b4c3c952e56d5e5697b00a1a1e8df490f9687c196f49a8f82313fbcdc37d3216f46186bd3f53e025a73b26bf91236cb5ff66e57f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/my/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/my/firefox-59.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a46de7ec5ea0ed1ae0551cf927a3d7b93136d7738663e2c7a3926fdbb50db128ce10520e4393ca5cf8091ef1f763e112115123953aed18f117d2db6b78e8d8cc"; + sha512 = "e0d692cfaed0048c084db7d067d2955759722897dcc0cf8da817b48ff814c8872993f302303604a010f000d66cc96d1fd74a103fe4534bec719d61e88031b2bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/nb-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/nb-NO/firefox-59.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "8a21fc028964d49a85e5fd4fce5c341b154a1da99bd0d7005b6754d9da6c0c7272ac2bb5a55fe4671c92288a06b77ffebb308a659ef72d6d87de894aa580c192"; + sha512 = "d28ac3a815508ea0f26caca4ab3df89d4049d0351dc6a4882b5894c1d1d7b511d83f93696047ad1c71009df7b8c84a7b7ea08ea2932e287a39d06c3e42f7803f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ne-NP/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ne-NP/firefox-59.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "237634fdd47842c26175a3b9cf0c56feccffd835cdc514fd7e3108b8ae1100e258e5297677ef1e22c112f799036223569e3ed2fc17fe21ed23d5853e4f05fa5e"; + sha512 = "0085cbeb3e8d9251c54eef886a96a22ce050e47657680b8cbf9c2c214652b62b8630acd86252a3159b7753c994cf8f8703c4aa70a68fc07122365f4d8dd9b969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/nl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/nl/firefox-59.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "839b656dc93cfd0900bae78b71b6a967838ff01aee51d7a8223ea78f5110c415624ac893d0dfe94be3827a1731b716a26bed9b07bfc158577b54d89da1aad28f"; + sha512 = "61001591ae3fc54a9c63d9489c71708ef6cf6c8bb7ba317413fb35cdc89a49185f352d155c4e8dae7166352a5a1f7ac01114e0c754b9cb8bb062d01e7fb95bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/nn-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/nn-NO/firefox-59.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "f747ad8eab3a3b2bbd03788ec6104e024512d259193dadba02f4798a4933a191dafe7754fac5fa1b143c8cec35b180979ba1b7304ed4f823768ef6b0766b724f"; + sha512 = "10fc0a716314217c083b637a90e19c120fdde47ed6938b0297bae90e1c416bcd65ecc3c370d828b032317e1796f627899bb1f03a3ca0d91cd0ec8a71c7ccf2a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/or/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/or/firefox-59.0b7.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "23ee26d90e934127d2e4647e4833ab1e0788c3eec3ef66e981de5b7fa5a98947346e07221ba6ef4718ab0eb3ac0ac14ebaf8c4dcd322a05db0c1e0ef6665a478"; + sha512 = "7ba403c5d4d1ca6e36fab9334dbbc13762c78268ce2b18887c09cd77f45bd3693a66e0479be8db0739001a79001a610d5c2b406ea1fdd006488303238253ad95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pa-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/pa-IN/firefox-59.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f04f51e205776e552c02659c191cbbcb95b836a7a762196417d04107b7e6016d49fbafb15a9744959deee561559231fb370b51f4c583329335d350aa16d7b6f7"; + sha512 = "b2174880a46140b39da9088b64d007920d9217d4f56af6a9ec1ab8993435ff947370774451e4eb66347e1f2f1d52c1fb517e625e640637bd2bb6dac177ec04cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/pl/firefox-59.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "190a3b3300c97be0265e69839ab3bd160b9ec5d6705c27247eb8f4a6adef25c7654713e1e27e37367367fec87c113ed7c004816d274374a3e7975ac21fc4c769"; + sha512 = "e3091eea6dddfcab2348617ef8f2cf79bb5d1dc91a5e62f55fe52d0563b6de0311f212ac2bda1805de1a8f5378557a022f54015e8a93a67054377f6152cad29b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pt-BR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/pt-BR/firefox-59.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "b3e36749ee3e88f698320540202552fadeb33ce8e29333a0c1842f2c0074d8d198dabf321e4135f976de9e88464a0afd8b7a2712b62277bebc051a2ed7494e0b"; + sha512 = "3e284e7a6d4c344c4b17b5035120a6c2188ceb6a61a207e26c0135a51c40ea3b6ddc848ef89267ae42e22cf9f53f9fab09401a50525832b9da73f7844ea9e6d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/pt-PT/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/pt-PT/firefox-59.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "69cef4d5a6ef9868f0648727a8c58fc38e137b36a87a02c55d2b46d82cbabf6b8487a13102f28ecc08b8fd082b215fca0cdd088a0706f9147f443040e77335be"; + sha512 = "1cd7d9330ebddce696c33f0f3cac40ebf46bd427291b8ba54c6cc5b671e33739b79dd88a48981018adb67307663fcccbb88d389d3ad582f7da90aa31840b5f3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/rm/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/rm/firefox-59.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8107c2b28d39502656e41628ee9e359b12981a53556e757011ed09c7fc53211d9974392e94d10a20301ccf3943c7147532859fe0070ced83e21f205afcd97b10"; + sha512 = "88c34a7c643585e3ec2a8d962b496280b292226276c1d40bf7ca45ff3a4e4cc8a1a1616d111aea8be1a1c3d5953a5f68fdc1e2d2d4453b1b53b9f4a629aab260"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ro/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ro/firefox-59.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "8a023f3d5c45bf2617fadde60f74aae3d3740f1069264891c6bdf98adb242d7ddb6de0eb7b6ba76f72fdab9a58a1d746a69971f25584da170b54424469d16c0b"; + sha512 = "f4deca05c0ddc05e45e70011ef7498879ec628c904c5aea015b12e6c1de2682d4c8bb482225a156e69de00fa114b55f26f4ad3eebb42cf9bf5b7f86ce7a65880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ru/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ru/firefox-59.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "f7a99fc43cbf30c68568e3b67b1cb93f4d243720d5ab752aa289612b090285b3438912bc2336c0d62c2ffcd8fc86a8389916d62f0ea90917242b056ab89b8b65"; + sha512 = "f183ed0fd79da72b197a0cdea80127d26508accf5b95e3ebba993a4a23a48e94e88c28360f87ec66703c18539883a190a36662f46a93fbd34dd148f82ccd1d58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/si/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/si/firefox-59.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "3195a7feb306d2dd694fcd8fbfca12493dc485e5b5f8ed6ef1d61c36030fc13ea64587471bc6686a29ecb8d05e38b554412285722bdfd16f65d146d9f9314600"; + sha512 = "a1420ab2d3fd8c9b60021c0f5393421b48032edcc8d9afc7c668c6f28751ff1027506fc1b03595f8e4365255828b43ecb97181e94df06c5e44a2ae8f7e7004f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sk/firefox-59.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c7279949739e3d35277e671245e94c77507096e1a8d0f25718787363bb5801912adfc2ad92ee4a6b4626bc919e1a9ecd52da4ef61f91dff3c36a3af79c88c813"; + sha512 = "25da744b5010fea325db824a64ab0da1fe05a7db22530d86f0451d7b9bc675a6797689cd6e08ad1aa64687f3551e87a688d83a080eac206f45461e235a3dfe81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sl/firefox-59.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2c114b10ace20f92eeca48ef667532261659d9e604e8394d885eb75ad6885839c895311d4766969f6f9b32c689df68dbd3780049e05a086dde7cf956d92cb81f"; + sha512 = "6c0a8fa5b16c8e3245418ba97b253e2728483158b9ec52a3a13f490b0fb672c5827f17c8aedde921f28ef49f89a3da08a0c0993b96e7f76c85b07139464a53f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/son/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/son/firefox-59.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "bf98308718a80c3f333463ffa41924969dd6dddc6123132b23fe2298bfa7e01704af56eab400c12c65975c092cd4f4d88df071cb5c71c0f47b849434f1182be8"; + sha512 = "8b9c9a098dee9c3f06178c7098031f9c8edd9842ea18f693f4c6b967244465280e50753f3d3cfcab747bc9b268a31b8454b9daf2270defce2dc79507c440a79e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sq/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sq/firefox-59.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "ede1bd64c9109a6bf75eb0d8881935c30d8a14d3ebd074e9f0b8aa300f6287fb27826821ef49175b8a1605ec9e58b14639a6738748bc6e33acbdb95c73c82823"; + sha512 = "3fc18a556f335e596c0bbc59b45f9bdedd0a3561ef6b79cbbb60b94d19e5afaebfd54427f89bb7f01c25414bcfa673d6fe3ec22b106c3f7b490176534e336694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sr/firefox-59.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d2786f91ed17b225cbba148d7f54c348a6d6034700b9f6d2dd1b372805287c4d7f82b15ae9b907f035589f8fd29f2532003dba15b4de7eae31c26f06be7e829f"; + sha512 = "416374a53023bf6cfc08bf917251a594e16885f0059ee0c5eaef79fdd54aa194991de4c5a113fc472cf0488c50b758df73a02d922d8dbc2a9a89408964109c6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/sv-SE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sv-SE/firefox-59.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5ce5f0abc1abd8bab2a1a22d9ff49957d258efd40f2c8e3b57eea85dd061cb1fe84377fcb108d8edf1cac0b2b450d082553f60fc1f33636c164064ceea584141"; + sha512 = "cbc001b118f6daee089f6b42bf19be812ca222ba5719108e1f5950dcb2af2d3bb8a62a202f4e8590acf882e83a303e880a99cd62e4c1eaaf9a70a250febb4cee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ta/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ta/firefox-59.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "cb7ae41b395cc80010f9f327e38caa479308a1e09290eb96382b4bd9f2412aab661c5385a080106a47ee0e7cd5476baec7889b58463488fb912b827efeb00264"; + sha512 = "f35901d6e4bad37bee03e681c3389ead5a8b73b07b5c64ec0b82032f48bf982bb7219a0c2d4d9c946ec269007e225f9faca4184cc108e20ebaa09b85fac744fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/te/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/te/firefox-59.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "aaf074a19ef45b6d0d126e285796587863c8944daa79a713fe79fa157cf6d77e25a0c1db138f5481b379cb0269e70c1654515ad38e5a88398641917772a3e199"; + sha512 = "377f22055a2d03dc4d95eff9db7bc89b9ac3808b4d8272c7cf7f6a1abea809b55239e558d55c7e212bde10adf93f63011fd0824658a8369e304c96a9579a0a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/th/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/th/firefox-59.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0dd9562d385df65c50f68a639b3e0f3a6dfc8108645d6d9c7a2c872b42cb33d8510ff182a0c2693d31837348fe0017be190bdb3979919dacf4bcf2516eaedbd5"; + sha512 = "bdaf8277120e197e9a1d7fbc9684b32e756e42ffd43b20d6a470e20a501bc106eecb4e871fd9b64fffb4e1564ce22c3bc1e436f0cb4dbef62e3fc2b0df0fb679"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/tr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/tr/firefox-59.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "e714ad21aaa8807167e7d114971458783db6903cf0969fc3408b746b5b5f82fc46c7bbf1dd93e65f9cce60db3bc22d466109ab01ef7549a36b7e8c12901929e9"; + sha512 = "c601b1a4567f6024c4c5610c1db1706cfea08f81dfce65eb08ad662f863279a2f2a728dcc49848384f8aff3f450f2c0a6b1293de0555973e4db5b7e25b8e0faa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/uk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/uk/firefox-59.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "5c7dafdf0639b1e491e219543993fe66230f8dfb02eea5735a6933ed09369c53b3690a3bff9e0976f534333f2cb81a176791760d35c981ea21a8dac980dc0ea2"; + sha512 = "d5dc30d0bf86fe0240598746dae09448dea668723648a2ff2872b7ac9c0ab88f644dd0ef0a5e7d89614a8d95d634ddfd9b1b47c10dd65a5507fca0297373371e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/ur/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ur/firefox-59.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2243cc3523bcaa9d6500ef1e32ab5947df3c5b233e9ffd15cf8aebbede666144dbcef7e41c997e2773786313fa05a580ee3db44cbd3eef180367ad6586f9d19b"; + sha512 = "d162ac867611a8338ecf33e030e72fdf2cc59bfdd0a19288e1f32319687f82f838579ee03c36cddf2e1fa60b919daba38e767b991479a34fb716048b65b74f0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/uz/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/uz/firefox-59.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "35cba02319ea1831c8a09d403f2613d6eb5ad0a59873a12ca072ec543dd85482e6979991b9b329568db65552d923800858b1218aa1f90512a243c22cddcb9a68"; + sha512 = "36d8e51f05af66a44e9026a8a622f0b889522bd4e8f9b24fc1736cafbe23e0d0c49bf6aa0d95e80ff14386863574fbd452773077c1b907a9f781bc99e2ad2125"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/vi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/vi/firefox-59.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "af3f387f85604d3a6d4cc756d2bc9f0fbfaaf2ab986a56be9fa96c6a49e23fda07a3586dc45ddec88b334d0150aa8338beb38b78c3b2a78563cf33fd2da20655"; + sha512 = "13facc99f73c27a806d5a0cbd91aa382a5fc5571596072bec53d0620c8fb8567f9ff47326f2a1522a6adfac97508bbd5a26ef45e83904a03c9c15010d258d564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/xh/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/xh/firefox-59.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "607763b3ae4e17c346ba203c0c23374f698e96a43728d7aa2e5d4736555199f2db2d06ea8e5db41892b6dea2618f3e1e72ed6e5dc24e524bfc8a1d118ea4e781"; + sha512 = "70e2c375339fcc0f1fd5b22a57d2db4b616a15a21a18b1e0eb6552991c7c5278d5b02dde0b46df416f9ac8cd1695e3b4ece356ea904b2b0e24263ba6069cdfff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/zh-CN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/zh-CN/firefox-59.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "62f570593c7f83169f1739ae4b03fddd2fcca5721e6cbe1c3f5220a57ac7e12d464bcf2bb3f4584f72e0fe8e9d0b540b0d5e0fa99d808d5673c8eb98c60753e9"; + sha512 = "19c13d5be892d236f9ed84a1bc98cd917da65f71f9b5f84326035fe89372749ef904591ebc94cbf1e682d339a47f7bf517803e82fe5fb9eee2ce5287d3c8193a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-x86_64/zh-TW/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/zh-TW/firefox-59.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c19b81134c15e7849e3b389f05f98f5f75938a3b4ee2d347ac6ede35dfbcf606a716e80c26e14bdb12bac3a5fa0554d74e9e93cba9ee610951bb90723cbf0330"; + sha512 = "266334663a7c64288a206846824b566d3b10965847a5985846be3c236ce04ef14e776c3ca431238fd6b16787f0ae9812c7b2e3b51a97d8cc3e413fbf33fa735a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ach/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ach/firefox-59.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "50af4a771523571e0f2567c28522a36018f8a53d80a01648d2af7c2e3924d3feb2cfdfecf85036c38aa48bd33cae7470281010c73cbabe020d9fc6efe7c6f5bd"; + sha512 = "9a5e7424861cfb768f749319fd7134fe96fa107461f0797bb977afdfe1f7114d557fa81ad764541f2eedf7068cb8198fced24a28299f9435749f3c589c5d5755"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/af/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/af/firefox-59.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "2f80f8ba2adc1d3a8a30a05d549335f160321400ebfbc5576901a544a6dde7c19152b8a5fab66e23c6083942e982fe6c236ff8545a7f0457c0e3700067d3c61c"; + sha512 = "03ac5b87f8163993c8ebb2eb697da4ca9f8478081711c08ba64f358c31d1eab4966121426db0be5e1b8751057520f4d65f2066401409478c02efb6ae4057bb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/an/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/an/firefox-59.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "4473c1437b7f07c8917d0b40e0b214baf649262531c329c5bf7f1434693070cf8b6bff39169dd40d5394ef59dcb106f0023c76e69e7b48103012de4fa7f7e1f3"; + sha512 = "cb1dc3676ea619a57b554d672e67cdde7f093c3d9023fd9dbb742f1d7bf42e31bc7caeaef050ef093961f3f9b1a39eac000a1325c0a5b87d6fe0d225bbfc89f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ar/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ar/firefox-59.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "f8f9626ace5bb47f7f4815cf5360e9e55b73e2ee8472c4f24e4c6d26cac2985f5ff56473561981354b0202309b37e2210c7bd14f8b50fe11cd9f27aa144ab331"; + sha512 = "a86e8e3604df864f253e6efaf368e4c86e17cc4c6623e883199738719aaed12dd9c64ff247b6053d2d964a0e9f94bcae831482c49bc92abde8f8a1966060c542"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/as/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/as/firefox-59.0b7.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9f54057fa5e4307bb4e54e600528d6207a8fe63690fef4b101e9f1d73ee6efa91ffc808e2adf7883a6a77dd4458967ae736de561c251181b8586638bde29b1ec"; + sha512 = "ac1753bd1d2cbabc491af4c702356b96a5d9c5b8c58c943dafc8e07a97cde66f1b7ca916f5b087813d31f31ec040db0d230eddc2a66dfa89b4483f885a786ca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ast/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ast/firefox-59.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3055bdd5a77f86aaf34ae618200834fc0b63469fe2c5f0c35b66a549c58e15d5d1e66e2ba772fc2ef9f7c8285ce3b642913ab40bf9a2bc0f9bdf42dc70daa5c8"; + sha512 = "f789595668fd6ad641c0936f5481ec293cabaea2c6903eda04fa27469dee4b89d1c555a11a8c1ad2dbbd79251fc524819618c2062ace66fc378834274cb27bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/az/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/az/firefox-59.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8e025def60a934711f4e41246d8f1fe5dc3406df1ab2e3b6495a29d9a76519fb7cfe1b43b5d8cfb8f7c8546d3ebf66298502e44aadc28d001ceffd6439ff2299"; + sha512 = "86d6a34d83cebd116eecac1a86a47bcd23a13e9987b87c8c085ef3abc7708d68a35fcc4ed42d1d775b3f8689e9190b0697f502eb599f5113de5a88acead3a72b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/be/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/be/firefox-59.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b581ff43eb98fcc606e8f70e1eb794ef63f22be03f2495507b0a08210a672040d9db8ab87c52073de099666e828a65bce91aa86f3722ab5c3230f00f5fd52556"; + sha512 = "fd712d859fb258ccca1ded5c2b6f1504c4a595d12e1b04c044dc7106dadf705220081eb804f3ee09c6a3486700e7fd57de70b338e6eab2042725c45e17cc3463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bg/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/bg/firefox-59.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "5272200ae8c27912783f5fa81188fc5bf8439bc57fd72c560e798f679f679ac8e21a8fc0d1e00a89f1b82125be100308b65d2fd5dee3e5d93353596a11869bcb"; + sha512 = "0bb8ed3fc60d49d00102f8e3d40efa150a7d5ab83c027dec8eb8557658a943c0296e1f584b959045c1e0d5136daf4e6f8e9aa95f9f27bb657f91bb578f0b00d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bn-BD/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/bn-BD/firefox-59.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ac3f2322889dc4f6a8fd73c8b627a616295c00ec18924636b2ae2efdfebacac614a21acdfcc7874ea760eb356363d46a3f081aadc21426a45b298bde2981d494"; + sha512 = "34d3bb745e6edbba7d4304830c18a7c5a5da056378e6ca699b9e83f022a8f04d8fb5bed1b65949e8959a0351c5e53caa0499dcfa9dd96afc6a8bf8f11982e924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bn-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/bn-IN/firefox-59.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "9944a84d0af70dce2d0ad45201daba1c76984fab4f0ae1ce538d1be2d70428fd09212b41541ddfbcd0f0173ba8e57cce033ab657a87747000511cec593bb692a"; + sha512 = "f003b192727a1b02a5107529bffc3eb6468fa5a82de129bdac599f8dfefc5dbb3d7765faba2602adcd525a317562395b2a59805d8a54b6039ac84724f69cd7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/br/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/br/firefox-59.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "cf600ee3b064459a932e2fe4cb46fd15243e9770b90426e579f5042feb0946a6af77647925b3c90c5185570ae686e8d9fb8e33573e8d464b0c67b15c1e178f41"; + sha512 = "212efc4ac796e5b8f6d1484c45241b9dce9f42ef52d5fa93fd0f84a44818f4d9db97bfc133f7b2ebd1358780835e76f8c6de37571dbef0b5d8bdb140a9ff53db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/bs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/bs/firefox-59.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "3d7beb15a28b46d50f6c5ec7058519acc50ff37a1a806f3ec19dc45212c970a25a2c6912cfd6f10bec3ba9868cb36756557d01e97be46227f7aeb5a49218ae70"; + sha512 = "84e0228d40124c74d9ab71d24ba49a19d313f3ff14bda2eec8021ceee87a4481819dd597440824a0463aa16f438f93a0480489039fccf50d2c659f72c652e122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ca/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ca/firefox-59.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "bd980ce8afa64cdd8eede8c183bb286d4c799663007e4f9bae99545bfbbc22a1f6e7fdd52ed8364f97ec1eb178ecfd703726a03f8af7e3450ee112c49d1f3d76"; + sha512 = "2e0561f245f23fac9d357953b9df048ab1a0ac99d4e2bf46b4cb212414ce7b1ab16ff636805d12993445887e29ae368140ad8977dce3aec0545f0c6d7c6a592f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/cak/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/cak/firefox-59.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "2232425a6a80c4248c0ef47c16a47af60c319e3e63b3607f25f11f884c63d21710233b048ce9a34df248e8d33bc35e188752a0ffd2f834bf5c87dbe5bd44191f"; + sha512 = "8b636a3364542d630dbaa5e771e5193d265502d843c01614d45133db046edd0721e9230db4961905548654c6d5cad46fbb67523f7882c8897881c80d22abaf3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/cs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/cs/firefox-59.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0826a880a40291fd9648fa01129a134945b146b5a50c841ecad8eab4615c0e4674e6d81cd8990f0732b5d830bbc5fffbb54febdd43cc9050a35e99b133587b79"; + sha512 = "37cea23bd4c4304261ea9a654d02b5150c67f9cc96d2b21cda86fe238e115dbff1b6972526864ed642478103a2c3d905cb6047dcc6f178e6752aca09b468b96c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/cy/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/cy/firefox-59.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "802643ddc521e3898de3813a1fe489682d129147dcb9c3ef0b4e2bae1b80bfbc80ead1de49bdf1c6eddb7cc0e012505915184957ea55a750a7a0874278e316e0"; + sha512 = "3a80282d24498926d52b2419fc6feb6afc49c676ad09cfb09462f052cecfca908f2e4717a2ee3db1f8eb9603cdab184f169fd78de6f1d68c1c03b2b4a72ab1f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/da/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/da/firefox-59.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a49d1e583d78692ffc2510912eb30a78169809034aeef77442d830b3237173b9ed915de7b642aa3b9f36866deed1ed336ef0f90cab5c0253e1a20221599edf5b"; + sha512 = "4b6b9a9a0d9bb9c1a84075d1a8b206a819579a8cd428ddd16c63c23f4923a738eca5bf57aaf7eba9f42ac359afc6b9398f3658f403a92157958fd5b3da7ce3f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/de/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/de/firefox-59.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "2d67605da7337dbffda4cde7e4390aa194e1639f657f5b1e27fd857d7643f5b87e930823f337dd87c40601ebc07aa8111f2b98d273a105f20831a5a6d6189656"; + sha512 = "15af7cc97168d4819eeece47922e5451bdc8978bfaf155192a44081e95a1577ef6a1aa2343d60b00384281a8cb1ebe81800e66fdbb33c76a2ee912e06df5372f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/dsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/dsb/firefox-59.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "59d28e4f25b287757d21ab27b057758b93d5b2138303cdc5d64050ffd56809f1063423182c1e523123d24379019cbd4f8f1e7ad7b5afe4f86fb512bca172921b"; + sha512 = "0c7442993fee304ba321b8b56ef67d5bf65def7939185fb40bf94dbd836de06f8c6eea66e220c789dcd7588f14a68b87dd5a5cd4464b2235c9e99d0acb8ff8df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/el/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/el/firefox-59.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "09efb6532ccaa2e18be96fa3bd284d8f9b707c388cc8c37a149cd08b427a93dcac8f1d95fd554bfdf594d0ea58a216b938153d0078999f475b80cdcd4be0c7c5"; + sha512 = "c6d3247275a39ae9ff2adc90efd4c3376bb1bc6ed7f43136a992895f168fe2050ff60d8d8d67f7a0a383742d7ea83cbc34d7ce4d2a111516a56c51d799c0ce0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/en-GB/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/en-GB/firefox-59.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d1f3c7634e4cfac8e4d59bd5a68acfd272f4f4d7b6a9b300d635b8bbe4eb168eca5f7fe07d49aba5fb1695c11be45cefc33349444a49029fc42d9975baa3ebab"; + sha512 = "c7c0fdbd50d6ef56594b62188cb1d11985f55dc1aedf2a30f3103bfdf25c6f0c84d13d5531494bcef7ae37d986e760c2b0f9d85a1b247fa714521fa45a8ef10e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/en-US/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/en-US/firefox-59.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "82b9c2639a38642e9e6a573a23b8d4f104254006bcac51d8583981baf685c4e2afe2da71783fcc8c6396788b8d0b27c6cebd016894efe5e5deea80a616552c04"; + sha512 = "aa91a4c738077320133ca7cea6b202848e2b002c80bca688faaf6b8216517cf474f978c2417016ff9c3e266dbd7cdea3b6322bf5090e989321fc313619907ade"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/en-ZA/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/en-ZA/firefox-59.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d3d59ca990a5b2797aed4a8b69aba6ffcfc93ae56fd7ead3e66fa6c4aea89d9417eb15099afd9725ab1b347670a67b8ac4c9e10a717fb5648b11fe1fe17c1e74"; + sha512 = "38580c6a8a651e35c065ec1e7dc5c5bfee3508b999f4e61aee246bcd724b27fd97e4deb8b8ad654f7dd5b13d1473f2935f65c1e34deea3b186c8ae43c732dd2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/eo/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/eo/firefox-59.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "f7070f4af84c7077c9c64f7ce9ca4da8106e46b0061cd2f18bf477a196c323cf0a0561bb4ae592a418a899d1091f70e8510157d16fe5ef06cf108930b7187c7e"; + sha512 = "32329deee77ebda40643f0559a1a4ab0a1fabcc7107a0ba5cdcc1404a15c333bd9562e3fc4475ca3bcdc7fa54433f1479de45bfbe1b89812b29c07ca08d1f292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-AR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/es-AR/firefox-59.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "e29b8c845eefb189afe33767b413d5fccaf38db71e8abfeb8e5b4877e54729e816cdf5d5a1458dada961636accc079c13cac01625a8ca7b722f0defaf85bfaf6"; + sha512 = "219665c031095847052ed940870ec64e768d77dd245b532d1c2d1923fd876ef4395fdbc3d2d5b0952fb9fdf3b48828a831a27a29f36d6ed8423fbfaa44a1ecc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-CL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/es-CL/firefox-59.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "1ca0c7a0d768f48f214f053baff7f10f96c17687cb61cc2f0a78b9214f0dcafed1d2cfed5c086465f99c6e0cec092aa1d617f311e1021a258aaa5eba9f9981e8"; + sha512 = "ab05372c3ccd2e5f9fa1c65724ed967122c2fe4a394b791f83db8adfefcd71b1649c2b08023f4a74a61b60ee776e587f4042f4bb0b7240bfefa4c6b9b9f04986"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-ES/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/es-ES/firefox-59.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c0a12ca65e1e1c023092fd9a75dc6c959094364047d6e627ff33ccd8f613d005cb2fc08dc22687dd9f52998cae6191c5a7ab8ea75009b6c9f0fedd88c7db740c"; + sha512 = "8d6c07ba7f5b449eadb99af41e29ee528d79d02f7d30026f7e41a18480df6b60e106505686197fe49e945308507286198d95f54ae0a2f78f991077f80c73e36e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/es-MX/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/es-MX/firefox-59.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "7341c24a0bfcd29ad57108be3ab535db79fdb65e43de92d87b867b65e122c4ae25bdded92469697d9b0656e6a4517c01b98318f8bc31fc265b66a77428fd5c7e"; + sha512 = "b3d51d406174dd5beceb8e64f96204992fd9c6a78cd6755a77f2d9369c4f6a0af6fe60302ad569a196a959ef2a300d88e6e2d5a1a9ed384adccd8f3aa153255e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/et/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/et/firefox-59.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "19af1a005fe57fb038525e98b5b73a9024ba79c0027c56b55df085a4036c9010d14c268ddd09b6f3db81841440538421324195f2eb44e1931c41e530da93b978"; + sha512 = "db72e3a7f8af8986beb3d0fd298cfed7d3e4c9249f8f493fcaedd347eb5363f3fd00247f9907c14b670445f2270805d3acd0282c622a5dbdb9d380c895a5d276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/eu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/eu/firefox-59.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "1d78b098217b562f2c9b6b6ccb06d0658e6c183e336b47d3ebcd4bce8f6859aa7767258f612454ba0bbf6087e7c3b536944606ea0add7a7cd5467cdbbeb6bc29"; + sha512 = "89175a40d203fb1b8eb4ced857ba41343314d3c2459431af70a9a6007a79f0def548752827925f3cc5255af2028dd2b9fbcecdfd6dc9349dd73108eea1a2605f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fa/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/fa/firefox-59.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "7b587961e1bf0cb84c80fbbadcda8f058168729e1c6daf9ad3b30753414a29462c82aec6217a3fef130e59acb4c6b7b65d29d1ccda2f50cf53b510e53580e68b"; + sha512 = "ec604a5c013fe8227d0936ac6573d73835e7106ed2103cc355664ef130786332316f0f499eb72c47bca73ff700174cdc4d413fd97dd646dd879c4f73e29f93e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ff/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ff/firefox-59.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "aa7caf7b0d54fcdf84a3a493293a9ab84646d3337d6b1032598f27aa3affc340446bd7f1fa69cbd613be003edc17cffdfeebbf7cf3c11b68239a77a46e25ec0b"; + sha512 = "1131768abae97f961fb4bc0ad992fe5e5f625d319774d7110dbf57d0c1cb1e225109df631fa7ee19b8f93631fde0547c7a0c9c8bae7bfd980339a1e0ce959ac1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/fi/firefox-59.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "de9eb2145a68b693995424335c3e96eecd4ae6716cb366ff341282d8e6fac9d1506018c87ad285637b29b2d607d73a44bb15e024866150f5ab99b57affb761d4"; + sha512 = "d5d17451cd8a6959116c287460dbaaa7cce8c6df298b719532458c047c38227e2ef0d7e83b15a07d10237e91aec6e40545c9516b4c2371d305ca58cd66fcb4e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/fr/firefox-59.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "6880f1207359bfd7d2be69416aa6a668355f6b9776eb69a8f93f8efef804d8a5aac984fedb553c8564498c0a22dd4d9011ef968502c7c5f142f14c038be7b8c4"; + sha512 = "9afc9b5befd542614841b0c50fd43cffdd427b1bb39deddc7c8d21a5cc3ec1120b894b9d63b88c72d00870c24fe62495cb3741d47b5e4cb595a3bfdfe90e2922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/fy-NL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/fy-NL/firefox-59.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "bac16eac70b8d92487627a11a915fc6f111d1942bddc45fb746fcc04b76e199335adba858f599a8acf0e5cd90384f5f814c49242cc2bc8903ac769acb6440356"; + sha512 = "648b5ae2ef6d71d18a9940aaf6c300d0588f646bf59eadfdabfb6fce4ff0982e2af6ccbb4263b2c5e6857ebc63ac3b790b7c200473e39e6d0fcf56ee2ec8ac88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ga-IE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ga-IE/firefox-59.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7017d19904f1a534d51bc527b496df5a11d913fc50f506af9202cb51e73adefd72bafc0cbdb6c5582cd7479042d5b40a5b73ee19466eae98758f626735b58e43"; + sha512 = "69133d78216d60a5f382d4ae76942493561fb078d95f071b9c85c581addae7cb6c63196817eaa0be51c455d7c79a20aedc2d67d5e029702138ba6a9558095652"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gd/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/gd/firefox-59.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "501af97549bfb5ddfb6df26cfa3336d6b2391d943eea4953638aa38650c58408fd554c22d17fbfd9db1675871eb77af8c409e68e415bc7c3b943497e51e38a70"; + sha512 = "5dba88817cfedb0ac685c004fdeef01a7d52044afe82be7a3f19413eff7c71613c0d48d1a9391bf83c0eb4424f8e4d95b4d1aed31c1fbadea41db79a48d4a3f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/gl/firefox-59.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ea02e0ff19b20401f62f2b65d023c3337f876fd3d1906d7a1cba8c353a16b4fbab2c135daa449b5020ba332fc98e0dc6045171f3db94f7ab9f7a65cee81fd0e4"; + sha512 = "00456e95352f2e04df7fe04b44e08b2d39ffadae21e814caffd564d025f415a290b2520dd89433a92091f849531815a038471440f5fb44d7dfd5e912ebcf5194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/gn/firefox-59.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "8fbccb828fde85404cfe8980e7620ea2c9f9378d30656c2c75b9b4d50f5769bb888fb4f36465ccc2e291a2e92b57e53bb88e8ba7123b27b9347ebb37bc6f764f"; + sha512 = "ee8c2b933f3ff613a2a128b5b39b249d197e1ac496e8963a1c052e0d6294f1f9892fa0518601bfd083f6ffbd3d227e0595fce8fb6d07e6a68e089bc0244594dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/gu-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/gu-IN/firefox-59.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "2816e1d9b7a3c75c14427049023b203ef3f183f69cff30cd0543f0993814b58429a6d3d062b991a06dd021435f97de17e85cf797423cf69fb8bbff2818907881"; + sha512 = "b15b68da16c332b64c83eb061b30241b1dc55a1351919e85b5eb1c6f7fd7cc52de758877f2941d054a2956467d4ad206613e465dc0f4fb00ca492b644f62d45d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/he/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/he/firefox-59.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "23a965bb88e207d63db79e9bc4b49943d4db1062a5f9947bf5ba6941e4c309bbd2acb7c6e53a258ae8984a1976a28e08e325fedc786d5930095411ad7c0acc90"; + sha512 = "8eca58078181d992a0f391bae88c17cfabcf6c92e168be95a8bee52deb7a578df321ad9847189fbca5ce45f16f806e2003418f0864fc2e615378e8b25325c46a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hi-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hi-IN/firefox-59.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5d2e1099ba22062884a590dc3218fa94ceeb111e16ea9441b7b73911b8c93fb1f5cf4c1576699a48dd3d55e0ae460c430d388347b72de449cce851ddbc94cc7e"; + sha512 = "35b1eb4bf5f7e1c641572cda773aad456705be7093da4c14e862d3d520915717e5169957f37dba4de23d262e4d018510abb1056b21ee45ba1cc79267c5a84ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hr/firefox-59.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b196238fc825486f377b5f82fa8df76fa0d958d7b7185f9770dcd66b8bef30b8b0f2eaa975ab0fb1dabf5e6d7be8d8068873108fe2b7ef914920177a727aee91"; + sha512 = "c71bd71e0d37a64199daa25fe44c411f3c79898c6c03d4b5d5eda5ef3f1fcf41c85079028a2a5b99546eec3fc2a309feb1c4fba2ccf16806ae5be4ac8a39305f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hsb/firefox-59.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "15c26b9d93cc78d37059b14768173b8b55d379e48d0d134e8d33d357575062afb70614b0ed268c3aa3ca992a893abdc0dd820a22667511ff5b9d91d1718cadfd"; + sha512 = "f8bd829213230fd808934336a0f5156b4c96642cf64ce427e91492c98b2e73bad3cd35bb55666a18a8c172bb5263e8b4adbb60329b8de98cf2fac265ea19b8ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hu/firefox-59.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8a50a6c20791dca3226d612c39bc65d51631c07ec12210359c2fe449e4bb6340a307ff82e174094a410f163bbbbc9102f04b8c88f09e02821f06250fe34c3853"; + sha512 = "0f3bcd9d2d480f604c58b9f94f191a3a619b97956e83381dcc960c00d2fba9a387887c3fca299ee1879dff91e4840de9c7ffad595f23b2f5e227dd3dc34a11e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/hy-AM/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hy-AM/firefox-59.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "255a3f1624278bd0956047a8f58ff2c5509c8dc05c9b1be666742747d7262a34d492351baaf2bae69ad60343e5f843be07456d8de2901e10726b736704faf7d4"; + sha512 = "155b09619ee496d9c8053a0899c66bb00a19a78fc8719199f44d2ff2606d08160015a6a06c89713d6afc522bd91dcf2093740e33eeb090d8f4e600904fcdf89d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ia/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ia/firefox-59.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "8f32345861f5c6a4e719326bc7d6f3af2f179bb6b3e97f98b1d9f7d77dd4eea2276cd590d7fb4f2742441dcb507971165655cefa4b34f9bd99dd98b2845f2b78"; + sha512 = "f781ea27696e5f8f38a3219ab3ffdf19f6331f4c6d010a536d1a6a4dec8e0d48b57a85f001b18a8482cb0f87271b55fe5aff4e0f00b56819af700a2e779f91ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/id/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/id/firefox-59.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "9be74f1f2990c0116f74e60454d0912e4ef352a3990b421a849717067c8d2000e6a2f7455c2dc3e40dcf295216ebcc3ebd3e544e185d099a52767002a08869fc"; + sha512 = "1a7334ebfc93b5fa2a5f08441b8f7174681db2dd1d4ccc263dff9fbfe100aaf5071f6ddce0af0949defe96726db417b2b7b153d8f4482a4621c87983ee1aaecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/is/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/is/firefox-59.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b6f80571985184ab274857caf365210112d244a50387179c7876560c4994c155c09c73ef6c790d1ce11c3ecadc8f78dc65d3bd2781fc25469d6b4d935d647203"; + sha512 = "83924a63452ae7d25ce52b450bc93fa98fd6850186abb65c0a8747dbe8de81f301a35ff8b97024345beb3bdad2a14edfdb322448632f59ea5c98dcd1843f47ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/it/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/it/firefox-59.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "2a2d9414242382e5b057f87afcce742ce7e1be6c5688cfbf6a24805dae87212958ede18e4572f820c4b459449dbcdd6ff865152e905ca670f2c748c080758013"; + sha512 = "a47898144e749f3ac34ac1000b61056a848ea628925cb80edf0e25fd88a0f9982e983407fbac0b888c1f572b3a046b446fa300d44de7c3464fa34091d5657ecb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ja/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ja/firefox-59.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "8ca32678624f811754549dabd6482c4ce09e9733f0679fbb8f44ca3222972d702f1c1f2aaaae75fede073c21e4f457b2e4974c0eb70519f612b2ed43a54ff0a1"; + sha512 = "54ada3e3bcb01f50986f4374c897d3e434498e1e4a66a3212e0257de06e98603da90901912fb051bdb7920b3b99fa061acf0144d53693d12967a4a9504f318a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ka/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ka/firefox-59.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "330dfada0f80a3b762dcacf1bfcefc5eda492617547dda4360eb8ed5833532988ed0d64d803ba1a0d5f37e867250704e38d1d5c84182975bc2de6c286afe0034"; + sha512 = "163581e05f2c836b03cf741bcb7ba8c914d14fd1a2cc5fe2d92617250bf2656595c429737e736c7832034c50aa3c7b8da6f5f854fc33b2bf3648e242b920141b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/kab/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/kab/firefox-59.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7c264bbfc2f898174dabb33d540ae1bc5c0d3de9f4792d734634c0360d3e9415fe31968a5a1749316f98bfff15b3380887d8e550e03b2ef8a07b67ebc65222db"; + sha512 = "18b571ac6ae220d7949af5a22b41d702ffff6d5db80cd9629baf3d705e596b61d7b937ee128008fd280014c9dd1923684b118b49e836a8f2bbe6c941a159a17c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/kk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/kk/firefox-59.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "eb39b7099cba0ab95ea57d5652737e0d911a06a7ccbe8f134d1e165bd0e275bfd2b9b5f5a7b8e2dcb8efca52d797b5ebfe88ce424a8d4ca5153b0e14d1196b86"; + sha512 = "6f4f5c540ec833ec855949df56ae290c1ed267dd14cf32fef6bc11ecd392f2b1630a2558125612cf10b2b806565ff24cc3bc5f7876324f3f05dbc688398ffa67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/km/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/km/firefox-59.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "fee1e73f4a550409f13b1e6ede1f18cef99f8b16dc62f294c9450e4e55b5f478b3bc6714ed8da7610eaf213e3180e4c95ef81ad97621c5127c2cec5d0ac1fe84"; + sha512 = "f9704ca7a6be1301bc5fb76e92284ff957f40b4818425bff00ebb83c5fb37e12b2cb7ea6f994794e8712446e0379a3f86385bbbbe6f88a4c787042cbba89067e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/kn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/kn/firefox-59.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9b7807a6c0b7cd89e402ec6b972879b08b714002d1f105b937926175d15496a4e3aed588cc247dee2de05ed36757f1de13691742654c5621c60b3755eab46ccb"; + sha512 = "7d57847bf55573c998917b316210c83156f817eb00d2412322061723a04651926ca780a7a33cb458770034faddfa94c4f0ae4db7a514d251b88ef151fe9aba2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ko/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ko/firefox-59.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "84208107bbd8fffe856165da5db41cfd0ef05a683253a11cc0c0f043a5034a6477eb5f7e2a7513a319344b43dde11f2ac3ef5eb14ecce4f965420674397d62cb"; + sha512 = "36644dc921bd12925ba507cb75e35f0461c923cc460009d55119fba5af1cf9d5fa54958687b5aeb20d26ec2914d883402883de9af4762ec170f56dd55952b0b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/lij/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/lij/firefox-59.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b7e4daec2720f2163522f4257c3622d9a424807e2997452f50853a8c227d6672d538d03d44a59274ff1a58d6b6efecdf3cb817963adde039fadca73c41decb08"; + sha512 = "827b1051c1991881dd1bfcb9b00f68f6a2452d38ffb3165b229647fef559607a2de64ef311fd9f4d9ddb3169c884f3ea83d215e5e45a3d821597ed2237fdd6d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/lt/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/lt/firefox-59.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "5085f82bb167ea2f9bd50e7e78b1a26a490f559134ca049e1edff7ec4797c622360fcca726229b52320744ae88f15a6d728ce50e257d0cf999d0179b2718a220"; + sha512 = "bb1e0a5972b2c9c213e89d44c377bb64673eaa5c09df7bd2e5dd8043ee6314bd4afd502f83957a5eb8c0d3e3ee2bbd8674079821b0df2d30f8129161341944a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/lv/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/lv/firefox-59.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "662fb0a02e1e8ba8a28d8eb2dffda77ecfd3c4da75873b5cdad8bb6d85206b82f5acb2f55ae5bcdce75ef1427969e2dd2b3f58b86017c13e2ae0afa06e5d52c5"; + sha512 = "e11ec9804f6bc83995f1c34d49d56e9946ecfc6fca8f7f31186199523b7f3a5affb7f1754c73167f690a2423a881ab5c1dac8e2c55fd4ab894c62290ba87057f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/mai/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/mai/firefox-59.0b7.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b97ad4d8093a402c957e27691b29baef01cd587f3fa2210f47707c6f846f46916d92eed3ba0208c8a659a7931aad7ed63dafcb7d41451a08561f74a62c057696"; + sha512 = "da17e25f57efd0a194f7a57bc671e66bdc525340994f03db8b0dd0c40f61ae896a967aed3cf511da2819c313b171dcc68466320a8a28293b19ab738ec0097a2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/mk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/mk/firefox-59.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f44ddf9d274a2e095ce3ae56edd23b379bb47502f1c9ee8e66aaac385a25ee05e6c442c173a77e9a75749d3785aa6402a76dfff8255c101aebd178de0ed43d2b"; + sha512 = "1bf2ba8167d24fe69cb515650190967279bbd75aa34ff0a5795a83ade81e652cb6ca9bfe23569910f0422db2555cf73deb3691438f9c26d820e657961cdbf561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ml/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ml/firefox-59.0b7.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "a449e12812850153caa7edfe64d58132d47690df7825b9dd732b55792a6e7842f51361dbb8e5792855336f4267cbf30a6c12c69375b0c1368155a3deb06e80f3"; + sha512 = "ef0d9ea155893e96edf36b19bb70b2b3eb7744f6c7785281d7c60726fcb770056f7dbd4c05dfb5b59188d17b007d2a94354bec4bc72ca569e8741f5d47d9654f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/mr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/mr/firefox-59.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "585ce21eee30af73b1d23804158490d3189e7e1b8dac0b27832fb4e9149ed62bae28b9f38141de2dfd131e4c65a2ace93d944ad0e3cdffd96a3673f69ed66c11"; + sha512 = "6dd7908b55346747aedf192ff46ec123fd1b7ceb834e498eb38dc2d2c4cff0250546479a27eca521abab09c44e015c86ed4decde5be79f3637eb4695c33c7511"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ms/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ms/firefox-59.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d300051710a6a4a25407e36aa0326609939fbe6561fd3dead01bdf9f7987c7604089302b9343b946a896f7693deb7b1999f35a6c8146d9558ca085c602ea7555"; + sha512 = "fb499428bb57cf2652339a59068a2074024a05ac7cb9e714ebae76a3b53cfb2a8c2a7fe6790bbc4d4acfa13e7631553835656792e7347581e70a1897a6731904"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/my/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/my/firefox-59.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "82d789949ddd47a038e271e38ff3951047ba054a318eb072708acc6b39e34ee878b350f87e491b8aafe9429a7889f41bb03982156fe8bbae66dd0f7231560dfa"; + sha512 = "069a4959386a53224420562fc332ea875d784de3dea9580c5cfd6d1454a445f316fe49b3168571688e4f23b9ed5885b1e4a7ce624730bba8e1838bdaf4f8fc91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/nb-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/nb-NO/firefox-59.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6e17057590b82690d7078f07b87242307b4579008a6f6b4b3c22afb05df7cc70af96c75b639e0852a1fd94b08bdf33849ddc7250cce80f9d0b6d5bea6e000efa"; + sha512 = "b64f833994ce5e8d5b89a78711a4034d6d86143a4a91ad042b82d77adf4ede663ed0d879481ec20b7a3bac4ec5f82e6fc61c71e67dc465a01fcdc066db04e2e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ne-NP/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ne-NP/firefox-59.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6d0d4952b2b926d32d2b20ec6703bf989d31f44921cb7f4cedeaaf1fe7220ae82059b0412354e3520ba77c5d72cc0354d57e3ed87d61bd37e01d89cb572b46fc"; + sha512 = "0e949450785e51392b5da8db8281481fe0bdedf9b6291d8ae769f81030906e7f2617d8e92f24030e2bfcc0a69547370c156c3a7a898cad916c0ae649e15f7c0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/nl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/nl/firefox-59.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4f01f262f66f14822c1f506d57ed5acae783e4108f9201e29b34b2114f1ee502c1d8cee8021cd09ccb2ee8181448a9727e04f6cf69ffb769f949a95108b52d70"; + sha512 = "979efe980485b36a9c6017f26515b25782a005c90105b653638e33f28fe0d872984039480f3b660b0e3dea4c89e520eb704dd606a930a6c9935b31b12a41f5ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/nn-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/nn-NO/firefox-59.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "408c006e374b3d8d4123aef1667f80c831dd764bf0b1747addace652b01bd8d66d5cd5be1ad0cd3c29704049e253e1aae69f4dde05ba9f11011a5c9537168bc2"; + sha512 = "ea118a39c4eb5529d5ae6782a09151e7cf588214f58efa9f9da9f8ce869ba0d372aef7eb3c04024c407ec79861a052b47ef180bb1ec281c2d23a4050584be144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/or/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/or/firefox-59.0b7.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "35ec6f9200e52262f8320237f006b24b4be290b303d5d3222338fac1d6adc91c3c86417d808d33929ead01890681a4335b75801d9c5b44adc70be85c9f41e18c"; + sha512 = "66275b64f529fdb1dd7ad54ea2f7145b1788983eee48202deda505ac03634e09f037fb9ac34fe0368781165749303741bfc1532d6a5e073aca2a719d75234bb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pa-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/pa-IN/firefox-59.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "0abf82d1f4fd3a1da22ce0341c57d3c2fcf46d6f051f8d76da6685e32614eefce105565cc72b019934d6cce624968dbe8f2ff47a4d8bf344f317fbce11dfa833"; + sha512 = "e409196d50caaac3afa8feb8c37689efae67c1f2b8becede52d1be745196ba76dff6fd23d844de87b001782f5daae5526f104e3f91b9109fd786c3b034470fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/pl/firefox-59.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "96d61e9be18cccad5f92d049afa1c0e034c5ed7c80b6618db1566127a12aa77da156c1a8a65e381f12a6be261c479c66d5cf4b0697bddc507eb4a507cd5b33f0"; + sha512 = "d29638eb8aa9284355ab6fe7617ccb8f803269003bccd306872a40025c4b0e64dcb18cb76be6179368c00b3d75cee145fbc5f90f43799b03d82fd7ae64934403"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pt-BR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/pt-BR/firefox-59.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fc57bc34db3fde2ab4c2521a70db33418b96c1bffa025d6cf7841048a50f9d959bbd0da5adcc8b68cd72f28bb97930984634231623ce78860b086c4e2884715f"; + sha512 = "ab750a46b5cadb7b6c7279c63a1328a597fc3764063764d5e76419f795c100859ea29a580d1e75254c5e8ecf33863ebf29d4e641c3bcf98bda4939de22a05cdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/pt-PT/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/pt-PT/firefox-59.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ff89521bafa15aa8990598ae1985ef53c9a5a401281f04b6c0a0270e9f6d394a09e2c5df69cd47ff602c7b6f3fcb8565932d0c59bd8f2707219e06dc1be8ae2f"; + sha512 = "247e4ddb9355ce2efb3081ddb16c7af74627fb2d24142f875fa2567178c8b0252b6ad252304630781d189c2aad96aefcba023fb728b01172e0ed8abf442fde90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/rm/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/rm/firefox-59.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b259e19fab6bf234bf7df2a17f2ee12c7d04e8e8cf64e1fe22ec67e26a6e0ba1115ad7bffb410a1c11d9f17414123c4e856706b0a8f443136bae9192be87c63d"; + sha512 = "24cab3b5b8b3c198e22b8c9c9455d55850bf105a7d3869c2b381225746f914b01e683ee343ec93a0a85b7d8139b0d76690e468da9e1d7a193ded7df7a6ed7f48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ro/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ro/firefox-59.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "2131c7ac80966498fd673c04432d6fdaac0da9a061d9181dcca8e9b86229764a4872d39d1dab48a7e5f2c4ff1f085adab19dc961cf62813e8f3145909971369b"; + sha512 = "7dd76552ddfa66a0ce3a6b0a05f0a1ad872971e32a443757f3f2d8400a1149314de581629c63263c8c06be6e40f6fd49cd8e8b809204df9a8a0549d15440871a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ru/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ru/firefox-59.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8f4bd39ccd6e71ae33c616da55307b8ce718842f3e451fe79d3a7517a6ea211a6a87aa0755e2d916e3e3b74bbf5f4935418cab4eabb397fea31552b1e758acc3"; + sha512 = "c40e3c8e8e5cfadd5ca1293daacb5ec095d05110eeb215c357aa5f23832f8bd7fe3af6c973bd1c5392eeaa34e68078efdbaa7b30f556d4bda57525d9f926c456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/si/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/si/firefox-59.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "78bd2a0ee4ca72e709ed227640b85818a762f836798c38cc327ad31d1677eb0308f01232580b4c94aafa7c19482eaae36af1bdf9cbbd1c477be743f0f08b12be"; + sha512 = "15a461b4afceda96952397caf0e87a4544050e5358d69bad5dd177e638145080e69a5057c985b4fd82c0673e40a4ad06acc648088db598213c63fffed9533d7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sk/firefox-59.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "60735bd53c852cb3517434ebcf0565ae7ecd175277e1e9095ad1e017b9b39ef42bf9cd88008fbfe9db457d82f5e27d6b927362766b115af5dd2bb8bd4966cb79"; + sha512 = "47e5c2856c8af12aac094777db9b1def8a7ececaeb8c9162d5b13055c730b5f8d9808ee3a1fd5a34d7506271302b80454820dd0fe1e91c1592eda1b42ca98bf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sl/firefox-59.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bcc903cd0c1cadaa91b515d6f744122bc76173b1c526d7e534e2abe1c32776649e003911c87473837a3f50459801d7a99c3ca99dd46c06559c8903db03f5a115"; + sha512 = "48636b22f8082a8187948928e00846d3b9a7f1559b371db6a79090bafd5a66ae7c9d12f86bb6ad5ae316e4363a2c035aa589c30834de5115816dd308b6235315"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/son/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/son/firefox-59.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f4ee6fab131300dc12c4ff04d211f405b09f952070ba833da8298424a505cb1b878061d13696db55f7e598a42c92698cf474819db7ac7885fc9b54529ab233cb"; + sha512 = "64ae45771519e16f2d1eebae70cf33a5c49ce0c0a303223b008348993dbc306c603f7713453a36cbd66052217c46182350a79fee65fc6ff895224e665a33aa5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sq/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sq/firefox-59.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3bf50ed9c0a5a056650cb23aa4c4b598b56cce144ed1f3801e5024ffdb1f5a976614a876632ad0c4bc75e85e781be3d941496b2047e92405cab03abd5aab2bce"; + sha512 = "e4ad57bda0fb4496f519ccbd5f227b4c9f5ee35d7f9e2f6774420c776e3e99c95a1035d2aefc292069cbb099ee1ed3c5b318d8bf2c58c0a3f716dba8a1b35264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sr/firefox-59.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "47a1e0fd0e9fa4eff50cdd480cfbd74e1afa50cf5c5da01f38def27ad84c0c69ccca70ef3fa5fe93116154fa045e14f437220970930169ba73a376b6a9a85bbd"; + sha512 = "a5712102f6d2f2747b98d35248f961bf53506eacab08df9bd20195719505824c85e3c07698da60374c350a614c655257bce89bc94bf687acb94fee47edf9112f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/sv-SE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sv-SE/firefox-59.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a605236ce010d83913db4ad8061e8b3993b6cedcc3f54044796e0a0d3f073e5ce5d7587081428544efd7938eccf302190313f895f2603785cc60284c16dd7b08"; + sha512 = "9bb15232cba9c1f603b5f60b5ff6d4e062a850651702c3400ddd834eaf4a9a96c9b005dece5ee5e626b37a69be0da8ba91a580a5a3a40db1bc5d4cda9a8c7d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ta/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ta/firefox-59.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9b5e7e42570272989156f48dbb22b26f3dc4dfe2298c97b1ad1ed60f0def7a886c32a7260d450776653b72793dbdaf774c05198dcdb0b1a7812be9563e0666c2"; + sha512 = "02f81d91d0f0b87e00591ebf321e506896831eeef861d8b96f6f9bd0d2c124c7c0d7581e127fa3b73af0b7e79877a887fe0745a3d48af5f3b9b433f803d7bf10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/te/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/te/firefox-59.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "82dd8b225f1eb515ac4ff5b2fba68028233f773d04f119bf9e4181017692b72557c46a73a463834e8ed52a81b02f5501f5bc3af8d9eec84aedffb361b8ddbc39"; + sha512 = "ea860c1576f11fd157cfd6db0d25e8addf89d8716936d5cef670676f6a95115c0d8cc4efa5a4e89e9567b79eff70f722102f8b6bbcbb7f66de76795275b737b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/th/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/th/firefox-59.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "8b29b3b7157624d304a00238f3f49ebc9a202a818c4e6bd87596256926d0ee9047ae48db734bc6040ce6f2c94f800fc88b06a6f96788933482275c0bc1d01bbd"; + sha512 = "4852e8105186cd861edfb47934541d6b077d9ea726c8447052bb222f810b9ece378e4000711f03ef83200baf496a9ed9d91b0a211d425e7d5de28c3b559d2505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/tr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/tr/firefox-59.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "727405e1d1fb9e4c84b9ddac65bd7a95c837f2ba9239220e5f4684161a2a0e25cf8fa87c5cf0d924fe0f7ed4286e7ff6ccb05fb2041796226b346066831de618"; + sha512 = "d50f36904e01dac829da3461380af518c0472e4cc065d79dc7850afe2bd1ce75fc3e684995dd180af8c298799dc08dc2182e250d9743545a7f218b984148d1ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/uk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/uk/firefox-59.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3ae3e87414e521332856a9be9b6f9a7f1df08e48779693dd4494cf950eeb89aaeb552d2819cd2c71f19f08a17fa01b092b66fa79930d9de6551161adef7391ce"; + sha512 = "14b1e4eaffbdedfaa8ddf5bdd5dd8d151f9e0bb2a726af71f3df2902404393418f9e7ba02802dd78fa594d4baf84b9b97cf580cade137a0c9a7141da09a0ef0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/ur/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ur/firefox-59.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3984c7f849dd16298360ee2071568dfc9a77b2650fb4cb1c6092038144a12726d912ba28eb64f4a3e3e65b8d1221044eef66aac066f66d097b63bce6f85d2b3d"; + sha512 = "3228104d28da0ca46cf43094b4913d3c4d27680f0c50e86bb1225e8a5f07ad4a8ba8dfaaedcf0812eaf79afe1340f529d52c3a8866ee9ffc2cbf5c5b3c5734c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/uz/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/uz/firefox-59.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "6e8ab925ac86895b870797dc5ec52019f0248a7629a22838a053f9442e120e95e16007a35063e71cd30f64b1678c6542f1b2ac96504183a1ebac2843cb455d74"; + sha512 = "8b25f8467ef5fef92a9443f6e7d57caf4fb5ad2f99f7ef14b3124e94373fcae9b57215eaf55fbbc35ca393645ef8435e3147d7333b1a4818f89539ee2175ab79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/vi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/vi/firefox-59.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "caf650ee27dbaddfd098288db30541392d9f54e4818775f9a63da86db1811b3ff0f4e8547b77ac428f774fa28e6b3d873f04ae196c72df5a08dea0655f26060b"; + sha512 = "54884aec2814e4fdc4b7df84a021135e834de412c58147c3075514c3bc6fe0fd562981d8d08d9ed8d85e1b543cefc31f8603c1a6643d1f7da141cbbe3f2307f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/xh/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/xh/firefox-59.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "655eedc85fa84d37dfaec42d53088c811c6c5c4703591e3ee5b67e6dc590d5a8c4553bd460908a004cb3d287c10c1929b528867b5b0b7d99bfb7d705d1797827"; + sha512 = "e6614561d3407910f3db30d7418f6de60d1d0422bf893cfa41bf727faa984f6266e471290247ec6427e9dd57076d02ee7745000b38472aba7720c5060707e326"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/zh-CN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/zh-CN/firefox-59.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "1c60d2929783eaadcb02e5ac30fff179a5aca67e6a8c618dda4a0696ea70a7f82b035db2b94134fa701c4f1ec1861cac664dd7ca2a4a05305f9337cf6c602146"; + sha512 = "c88fe1439dcbe0d96beb8fb7d6895f909eb0a17f8cc4466b2d170d2312cb476a1e52d2326d6749d155aabe8bf0c7fbe19f5e2037c23775857aa1ad3d119de747"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b6/linux-i686/zh-TW/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/zh-TW/firefox-59.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "110a2e0e50e41646ebb9f601905ccacae7ca1a7028e063a671cef97828ac9637eab741fef10254aa121062fc33bb6d75f907ae7e306fe755d4f199516d1ac7ae"; + sha512 = "d76ccfb87bf55907d0871982ace63fcf58e788a784dd000033b513043f1e3f57a5e273b7d4c8b000e15af05e9ab8bff15411bdecc23dd701187823128ac94513"; } ]; } From 2c92eceee674a62c999ee38c3677f024ed4a3c92 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Feb 2018 23:21:27 +0800 Subject: [PATCH 600/797] firefox-devedition-bin: 59.0b6 -> 59.0b7 --- .../firefox-bin/devedition_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 889f19994c4..2ae02a2d796 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b6"; + version = "59.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ach/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ach/firefox-59.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "595b5d322cf2472f3e6e7849a70007f501e7e4de0bf1395518c484b4e6494333949574392655ea2df9f4f00ec6b2accc95564a76791844b2ac2a3c366e2500e4"; + sha512 = "961152dd8e528c2f0ecdaffb14140077580e00e443f5f4bfbdcb40fe72edfad2c717840cca452efc2a79e4ecb349f2bdd5bb4cf09561a9592d3e23422abf4575"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/af/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/af/firefox-59.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "fa60ceb7ecf2d84211b763313a7491e5514f78f9765c55b95a213604b686e9da2d8b10c1b6d18e27553353303e00a04e5ae01365e2ca9be98fb7c6b45f531798"; + sha512 = "381c880d2d8c7dee4407a746a7131cfca0af5be12e679a5f100b7b5a40a24fe395e4fb9730d16a2226068059e1412e0258c0944508769a3d2893b25aafdf4c7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/an/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/an/firefox-59.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "c9baf0badc2ec9677be906a9bd2b457987589f82f6efee189f692adc3ffc602dc961d8c539304fb63c3330064751a4bf9da7d732629181ee3ed916a656202a11"; + sha512 = "3834da540f1752d9f3fb62e3d3d5b5492b80a9c3ea9d857db638c8bc0ea509bbbc384c132759d1f5e236f28d4c1a416fbbd341b6cef5609714e00f91eb125057"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ar/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ar/firefox-59.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "5c5b7762e2194b87c4b7f0fda75fe3975fbcfc28e1cc6aa5a242f319aeb95ca0da8297ad7d1c075c59cf580cca246712e88fe0b0465e09780b3a571a0ce02583"; + sha512 = "638687264659e77c0d4442220c33adc5d236ff8dd2af342743b21cefda8f6206acf680b5537c3ab11e44191981360ba990ca316e6669c691cfa362f065cbf427"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/as/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/as/firefox-59.0b7.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "68ff3acc5022156676200acf9c4497c63aa5b678d7d0907207fe1171b1e0ed48da929338ceccbe841866c9e3a17d156f7da55bb2ae65d47774dad5044de4f3a7"; + sha512 = "3e5e370948f981286cade0c24057a7281ba4bd6b65a6145b2eabd24fd4b20b13efbf313aaafa5480aa2ab8791597f7aab4ea493d72c3ffa57fe9e59dec44a7c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ast/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ast/firefox-59.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "dd5e47f5477a4024ecf501e74175224c9494fd28aee3fa15dff5e04db6f72bfbcbd7514085def809481cd26e0d158de03bd02dc59c2c054ab82d8e0b18409642"; + sha512 = "d47e8c4006f5f668ae7ca816b55779e1c60680fddb06fafc7b3eed39d7ac81ded9d6417a392ed8306d1d8bf3243ba71d8e4771c1813b8903c6d876299b9004f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/az/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/az/firefox-59.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2f78b1459d80543b7bdbd402498fd401394785dbe7d8e11bbbb04c96dea25990565b95786b2204941628f15fc8105f6ded439a00b1a0ff1d010df2e86985df87"; + sha512 = "17d277712a27038e4a6dccc17e4005f1c1d0d24b20c53f498ea5413dc3245ebd21cfaaeae8b1c6e0b2372430953c317e51286c3239422bb56163ca96bdaadc05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/be/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/be/firefox-59.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b1f13f7fca082ac33fb64e177089228864a8d19e0eb02e21915126213039fa8ec6396ba514fbfa0029fdad9481dd26d513fa106553aab7be69879c93bfaa7783"; + sha512 = "80cf57e5db1139a681aacf8df482a01d05b102b2697bbe3dac695a77af4af36020404e5c90ab21d51196db4a4c2fd8e426c8db382b1f33a480fd4197ad9a380b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bg/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/bg/firefox-59.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "73c15deb8b3f9beb26c446465388fce708b610de2735036ab6fc80cf104e9fb440c6745b497e72bccaa5a61e2dce6edbd0c69d841528d0ab4678bbba5adb296c"; + sha512 = "f5e55817b04933066dda30e44678db6e8820a08f13413eeabf0623467e417275552097fc6cb5a0fcb10252306ee39194da2f458c7c4efd5ce002645d28d50973"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bn-BD/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/bn-BD/firefox-59.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f2ba031b25cf93c7da7048c58d8bdf4d8430c42dcb082627b9b45b37ed2ef924110edb2864d876dece6a1326a3e24ff0502f51077dd96140e760ad63f858e9f4"; + sha512 = "1af4624598a603f8bcbd9bcd7a2f43c4da6273846bba91babed5f8f0ad85819d63d4ef18e31eea5b3e07646fbb2091ecb0efb6571d512263da5f30b6cb5c4535"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bn-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/bn-IN/firefox-59.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "defa9a78675a42778b18f38ff447ef5b81d09ba54f174133913a072347d96b05c9bc637c7fa0a81014fabe7f11a49d6a366437fef37459276bcca764487c7cf3"; + sha512 = "57c0404e44eb0cabea7a396b7160bc0ca0920bda01df97ace1808f7ac71bbe7666e1e2d014f940044a03c17dc92684a3f5cad0a3f41af76b5ce4f41324d7247a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/br/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/br/firefox-59.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "26fd5ae4427c44565f31ceee81fab2a6d930afd603cf60342d8400133e53357f5c1b1b718ae8d8a1856aa67d1bd503a1b4527c2a1aff0d089d941f30071db251"; + sha512 = "bc0d94882c925da3e5862b3b0a3af3ff02a0c998b12216c9d73aa2bbfc29e832e3096cdd9d3b784847b5a8eca2e5e0315bc92e6c5f72139c7dde773edb048107"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/bs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/bs/firefox-59.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "9855150263394d24dc25f40384b756906664491c84538572d467304dbbfe9151a82a0d7aca0ac07e952ba82765c2042ee5fc4a47d541b4a8f7efd5879c4ee75b"; + sha512 = "35a35e4437020264f4fe5db74ac0392b473b7151938d133b7bd144ccc3316667e3c541427af0df148f28bb883ecdd6e0e04ccb8d26e49bebbf0e3b205667cc34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ca/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ca/firefox-59.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "369eec4c1e5f56aec23538cec89b55f9706ce7adcb06777472189801c4c708cd0f38ce5741bd1b06187aa1fa71b5f8682ea8d1a2675b5404f4fec2a124f3ec7e"; + sha512 = "7b82048d987575f22808dc4eeb246d409e9dcff5bc398af192b64cf1406827b70740d5dd413f3acd403e2bc5b1e27bf1bcee4e37e2e66c6624bb67db60dfdee3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/cak/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/cak/firefox-59.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "42fcab30bf9a3706270e531fa91e7e52e6a0cb6eaa05b53b718b4708da1f1014a27ae94e5bd4092197565263733feca589cd6beaaf0d47b758f337175dad2e24"; + sha512 = "92d4fcd7577ad4018ee39bfa39737e10ffb195578e5b33d5547dd1a2094f645d0550b8027b99293a74555e8cc5ec2db8f2c2069d3606fca999dfaac750004637"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/cs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/cs/firefox-59.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "80cd387e50ba97f387c1ee04b123436efb02aed9eb492e5a91a4a78bb70e20bc0893a4f646a339e470e830910e5c0d0c34ba09725957ef033a6c31bd6e4c2af8"; + sha512 = "f8780c1d59ca551bab613e470b4fcb05ce22548c3302a8b79f6076f74aa19e9e19c999c04ece8ebe1c0fe062fc9477d829aadbd43d3f0e4153ba6c7b471d8db0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/cy/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/cy/firefox-59.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "4f4be4af205e9b04b9ee611bafa936d2a8f6c9bde2c5fcfb865a8e2d065321713f4a810f30dc1432b35adf736e95d3b00977e029ad5dc3e26c0a5e03ab803ee1"; + sha512 = "a9d0923be5ce8e7e337f01c357af4b12d667c28dc0808b996dc370a5841f1de30a54def5aae5b5de341bb0a80071bec506334e7fbbdcfd3bcbf0c29ea8c815aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/da/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/da/firefox-59.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "912056fc39ae349a345d541ced2ae8959d02ccb10a4c7aee95a6c1ee5c854a5fb73fa44a13ef6ab51a20d882e44711d790f0f15c9b1cb07fa5b7d3d5d36631ca"; + sha512 = "4f1f21d7550716f9b4fb6d4edb46e94e5bc21d3420b569ef0008e21d3ddb6f7408bf4c598645681a883f473b24d8c5890a06e56c2944dc1cff592ade914bfab9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/de/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/de/firefox-59.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5acf637b84ef5f98e5f8156703576e24880c8c8041bc8f5474cfd4331c4de8a104adcce4d127c13720f17105bf2635facec4b5609ca88a7fbf2ae662ca3d3343"; + sha512 = "d008e19dc34d61bfd2d5e00603f54cc3167d0498a4baf9e1e8ff911f4a68a254f7e6f79ca40de24f57571520a9ca33cb95fd65b9418258ba3a5201cca4dea45e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/dsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/dsb/firefox-59.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "33c88b9286dfacdcbd2eef4e2ed380263bcac4ceead661a3f49f16610f19f2dcbef0b4ca53cf54ef898b807568eb2a72a157477b134764f767d1ae64567bfa13"; + sha512 = "e66e1445ac7888fe6e95a062266c48ae5d525f67e971499be9f1370518435d56486e01173ef70424395e5be3181a2975d424f3b0c9950e5f7c963fd316581ec7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/el/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/el/firefox-59.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f7e26ff1e985f33ea23fa10b7917ad5ac25992653050e3708801d0aa1949fe5a9c8829a82f5df061dbfa0cc642baa65bac3a1d1b52dc888f72aecbfabbb51b6e"; + sha512 = "32dada39256e7e9127bc55216658033d2ec4602880f3662a3e4aa7c95528fa6d0c4ad22bbc8985006328a20e7baa91d7b2582d37dab2c81e17af870f15a40f34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/en-GB/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/en-GB/firefox-59.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "769a867c351673c95ca1b57a72eb1138be5429194f37c40d741cd839896124f9272a835edb1801e1301c6a384619974317ceee4ac3a1f7c710a388420b0ac8d2"; + sha512 = "26dead041f7d9daa017182aac7c0ba2771d3ae12f79f113701b232a1488d41b875212416347b4627b4b3599686e00c4af8f2f7ac60ad319f3ec8b7100d13bc0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/en-US/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/en-US/firefox-59.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7a843b23ef5bd8fbfb12ede433ecde84e7dc12c212e1eba4cc6180b7794e7436829096ff7dcaa22d44496898240769ddfdf590ae846b6501fa4476b33ee8614e"; + sha512 = "d14f0fb3471e243567effcda8af8cb3776e5c00a5e533a64cdb2d575a875143423c8de029ef0ce76f282ddb30824b43ef65771e5e458ae361648ad01221a305a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/en-ZA/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/en-ZA/firefox-59.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "8499792422ba7561e28c5841b4b78c63ce77125a2ca4ba961e50144173f00e36c506521ef2fb961d6bbc79b6f7b0f5ea8295da455d3c6e9eac371541362bf794"; + sha512 = "2a681c87ddfd6dd3c96a2e949aa021c30614b11c6b7e2fc1fed23702dc906f6550829516e3031f8bca7f0d76c694aa92fd1521bbe24e55979684d19c66b82a8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/eo/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/eo/firefox-59.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "29db43bb944e5273c8a0b20329e6690a79d244c963f3da2074293f18cf3e0cd0944cbde10ee4f103a7d3f1a6ce0333d999b2307d14270c0fdea1b2ed584aee6e"; + sha512 = "e73c26899a8c999afcab0f0bfb68eb0c382af57240c12b8c05c54566d3800761a0c7ea5ee7afea719144edb3dc16a105a9531f8655bbb692c24f4858a8142f49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-AR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/es-AR/firefox-59.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "9171f4e4cc61b6515769b38d6e0e8a2de883fc3d132ab9e51f75f25cda47c16cc677a5f4ef4806c00f1513c19633358f6d4e47c219a56955923e045918fba41c"; + sha512 = "d25bba346b583364936b839195513bf3d691cbf2bb7d328ca5c5c62d527768ad9c32093746da6ace27849d3742586b81ce1f0ba364f6017f8747cb28f4ffcade"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-CL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/es-CL/firefox-59.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "5c9f4059f809273a35e039b1bc439c22623b1340f148469e878590a95caef6efbbc37910afb1b6c203b4f0f6f757aee98f9bbae92a777be88d8974e71c6561cf"; + sha512 = "9f7cb3fc3cb97866036dfebdf7de553a39e258a05c4cf08427b87f8b3a3e9481e445f1e0ba1ecc42f32c761f8c4b781daeb12cbcdd6f6b0cc7f1e52597bfcaae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-ES/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/es-ES/firefox-59.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "bf95d16a2cd20732b99c31c72021b1a33d363bb6236eeda3ce39a6034db85dc20706f10fa9f5b99a59344919476018ce00e85b038e6675b21b8d88e65df37a29"; + sha512 = "1c9cefb35ba887f309d46ed819cbb1fe1a64f4cbd85d7a8a8e1978e45b5ca0e4312d4bb0e2192d2b74ce5b9bb730ccf7753c13c571d2b4a2c6afa95def1df102"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/es-MX/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/es-MX/firefox-59.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3746486e435831eaf82fbebaa6e25a8a9fd1fb65660107cc9c9b3818b746cbc640c30cd0a793d3dcb86382c522d912bd8758ccaab9c9aadf56485372a00cdd18"; + sha512 = "02094483d2fce3e15b644b38480b13044240beb463d78ff39500c1454706501d1d0cfd0821f1bd47b76a463e03ecaa96efe5c73cfa455feb2a662e430e310a78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/et/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/et/firefox-59.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "5065889bf032c85070c5f1a426a0914568266206464ff60841fb0f08efed7c52ce2770ddcc9d486bb9395231e332691910816f0bcbbc49724be346e6ffbcce75"; + sha512 = "c230a89e2df456a3c10f6bc8940ed9f9dd1193b597d725280b2cb0836d04b7d31aaa0b13fe420c97d6fef5b640b95cf48410e42e68bcb9f9eea0a5fbeaf87f87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/eu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/eu/firefox-59.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "12790d229217a9cdd66fdc03b460dc409c3fab9a12e6492491a5aac115fb396901f7b6ea0b48ad3f667239d3cb6dd5d3726fcd9ecf2eaf2b9d69ec47f7813d3e"; + sha512 = "c88f9df7d9fb076c8ee905609c0edd994a71d16b34007dbb1caf71c224cfdc0d376d4d98d56780339c98f38708776712d1f60f759fa7e5fe7cffab9fcdf7720a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fa/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/fa/firefox-59.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6209e9b4bbb29e783ef0817be91e32c6d31fa0407e5d78a1466e3dc32ea8058261bedce370b8e5e647bd89b7ef6c1e6064cb8cc786643adc405a50768fcc124e"; + sha512 = "2eb87394f23b8f342f51851a4fce181ae146fd349c2bb96dc50319273f010d411f0ca94d40a775295484e4c686c6b492b659be77da04eac8ceb6ac8a1f290ca3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ff/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ff/firefox-59.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "5f3fc2665b6b5cf63999a1cb47e30ad266907276910446069dfe5c7cb944b5131ead06bbacd2fdf2f2843ce55cb360aa6c17509bc9f8fc3f94cd1debfeee97a9"; + sha512 = "6d0c15b38dc00c7fc95645cfde8d852963f18eb6351fd1a85d9d6fdba7f540399e77cd377eea1b548090a5abcebcbe5409a494d270a49ae7374bf1d3b8b4b5e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/fi/firefox-59.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "532c2715c67531508875307264d03ae65fb168463b82be507550136b61250e0c9031894dfdd0662bba0de9d7de703c289806166d9292737fcbdbaec41f7a6276"; + sha512 = "f414c5106a4e02ec54df22fad69e317f4e8b88e9c210bef6d7e6f5992b2aaa7e2508df77f3ea6bbf8d17913d30681f7834e3a71f26d0f191a247d0abcac332c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/fr/firefox-59.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ee337c590300b765b41d55e8227409eb62b80b233a4576a838e9572a952addbf76ad1267b2aa5e9fdf0da2c22797e754eb0c13dc51e4b8220f8d53e95f49e601"; + sha512 = "309addca4b8bed098662a14a268f13487e7068eaecab908226a882d25ba808dfc42b093215c05c1d0157840beed56e4e1afa54e4c0f8a9fc4ef790fe080f8034"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/fy-NL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/fy-NL/firefox-59.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ba5cbda964b89d6c2752f5a69218bf907a5d79438afd50bf6ff465c97f2e59bb0afab88662f69d656fde8776584287edb1f931ded4e8462f4d1a6bf6067dbc1a"; + sha512 = "a9acf176c8a5e8bc2dd8003b35753d5562711c5103ec907384e4ce8fba37fce61bbe0d7af92c4954c82cb05e5f6cad40dad0c94322b2f7701ad37792e12928db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ga-IE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ga-IE/firefox-59.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "6ef1c7b0d4607a01a6b96fc85c7438ecca85b1171a4c06049282a0670c00755b4dacd42b64d46553a0002fcfe4e9ac8a6f57f89e025b291ac3a39ff52a22bc39"; + sha512 = "e412b2df7251ed261068b68f84083cceedc04887655332b65a2fa2375b31a1d8ffd5aaaf9fa797debafeb7c9547d9f8a8a2dcb7432162a284df6136e4973aae3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gd/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/gd/firefox-59.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "86f1b629e99cf4e3ac00317a3c92e734ad7385cf9ed5016330d08eed80ffec8d516ca05ec843a029a8478949d989b38a65bb47e93c9f3bf47144cd9f128b1a00"; + sha512 = "e341bad41d315361d02f394beef986c058fbac300ef99106c12cca119ecece0cc2b279425512747d7413dbd6346b940aead7b52914845edf284435f1754e16c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/gl/firefox-59.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "245fa4ac9b37c9fc2e903e4eeb7ed5e4c992730dd6d32a21ec32370b4c1cdf1ba796ac9699f96fa94efd687ba06492d4bf3cb8d2db23226660f041e4f5ffedc9"; + sha512 = "a9cc122d5c7f12793620371466603124d3e709934ac4654aed7cd04039f812d8a04a32c076f91d1f1b01abd6502dc6858cf7452f0d6338f59ea5e6e31faf28f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/gn/firefox-59.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "9a9a34cd51fcb104fe4f59a1dad2b0641be345e24794facbc37fc9139fd7574c818c48d66b37179bf41fb42918ccd174407f4e651a59a1055dbbfe3aa48ea9e3"; + sha512 = "70f311fa7d3b60e6a2ee633485efc2bc5128aa20f2b8e470d00a709f2c9c5deed5cbe67bfaea39fd9df39fcfb1118ffb2bb0d58a3429753816268e4cc41e333b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/gu-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/gu-IN/firefox-59.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "60d8de8eef96240bcb19ef862efe6be7b502d263edc543e927707f7fed3fd37f863f6e177a020eefc96071e6cf9363af052a053cc449204c57b990607a835e16"; + sha512 = "04ea260cf70357f51adda2b8a7c8a782ed153e1ac6b82da90f232f04393426f55f371bb203b7ca885cf14d579c1585f02c8c11b13fd60f4d175865a546c71501"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/he/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/he/firefox-59.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "622cc6eee35804c5aba73c88328c98c92166b84520f4d38f0168118abc979b23b8d99955251da1861178ac43c25d97688c6890251d206342f15f21e692ab4689"; + sha512 = "e130d7400c4908f93acbd85082e3d2f52d992f12b209fdca66d01292682b4835c97cd416bfd931429559e270464c62228bd2c888189a7976977742eee783405e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hi-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hi-IN/firefox-59.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "2bfb9fce937f5972a5a85a627f05b5321517f94a55bf39f162444857e4db6dddf3c7758d8147d2f0da75f140aa8061e9afe08451ef3b9a3701fc75c3408a26f8"; + sha512 = "c44008381dace09de874b77e566b77836667842161e12d14ad1c497f1a7b11aa6a43312c6a814fef710681ea1b72d22c5d2687312c32bd7acb835f2479fd2522"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hr/firefox-59.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "3c9cea617d8e9814e7662a6aa8add1315639c9ef09224b03d516942ca8a244ce1bc84539b4b103d12385f7aa156062e5915c285c4eace96896a098352228162c"; + sha512 = "b28f9b876a5acf1ff5e4d6e6eb09ba611f9d41a55979f0176c49854f9b70de3e82e62fe9a1c2f4ee66947821d27bb31d33d6696f3e4aa3e0fef4d280d18cec86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hsb/firefox-59.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1b341021ac94c4d673c0ad62c031d0c2021d275faa32da7607aa93ed036bb90c6e591cca8aeb7ca0a0d3a1958c3070d5637ed695a25cf775302db0bd5d24a921"; + sha512 = "8f38771672364db97fad3301adab291e21d68aeb70eeb184333063532c8712ebc482968d82843b452434155fac0ab9688d021e486690768cf97bf4fb8c9de217"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hu/firefox-59.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "898a792eb5eea12bb196f8f930787e0bed085bb49e93cddb08415d6b9e5ea63a28f6a5b48a2075d6ca595fca3dba69a91fdcb0f031eeadf14bd9f8da477245b9"; + sha512 = "1556f2803d220d0fed67330ee002f410b06fa5b9834ccd0dd6162dedd29a1f21fa3aa560bc3b3866b03c2b4727171f99edfe47b39d0f2c09432aca653897ceab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/hy-AM/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hy-AM/firefox-59.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8d83670cc2451f866030948f888dae2edd6badcbd557b077893b145949f7958b2635c644b7fa5dbe7bc4a82ef07dcd871f3f91b530bb19a576af62a80c4c0120"; + sha512 = "4ac7ac5b6fa1c416b4e803d0e3c63d465e5f36779477aa9d0a1ae3dc806bda447d7f6400301190d55c149053a1c0967b5d2483f42db1e247670c06befb4f9fc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ia/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ia/firefox-59.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "a7745e00279e8fa9ef39f9f5d16ebfd3a0fc20f208e4aeab80e60e9fa07ca22d32a4c88238c05aa25ac2149df93e7bb3ec639ca2c2b99128c8cdbe65c350b6ce"; + sha512 = "2913d70d998e673433ecdcd50bb9631071b8b92900a641bebd97c5cd431c6f6af5a2ff74d77349e9e25807f4a577f8f3a663a05997f96b025763ece6d344fa47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/id/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/id/firefox-59.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c35fcf5b0b7449a2ded6811f1f85604ee0e99ea0df9350cc429c5c3b673cd46ddf075ce2e270e3195cf42c93bf7a81fc55db08edf57874e961e037149fc4afc2"; + sha512 = "cd27f8cffefbb560cd475b9c2cfd7c47bb4b9e6daf80e326d2bd1b9bb194744413f22e8a33cb2ae14c88ac0c29bc7e823b1cc7321ad9bd3bc26b02009580afa7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/is/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/is/firefox-59.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "da8877007e3404b4a66de56194b34b77dd481e223074f528d0cb8a15071b78ed2a9f73f653775e30c84c77a042dedf142a771621468580fecfbf6fb134bf691f"; + sha512 = "1c23920cbee7a4353515c22330e3d16adbb4a0a091978d6421802559f6b87045b951603efec4e9891fd736aa2bea92b3c64a9e06f16688c7a748ff6d98672317"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/it/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/it/firefox-59.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "7c0e8dc1bfd60233f2b5079f25bbcb0268f2d512e1e4b3cdcdb1edb9f54ee45897b2806cde424537da7c4557e744401078cb4c53f84996408d2ac3f1d8d29d86"; + sha512 = "c93650c0be00e550139a639376919c422756d75438c41097ab9de0cc832feba26a2dabd7c148208dbc855036916218b5bdbc0e9cd94d09995a3f55b7ab8ecdb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ja/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ja/firefox-59.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0d0018b47da9d99c1ddd902b4aeb00fcd454ddf159d40528d8219ed5409ada1e307e1faacc14a52e9102233c7ae87692096e0c5195ca56a925843c2af10c56e9"; + sha512 = "c639f3892b1f6866e50c558232e9deee161218653d79df2c241094020763224a0520695a0b8652eec811da8893cbdfa005e062c6345475c73d2b92c574c92cef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ka/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ka/firefox-59.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "3ddc19fe92dd64ba4c49eee37b74f6a8a64555635b2484a64de949782a3ad22ce9fcd133f415a2cb0f10be07121f73b09556f4088b32e6cb5df0b9578657cadb"; + sha512 = "14e3e3dca6eefa71972abe021e9291f90df974480555fb450ecc0051c1257fbe84e9f4af2b8b6a62be4e88f44c0a25801d61ba334b0e8a9720003367111dc9f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/kab/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/kab/firefox-59.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d90b759fe466dbd421f4931c086e2240f4d0f478914acd2de95da7b09288b386b880cac2cf8756993dc3502c0adbc7b3c54bf056dcd1248650648fc8ad139e6e"; + sha512 = "b743173cd98d4a7c89933bbda814898938cbee6fa5c1210d884782296646a8907221e56e491844b6960cf2e1cb35a21b147c7c990950395c69d912129c4797b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/kk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/kk/firefox-59.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ada95551bca162ee09233c0b69bd9216a9f91a1621964e758ce37792d87b3244842a330c09f46a4bc83c91fb683c49d4f8ca7a982053ec1b08e8d361e7aaa00d"; + sha512 = "edae9784f6bd3257e87738c730c1d65d0f01f506840ff253b6deca672599d00e43acf0d3eb96cc0c9377324b7fda6f61acc3bf90ca594012f60e8e81c49acc07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/km/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/km/firefox-59.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6701c09a3cf14d7de5f2843a944116746a5626b43eddcdcb3aa7949c7b5414d1860d1650e349ee4fbc8ae5628c112d9bc57d0203901913c5112e701d0ab03e8b"; + sha512 = "eb6f7ad4648fed20d58d8f6a9a61ae46536e3e56621f4247602cd17fbb97d1dea9a3c0636e4c5fa6b4deff6cff483a33def52c95fdc49b28ea86f901d8db00fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/kn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/kn/firefox-59.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "e315e704d2228bc02ab0054bd205d2cb0d11b1ffb292dfe1f04f0590778a94981dbf7f9d0c137c4d515d6f1616925c61668a5ebde8b408e6bb5d0111e243e1de"; + sha512 = "86b0dd43fd99c9c2c344c82eaf2f4af5268a60d7a1294b9a5f871f338a3279a11749afd18753ff2d0815f026933e91f32e54e8ed6c5a7b1a219ac9e2246391d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ko/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ko/firefox-59.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "ea81ef5c69a5e89aae22d538c6105cc72b4ead95129ebdeea47e58039a1f949196e96a90858300440f0eec5344044df71e522d2b37b98281d7ce461bfb2fcf1d"; + sha512 = "ee609c2de7255a3ece758132f3948c795410b7049795f673614339b24014c053beb1c59000809c47029e9c81961914b7285344f3109ee80fe05c6798684dd847"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/lij/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/lij/firefox-59.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "74f531103b8de8ff7e2c6efd7d3ae18e9a6929f3ccdee7ff10d0e6d608035185d5e74e64bacc3b191e719b0533fb3ed78828cdf081141e9db30c2f7043264223"; + sha512 = "fcfba569e0517d0bc48103c23aee700548e8f1d10fa0211b5ad491e7d9b3d9a72dc983cf921c65012d279ef4b6042147af0c3528ea3c0c000254f699bcd7ab0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/lt/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/lt/firefox-59.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "c7ff5a95f3ce857c64625e9e5f841eaee9473edd570da6958aadb92496c44827e0c8a9aaa7895afb17bf00752e65d9024693d7e4e28c38cc8e0c07e00d2037aa"; + sha512 = "ebb525ff271d70f16dc42110e5402707dcee3c7c1d9ffe25eb6780dc5cb9b9cd184b64c526068091ec142415f9725e8aa12b36262d5b160b09b1f7ff97c3541d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/lv/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/lv/firefox-59.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "0aa35ff6dae6ab41e5ee8ce8865e652d4e849f1a36d831090f3f48087bbfab97a4d2d5e09819ee15cd603056230d4512ce957f42115f23135f49b732252c8ea8"; + sha512 = "5dbd95878117362e362f5409dc335ccd38b2d244efdfc8ade8c43169458019cac0abede38a89272346aa1a6578e818d5446a58ba702a174294e529ba9399b380"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/mai/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/mai/firefox-59.0b7.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "3fdf9ea7ab6bad0a4d50b050641fa28ebb4136ad18d200ae6563de7a398cf4231465a72aff7418b401a291263c23758cf9a42ef3a249c62f2888c8cab63f321d"; + sha512 = "af19940acbe5855000f033817b8284c4912af9d69671e5b7033c56a8981adc33980e8d467b61622db3215376956992faefdba651a44067f1b43f07dab7389a20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/mk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/mk/firefox-59.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "73448b1c969f869d56a068b48c7d91f1b2ac16a3a5cb4ae8aed099d6792c230c9d818b962b3be04141ff0c561fe7f9a50a7f36340fae793faf4edfb2177082a0"; + sha512 = "a58fd73fdbd55763db914b19bed6360395ddfea414726171abfd7f4b87a19b33b2af2ebbece8f2ecfdb444cc2eb0cf26673b3dcee972bfcaed59108d39b5099b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ml/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ml/firefox-59.0b7.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "fee8a3b301a302268dce12ddbcce3e778c138074da7a29030ecc886d3bb39623da75b75078a9c9a1756344c85aaad4e73e936e54a0509d96370548bb0daff551"; + sha512 = "93966e5b37e2dcbd29ba5a8c1207716f7aeba68c95aa984ffeaf3aed64a2b0a5a0e3c22400ca2cf75d12d56975001bf96d2f04f89131690528cc1ca91aa8e911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/mr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/mr/firefox-59.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "00231d12298e856126b8e6a7df2bf57689c4c705edc4e03868ff06b0d11b58a38ad312b7bde8d60dcb505b1726e82f98c124150be08246f97f7087cca3d5d7bc"; + sha512 = "bd790dd2755ce4a601a3a0f43dfd340beded583904a9087f24b810a2ef6dce5a0afcb62f225bc68c650b9f15139a5272a9b9c35d86a4a8a7f1c2d7b9373dc92a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ms/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ms/firefox-59.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "74cbd7e895aafc688a696c56d4a8d572a62dfc6761f8092b90fb6f7bbfdc54c9a17bb1ad373b193e745080b2609575672f023d9862bff4cbae3ae975aeaf470c"; + sha512 = "f0379a677348c7701b919af4eb26025559821079d1ff153493432f40fd348e5e473f563f4eceef5cab864335e2962efd75c1ae1eaa1ced328672fc8090fa4443"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/my/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/my/firefox-59.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1dc1ff38282d7c2ff1bc9c7725d02394d2d35a3cb976f3cd59d8c64cc3001ba6c8af6171fbdef7835a86f9c234cc51be7d8e955119b531adfaf67b0681bbecc9"; + sha512 = "31dbfcdb0117e3e82c9fca9bd1779d05c58482b165d1439e70c3fb81a49ec157d6d30f0be0225e1b5e4ceb5b9806886d6dc8afe6895b52f3c271c0c3f374b378"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/nb-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/nb-NO/firefox-59.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ce23f71118c2fee3e4fa6218a0cf14fb34088fde93f9cbe97205fe547541c96fe78784d6b18c50b800dc4882ae7e056095cabf57819cc60c8171203f8052b2fb"; + sha512 = "0cf3b29b39b6880f4d4b90c0625a2031b6fe3aaac8f5b841c40c9e8140c7d3c6710ae3ab7444cf471bd4945c946f51fec7d3daff4fd67d80beb142df32890841"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ne-NP/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ne-NP/firefox-59.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "fdc930a0edd60e243079ed15354aa2783c9cf668fe3eaa2e19ac0846e3a100f7fc745d23001c450321cfc7b76847a5ce0a0e1e09885096d29bd838e730d9a2e0"; + sha512 = "40f8dab8f69a84722696d97ee23c1fc661f8fccc1daeb1e1110c805893923d9f0fcecf2a438d6a7ef2421962ee66485eeae66c8874c0035666b5a21c2abb9a83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/nl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/nl/firefox-59.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "1372c266828bef521ea932e147fdc8315a68cf93fca386e8f2607823efd6c62d96169d86d4bcfbd0b2fd21c2223efb780f425607aa603f16326ac7b43517c5bb"; + sha512 = "40256687f025eb34b65f3d04f9e084f68c76887fb9d3535e183f736941e55c24feefbdb6654dcbbd263ff0944161b9d9bd6e993a85a6a546827f9c5d6e265700"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/nn-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/nn-NO/firefox-59.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "fd439410e60ea25bc622831678939aca419edd24d4b5077f5233be44e1aa0207d8112c7415155a7f96ac9aabe65d7114e2c8b461c1870613006a381e233e6285"; + sha512 = "0d4ecc0ee915dd73adc758005ce4d9dbe319f47e5e63ab471d9b7e70c5bbe32f4e6a05c33e5ad9e7300b00d167b26a43c4a042bd48261ab7522eb93d8eb6216e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/or/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/or/firefox-59.0b7.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "775edede88b773d07a70e6743994c6cb1c864a3695a57c482535fee8a8a25eea2bf4559c9bd66a7b599fc1d780cc8ea89d71ee37a04c28718ba6cd8d0d3d941f"; + sha512 = "54936a9550e47c5c418a099fade3109118996f0bbdfb6d6b5eb98b239ae7cd89ebd6e03a6a4365157a99b1cb3c7cb67a53e3b2063f748a5afd7bcc72d7981c13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pa-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/pa-IN/firefox-59.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d4a06a885d3d898b046b994e95ef23a92d5c35e47d341ddc93bc504eec54123993721800f7b43c3739ec09238d158671b8af0e06085a318436d4b8bb622868ef"; + sha512 = "1c5115efefc64869214a07167a7935e3d9eb62c30fcaa0a1cf762481545c61c6c27d346245cb461658763a7aec734925579af4992263d2c844eadce79835f835"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/pl/firefox-59.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "da0d744b94d05520cfad3c6bc48225cea76be9e402ad13e59b7e0e24cc96a3a5ce02a1512f394c62d911b7b41283a7d33d397ac49d37bb9b5bb986c6959f9d90"; + sha512 = "c496e713d1f0c67c47cc5adada2bf1cd06f0ffe0d97e67cba934246665d1dac91e5b3de492ef844759233856b4ee8347b680531c421a6e341ae3729bdba0b807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pt-BR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/pt-BR/firefox-59.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "84a642792eafc5fcfb4b89953f0d7f2480043c413ecc7629ce7f9db759f9a0d58017f4b19f5fd099ab0a8e0c7e1136dc0e4dbe94de5b6d2a48368e9a57ae1e88"; + sha512 = "8c85e7df9f4e92ff78abbaefa2f4528d699e6993086f754d7f841613b94c061c8fc4dac5bced24132fc9ac00dea437ecf4d9e169cf94adf4f916a6d6174e5f4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/pt-PT/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/pt-PT/firefox-59.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "282cd700e10069da00df6b95e1d497383c23a6b0a6f0f3ea02738eb3a3ebca07f7757aeb11baf1373fedb4d6975e85ff2d45d607c42a939ccf43bb80b735ea29"; + sha512 = "647ab8ba8419aa662aab1a42a3cc016155e727e267513088cf04d0d553048f94f52fe12e2458472adddede896c76acdd9fac33513143f18568b1f11c8b0affdc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/rm/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/rm/firefox-59.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "c56721b5d1080f605769f190c26ff734de9067d028ca1bf8b48b216e4d9e87009d856f4652dc5a654508738d3983ed350cad0cfcf91544a6a5c2120c497a6e21"; + sha512 = "fb1a0f849196a3a0f20b1749290b119e949b337af871edee22ef642e889b99b430cbd76297ed11a1262e35785b6c6092d38553e540f74dcdae966f1c155e4ed0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ro/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ro/firefox-59.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "856f7f48133f78f18b5834e7faa3ae30b000b20b137f935a5783c042533cdcd481fde575541752116cdf86c32e645be667f77d5f886573852d1ebce2bf4e230f"; + sha512 = "fe45cc59c50e3c94c7d8809416ba668da6cf3a4d91fdf6e1be9e6fb3b6d9e498a35e109f272d98815a129d4bee8cbd67211b2e4864f222f84ea057e2712bea00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ru/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ru/firefox-59.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "204068402e15071585efc1ceeca07bd253723b53e9bd1ca14642a5c5fecafe1c325e6bf12b4f3a51d8e8590a46d930f337ac6fb2839ec92d2d4cafd9e67f16df"; + sha512 = "5f2d5d7f285a05721fdf4f6f442d328a2daaa52f37d963060f103b309fe56056cee1917c057cc5dd13c1df881847c2bdb101759011676a8128901266514b26e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/si/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/si/firefox-59.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b905b59403aeb3d863904b552ccf5597cce6c333c1acd46a20742eed8518b60eb96e39a47d7cdb43f50995c017bcfda52e152f2ff5d4952cbec5f641ba45c565"; + sha512 = "2a8ec448e5a81daeca1d16524189c6686518a0c8ff1fffb33c0e3c63cdc184d668f0cb7d5c30ab175708e5fc32aba38bb0a138b956aaec6cbd3d3b1a0026b571"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sk/firefox-59.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "7f512292aca54210c16cbfbebe8b093d5a26293aaaba39dafc226d67a7999b0f9ba03168e3aaac7045e51b3ba2dd03657f0b121fd4cc6612849d245561c5e5f9"; + sha512 = "307b3a718526522dc8f0ae7b1ae7ed542f630d2fc3d9e032fa0820d943bcd631e97358a6053fee285cd20638cb65376304b3f0000902fc97e9fceda3344d9217"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sl/firefox-59.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "e40500d7cc1bc2b429917bdab687025d77bc530c77081d8289a65d00b7f29b6bf8181d13c8f5959c81031c7355096aaa05aa105cc511c8eef1f71f6418bd9c44"; + sha512 = "864967ca09b58861670537405f459d8149b2ff4f77a18f903ef38f925740568e1532adcad7c02e63b760875169bc8f43e779c9f573a889a1808108de5a4c67a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/son/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/son/firefox-59.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e3b59a646edfa4cfc99eaa66cc540c374ddb1c5424e1aad7f158efda317f4a8c1edd7f36f6ce54b937e7c5d3801b53446580cf90344f35846d437a0c245d978d"; + sha512 = "29d149a19ce3b76ae48b50eb5c7d6aa9fbc9532ed0067a5f11092456e91d615d9dae1dc3c1ed62b00bdcf5da6daff8e750dea429bf73d41ce79c564f478411cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sq/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sq/firefox-59.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9dbf9e77d61e7ce26bdcaa8536b725fec8c57d3c5e3e7e6870bb686520e3af55cb0bcf2f5b8525fc24cb72fd7976d3d8b466adf18f2e7fdc29f586d912cd7bd4"; + sha512 = "b5289d1a40452c57807054c7dc946aac0ca452233a950e671ffa65ec02c1ed4198fa47cf6d4f4d7a3dcf0d4bdd9b17e5ae2a8a97ccc19acf0f456c0f7fef123a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sr/firefox-59.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d6e0f12dace67c6260e3b766393e898e7fbe394d34e14366594050294fa2cc6931886d4cecfc23f4d921fdff961c38c6d6356760d5887a5570d5039912e193d2"; + sha512 = "7b0676253b085e69931e01166f56004b01e877d7ba178ee356f5dff43562f84a3490881ff6bb7e800c8b2857f4b9fabd64def393f9bbe5e7bb2642663c729c93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/sv-SE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sv-SE/firefox-59.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "388fdc10907befedb9a3a871be53799aa1cb1f9662b2e18e5fef1de8d6805ea6ef01d95c5225f06fe009c4800b7a5214a24db3529fe53a60be56f724dca12086"; + sha512 = "1930438ee12b671e61a1534cb43820a972e574b6e12f1b9b0b44d740e02750e904a4654ec521bc7c6c0821cd92499249ef029e940cbb7a22b9d9b1c94ebcc65d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ta/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ta/firefox-59.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "d52d69694a2ac1cfba8d568342c3da47932f9d5744eb03ed20b1a5c8b4739e3daefce25146180b39e360e3c90b2dac99e7c9ae9740b2abf580120149db2aeca1"; + sha512 = "75bffb22482c6968c5c177f3dee2613b75659cc5f701f1df6f7b394ee462a7a4b2283cb8ba6e6333739b12e72957f4ff7f36d9891d424a069a27700ba40804fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/te/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/te/firefox-59.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "19f82aefeb7ef6281278ecfe55c052b4ee24ee0d4d16ef6bd06b3e192e801ee22f034406ff224acab92117e4b4e63e98d7a636513012dd625de5a5d77615ad91"; + sha512 = "67b8c2d161577370585d1d308287cc2dec6e17511b5216debae424d97f01d38a19bedcaf131719cc211016812fb85e1f321b374a33bb2b41578f506b6dbdcc99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/th/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/th/firefox-59.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3fc491d1f70adcd5ea0c479bfc32400c898f2709674a1ed59da76521cc006a1683c31af260155ec008f1f8ec08ea971e91465574c7060e9568313433d2b7e372"; + sha512 = "6d5a11f2b4364e99021530e32dcc0443d76efea0597f09d29ab2bdcee6a8e97af81f56a7e09c44e5ee78723e2ca99abdc12965e115e1b32e39441975a1107550"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/tr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/tr/firefox-59.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "7fbc87f38b07bbedd644c89ac5b42d9e00114ff79dd0b02f25c227c4944e32c353ed9c4491ef9f3981f4c565e03afd175907cfec5243832a1c82a12dc4f96b90"; + sha512 = "c62f3048f3678799d3526660cf5442ba0f39b5acb426d9fcbea7d0310d54682d3bf19fa510f0736c7539ac38434d338191940f621604e9f98e2e99a06bc8705c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/uk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/uk/firefox-59.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e0ebdb71ad23527be68a3cc0e70291b803bbb5d43ecbc334ba92c48215ae8017ad79e78692eb39da8d5403b64a9b17e127c73bffd2592df8a5d4cf6ad46710c9"; + sha512 = "c6e2cbc831993decba5316b8f9e096a8c0626eafbd86e67df219923c7169710110cea6de5f8060ed7917c15c407fce0a7bee2d6a46927cf5c8c95ae76f1dd473"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/ur/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ur/firefox-59.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e8bce7cba9c56db4a74b00d9f149704ef0eb308441e70a4f6ff4919b4d54c5dbcd0e7446fc0a23fcaccc5cf44f1a6238e7012f2e3acfb4c1f26a5f8724eeb4e6"; + sha512 = "48f86a924fdef01c7ad7950a79a145fe3ab7087ff0f4d2e50feca384f25dad4575f0915d8c7cc41a253d58aa1b9940fe92930a7cc48081f2e363ab7bfe740e21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/uz/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/uz/firefox-59.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "def047a3437914a7ea7e0e8680fc12a198181f2adcf6000879ef63eaa061fad85db8a1f64fb6dfe6d44c063accfca4e846b5624339e52dc2663ef0cbeff03787"; + sha512 = "40180bb0ce42f27f4944ebd397332955cb200446d11218a0cf846c39f03fe71bcf720232c7e52ec237024673024d010e909c57e44a3d26310246067e0022cf41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/vi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/vi/firefox-59.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "dc534f00d41b4e11f7e620c3568cde029784d86a11bef65b629d5d32bae62df9d1d45043d0be0e511e8be735e7478857bb5be0c4afb47a2aafb5c75e6a32831c"; + sha512 = "0b546168fa1c46544a693b40e8e97c8d01fede814cc0866db6475bcb7ce17a2346833de1b19e4518b21b7498cb1dd5bde109e7491fa320a5a722096f1442bfe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/xh/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/xh/firefox-59.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "6275723b0ff3f66f6631f7b5fed7ce73a2a72c77fa4229ec21b7609e43490c8619f099a20706658fffe693330919dcd65eb52b83328614b4c25000b97cea807e"; + sha512 = "6d431b8dd89250df0ddeb07a3884c0b5d8e13b22c53646d75ee4137d5fc2d3f5592f2d8974640ff0de6e650f0935fec74c9d7b6556f8f8c1456149c4edb34b3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/zh-CN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/zh-CN/firefox-59.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e511d5091cc89560c213ffba002f55a25271fd36b436c35e2a90ef84ed1e6a20371d9aa2e61446787be7e4f611686071ef9309a8646f1c4123bdb8d256a5edf3"; + sha512 = "9e9aeb50a38c3ba753b13ac441baa8126645e07a73bc8a34c633a9d277a6ea6599abf9a3b81ff3da736fbeb7f1d246fe949d8e02db3cf91b686782be0a318595"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-x86_64/zh-TW/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/zh-TW/firefox-59.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c2bc92e48d464211f2a936983f2016d4c155a8dbc5f636876303615643096a5dbc3f7ecd674586e51b56aa28f4ed8f41e1708a5997047ef13f8ee6e7362f5414"; + sha512 = "6c22cd0c1d95a0f365e2cbc0d0e5c21f7af982cd36833ead9a056cd676d7dabb626ac9df9af5429aa1fb92094b33a69acac23689d2ff867124545c110a35672a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ach/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ach/firefox-59.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "4499d6425f3d16788d829575772435ac0c2a3e2ace072012624492e0398292cc5e7641dd36e0b2d58e1e6b796d3fac7fd8a57eff4a9e48adf3c093b6328b4595"; + sha512 = "dcdbbdf2c61cc5160eb9f961c7380093cbf12aa73ba0066296790e69bf8f60ce3894087a1fde706016b57020c1b8da32a23a9715338b75c97d59183941503d68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/af/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/af/firefox-59.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fffac356b873b58d275e04ed508ea501e43f20be51b6967637d49d4a4a14788c04c9865aadaf0c1c4ecf4a3707bdeb460adbe40226f13916faa748bc773f7336"; + sha512 = "b46b173df4d904ac974bb6871897f8fafbbf6c590fc190c992701fde8090fbb2e252c568f56268286a43f08f68e82ad393690ac446ff0895aedb1dcf8900cb59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/an/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/an/firefox-59.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "05b688f115a9c324fb92a1234cd3138af1068e6dbb89a4aade27af830fd5b897e58d07f9876f9f9688bcee2a98ea1c4158a585755169ffdab9ed8a9927a2e108"; + sha512 = "f4043062501615b69b9a6f7f8c5bfb1898b877ee580910efe627dcb09538b08c3614e15a03b9ff1cd74dadf8af9a4299e22db32244b1741821aa0fdbe72c649a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ar/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ar/firefox-59.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "2bfc35a015148d04968b1f0f5e8d4ece02f448590ca45fde0cca37b31357f4bb58e0f0f4f5542c77ebf2632c3ac3340de5514d5c999d97b95abfc548486d666b"; + sha512 = "880d129688cabc9732138d7eede17dd53c6259df1f9dbd2fae5510649e8df9c1be7decb1f1c44cd6e9d998a32b0680490b5a9e348af2d1a50df8d521db730989"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/as/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/as/firefox-59.0b7.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "baed84fa6256bb002dda19a46a32d9b46ba64f30c466d5ae31dbaf87feaec051595164dfc355d4433403485cfbfef8533a55e2291fe940f2343d9f30bcb373c4"; + sha512 = "044ad5403e1d3af4bbd3a0e2efbfa4c6b05ae80ffaa2397294cfdbe087325c7f17a80a40e44e1817a5f5fcf2b420fd892c0b0b9e56e1945d2ec96d77f39fa3f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ast/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ast/firefox-59.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "08f3957c23dcfef80f89fbfe4bd4314254b74fd998741358f5d03ff16728b260768185968e5f9645f54a3d77bda95ca4122e7ac80f6a00f95409b3fea8205a74"; + sha512 = "28efebe8f08d88778854cdd0dde2a66a76e85898afc86f6e136dcbb162c4b3bea9eeadce420efd5660ae22199c7ba0aef29b9c803c1b9689b3be9a0856599d32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/az/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/az/firefox-59.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "b443e25e0c2fed05b5ea32416d3808f2236a7c37c15d755612f394dab17d849bd3c93d3b2272b422a7cdba7bb4f7de2cb37cf19b507904360ceb4e6beb522844"; + sha512 = "58faa1254fd08c606a58759780f96fbca4172e7551e08bd8c998037b526244f2d44fd618ca1677039d5ba1ca1a244b8a104f3478d43ccf0bb56c3b223d759a34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/be/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/be/firefox-59.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "52da8342a683f875334a1fdf493700019992162fbd983efb6484dfe3af8918def29746164c93445bfc0c306431ae252a16f5cb0fb525e5381184221b80f4a7bc"; + sha512 = "fe017dc001a47ee3520af5f003d96a6d24d6205676153e2837d7c6972e5a7652a74c352709b61908d97107a040eae5a9416d5ce1613cad3295fb7fb0b1165d03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bg/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/bg/firefox-59.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "303b784f519eb9b2370b9b06d523f2554ac2c326d024d0812228193268f8778bd0036d572fc57574a3ed5270edb64f09253aca9cbf90322bbb3ccab54c62e638"; + sha512 = "674ae504a6ec9ad52c4693b71eb623204027f83a47845365fd55feea4395986b4106991ff977646e6e5a4569e2c00e74ed81c8cd99121b40c229473fc3763697"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bn-BD/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/bn-BD/firefox-59.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8e902ce41ab242c081c5593f9f27912721d358e78006b364c74e0ab718260825c98214db4a65f35bbb0717326f0608aad5089703b74a964523f3230675ad77e3"; + sha512 = "d4b7a8865e1743ef415e91a9ec316d671cc0e959b6ec5b6206ef82efe783a7b2b7fcd7624a4b2520c12553f363c15320f9e08a5bbbddb0b7e2ba2983e31d6698"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bn-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/bn-IN/firefox-59.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "037400dd174f16f7a34074dfdb49e88f0892092dcad6c27581321295023c9ce564b56a22eefa5b35381a8a01f42b26826c1a376bf05be3e34feb4eb5b02f9231"; + sha512 = "b8b766777510129018ef091b975174ddb90e277d6395fcd93b2cf46eb998deb02338ec7f6e85b9ee2ed8791c81ba131bf614d4d590b0a418292df85b42f3ebf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/br/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/br/firefox-59.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f9b49aefa070204f8b95094a6e8793b6ab00fd8fb4f400075516cd697cf4ca5ea89fe267eaa477984ae82d966368027cadff04d0efc1be81b63a399413ae83c2"; + sha512 = "1297040bf1b387ee0818f1f516bb7b1bcc3101e16b9607d1100c965da1be489e50199aa730498220843b8f9a91058168c093ffe64cf89c80cb146a00ebca2c26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/bs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/bs/firefox-59.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "35538a5a5ded9568a2dbe09cd5ecda77226584a5f9b7eb7b9356c720a9b784767c5a69ee74990a7ecd72ef660833236d2d6b4267c091ae89a2f9750ca1332753"; + sha512 = "6a0716c3193eca75edf820b99b71f1b289960d190a6d0ded6f62633ab4ea1375a5760300d99adaf672b72c2d986e7bb8e3d7efcbb136e32d49011efe25af0751"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ca/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ca/firefox-59.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "71cea9ff69b435419c1ee8ab0ec121de13686a7f0d29f10bd308cd5c6681115d1afe035a50f25180daf6067da9fc6edc1ee31980bbf102f8e654b79f62aae1f8"; + sha512 = "566ba7e707684477b55732d31535834dcbde9ade01fe5fe4fc14d6065a937e29cf8d2fef05b0e16222c06e41d6b295c131a04b9379dc0a62ca710ba78152dd31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/cak/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/cak/firefox-59.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ffaab8ef22b584c4b147358b39999632ae9ffc0eab6d46ec5f2d705264c11cec7051d42ff2ed8ba46fd1c977d4df4fb4fbf28d970bdd0e8abd9038a59bc139be"; + sha512 = "6516e8b3fc8bb10144832b0606833b5085c057020f78f974b1196c7d42956c924e45214a9c946b50c0fb9fcc50db24ff912630adc327edd960794b7903a1cb15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/cs/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/cs/firefox-59.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "065eb584812b3c66a31920e0efbb31b900b101fb84613bc8b7e6b18cd544133199deabfc5773823cc7c7a3be03c3a8dae41204a65421e18e1ed0c8ccc6c7fa99"; + sha512 = "d69335fdd9314b7ea51260b6d09d752ca7dbb5b79f99bfe227296fb230b95ed783c253c4f590760d9e5773f59583faccb8008a48bd5a96ac7ab465c8087b9ad9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/cy/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/cy/firefox-59.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7176e87ad5d6551ce67e2b158647599b67e322a1a8cc35457cd8b682b132f25f4dcf4be187dcfed4e0d304e6dd8ed24a9cafbe0dc4fef261445bacae50a2feaf"; + sha512 = "4ef538b761e7f25b112d3fdcd879be870f380a20a26da13a3b6b356d15e60470163886ee59aab67166ced1747bc9f48369df3275719fb814e21f81c9060a5515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/da/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/da/firefox-59.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1c02a54a801080d6d8f770ca17db139d2ec1911f9e93283714d01b5bb7230dfc84623a2737344ee46c06fb2c3e68c0b863624293c48da71a6e0fa702f0060ed5"; + sha512 = "4e62c1f38b53bbe3eacd612d17b63b449f609f8d94beedd96705d3f1b627d1a427165c667c8d0c678f9a47532393925f47915ea72ad3ba1490fe7b7a0d957cff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/de/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/de/firefox-59.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "a9fdce31be17eba18388eab51241fa2afe71557ebec8ec8e7fe27daf405c20676d3b9baa7826a5d9a7e6a113823d7ed50ae958df6b2412ed712f00e0bfd99dbd"; + sha512 = "c406ba6aca19d4f517b4e923f1d483573e82c6b590805f0880a5c38a83ed63ace3d9b52969042d0d0734ceb946817a55b730c1d532583024e360dde592d3e99f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/dsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/dsb/firefox-59.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0a962b8ddb4698ecbd979d48fa21f91c7d39f7d55096473e6557296fb8e849f27417060751034e9906270c771918b956755082d23c5fa73c06128766a706763b"; + sha512 = "5e7d27a03a29a853e9c128acbe1715846ab49078aeec43fe9e9c461fd8780eea0f4723bca7f84c69b4c2d3dbe57c61c98f49511144d7405821b934cb15fb5e00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/el/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/el/firefox-59.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "fc14290342ef91d29a93707cf672d362ef0790641783b7d7187d7db71bc774bee20d506d7f42b704abd101b040eec95b8aff5caa572e20ce18c0dc56103d0c42"; + sha512 = "868a7ef45b4c7f0cb2b3180d5ce070ee619b447497779dad976740f4bb21081dd942302b3478893ded779031ee3c5cdce0bf1aa3d65e1542aed693e3675dbb3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/en-GB/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/en-GB/firefox-59.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "abd3837fb2e1e69c8ec2bbe59647116d45942f4de1dea7fc437f73e609d9296a3bbb0790fd92d41f9771c71cb466f3aee96f30a1163fa986e72ad0db43301ae2"; + sha512 = "dcdf0b70f0c2be1a25c3f7c5a03f7701776fd12e1353ed8028e9a32abd657878bda25ffad1fd3d51291735499f98d88293834dcbde558de5fce26acdaeecec69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/en-US/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/en-US/firefox-59.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "080b12824d252875c5c62692d652d3dc4dc908937e833c3e99cac58e0347a3bcc2cb9ce2a12d1419f22cdf2545d5fca947d35504e89f7a05f67b7988304cecf8"; + sha512 = "e06d91d7279a791fde529db3dc82500f2133235f770518ce136b8164e1b4773675bd1fc00b1df7794423aad80cb020544441014c95bcf6d54ffab3812648193b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/en-ZA/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/en-ZA/firefox-59.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6f9b9f66e79d39b57c05c2fda451be7390321d847bcd19bde3b3fa5f80cbe38f25ea0aeb971dd7122313761878bc297061881fef43cfc068d28c33f11ddcd774"; + sha512 = "baf3a3b4b07aef66072f34d1219f59124a26973fb52f049d9b3e32a625a9ddd0e507792f0f4aab59bf14b61903de7b3788012933040bfbcaf63abd018ca9f6a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/eo/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/eo/firefox-59.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a5cc94f8abd0dec22825e3bf242abd452440793958e35ed547a01c8a7987061889e219a59341ab8d7faa7335ff0b35aa80a61e5bd6dc2b3c0e4c202edf262d00"; + sha512 = "c44203b66d22efde88fc24f9d3c96629d203bdacee0bf9a8ff672424b202a29e8f0272bc2d8d0e348cb8b7f0240e2f1c61825b61bebc44f0da6d7f01aa640f84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-AR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/es-AR/firefox-59.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "25f24c1de811fb2371f9aadaa9f8b2dfdb542000914124d82610fa77556e01aa93c491d0c1bd6a1f5164efcc0c7e90832d36b6b8c7706e61f36b3359e756f6ec"; + sha512 = "ece746aaa80c6aa27113105325fbdd37eb2c2f8950a47e633a0a5f6c8b20bdcba16676f992c72c262eb95c745a9896242f613e0fc75c190cf9aa799a0162127a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-CL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/es-CL/firefox-59.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "602b58f4abb6c021a6b0b286eed2d5b8ef007e158f63dcefd107e3bfa8978b6127bbc167a36e4b7758ff13a482aeda8a70ae69a84a9ef78eb96a3dac08eb7d86"; + sha512 = "c36489b825045844687ec11dd95a2c9fc67dd75d3d86b3e8a833abdab9faa0b2f946ac4ae061dffd5fcfba57fc78b20a161ace2b04a36d206cdea3df625fc82f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-ES/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/es-ES/firefox-59.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "171d14ac46f598e40864dc51ffa8d46b0fa72d722c388c1341895c7492f1f984f169e511c3940a1216406ab131ce7e371943ef8d055704019dfe57e39e84b282"; + sha512 = "6ef85e4b571c901879563fc4dd55932151e23135df780fed33730a18565c77733388d7bcc29e0d72f6c7d37969478c3a2affd236609ba2e86a76d46bf358a84d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/es-MX/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/es-MX/firefox-59.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "be66bc35b023ee9236b4bddbf7d00299cc99aac0bbfcb05c900fd8b34d024fb29079ab3012c045431c887edf5b5424bd7373b13c8cc2ee4e4d2a58c4d2136740"; + sha512 = "95b8eb509e7206588d5b8546815b9c15dcc99e446ff35585494d17508acbd1b699d7d1b429925a7fe7b38e5e9988470a5304e11ede0907ea81b32bc8eee242ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/et/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/et/firefox-59.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "46adfdc992b1c445f1aca0ed8e3c0852a44875da4f09d365f104598b71e070cd671ff637d9804fbae2cf04f1eb43578e3b22c0e55bec39d9f581937d503af420"; + sha512 = "1fb01b69c034f005cfc481d8f37860eb4a7c0b8f6a132103a0b13c04531b4218474f17e8a707247c0e55ab084ea4f69697f1b73bae903e3e5a1f1e7142104632"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/eu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/eu/firefox-59.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b602ab66829a98fc1ad342f1b7d646e4e0ccf39d898c0cb1f8dc20eb55f1da9c086ca47783abd658dc73aafe2d8b0557a3a59de5aa772ff76312ec93a6aff8da"; + sha512 = "bb9c0250e3901e98c9723b6c56744e0078bb9e7262d19b8a32906d4347dd8aeac7dd05ba6f7f900d84d7cdec33ea42219f6b5d34ebef7b3751a236374c2cfb6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fa/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/fa/firefox-59.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "b78a501a3130928de22bb06261c361fc07646024511081dd034204d1529e758b81b4bf31a05e20eeeca649a089a20947caa7ae08e6f61a996186d18067cd6030"; + sha512 = "ba7390cecc52d00294468aec6992fa647c1cef8bd2676b885a5dc4d43612a3aaccfc5b9973e11ae8f41c067341b554489ca34eadf5996b7904978c00bccb10c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ff/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ff/firefox-59.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "825e9f87019ed6f7c77c059292736eaf2ffc96d7029da168f02953cfd0d30eaca1bb193eacc81a49fd5e094d88ed8daa36db8562680977187458db5e36192ed3"; + sha512 = "ab6d7f44295392726bca99d11e6ab9894feaee189d6512b5b7504c046c9fa48829003072e2019ab60c20105cec13c5b113e35cd3628c3ed9a00983349761cbae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/fi/firefox-59.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "08b94b2c2fe976bc8eecd8a92a5cbcd6645883e27c4ac807c961e204b59412a55a359207fe1553e66e48846a1dc1fa999f2992f5489292b2f0dd2d650734bddd"; + sha512 = "71f7c6f480a92935cf4a8815b1c213e2a91a2bc96b184df4557289c815103b5767409265ca38ac8fee2d70b20f321a0d758680c1611c7a4ec58005ad4443e99e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/fr/firefox-59.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "6f327a4688107610f89db61dfd61a0ad4186e21e9fdbd8daef48d7d6ca9a97b905f27695e37dcad888495c1d38532546afaab85e9d39250f69f961f06fc7f3d1"; + sha512 = "7ecc1c31c2410b0a6d853507aee740f7f9981cb092332ba41829557fb222463386091f9c54da900d1293e808773aef2b990985615b5541eeafba545ad52b8055"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/fy-NL/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/fy-NL/firefox-59.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "97f65158c6fc3b885194c4c94022f43f1adcab609b1e6168991e3fed1edc23eb2de5692d353173d73533d2428cea9898c2c907f85ad7e2c344e34548620c977a"; + sha512 = "575cc07983498858ea720246929cb9991e5c4ed9f99679b3266c1d1d290025c30192f8c653ec5336c6d60c59ccf124c1c7d9e42b2e22341d5552cdd9507004ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ga-IE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ga-IE/firefox-59.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "56b71aa21687b6ff108b2dcf1c4853115a29209ac5b9b228f3041385bbd6e0abeb170d13a7bd3d5001cc83f58fc4bc872707d6e9e086abe6d73ff288f93f5fcd"; + sha512 = "f422262a08d300f25f03160ad58f474cffccc0ce573bfda47e90c0ec5f3b09588f6e527ad99c62174a3c9392c803a37152ed9670e31169cb63494b1d0801dc65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gd/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/gd/firefox-59.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5727a4de97cf52fcd69fe7260460c1fa2cc208bb53c52d7d9efebc9bd9d115b4fb33149372a4a79ad51511c13a9ba8ae1ff83356c65ed566d6e4894dad555f3b"; + sha512 = "dfc94426a47493438619c275557b669e4e7a6606f968fb166a035a57fe4408388dff820cc5760b9042e6f39671ae5f1416e0b05ddd97c34cc5e45830a2007aef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/gl/firefox-59.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "2481ff0b2095b8787cc9b5c00f59b027fa1ba0d0ce94010d38f07ddfaf23bb0bff74bceb989fcd4cfd5969cc705191c4ec37b0a47b17f46736df0f7f7354f1e8"; + sha512 = "0eaf06e0b666b4411a8acb1d26531ffb4200c06dc423b3c26dc65cce0ce52534b6764f9f392c122b2c86c89efc82d205d1075d7f7cebe4a90d6d395ecf4dc51c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/gn/firefox-59.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "4e8bbbea63db7e39c421f8a6d9ab7c8459331995010c2bbbf45ca74154ca9919d9591a5a7c8f1266205abbe04818a7763ddade1972ba45b678b0e65e76092830"; + sha512 = "201cf482bb592ea45042a76d550345975dd7ffdd65cf7dea906292b18ed22d6587f87999eb75f1f4105a2b9463be042f2219b6bbc024e480f2a8bd54788ee070"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/gu-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/gu-IN/firefox-59.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "eb7dee2ec3cce8e2ca965e6bf5f0c6db8f777f771b04188f150f53bbd79a187fa2cbff3a5639a14275c19262c684177262c130523f52b44539cd0d7f826e8eae"; + sha512 = "36a1548f6cb8352899767cd04915f46ee9db23ce81474e8ae6b8814014b95569f851462f8ccf4a67c1a90ffd6f0dbec0bf28890d4d59d3952402ebdf8421514b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/he/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/he/firefox-59.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6a33ffc534a2d740a60a104a680a200c5fd056f11d53db22d8ccde52a28b9686600a03a4a030c2c90233ffba1241d4ae9599b1688fcad96450951417c5b86f48"; + sha512 = "422d309f265d6c4a4c2206f430d1d16d84a886dc3fe85d6e44980bcc09d9114cb426f64a595119a09e47668237d3141ac4cf001cef07e15cec2633fe0ba89188"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hi-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hi-IN/firefox-59.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "64fe64b3c5f8178f9e534aead47bfa044407216d3daf7fcb1a135f72d72eae327dba5b235a724491aa16bb7dbb2e5bcaedc49ed4219f06796fd5f8a9fbe84fcc"; + sha512 = "c12da2272508c9b6fc1988debd620f0dff95cce75a289a312f8480a442008917a28948977c96af3c60f2184182409b4811c50b0e231f881eeebb909411a9771f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hr/firefox-59.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "0791d6fafec7769966c9aa2233d0580ccd203a1baf851fd8567defd58bb43403bbce5763ab27cccd22d67dbb6afe2fa795557376182588a1d00bba6c9462fe30"; + sha512 = "93dedf524596a70c71a471003f98d9144f3414c9fcb1c0f6e843a8f66a5de3432c72c658745beff7b2a061db642c021fd0f8f5fbd47b16c3c49e46fa352a211d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hsb/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hsb/firefox-59.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "fbc6143334fd5f5b8b44d7927396b83aea34be5d783b948eece034168298aa046eab1131e38f7b71c022ab1f200c3d0182c854ca6bd45f5c835d0eb2632234a4"; + sha512 = "dd713a5890d8d909d0d81ae624730d897e216c76e5e5f3b0445cd8c35920a99757e3b32787b0a5de852dc689c9a1a7d7096e8ca8a22f59b98a82512da1e1d3a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hu/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hu/firefox-59.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "3b0a8fefc165ba016b6666da429aea75d3c19c40db87847ae782f9412ac98d0f06e834a7a83d3a3bd38a410a4e32b38f8c7a310275950a8676b64f9bc1991022"; + sha512 = "15b6175b8b2bb4b9ea3efdd6c9c16a954e8760f2537f7bcc78a0231815395bb0f2ef1212265e498eabedec4d561f6944e5bc851939a7943285dce981b06fed62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/hy-AM/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hy-AM/firefox-59.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "fd706b556a9691708d65d1b3a6926f7294341966ab8f9cea3175334459dd230e0d9d6b4d18b965a39bc60de467ec3719672a65985804ee56e9dac0660903f231"; + sha512 = "e5ec9abdc9a9ac38ef5671041db9ed84907e712e998d261a7a5c07a02ccff2142949c9c137563657c28f531c5a3c577ac35b8c3760ab3bc7f0521571d1779033"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ia/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ia/firefox-59.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "508ef8e011e201b74362770a03c40adb39648fbfe5fa099f3f0605beea0904b5e10bf6c2b66eb5ff1e061ec214add46372d6409d2f29f6d7b5a3e6bd0db9dc19"; + sha512 = "4466d36c03523e0680f591218e5788623b5cbbfe1ed25402cbeeab7e53a325cb2abbf66bb5c4596e588b54dd1e7da66b920e4909a11ea86832e891f5d72a6caa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/id/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/id/firefox-59.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "871188e46c62523b5fccc4400930c15b1616fb02eb9becffa305f5964644ad749792b95d59df3324ccea38393ab3695d93135cc93ab720a29bb4fd1ede9d5459"; + sha512 = "f18bf165dff3ba124966a641b469a3d059848e49c5e3dad03ea1c9d1d2403279f9e63d3657f83ff28cb1493ee7d5f3e0fab9ecd0a66cadf23db8fd4e003c0d2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/is/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/is/firefox-59.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9006ecb02cbdacaa5fb156b774ede6991be42c09fb32039f41497d83ec4337fac4ceff1a9597f14b50c5385919462c11d117486fe4eb5a706910f0ab12b8e95d"; + sha512 = "1b2d2f2116752ce0e0e572e5bab2e60ef60ece8d62e68bb339d65b9ffa4dd79e69525183e1a584a878f6424248255c305ee2b49c946de834517f38c535ec06e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/it/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/it/firefox-59.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d2f1525225cbc4201b25776821b45362cf3de58ba66b8ffe70ee9c1f2d06b87fd80269fe775ab50e64f02bd6aa95d88085d17e003f59de578868c0b3f34548b3"; + sha512 = "a14fa6699b7f896c94ed48be0b8778485938447a6e0768199c4d679ea2413991e8a36f2512c2752918375169d70a3ca60d1c47ee820bf80f152048ac15efd199"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ja/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ja/firefox-59.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e6a2c7993933101ae2ed4f6222ffeb5750bf012b593c80cb96de99bb2911c7736e42b3e67c085591b89f0fe635119204aabc43148f24a16c7a24e1d2fc83fc84"; + sha512 = "aba0140076f89722e80b4132c39023e37e14f01f616fb4e842597855bda221a84ec005ac96e6eee7186303bc693782517621df82520cf678bd680715f1ef4197"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ka/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ka/firefox-59.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "cc6350ac1b36ecbf71b82fb2cb12745fc11e3ffda92ce32be6568e0175e0e563073502381837b1bc48176033637e8ecaacbfe380badeb9beb45d03707fb1a3d7"; + sha512 = "014d45c95b3b7c718d969b8b3ab5c48e6faf932b9515faa06bd9d61c98d6e1b2e6ea5747c6ad3b0b715da9b5394a3930cb975e508d28ee2bd2bf7709190329a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/kab/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/kab/firefox-59.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "529130c7ef17259485887db4e63efd99dd99bf1863ebddb4f23d046cf5f7d44554ff35905665d5426a7961403402095e0e50208fbb3f51200820621907cadfc7"; + sha512 = "6bca11465d3733408850b66c5383b4bde5889dda7b0fc586c0769a771831f5f58f4bb3ffe4d1506ec1cebb99f181361af8faf6101b1952fd5d4bb4dc753911f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/kk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/kk/firefox-59.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "19789148defa05a2707c30d53356d918b0a1629ac5dea1e04d78680f2cfaa307a147484b0ca8c6a72147768184a0097e288e3261c4322960c85c05f5495f8eca"; + sha512 = "cf540be688a915102f95dfc7cc472431d15f724ceb2502e89f78c53340aced1501ac5f9590ae81bc84d0f8b0889b9c0988932c211f31b83b7a3cef0ecc10b638"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/km/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/km/firefox-59.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "65bd3e500d3f0c1a0f728fdea563563ac1729f101945fba6cb453a2d0d40d6a7291244a6dff81d708db230fbe478dbaf8c9cc410f075f7d71bf316703206c66a"; + sha512 = "47e8cbe0548b2c957eac22fc10dff5bbc58a33b6ae28c9f453071e97213c3ac97708bf3e62080cb1b0eb12478a3e0581e48e363175a5ed51512b379d888d9b2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/kn/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/kn/firefox-59.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "fbefba8c9313a15f0003b646df86a44924589bc168df68f128bc7773a97cf14c0bf5fe36f953b32dd2d154ce899db7d0a28ceb6d97114d89143f0e872bf314ec"; + sha512 = "72bbcfefba3197b489f32f656c8d8f1d9e86112482ab178606d9291687367549b86bce4c9f332105c55e6556844df5a614247f3f20e15c7367c58b0ee9e4f0d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ko/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ko/firefox-59.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "91e62f8789efb1d147b923800a2f4aed54bda2882089d3d9eb8fcc309ee0ecf82efb017ff4de577ee7b3db24c600650428858d7f2ba89c52d6758e010f657b24"; + sha512 = "13022a8bbb4458c371d3b640ddae98a2ad41722c05dfac063beff06a354e062e38fdb962ba5dd0ff2ec5386fa3ee2fb9329dac0143bb9b14387c9cf786309e1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/lij/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/lij/firefox-59.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a5f25adfc9b5b8708d8188ba2fc7ebaf001b8daa1ba3478f1fa757c3c4bb7079581a86d32c2a99af58f46579e347327ab5b0f40b5d716f88004577b317ff80a9"; + sha512 = "882b40fcba581b03d36dd3021c5bfbf375fcd2b38676eb592cc9b0777bc5223a2f931e235f333dcbcad2380342c1dfe26a9bb043f7ef5d88f7e92fab3edf5e12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/lt/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/lt/firefox-59.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "29f4a6dd33a6f3667ede1448e7375124037767417cba73cf35c0d35e546e26b0d31eab1640a897eece8e752bdf8fea931023fef8c0f25263dfc7893712aaac6e"; + sha512 = "c7a3859f644705c5a269bc3c7634aef5551c8cc9730e7666eafd67a8e39bf6ef1943e043649d73f42df3f987e98a71168df5f7303ed25998e6edb471d2a70754"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/lv/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/lv/firefox-59.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "740ef5034f0609c1060a2ed154318d33e017bc6247e3195b61420e50db7994bd247e1ae3c7367c96b0b325d7bf11d90c2f3e66d199a1d8914f068a33e1b6c2cc"; + sha512 = "f2d3341b4d32b62a2c67ce922bcff689ce08bfd7ccc22306299b4a297dde8a3158cc0c225a4470d2c60762c4acc1b06f4df96c2f2bb9b053d5bdcc1a4c0577f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/mai/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/mai/firefox-59.0b7.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "7a0504265fdc7b8e9dd8e02bb7dbb51bc6a8baf7d1b4263f8d174da277f87c9579451ce4e50ab5aee21969de1aadbe4c1bd6e1262ab925091d516ede981fdfa6"; + sha512 = "44347bfed38573998da52f2afa1c92e24cc86a3f78b64947fae4487047baa7db72adb89fa361d2a6bab5c303500b8fe89167e4aa818d23c21c42c81fbdabc15b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/mk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/mk/firefox-59.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "1f08eb3edfcdd0b0b2aa40e3e9ac59256d8b0e7c10043a8847e5880369717ac61abd289356edcf5388a2fb3e41543561ebe85c9767fe4dda860e00c113220994"; + sha512 = "d3022203142754e592e3593ee4602156552f9c9c629ca9e2b781ebbb3fde4ffe8360f9e959333869d7535771429b04c96ccd3e06fe9235fcdff1b6d440ff37b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ml/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ml/firefox-59.0b7.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "507498b1f30bceb26e9cf65dab1e06f64178353587e32257ee7cd57395eb8c62034f272dffd35ff46d87844b74c73ac3b9a0ce39bb0866ea5b9b9a923e839be5"; + sha512 = "eb1cad98f1f6bf5d74a9fc65c631547687dfc97f64f950191727c55301882e48a1aca92d9566cab619ea2b1c69f3670d4d7ed82eb0a07578b6d949d109cfa34a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/mr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/mr/firefox-59.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "5093a2a5b7cfe9b2c5b8dc93522aee7d14d60c07e6a80a032cf69cee775d4dfa537a119f931741b7ea86e94aec18bc868f894c017cde4e2cd7ec1397b8395adc"; + sha512 = "2246d555fe20dae8dd4b33981aa248b17a4454b789b831c95922cef04cf82c9daec99deb2ca01adcd36845ac178128255a8e5e1272d0541f70b69a40ed149679"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ms/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ms/firefox-59.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "12b1fdd4bce5aaf8f488777556c958bb07cc00ed0370651f198f87b495b2b036e9ae337031c7230a083ab4d067e4c325ce3529f2ee751f4c05e6738ccfe4c8ed"; + sha512 = "4190a6c6cd1895eb7f325eb89076e04278fb3d1334dc4e7543826a7fc42bd15b681538366ef2f73ea864f3a3a3f2758393f40b3d60241f9ee82aefc36d1323c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/my/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/my/firefox-59.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "684eca0739d3f186edfc0b3bab57fb4b4fa8696619fcefee2f46b453227c543f3b5775615b6983be134410030bde01850e339ee54026bbe898202ba42c91bdaf"; + sha512 = "295907b17943be4d537af7bf7a1838ab0c870cd8a1890a00d968a2630961716ad8f0b740041cc48529fc55c01856c5dad79b434a16cd5d9d672cdefd6af8c3d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/nb-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/nb-NO/firefox-59.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5173a44c41092d29fff5468d3133a2791977f079f82e1a82ef424cbdeae7198e7e7382cf16715c5a67916a06ac865ff8a2bb1707fceebb0b4d60e2232e34c351"; + sha512 = "fa4b2606e7c4a224d26c561c93a3ab4ecd7efd4fd628e485b23724f16f20483bef5098080bc4fcbd23563f097813396c885d5d19a6743cdde9d6e0153323d02e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ne-NP/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ne-NP/firefox-59.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "73d5c22d8af86f93dedc037978fc3096f0ac453eeb7cdc16d108c24f3a889df7c600da9c1a998af19d2023d9f33f3b93bc1dfe7fd10a1737bc8252c162240182"; + sha512 = "1c1d5f0a70d960860f5d95cf35b14b6042cacf46510ca8c18d21f9d0c8c3b4bfdb49cb36ee24f631d8f98939b50754e7f94a7b809f1ea373800d4728c0f8e3d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/nl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/nl/firefox-59.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c77b8b70acfab1aa5f96e3ff1919b04a05d961cde124925722213cbb51c3defecbabc73a937d3ac703dd7367f6d2133534419aa846bc50b6a0785b76283541a2"; + sha512 = "89aa1bdb8adfd631a22c7214278f8aa16ef8aef2771c1eb2775b8e4c9cf82d646e0c3d945b786b31d865b8ecb161e4d9b7e23544e37527727cfe1fe3ba5fa210"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/nn-NO/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/nn-NO/firefox-59.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "79d725afdefe19ce53b44d658867febdb6127564b85fdb048690fa917caf87ddd4cd43a2fc4fdb40276831a176ae07c47765746b3c50589c5e4b9032493ca55e"; + sha512 = "804393edbaf62246ce34ba2de0e136d191ea5f95297cf12b95963304bc3dfca88dbeca33db077ea12f3318080ca467d6217ae16b9613e7a9740d1b159d7b68a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/or/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/or/firefox-59.0b7.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3af4761495ccd1457b1ae9864bbe1fd4903e6c38e3df9ea9571074998968365deb5ac3b738e5cee24aed2c42a36c8fef3f959f370b2fa42295179110be85a165"; + sha512 = "482af2011d97de19d35a8cd33b9df157b985a5fc99c1aff125d557f1b5584b46fc61554c151a80303d5c298aaaec1c816ef543398ebe88058880a36414bc70ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pa-IN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/pa-IN/firefox-59.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "1aafdc04b1c4ca43dbd9e89f09afb48ccd0e799f669d6cb2526a9ef5858bdd548a40b53da695ba1246b18d86ac1c3c5a4b8989ff2c840d465e19f6505229c70d"; + sha512 = "0a678d0e6069f8d7cc16f81021c9316734fd07a06a12f1aae3b5e547eb7b42a19cb9979e1227ee9a88335d5808d61197e067ed829ce808a35a50262b341eba26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/pl/firefox-59.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "16d3cc9cfd18d19bfdb4451b489f921e8c4904d2c47362f9e66e689daba6635204a692a227b8fbc397555671fa40e1195d5c48a1630695e7de5bf0810c00d0f8"; + sha512 = "2a1ed4dded1746489ec68c9782aa245670feca15b885d5b9d6290e7bdb8efb2c94d441c6fd3c29f0055846d6d826b9c6d174711123eb92247e5960b26fca0a05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pt-BR/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/pt-BR/firefox-59.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3fcfa87d8bcec7e6b0c09883a81bee06e56cb5728be74c9e82dfd8db89cf7e18e06e3c8d037a86be63bec3b517425460c2446ed1ee50a98f28cea2699e9b93ba"; + sha512 = "06ff1bd1049edbb0ea6745b07d4441e9053cdeaf034a259fde467b88dd3832ae2cb08ad7852ded6e0afc10f26ad66d15737a820ba7a94fd9281d9fdc6f6da983"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/pt-PT/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/pt-PT/firefox-59.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4dc9f130aeb8fcdd4861ef4e737c0ba1ab58eb58298c44227c5e7c8d0ff51e307c20bf066f88950bac28a75171251cd3366fd144da4bf11c8e2d12a1cfd9c355"; + sha512 = "762788c89c655d20e04d2f4d9231dbd38f8d33237a5e9a2120557bfb1a3fc12c309314d096a395c2d97873cea46ba46f08aa021b6eb57b6e08271103dc010e54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/rm/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/rm/firefox-59.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "fb805da4320ea91c219122e184542a32011e3eb08bab42be173308b0fb3098d2fa0d8adbf4b874ee05f336f1894a24c7ebb9a23ab4b6c50de8b9766964b4b9b8"; + sha512 = "a81941bc85f5841b0c3bdd3e08a8e03e18b2964b01fd70c6986b42f6ffb144631d55c7b520fc0c4bdf8b4cf7a3d0c7a02e4b689e5e94f21d39ee30fdcd3d0bc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ro/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ro/firefox-59.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5d21af81884cd02cfe18f42bfa1c19b4772274885215aa12902b86dde4f4daa1e1c6f565bfdff64cd8d60014641e5abcc6b7fb9caede2c2c77f01044c44fb504"; + sha512 = "e17b8dc24a656244a648030cdcaa491ae641c88dd88c05a9d3a110c7aa7aced5f1654f948409dd7b0364172b6eeb57f53ca904d28611064ad5a6198b7bfafa53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ru/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ru/firefox-59.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "f8e2469d3e5e0702b82bfa9528ca3811a3223c5a753d2952c8a61ef36b1997d1fb4f19ab829ce41485a75fc6fd5f1665409324706b7b1678e7191423dc2966b8"; + sha512 = "24ef18457f75befbeb727bcf53a2205e62098f35d4ec40cda2ddcb08dddc711fc96fcfca388e4a006639ffdf646392a27b3f9424327aba05cfbc94a030470fdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/si/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/si/firefox-59.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d33d4ad60d2aa0e6aa0751407348c22f4975ee05ae788809acc2cbb7d23f19324138509dbd77a7fc7d4798de265f0fa4117bf4eb896204cae3695cc8c3762213"; + sha512 = "ff77087c39f3e7a81c5a359a911403a2ebe58e2425e6fc991788bedd3500e374e357c4199a55a22c9cc77f8369c3c2421990f1ddbe03921d9ba0a76337fff2f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sk/firefox-59.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "859e5be2c7c383b02a296573e0c4f597de5c7f456febe63cef5a433a3ae7174264032d751ba39b353a4783658ba8bf382453631252579ae0259dc0d95c777b2a"; + sha512 = "75b2f58ac881842689f3ab6e3be33f2ca5b836b5a1ced1584192218fa178785056c699d0c0ba54c0f2f4069aa2b4e4f6b6729c78e55402950453754734e86b6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sl/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sl/firefox-59.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "22aa6cacf170b34e12e84f23de8a91f86c64a5e257affb47ad48dbb150c07fb704c06b87f147b272ea0ba706d2355f1237b7e8df882b0f31eb0f8af4a40d1f04"; + sha512 = "9f5b6cc50e5122a5963586e2cfc93461436c57e07483985d835667120809362a06b329ca510d2d6a29bef409216e6b528795579fb0424455712ae4b02c88b428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/son/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/son/firefox-59.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "d5a1f99c78eca9edb4ce9f5d3c8cc052e013c11088f4b1de42f4af60ecf8e6ecd590318d3cb735c4042eaf4456a8218d8ba479b8164515067a917d9afd7e07e5"; + sha512 = "d76d1cd488def76b853dcfb4993a4336902d3f47b9943a103e5e1443f85f765b87754b9f104e485f07a1740fb9cb981eae650f2b88e82d8ef27fda2dde1a9009"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sq/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sq/firefox-59.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ce2162089d87c0ed484670f15c8692b9f748bc9c8b5eacd1883c1930a9d1635ccd3228ab6402957563708fd31d13d509c0037a502b51628dc381a6afa787ab97"; + sha512 = "17a218368fed020f009286c28618cd7e295666e5f448bfd970f2704a6aa070853f04110cf22c9b47793c6d24051dba2238b7b3e12da599da171d19ecf198363f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sr/firefox-59.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "36a552b06f5f0e6ed2f60f40f63673706b84da9d2a6fdece3066da5497a0fb93e48d3997ead07c981cce37d59f2a3857350e3de2ef013afd8613368afe9e687d"; + sha512 = "791ca9a22256faa907e9d802828205fe92b6eb61eaea35c0ada8e3ea2b8528cfca7768507cb345229989574ea9ec9605b8ddea359a8e7225cc8cd292c2bed648"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/sv-SE/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sv-SE/firefox-59.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "f75061addb23de8c846dd4a406392c05d955b161031dbc350bfa9258e0441b53d17400059c8eceff7afd646620923d50a74a46c30bac9a6dcbaaa4b438c65ed7"; + sha512 = "63bad970b1fa75d8e994dd7d01bbf67bb31dde8f349bb1655138b74f2c1ae4e190e77c7d4035caebe5d5d32202574273cd53c44d9ca983478b9c085a839a196b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ta/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ta/firefox-59.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0a9a047a8985d8bf9c215d08b19be055772f7ca862141f01df78eb8cee4e9d21f39b6640c2031dab9b74c97417c13e69499bb38f3a6dcf5d57aa74b0163e82d6"; + sha512 = "e715e5b5d2e5e0dbdbbcdde1f2576dc712e578d4563e0b27bd9be84d74e6b5fc50e619ed09a86f9bcc00a5d7f4b2c7aa5bb710133d3e3d8f83d6282e7dfc236d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/te/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/te/firefox-59.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8a74ab67a8473140a7d54f6eeed871aef3dafe98cea1f983c8dc6f0193b2ab87c6188c276299ad8c9703d35afe6d99c2da3314d764ddfb24b19ea792adf06d92"; + sha512 = "87b3bfdde89fdca538e57ec4330147cbd2fe473bb8e7a54de09f06cd8e43155b402658bea32ea90f381e0e2b5aa28d6d6fc5ff142a26a51ee4e258e160fd4e37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/th/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/th/firefox-59.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0c0250960e85cb1521dccb9cc1dcab81a69b8979822acb425fcbfb6b891ed10eab377180fd2bb992da9612803f90e5238e009be9bd8704782e315f4778e3224a"; + sha512 = "706f09593039df8f708674b1afcfc84c26d0b26278840cbd833332521f87dd3f2f751162c6a2963322cd617f76172802779d19f62c58050e0d0d3577f9adff8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/tr/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/tr/firefox-59.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a09aa8abf7cd3da53b079ecb31925c0b9d29defcc79a59fa7d0d0cee7f9e2e797ad396afea73aa567a63c5a282682afb60494d96751e387fec01a271d43c02e6"; + sha512 = "ce38e7ecfa85e602f1fa5db264075022795f87110c9fea80a6f4427b6368c8d76d1bda277b461d594ada3116265f80e5fe3831f96bdc8ffad4375c004659f4be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/uk/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/uk/firefox-59.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3ef5452b3ebeb18585780b315851a0bc666e3fd6f70ed0d12f7b2a3c1db8c4ce98c15b73491d89f600f9066d1a2cf110bc3f974efe7f8cbc44db9d00f8783654"; + sha512 = "f548e694f6d835eab2364c2abb85434029f85094f9726c1c1b64d7ba4d0cebe6fe94d275bb24c6b4135de86c3fcf27287aa14ebcbe43aa62a417804d02503859"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/ur/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ur/firefox-59.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "571235d2376472bcf4bce379fa066d6d671d21f3edf87088552be4daeae5dbd8f5674878f5bf5c8f47bbfe3bb6d0e08d53e0d683c69e655a94bf39eae10df4c2"; + sha512 = "0aed7a74c061e5468dcd8cc86c31dcbfd854638a886ef9a0d1648f786bf5d16c3243ff955fffeea93c1212d9a09ad38543ac22f4ad45f3caa9c02c8ceea43778"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/uz/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/uz/firefox-59.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "e3e3490431e88e7ad326526f1415feeeeb1f6db788d3fd1c5788a90aea015121c62ae6aa2697e490dd39bc1c67442ecd1bae9a6cdec8162bd389b72b0cf35f75"; + sha512 = "4c09aa4b69c66aed0a6167cd97c9d760c19837f060caaf72abebe9939c64482f91ad2bc00c5307e28801bc020bfb5ec6ee5d253d39240e6877f973e615446bc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/vi/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/vi/firefox-59.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d507fdbfdfde7eea5139ede5528d343bc4e993268d92f710c6bce409eb1c983ed83e2b97630b982fa525eceb020a34e7b4f63f3764fea11d3b0e8f95ce25e04f"; + sha512 = "2aa55feb7e466bd9c780e128566a4908c5865b5b80323d40cc8e112f28f9b2ded1edf1010c558b8be149dfe5f293da20ff0da6ea17e965958b235a3070ef9370"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/xh/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/xh/firefox-59.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "1eec3a1e2a4d64c4f28e1145f1ea76b477bcd12e394c1bb6f9e776ef3d8fa288d7daf377945b84189f6d6def6725d4b176db54bb4132ddbb63ad20ba8227aab5"; + sha512 = "cd2bf30b10f4542bf70976094efa99d4599d8ac0ab1de6f660b0dd16bf37279adf20e568ede25f4243f43bd51320ab2fbf43cb7ae9a6b5dac60c53440f97f500"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/zh-CN/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/zh-CN/firefox-59.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7e9ca87faad561adacc86fc89fde2d16d4e68f07e88bea28bca692244045664c888c6d8ebfd8aa4d29e9c2b368dc7d5706d3f622ec720f9e5e5ef9529722f3b1"; + sha512 = "c9f2c1c9c68361760d05c1f38440c664f62fe252462cde7e2271b5c014c21dea3801593552c7b0d15ca82c2799682e58148539a9cab6a1f7ffeda9b2119e8f41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b6/linux-i686/zh-TW/firefox-59.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/zh-TW/firefox-59.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e9a95b406bf91651c8efb22ea569a5e2bf056a18ae7fb9a2bd472416b1e26100b3fb1fa9132cf1b96c228b585c30e3f158ffae1ef8dd272408afffa4283a18d1"; + sha512 = "dcb31eb413421336f26219e963e9da1b717d5ef0e6359d20af3b7e6c0c11ebfd345e771d9fd3830695fb6a96ad2a13bdaddd2929b60acfb9b15d988fed6d6d41"; } ]; } From dda6f491923fc02312e01bcb0265324cbf41833e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 7 Feb 2018 23:29:16 +0800 Subject: [PATCH 601/797] uriparser: 0.8.4 -> 0.8.5 --- pkgs/development/libraries/uriparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 6b5c48a6105..9b4e3a74afe 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uriparser-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2"; - sha256 = "08vvcmg4mcpi2gyrq043c9mfcy3mbrw6lhp86698hx392fjcsz6f"; + sha256 = "1p9c6lr39rjl4bbzi7wl2nsg72gcz8qhicxh9v043qyr0dfcvsjq"; }; From 07c7a81b247d642e5de9fc9847dbcf9eea320e4e Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Wed, 7 Feb 2018 16:31:46 +0100 Subject: [PATCH 602/797] electrum: 3.0.5 -> 3.0.6 --- pkgs/applications/misc/electrum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index caa050581bf..6835db35b60 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "06z0a5p1jg93jialphslip8d72q9yg3651qqaf494gs3h9kw1sv1"; + sha256 = "01dnqiazjl2avrmdiq68absjvcfv24446y759z2s9dwk8ywzjkrg"; }; propagatedBuildInputs = with python3Packages; [ From 7bd68dff1ef93044079cbcde560fab214befa643 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Wed, 7 Feb 2018 16:57:10 +0100 Subject: [PATCH 603/797] chromedriver: 2.33 -> 2.35 --- .../tools/selenium/chromedriver/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 61f5f93ebfa..554a5585f15 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -4,19 +4,14 @@ }: let allSpecs = { - "i686-linux" = { - system = "linux32"; - sha256 = "13fngjg2v0l3vhlmjnffy785ckgk2kbpm7307li75vinkcly91cj"; - }; - "x86_64-linux" = { system = "linux64"; - sha256 = "0x5vnmnw6mws6iw9s0kcm4crx9gfgy0vjjpk1v0wk7jpn6d0bl47"; + sha256 = "13iyz6579yw4fk9dr4nf2pdj55v1iflj8yf9a4zz7qw5996d5yk7"; }; "x86_64-darwin" = { system = "mac64"; - sha256 = "09y8ijj75q5a7snzchxinxfq2ad2sw0f30zi0p3hqf1n88y28jq6"; + sha256 = "11xa31bxhrq0p7kd3j76dihp73abdbmbwdng5454m1wir6yj25f1"; }; }; @@ -33,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.33"; + version = "2.35"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; From 8e70725077f750d8cc46611d6427dd0aa85a7e6e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 7 Feb 2018 15:27:05 +0100 Subject: [PATCH 604/797] vim_configurable: enable overrides Sometimes it's needed to override parts of `vim_configurable`, for instance when using ENSIME (http://ensime.github.io/), in this case you need a Python interpreter and the modules `sexpdata` and `websocket_client`. However overriding `vim_configurable` is quite hard as we run `vimUtils.makeCustomizable` over the default comming from `configurable.nix`. Therefore it's necessary to copy the code from `all-packages.nix` and alter the parts you need: https://nixos.org/nix-dev/2017-April/023364.html In order to simplify overriding `vim_configurable` I added an `override` and an `overrideAttrs` function to `vimutils.makeCustomizable` to ensure that the customization capabilities won't be lost after altering the derivation. Now it's possible to write expressions like this without evaluation failures: ``` with pkgs; let vimPy3 = vim_configurable.override { python = python3; }; in vimPy3.customize { ... } ``` --- pkgs/misc/vim-plugins/vim-utils.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 23749fd4ce6..e11419846ae 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -325,11 +325,14 @@ rec { # add a customize option to a vim derivation makeCustomizable = vim: vim // { - customize = {name, vimrcConfig}: vimWithRC { + customize = { name, vimrcConfig }: vimWithRC { vimExecutable = "${vim}/bin/vim"; inherit name; vimrcFile = vimrcFile vimrcConfig; }; + + override = f: makeCustomizable (vim.override f); + overrideAttrs = f: makeCustomizable (vim.overrideAttrs f); }; pluginnames2Nix = {name, namefiles} : vim_configurable.customize { From 1b6e95e1eb8d74d004c9a70e0e33e94d99a28263 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 7 Feb 2018 18:47:23 +0200 Subject: [PATCH 605/797] hdparm: 9.53 -> 9.54 --- pkgs/os-specific/linux/hdparm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 0f794c315e5..87cb17329e8 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.53"; + name = "hdparm-9.54"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1rb5086gp4l1h1fn2nk10ziqxjxigsd0c1zczahwc5k9vy8zawr6"; + sha256 = "0ghnhdj7wfw6acfyhdawpfa5n9kvkvzgi1fw6i7sghgbjx5nhyjd"; }; From 5704888065cd0915b542a4c4d6110be145cfc9d4 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Tue, 30 Jan 2018 15:08:57 -0600 Subject: [PATCH 606/797] mblaze: 0.3 -> 0.3.1 --- pkgs/applications/networking/mailreaders/mblaze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 6cfac41676c..dac9475665f 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.3"; + version = "0.3.1"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "1jrn81rvw6qanlfppc12dkvpbmidzrq1lx3rfhvcsna55k3gjyw9"; + sha256 = "1a4rqadq3dm6r11v7akng1qy88zpiq5qbqdryb8df3pxkv62nm1a"; }; makeFlags = "PREFIX=$(out)"; From 5e31eaea9da06f6293c78dd39dc807b38c3bc8a7 Mon Sep 17 00:00:00 2001 From: mingchuan Date: Thu, 8 Feb 2018 01:30:45 +0800 Subject: [PATCH 607/797] rstudio: 1.1.414 -> 1.1.423 Also fixes the version number displayed in GUI. --- pkgs/applications/editors/rstudio/default.nix | 55 +++++++------------ 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 6ff67728ea1..6b7881c490c 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -4,7 +4,10 @@ }: let - version = "1.1.414"; + verMajor = "1"; + verMinor = "1"; + verPatch = "423"; + version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "1.5"; gwtVer = "2.7.0"; in @@ -19,46 +22,30 @@ stdenv.mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "1rr2zkv53r8swhq5d745jpp0ivxpsizzh7srf34isqpkn5pgx3v8"; + sha256 = "02kpmzh0vr0gb5dhiwcm4gwjbc3biwz0km655mgzmx9j64cyd3nf"; }; # Hack RStudio to only use the input R. patches = [ ./r-location.patch ]; postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}"; - inherit ginVer; ginSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip"; sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm"; }; - inherit gwtVer; gwtSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip"; sha256 = "1cs78z9a1jg698j2n35wsy07cy4fxcia9gi00x0r0qc3fcdhcrda"; }; - hunspellDictionaries = builtins.attrValues hunspellDicts; + hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts); mathJaxSrc = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; }; - rmarkdownSrc = fetchFromGitHub { - owner = "rstudio"; - repo = "rmarkdown"; - rev = "v1.8"; - sha256 = "1blqxdr1vp2z5wd52nmf8hq36sdd4s2pyms441dqj50v35f8girb"; - }; - - rsconnectSrc = fetchFromGitHub { - owner = "rstudio"; - repo = "rsconnect"; - rev = "953c945779dd180c1bfe68f41c173c13ec3e222d"; - sha256 = "1yxwd9v4mvddh7m5rbljicmssw7glh1lhin7a9f01vxxa92vpj7z"; - }; - rstudiolibclang = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/libclang-3.5.zip; sha256 = "1sl5vb8misipwbbbykdymw172w9qrh8xv3p29g0bf3nzbnv6zc7c"; @@ -71,31 +58,31 @@ stdenv.mkDerivation rec { preConfigure = '' + export RSTUDIO_VERSION_MAJOR=${verMajor} + export RSTUDIO_VERSION_MINOR=${verMinor} + export RSTUDIO_VERSION_PATCH=${verPatch} + GWT_LIB_DIR=src/gwt/lib - mkdir -p $GWT_LIB_DIR/gin/$ginVer - unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer + mkdir -p $GWT_LIB_DIR/gin/${ginVer} + unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer} - unzip $gwtSrc + unzip ${gwtSrc} mkdir -p $GWT_LIB_DIR/gwt - mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer + mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer} mkdir dependencies/common/dictionaries - for dict in $hunspellDictionaries; do - for i in "$dict/share/hunspell/"* - do ln -sv $i dependencies/common/dictionaries/ - done + for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do + for i in "$dict/share/hunspell/"*; do + ln -sv $i dependencies/common/dictionaries/ + done done - unzip $mathJaxSrc -d dependencies/common/mathjax-26 - mkdir -p dependencies/common/rmarkdown - ln -s $rmarkdownSrc dependencies/common/rmarkdown/ - mkdir -p dependencies/common/rsconnect - ln -s $rsconnectSrc dependencies/common/rsconnect/ + unzip ${mathJaxSrc} -d dependencies/common/mathjax-26 mkdir -p dependencies/common/libclang/3.5 - unzip $rstudiolibclang -d dependencies/common/libclang/3.5 + unzip ${rstudiolibclang} -d dependencies/common/libclang/3.5 mkdir -p dependencies/common/libclang/builtin-headers - unzip $rstudiolibclangheaders -d dependencies/common/libclang/builtin-headers + unzip ${rstudiolibclangheaders} -d dependencies/common/libclang/builtin-headers mkdir -p dependencies/common/pandoc cp ${pandoc}/bin/pandoc dependencies/common/pandoc/ From 52f63106261d51170631d5d5045e00e64233a8c4 Mon Sep 17 00:00:00 2001 From: Adrien Devresse Date: Tue, 6 Feb 2018 14:28:00 +0100 Subject: [PATCH 608/797] lttng-ust: refactor liburcu appears in the public API of LTTNG: it should be a propagatedBuildInputs. --- pkgs/development/tools/misc/lttng-ust/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 827ddedaee3..bfdebec154a 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { sha256 = "1avx4p71g9m3zvynhhhysxnpkqyhhlv42xiv9502bvp3nwfkgnqs"; }; - buildInputs = [ liburcu python ]; + buildInputs = [ python ]; preConfigure = '' patchShebangs . ''; + + propagatedBuildInputs = [ liburcu ]; meta = with stdenv.lib; { description = "LTTng Userspace Tracer libraries"; From 93aa83deb4923a2362814d952495aeab3ec49288 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 7 Feb 2018 20:00:19 +0200 Subject: [PATCH 609/797] nixos/release-combined.nix: Make 32-bit iso_minimal a channel blocker In practice it already is since the channel update script barfs out if the job fails: https://github.com/NixOS/nixos-channel-scripts/blob/9f96e1e25d197de46d5dbe3c4f81b8d57b9c9821/mirror-nixos-branch.pl#L132 --- nixos/release-combined.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 3564e629825..d4f77ea445d 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -52,7 +52,8 @@ in rec { (all nixos.dummy) (all nixos.manual) - (all nixos.iso_minimal) + nixos.iso_minimal.x86_64-linux + nixos.iso_minimal.i686-linux nixos.iso_graphical.x86_64-linux nixos.ova.x86_64-linux From a6ed912c888504afd0b2d95176e06fbf8c1ce9e6 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 8 Feb 2018 03:12:53 +0900 Subject: [PATCH 610/797] firefox-bin: 58.0.1 -> 58.0.2 --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 2221100f21c..0fbe6d749c2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0.1"; + version = "58.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ach/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ach/firefox-58.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "7b32498fed47b1e0a58b399436c54ccb784a870ec0e8ab7f789218b17a168d0968666bb01abb456c4d0f6350a7769e05eaf2a3a6a5f3827a42725bf7704ac941"; + sha512 = "4f974e90d5db09a02c61a634f7309ba479f8699d1d61f4c21a7bb6ae5f520332292031ce0988605f8e727da5161de1b3a055da59d5f8bf220c1b369f9c453f17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/af/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/af/firefox-58.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "12ca5365ea453af0ad4cd4c296c05b3dd99e713e46aa618544573c1023a7e1b6596d91d90fd9bd5a6a332624d985637bb12ffab20548dc808c5dccc0909e3fae"; + sha512 = "d821bf5c1fa1bc38f64195d1bfbc7ce5205b50139710fde6e1db37c4a429a0df16ede8411a618d8e339f369dac699a38651c3aec9952d7c20fb84e1eaf1f59de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/an/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/an/firefox-58.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7da1af63fdfa939724aac8c9def9b179bd2fdb37f2034e9758f4578a682c22bcd0803fc2e67412d2339b722eb269cffa96863b819d6e390ac01009152b00c90e"; + sha512 = "7238e49735bab7983a478c217b128d7cc8b07e90fc5e2739eaf07e35be054a354c5c0006bae6fdb29ef71855c33ea531e84c1617832412315eb2e07ad7310d14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ar/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ar/firefox-58.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1e2d9ae0ce968803b6ea6fdf9841328a561c90576a5849e3ef1e89a6f5ea0aa70b2179ca0c04fd89b829ce21f45d3eecdca607a07d64e6c16a8aa06cda8333ec"; + sha512 = "f505930eed9262e595a8969dc86ed43c04f32ba62301b2fa8d1246ef956f3075d5633112e6129707ddb02d3047b93a5c9f5ce16f958a06ad928c59d64c8a1e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/as/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/as/firefox-58.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "c40af34a01fe616e0924993b267cbf498a21962f77139b5aecebd6e1b6d17464685c44f435a18be018a00761e40ff3473a205d55c111be954f379ff6540645c9"; + sha512 = "e1b876dee0ac09a391c53f066f5bf56fa6b0b4bcb389beb0844670a7f14ff422a230f58389f3c3d2a1f8b7486fe528a7abbe3b6abfb86c330ea13cab0cc67a7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ast/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ast/firefox-58.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "81898690a8c7bbeddc0c89a2e6c91082e37016d86815a79b2488adc36cbea3c0b669221fa9951e4fe4880f777c5c0be9e9728549d01c77e592c8b1afdb4a629d"; + sha512 = "1c47fae696cfcbdd4f7fbbc8ddeacbfa1ae1b9a624bec9f512527b99c7ddd63c99fd55b60ae9a3ea1104fb5b943c8c029b19b93e6426de793788c2a5354a0d57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/az/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/az/firefox-58.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "73ff9c0be45cd7d5f70abcb8e397e9adc777383b793a78c6907396724c78f9fea5794a8a138c9c19f2d0ab46a0133da69f6e5c98a15a8b120567c22bebefcd27"; + sha512 = "5c3bab4ba81967b957c14152f6461ccb129396562ece07a34644f88b67185f9d6639ce3bd709a463816efe531c6e8bf3aa6414828feb37ae54564d1c9ae237fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/be/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/be/firefox-58.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "19b581888cf07fe9cbabba66832fd62a803920f2a39b195bffd8316b3100edb4b0c628d0563e3d6ab76b097f8e038310079d5d1a2bc2722bb78ee5a51b4bfdcd"; + sha512 = "8c719a8fcaef9f2f3ae50d0ecd999972649b5814c1bab45a418c474b6090bbcb47d58a32012f3ccb6c785ca9a1c76cb2f69e370714e1533349806c3db0364dd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bg/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bg/firefox-58.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "bb440c3132a75a7fdb0c3886af57b0650609adf3992b086d9ded68be5525c6dea292de0ff51dbab42968348eb8ce8c918869fa40ab26126cfe775b69a40fc5dc"; + sha512 = "b871aa3dc5e4721174e73081e4c551f802a16cb54690ea1850e549c37c1160000b9eb0e312fe03e43d8e254cfc063d971625624a6d0d7a8de14f731d1e139135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bn-BD/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-BD/firefox-58.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "5d7f7a98bcd0f927d1911e4d1a7eb79640912b2944f7c335ba6c81eb6e8310edb26917b9944272205ab2e90aecc28bd9208ffcd4049aa0a491f3e5671f21be8f"; + sha512 = "53cfa7aa2bcdebb6770d1d993d71a0fd039eb540884d0dbe3d0fc953260a850bcdf72b20eb67d11630aafa9f282cab279776fa9d5cb45aeb7280dfd064b0199b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bn-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bn-IN/firefox-58.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "96ed7a7c7cef4f88591f6b1f2c4d683d1b39220c8ffdbee9db9b9b470cca1e1902b042b10e62555ec614cb2b0ba560972042c4e65f5b17a2b8bad78d3c456744"; + sha512 = "a47f5c6bb46f6f4a2af27a8dd1556339ba5efd1b2c23494b0913033580dc735097eeefd58a6c0253d74c8fab30fa628d106a0f4111b0b5af5f98b1dd2d9d111d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/br/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/br/firefox-58.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9537b2f8edc30d76649e7be50f1ef9576ebd8dbde45c6a0c685d846ad2ee8634b80060449f01ea60926040e1bc6b8d8c49346bcc69fc276c4c6d3142e9dd8d06"; + sha512 = "b4dade4de1e40f8ef6c1af9fa260f7e06bbae6790a87813032c35317fa462f15905fa8b66c8b08bae640186f1fe6d10c15c87d64085d6fd23e5dd7a33cb9326d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bs/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/bs/firefox-58.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b9cc1e8d570173f283a77b552ed99fd4546fb1f55a1a5e766d6f441e2589e615445c45317c39043d98ae8c4f77a75d80d0fef9bc20944690fa7c75ffd4bc5ed4"; + sha512 = "d32cd117524343cf451b30526466b84f84a7ab99f6e716ccff5c1c7e768003409723df93ee8839ca00d3e0a52cd9cba270f78033124809e4d18942bae9c736e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ca/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ca/firefox-58.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "dc263ccc27c14d7aaa9fb66a9b9398df48d3685b2e2c3493627f279d5509884293121316cc8ffe3aaeb200287d1e0438852dc9e4c02f2aa525c2f16f9a2b510e"; + sha512 = "c4063632526c6936e71e50a898077568cf678a8f9275258311bda91ca0a150b7c30b19b86cb12bbf786624675ed3f383ba21b52545b36f8ef7032ef9001136e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cak/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cak/firefox-58.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "69026c93cb0e48c3b8790978694642cd6e854203a2d78bba48ac922906cf938781bf1c1dc5316eb887c89b9933132253d378233c3669954a1182d1d7d4145e3b"; + sha512 = "cb1f2142d698226ff881e9b3a1037ddbea1bc3ffca8ae98a7526bc3a6b728a3e30957196d809d523a638d7482db3e60b774de8f7f274c76982962026cebc0b9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cs/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cs/firefox-58.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4dc64d4fa8424b85713a566b0cd7373e352624799055ee7bc0879ebb93008ca6aec9f39f0aa657809f7c7a70f8473e731279ef7b3ffa16ea5132d01c83e5aaed"; + sha512 = "8b17ed6a66081f445319a6e329710350f79751388e1cc6eb6f5945e0c0e6145053904ee2a1c1a562407299518eb8d97a52d86a0d4807f8711ee3ba6521f23820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cy/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/cy/firefox-58.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "85b7c7210429d5ac6120629a033347f1c13de5998b83276f3b735ace1f4a62cd0f201e2312e0be6d7f0607062688402f687e593b93e92439fbda14367efaad66"; + sha512 = "a679e779b6afda954fde1bfdf079eca62e4541bb5c0398e8fe797e3ab8341922c279d1eb5d4f237995d01d39261f9b6f814540532c646558b10cef178870d5bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/da/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/da/firefox-58.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d902f11e93a23dbc4a4e2340926134fadb2a251bb4b00de1d79bbccc9d21de35f99bc2d4469cee812b15d95dbeff6f4388649d27fea020a54b24a59ef3084634"; + sha512 = "81771c6a78ff9349ac8086dce32900544d0a8b79eca55a61bc1efde34788a77fd41607c43403bf1df18f2f6aee8b61460e113ee301c2888494a970600fb4a371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/de/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/de/firefox-58.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "558502bf31db14744aac18c3efb8e2b0189a118cdf080621910c9cf15a05b1bd28fe1b2f5e2acad678ccbe9769ceabe9dec0b7016f1570ae888f9c3fad7fd6b8"; + sha512 = "cef7eebf9dd55af3d7245161c6f41153b99cefdb73e71c5cfaab1d8f1037c8da7ee2f36836e51416c36f7a7472b113bab23fa6a35ce30269733889ecd4aa1d5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/dsb/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/dsb/firefox-58.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "89ad64c3a489a0ef30099581370fffd3743c1857d12fbff65f6387ecf1503e6e394ee91d744847b6db3611800fa195de2e4d1df4a2ec9424436348c36b6731c0"; + sha512 = "986c25e9f994ab766f4017f664304c03cc0a26c8ea50f892d48ff571322aeaa6b76eb1f4c7f1133a68783a9f55ce0e56a6cc599fb6eae0431e5bccec639504d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/el/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/el/firefox-58.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c7f77728e18d63745cc6385f7923e673483df76b6e8e2ba8f39cf635bb94d8243f9ac1728c4ddb5b94e316ebab026a52871e9fad86276dd885e48481a6dc1edb"; + sha512 = "8d352b56ef049e2bb94952ebaca276dbfa4d7ea34ad368907406b67391d618e8aa2f908c19f3c7210220237d3721021686bc8fa0702c748680035a48b9ff2c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-GB/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-GB/firefox-58.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f76ea7e2d15016ca779a5b2f1bcdeb3cf1607ba4b570142cebb60caba5728be65ef05179ee7c5a3029ae8e21e26ea759e7b754b3670a0b6debd0da4528720078"; + sha512 = "318a67d7d875a350e561a2a4e0f2d6278ce3a9f7e2db9ce307c58b5a2ffd40753edbfce01438c7b02421efa84129f95caf3887ca2929271ce5fe95f9321db11a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-US/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-US/firefox-58.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ad5b2b66a8579ad2f3a9ff97425af7e9c7ab4235cf44a5684ad481879ea953492f0639fc79121be9f808bedba80e3c0205e43433b99a1c8809544fbd1bb3808c"; + sha512 = "71f5d1d3779eab4025ab57aef1795f9d6c509a50c5397df6a8ec741584d441acb9f7cbf8c8c002cb367c9c42b72dd6d29710fcf0cfead3a4525f2ccf39f3b930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-ZA/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/en-ZA/firefox-58.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "aaca4fc5bb264e0f2c8a5d783b3e1e53786403d01c157d8ca3a87642a3668e839fb0d5e204e96371dc442f21bd66e589ed55b6a76d3f50271dc0345da8059eb5"; + sha512 = "07604a360c8a932fdc161b4c2762e953812eef7cca765db29bcf0514027a8db3c22bbd879de6a1222eadbfb817540ef55e136df0df858a21c55ab4150cb3d5a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/eo/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eo/firefox-58.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "f49f89c5c6fbfee70e47a6b632de5b92981a23b54e8e9d7b47ac83ef18bf45d98417c73cfbd06b277b67f94f138c37ebbdea4f1c756e4229d8842f49da6a34c1"; + sha512 = "cdcb32f4b5e14a11033f62ec7e4ba00fab689dde93978cec405d55a497fb6a59a9c06839e04b8cd550557d37f1801bc6f9a9440e4a59f3d4b32cd2a27ddbac9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-AR/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-AR/firefox-58.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d04e9a28755ec6de2021b20f72b32ad6aca151cbe8300a54ace876878d8df043923b6afb3b186e5ae3db6345216eeebe9f97978a4e50d9a0a854207e5503a3ce"; + sha512 = "aaf28d1b93d1eba50eafdc112f51fe261a0a38bb9e28ba4d86c12cb1f509d5fb375986e7a7e7a81483aa64bcf16f09620ff325674c29738ff62335d8ad1d1c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-CL/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-CL/firefox-58.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "0251f56864a79cb38ce5c5cb3908bd1691d2dc15b1198d901a6907f47f1a15385c931538b022d45f75ac3ed0eec7244a081b79c1292bee7a35beb24ccc307dc6"; + sha512 = "f30c318fa51c551fc03bf9f962cad8fce4795094d1389c1a35096e8e229fd1d78dae43cfb6c01f2600e7f5fd8efd02345f2c18578e3bc0378fedb947abf5904a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-ES/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-ES/firefox-58.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "93a405ef018010d5097ade9f08c228e31b50e76573b75cd2d04205d89f61363d0b8f24585f4e08b93eb8424367d90213dd32fc85ee2f7e28a1ef2742c1c31b3c"; + sha512 = "08fc4a475fdf2e91550de0b5127df679f4011cc79af6125fb117aec44f97936f794fc0135fd381abaae4370b7343c200308e0cc659828fa8f8e665f39c4109cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-MX/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/es-MX/firefox-58.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "4286767ce5866ea0b6f1b41804d92e54361e4defa8fa59b7721abeeba402b07ec3fef051005c083d65f6fb32dd37edd2253cf8ffcd28ea9109963500e4fa3332"; + sha512 = "baf9277fe32334b88be4bb6aa5b714e86d6d316866088173d0bfb221ab989708e3b67dfdd934c0df80ddbbcef8b2d78c35b33b1420332b094442b31aa62b6ca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/et/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/et/firefox-58.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "f9a11e6b738a09a9f1eb8834f4932535b828bb1c8dde449b14794ac03ba4a37089ecb45b015daa2dbdde2adc2531ded5d9eec83e70b1ded4eb642e4dbaf118fe"; + sha512 = "eed1be0068e6efba0130658c7fe5104ca0fd9c7485da0715113ac82665a153836e6d0eed083c91a89b4f8c11eec0fe2c0f8ef161f2bf7f565b6689f5978a454a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/eu/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/eu/firefox-58.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c6015ccc4598bb2f0d5bfd12a962d457a3868552853ae6b053c3e40c1668fdf140a2bb791ecb6c2fbe283371f8c1e8789fa315e5a6c05b9b593c413dfaba1351"; + sha512 = "d0bd609308813d99a79b393dc4fe0960da01ab032ada1d4c2933c89acdc7a1016ac25ca67205aa29106ca12b34fe7dee42316ed457a4e0cee9fc43e3acc2011e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fa/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fa/firefox-58.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "4bfa551b23e62ce7a92136afd09e233763abbf36b536340667ba487e3c491a269bbc5e508d196771edbd1745a294a14d3f51ad3d4d79adcda86394ca2e7e5ad8"; + sha512 = "cde046bc147e860c40f979f8fe1bb39cc3391939f2b04f572d6db5a61be8be9574c1ddde1a400d16c06c2c6dd87a9b19830f2591809439820a27349d10860801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ff/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ff/firefox-58.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "e24f247816b7a633c814275a1a858f0580e274285a3875e0509ca65027bf7f39d2f56709af6454187326a7b0a5b20408582b4f16993c3580c5bd67473726d902"; + sha512 = "047d9b2af90da36699cec77ba419db42cf6ac63fd3d9185150973fa6aaa20cb4bf23538e50154f03bb3edee4f16985baa4332e247ccf7d756f358f81afb2c329"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fi/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fi/firefox-58.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5ff4c6daa231072927b0af6482992859adbfad7645c5c75666c4de69930bb809541c756031b4309fe81b776a434af19badbb285f0f68ebfef4a25a117448e813"; + sha512 = "5c2955e5c1e54bc0b2bfa08051ec61745765b7d9c970c7ea905e41d4ccb22b32caa3011a64a152d997db1f0b6451b10116060914c601aaa7a240f23cecff166c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fr/firefox-58.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7ca09555e939136ab336b70343f889832f3dc585aac2f6b3853b628b5db5686f56b97a7c9abba22b5ed7ac0d2eb9bf93ab2fde8ba992d9b9f3d2790130817e43"; + sha512 = "e32448bc068d0c816c16ec1b4c53d462da430ca7ebca484dd363253e9d47277a0eb40ef0291b58e7dadd3457f49fd69d452c2e7728e45a1473472a2523c24028"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fy-NL/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/fy-NL/firefox-58.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a5d2b78ad7cd9e1677cddb3889d74598383585caad7914ee08333e96c7e66b4b81d5d2ac13432f694dfb3ed5f8515473839317b68f06f4b3708fd02994240da8"; + sha512 = "9501fc459c883b3d7c3299243288aa5210755d78238af2f6d79e15104ba575b4a7cffebc9c067dc23bbc0941bc5f4a786909a194bac9f1f59244715f8b3cea2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ga-IE/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ga-IE/firefox-58.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "e1b28c3f064c190bb723373326f1f023821a2192836d619f23dc6cbb424e10376d307a895bfb1db5062a85037f78c3877b684ea1014da205caa4bd284370803c"; + sha512 = "d7696ae4b38bfdcd93ffc6796bb2fdd6b952a5892a4a753b0a0717c0448ff59263516896dac2830aabc7b2df5719856f077450d29a48e25fec77bde00cb25d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gd/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gd/firefox-58.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "14b98f08cfdbb6ca0c18afef9fbe4d1f283ea2a2635069aa8426ef8075c2e63d4b348c591d556832b3ed8a68dae6e54d9e82dcb9e1dec1b26d6de3189ec6cb9f"; + sha512 = "ebe7526f32d43572538bde521b4df30aff91eb1a30148e20a164cfa044d7391bd7259486c72e68f9c110745e9013f36fa8c1f5be7519551c303cfdb06d4b6008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gl/firefox-58.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "61473be66b6109a156c6fdf73222167825990dc1b85614ca7ec20c10948ed5a3fe6752361255ed73f31c6f1013265aed5d59a5ae0e184d818edf388cf5a33fb0"; + sha512 = "a071ecc811b90c102dd5c7b4174d6cd65e7e07bed16566e71740cc3d29446757f220330910aa3a321809de3417a64641ee74b788bd27975c7ad75cc4e777116a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gn/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gn/firefox-58.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b1706bee4fbc84365a26f733ead82f95db6865c2d042fc40f97e9e1e2ecd9cdead2bbc8ee3acbf62cf288f5c907ca4b9be5eeba0ad92dd9c25355491c0849696"; + sha512 = "1bc8f57884cd4af64e1a99defaca501561d84a70aaa3f4ee71c3c1497a4829248e2f5fea5b09c89eaf8d3701fd4f9753bdb50f6133850d2baa1708e942d8281a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gu-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/gu-IN/firefox-58.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "7a04ad824559b04709431e21197aa9c93a6afae05893ed29922b039b4a4c24ed27e1b091d06e948cd83f1b7f25df0a67477e22b9ce288dfb9ad805b3f43f3cd4"; + sha512 = "230b2c609b5ff96385b93ece8ac197910fe332ca76300dada12a0687b025ee7781ded47bb1a13816bb2fbd6c7e250bd0af8f4b40dd78c1d75a77a66391d7bccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/he/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/he/firefox-58.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "3f00ef9afa945f41b8d84c45c314a76abb2bdd219ab228387c3ac1b548948d9ee6037f1df6cb5b0de294a7920e77c3a16d2c687727087e8c422b2f37ec3beaa4"; + sha512 = "f52add938bcf862c8d417709298eae9e502aa5845d01a349b9a8d29ab790ed342b7bbbe615fee6db7e939150a15a2e46895d162544ce4028806bd68c0c832186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hi-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hi-IN/firefox-58.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "068bbfdf10900f244349c65913772e3565510d73805cdb658ec346c4eab670c91e8c886ad085a469df74bbabbf5a1cce5a9b845c24a9b155f96e2b9749856f15"; + sha512 = "10406b782c3343fcb63420cf98690ac6eb1eaf9024eff226066587c356edf32006e288e8ce6373f6fc1475dd08c30da2b38cd284ccfd610c33c3726c91dc7691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hr/firefox-58.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b965b136811d174ee69ab3424fb15b24f39a59b3261eabe83d988cbc8dd639d4b0ec82285163a33cea1be52a3671e2763e7892eccf176cd286cebc8e9453fbb4"; + sha512 = "8fdfd613b9ee56a9da8f8c1ed1e9c9a6ece04bbffb1dc197120c9d3aeef2c36d9d660a44539f4c1820273be91dcc30d89652a9d9ecabe9bfa88b146fdaef18a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hsb/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hsb/firefox-58.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "4b3d92d245f9d93980325080b0394ce9877e0a6e4e2337cf941e5e72becc0125e984166ee30e81b45f95ba9a562b040a26f4cb05114beb5ab18dbbcf968a32eb"; + sha512 = "4e1cce7f55a3b66b21c0f8f16661855b2946a403d6f29e3725aa300fce49bc065dd7719b9203e79b3ead73dc92220a40d2f99d9079eecc8ae44a38b87086394d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hu/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hu/firefox-58.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "42b70cff446c60a2e8388fb16ef3d2829e46f420169b73b4849069ccc75812a10d4a74af7ab19ea78566731e51cd86aae0c047f66fa5c9eaafa169dd520900ab"; + sha512 = "b636ff6691834dbab712be03bd3dfa92f8a0bcf5e4807ef77e81d0a602acfd1f5df37e0c5a2237518305e4a9150fa592204f84e93ef83273f84a4ec34f65d3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hy-AM/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/hy-AM/firefox-58.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "84f001a101ea71e8675b4ed7c359a8fcf8b1dea72bb73ff08c6e5a2383abca2e98da32f9d5da31d86291a5ee7f156c04b033259b538656fa17a60b3f66dccfef"; + sha512 = "909f565a687d6676175105584b2042af8cea66a2da1a2d529954c1a3f5f98807f655a20b1b16d1d80a9af05c02997d543055bd2edcffaec4fb0df0da6e610ab7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/id/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/id/firefox-58.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5285ae283ea21e24b0ab04c767bfac4d4db9be66a2716934476ca03755634c333c0e96c367889760137e584b2a58c8cb6e9689996038149ee5b568c2e4eb499c"; + sha512 = "1338acae5fb5d477f51d09c8e49bf29ea4a7ac1a86d2b8bbfd431af2faa7a2db19fe5ae61650127c0f10a40b37a464bf7c67e4a4d2930bdb0dd04160013f5ead"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/is/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/is/firefox-58.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f1e8eab99c650cf0e4c0d836c5143033b7cb2a9f87f81ba5057c511dfe61ac08778db8762a683b38dbaf2fccbb70a38a0650fc01dfdf8d59ea12d7b31235ca39"; + sha512 = "6bf296d0e64ded43518b30f2b064cc99ddad031e8ff6129a6a9bda4736e93cfee1d2a9c0df96e86754762cc0ef38fa9cf7d79caf154c1db8c5ba57d88abfce0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/it/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/it/firefox-58.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "ac877c6b0783c90ce4c44f96144d28d416af43710fe8ad6ac6c56a4847c748c2411dd817b1809801e4d96dddd301466886f45030e74f7ac1f2afefd162e47dc2"; + sha512 = "c46ab44a51aa21b23b50763a6f35c5418a03a847584a1aad3560f62a828d2f859c912ead26d1a1206cfde73d411bad31bc87f19c5203850712bae911dc86fa44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ja/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ja/firefox-58.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8ee911c05a31230df94d7044de5dcc549b5fdb9779fe0acff0d0095fe45caa13fbbbaf6e8018389222281bfd9ae0a416754836105e1f153467abb1e1db6b8245"; + sha512 = "4765ad23e91c8599b6d1144533b7b24cac68b77a91c197e6e505a3be0bdb74f60bec2c49b7e7338ba994619d3969c00e5b9c7ba872da4958be37ab69b772d786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ka/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ka/firefox-58.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "3d5399531290e30c746657286d0a01c03009d08b777b0155ff4a7a5ccb4ed8036d7d6d79de8495e75753aa573c4ab14c1462fc73ca4a0cc93cb5a5095cdc5454"; + sha512 = "2a8aee12fead92872c5c94a319926aec87a95e891fa280588737b66814aa7378c5d7240a3c5f50145ff23c7673767037160d043b655b2a96ccdded6015254f4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kab/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kab/firefox-58.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "690cbbbaa4fe9947189623853ef4a1a4d0df2d73ff50118dab40ddbe57ca772d59d85988d8d30216bfba835b827cc33eb96567ff9f2916514497b76a8e4c1c93"; + sha512 = "6518ac1276db195c2435160e619dbc1ec7494e51b06971fe409f46ead4af6367567a99356f6b5e353c024a8b9e51d2c2f99983d50709fba2e12342b0084c39f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kk/firefox-58.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "75199857516c970b0ef13808b2a0a13a837643188c3030378bcb010dbfc8c970c4195af4507e32fe17f94b9e1f12b41ddf80f914ba24b1431e6cd0975a334420"; + sha512 = "2d515605c00f1cf2e76b26dfba3d4fbca00da18bddc5ed39f66d15568b15a2bbee0f1676d2b1b5058e11399ecb3e7cc593ff040757fce76d82ca859ca7b9ce81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/km/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/km/firefox-58.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3733a9367ebe2a2082e2d7d1a5e09c13a1a587b13e7cb0bff3b4fa1d9c4fec5077e3b9c5156affae4c90ac035a94acaa3ca5666d6dd59ac6d2dfc6a4e9141f28"; + sha512 = "6bcba0015fd5753f7ab6725197fc164723d64de0790927115a0c06d0d1d92fd39bd41d83ffe59a5e9eaec48224c24e39f26cab3ac1bef6265eff8ad9a70c46c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kn/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/kn/firefox-58.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "767521f281d9a369569c639cf14618f79fcda275cd2f11a6950e91d0d88843a70dfe6845bc9dabce4229597b92e8562a15af2caaaa511e578601cade1a5dd057"; + sha512 = "5fbbffed20a48328d2b199626a9810dfa6bf9cc84f358d429e7986d813c1ffa37fc95eb20a37b10bbf728e4bddd3ce8635c096b7fc4a4dabe462a32606a6dd96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ko/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ko/firefox-58.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "113a28ea22d0a2e79f66680471f8d5974abbca440197590cfee0a934f40403d704ed35bca5be9a4164b740e0eba8292f6e0096707a288735d34a2b77604b8d85"; + sha512 = "2e7f5b385fb65b167ef1784288a68fdde29a3345ade9eb873a6e07a340c5bf76df5769c7771fbf9049eb31bfc5978e20c143a2e753614237b25a065e0735313d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lij/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lij/firefox-58.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "36f284f3605e55ceef29eb4e88205524df8ef1e92f7d1851427c4a4fbf6859721d6918dd4184315743b7a8108a1b85aa40d90189d46f3763c3fdf6d5b73e0279"; + sha512 = "fe436e3ab07f3b139460ff385e73147572a1becbda1ccacc0da6a6cf1c49ab3e1424e9b9d8e26a14a2748e5ac9b0c67fc8970f14f5d64975ace3c6e9949f702a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lt/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lt/firefox-58.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "d56da7e01024210a5ec486c410da70c63728a890c319e4496f6cc33efae41c554aad552c081f3b4777f1fefeec7b6b6d331000608ae4c7b128bcfc726d6be5fc"; + sha512 = "b6e3d248f7a76c4a202c767710151067031e34a08ebcc460f4d6bd95fb395533414d6267daa1d9d8172097aa4ae0155ae693e027757c93b1cba50ad9a94f3cc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lv/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/lv/firefox-58.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "d5a0f538a1a5860229e1a07d89cd0a7ba6b78ec049d71978bc0791bdb1e3861b8459962e8bdadee996d2abada552abad4f81002e7b042dbe136feee3367fe3e8"; + sha512 = "7bd3844aedf8112d396f07e1d57ec915e48bec1c375c8489057d7a3f2aa5f93c738d2d361848b977243b95b79a821848c2b27b3117a26fce9054d26e4621522e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mai/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mai/firefox-58.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "2c96217b38ec9fc78d025ea79a934e10d1d1553e39480d1dbbd878ef774aacec5ecbd63baaae1c834c44acae417605aaad5e748ca74f5814af83f862812d1d8c"; + sha512 = "d5e6a53c7744ab267404d9107665e6f55acf584c11123d0e9b4a82f6572ef815fb87f52ce9e0be9352ed7c4af901819fa186ed57e4a313349ddee680727b0343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mk/firefox-58.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "64fd2f8f140dab2786063218f1b6074d8c8f9c5dd506a737676afb9a68edf06d9800e3c9bad3dfad8fceb82c321531ca6fff6a97856c952dced721f0d0915913"; + sha512 = "7c49cc95a233c4662265e3fe57e87f4320ed120309599f0f78655a9e70b87ae36dad915afad2445cbf55c84e906c3fd2df4b7f84db59323f4629f662f6f2af31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ml/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ml/firefox-58.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "59036ccacdeff45c27a1b737913e54c0e06ddb12a670c1549ba26da4b1d99fd2338a133e1b15b1fbb673df2471b5cd5d5d4061ce56c631e37c429351da2cbceb"; + sha512 = "d1aed7e78433d3b427c215ed0b2c8455a8a0374bd4e2d88d7dca59c2a3d0402ce1670f1dc1c8675cf7953416fd4be584df59ab646783240f3aef14cb9474c91c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/mr/firefox-58.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "2fbac808598aa7ce028f2d922fa55b49174507b5ff6e66e1951c3f579cdd051ae4bcd28edfaabd2319dd7286b08d35a0fe33ac2f63c628d217b8f43b89dc23d0"; + sha512 = "3244354a154372149da8b0564645ac5b827176c6eb79a88a2a182d2ae7a5e320fc1f843c1576eee86dec62d2866f6648403bc9c687322eade1f943717b655771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ms/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ms/firefox-58.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "52f6857cdb97b86cd25b0926d509405a1548dfe310fe088c3b27ca77e87fab585faf4893e8562d55fd2ecff43eff5535ede306abcb57bc2ee31a4890530a27af"; + sha512 = "3f753476dcd5f128d7a660dfb9e1003f706ba2b2a135df629bdd68c8580e9bd47f23b5fe3ef77136c8e6611f434bc502f96eef4b7f7d6185ce7630bfd1f32e24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/my/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/my/firefox-58.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1e89a3a595ff4b6a1f1044788e34266af60bd6b6e0cf94c64af5e50ad074e7a2d405ead7210e1b55622aeeca3255f966f7f500e38e639fc2677502385e4ababb"; + sha512 = "b83f6807c08c08e7245bc1c5309e2bb2d3d434a577f672a9ea9e95017b61993acbd0df9c339a4fff4c5e65c589d939c57477ba206194e7d09ff140a8882d2e52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nb-NO/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nb-NO/firefox-58.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "b14c55689f787e4a6d4edb504e701d63b36512ae49008249f1fa34cc7961d58ad0b0c7f1aa76933afbcdb76b8830bbc7620580347502acc0712b500dcfa34f70"; + sha512 = "e59931df86dff00b3ee55f93b01e4828a60de0f693de412c4825dfe7957c0bda8b9644040657036d5228fd7b6f4e3a93273d561f14fc5e9d3d81cc5c708f0f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ne-NP/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ne-NP/firefox-58.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "20426cd45c9c2c5517587eb2c6d04426eb6c2d8f7370d690549dcf44ae2d9bfa823ed359655a75be83916cab2505759f1212abb4d5672a2b70d81ec573d1e5e3"; + sha512 = "4dc88c6895264f50639e17eddd5df76de7689208d6094b0d4a51586fa45b359a0ebddc2d58cffbb952cda0a3c199ca287dac278f2a9cd517b923c60398fea449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nl/firefox-58.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a98a214fd2c4cdffc5a85fcc074b8516d90c5d79e23c80f0ad464931b8288395d953ac46e575f66bcf0b0e5cf862fbe16f07060be73d9c7fd28930983ceea72c"; + sha512 = "30f623d07fba2688b8f4c4958817ca208bb8981d1c5a64a232568c301aa8b95dec9406bc064b5c629c357381b5c41bcaed9d652d7e25b3a4f537717d79302361"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nn-NO/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/nn-NO/firefox-58.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ab5ba866afc67caa89f6794bd93981067ff12684cc307f6fca9f8cb4eb352f96282fd745ef20ff5b2d9911c75f99f78784753d4755623ed3496488a98797db70"; + sha512 = "ddb85b71a86ad20a363edbdc9e0e79f6c485b4da02cb803142a717d297e58c10a4ada476a57dee01d5834246a53051b9e65b95eafae081b5b43648b2ac914acd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/or/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/or/firefox-58.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "6c32d13fc0ff2cf68e784d4e4a58e6befca6bbf1aa77a6dea64825a1e9d6c3c3705d6a60e31fb0fbc4b87147e954eedeab4cf194e0f2b500d8aa3462b95adb30"; + sha512 = "8161a5ccf70f5b370d1bdfb9b849a2761eb4c25f6d821d39e63f45cd29d9be82be81f523bdb9b1f1b2ea134a8672b9153ff14ece3af6ed7e5a2339c9a43d71a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pa-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pa-IN/firefox-58.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "483f1b53af7900dcafeba88872ed5b5c5d0d3c703e83d3e080df92ba66467656f43161851474362b8d3a4bfd48ae19a2a21ae244717e55aebbbbed3b55488b96"; + sha512 = "fc0424027788746b0c8b68c553b7d989e60af2a29e4fa733bea440f31d277c1e64fba06a74c915986dfb3c8da13405689121a8771fb0a47f091e27185cfd7a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pl/firefox-58.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "bf580678caf2fd653022ed5120f461b87beb47defb323836e40c0e1755adad1e893930a39afa9bf9137a2bbd197d5918b715871056df3cfa9574e684f80fd56b"; + sha512 = "f39a26cbc41739b250bb92bf2daf6ba835639e5751e1dd0893013e1541ec43de7e747b3ec754894a56362263b3ace8d5f105ace5654c30657ad9e44195cd42ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pt-BR/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-BR/firefox-58.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "8036559e9d83540cfefcc5217550f401d988c626117e42db66d4ccd9c31afd8aa4224bbadd7293c44b3973df7646d36ade1728d24fde3f5e7cbab19e3e83832b"; + sha512 = "2d3fb878c286a750fa10413545f0d2ce5efeebea5f8c4192dd5b53131edcaa6a54940f242ea002d9a79f41a14e70095cc79526773dc95d3550bc0e0291185a5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pt-PT/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/pt-PT/firefox-58.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "afa6bdcffd36065c94bb1984ac9734d1091c14bf065e68c2a650e28fb49a5f7d52f19aa83078973dafb7446c2a01aa9fde7ef43e26a7f26963863329b868841f"; + sha512 = "a2eb5b43c3d87ea8193fdb1f0ecb0e1a317a71f10af4f3184484536dfc1f7f09fdfb498bbf073f68847f7c2cbf9383adf9ad9e92371c8a835e4e3651a0546ce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/rm/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/rm/firefox-58.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "26b71c4b734bb2bcd7141247894721b2d35e521c5e9da2cd9fa455646f234fec97b55467e80f8d6b36bae62c807c79e7e12a395e65e4c59d464f7b4c3115f3e8"; + sha512 = "8dd38ae11781013a03fae2b3cd5fc1b033c45050ed4245fca2302e1818135f1e754cb6c8ecbc535d253104ebafc0792dbabe78f7f336f12297b7b4b8c4a9f2a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ro/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ro/firefox-58.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e0a3358a71ae65166bca792a8e60c6319f9a4c277c8369a2563a084dd9fe8b68952df87d1f9ce5270420090d5ac7a6dbb207cd7063b488dae4d0efc8006e46a7"; + sha512 = "e9958818254c1b5577a83960e1136541c8ebf2cd4f43ba06d73c2e40990fb6da958aeb423c640ae988057d3782db145ba8e8cd7816b8aac8dfb7f58c2eb0060a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ru/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ru/firefox-58.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "adfe22866b6123b537ddaf1dd81d397478e7894c021ad74327c922d85bee8ec132f410509a147bd7f1300df778922ab940c36385db2659c8a356914b908ce9ce"; + sha512 = "abcd9a548335648d84ed3856a89275c62ef7d883e18d52dca053b4d8f80deff8fdab7336a2aa9382e55e110ded2d4bd9cf147b3f482f3b0ebb972ac696562645"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/si/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/si/firefox-58.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "94892e878fc9feeb9e208aff8096496423e40e42bc22ede273cc5e3e549564861ec31ef9935f1e29d68b51abe79b17a9c6b1e5763917111fe94c95f27c3826b3"; + sha512 = "53a7b139ba28103b88359eb450c033fbc8bd3a0c95048aadbd058e505ec85b652054968304d113826a5fcdb6abcb47e8498d9750023a899fd83d5c0dc8b3ed63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sk/firefox-58.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "26985d29d4cef9fa987d83b873da188b7a776929533aecfd1f1639bc0b7c4393bd9e04cfeb3f7f9f2cfb7b43b5ee14a421791a6024b2eea3707b7c3699594e83"; + sha512 = "05d4f52e87bf24884caa888c14dbb6e46bce2de967fa4524090df63b2d9f2f4f82b926842544d2ce7ee46f0196a62e8dbe26e7b07176f5c13886ab2a1b2cd184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sl/firefox-58.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c8796f686d147774ed4205a04521fb1375d1189575e855b6eeb0db7c35da96aba70803cd477656118f6137658f71d53c188d10653d67f121942d95d81a6a05a5"; + sha512 = "655b4fae25e42cd1678e49b555508ddba2da83a24f04d7d66f5d25a124fa2818368adc851258dd78915a2998272cf8e7bb7a5e918e01228e735d3ad0caa8edc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/son/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/son/firefox-58.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "56f8b81bc5619b88234feef3e17c1a80ce06effc78880b4c9da083530c7f9c037015b6a940914bada62e98711065d6a0c556d90b60125af357ade797403885cd"; + sha512 = "cb555d1465c5ce0a7db10e5117081e682425aaf00221b93a66d23ca9217cb2cd2b3835007961f572a39d93a02d12f9a62acc75f1ce3d8c3bd6cd057afd750f79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sq/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sq/firefox-58.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1bd75656650f34ddcffd38eae46ba84eb18fecd79b9cd7972f96d0906862d37013c48046355530baf5f253985b65922d386ffcaa25339e964db16fca6bf85505"; + sha512 = "5afe4996a2c66d220d038cc041fba4a3bb5e411c0d1c4962b2a3f28ee16c5f23d1d8609a7d492a10b16d508c2781b7bdfb884d810ae5d8c5fdadee8120a34659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sr/firefox-58.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "abbfc2f50567f4506dabcf8500ca56b369fe6e6502147ced5a52cb2d506c6b28248adeb6564a6a092ae96632ed2fd43356507cc53c6c4a53756df2ae2f6dc735"; + sha512 = "641e3173693e73018154f5f3fdeefc0b0fdc0b1939ccac19b73769476a8827b7244a4088cc83fc651694e9c82fa5231b114fc05c80371469e63926494906aa83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sv-SE/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/sv-SE/firefox-58.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5f19b531d37c8774142a86cf83c678e0ab889c5f22aa792c6bfa881ad9441c02aced2324077137c8ec75c18a1e7a93243b9b87604036b5d29ae4e93871540ea5"; + sha512 = "873f11216e002fc9eb4bd6389774c21d1f3aa17baf0f38770c18db541b30334a84cf2c33b478d009227b1ef48a7c45183d7df9991878daee78c139f6964c8b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ta/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ta/firefox-58.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f503d38e25cd403f8dca12992258265cd3abd50219655eb51867ee455790e1864dea2a26cb0d72bc311c3685e79836df9c0c1794b499d13fb54689ab9408d484"; + sha512 = "1d91749d41fdd5d5f3988803563e083f3d65ed6c70fed197f38fffa7847c10d2b0f355fd46a1fb7f84d8c94dce096d2b84ff692fc6f5f33be4ee1dc63a4efcd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/te/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/te/firefox-58.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3f68679d85cc1c844fcffccb371424c38406df074c8e21a200e04bcc5fbbfb1199d2202487c660c95ff1941b433d22ef3474580a0de0909dc251092e139b4bf3"; + sha512 = "2b779beaee906278903dc12bf679f0d8ed51d622a1f790a956d039faa71c11abf1b4d462527e330dfb92dabd87aaaa70b3d84a295f21e1a701b4a308c85dc821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/th/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/th/firefox-58.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "b3ea54ed6c65b68f39eedad3d4500030de3f53c6b603a15f63a82b2766e023f552869d5d0e05cc5a4ec4eeafeb3dc124ff6ed09a5adc53e44068034247ac0bf9"; + sha512 = "82bf20ace51794807f6460ae4142869fc2efb1b4bcef66cc5d68fe8812d4cb89578a45cfe0cb7927c45ab0d1e057f30d4388093678213187bbbb6f209babad2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/tr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/tr/firefox-58.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "644ffebe355085ccaffe266c2ff50440200adf95a46aa1822f21a160dc982bbdbc8157d9231e1b96c11c573409c620bcff113865d55eba3c3b7f3cea7faf29a7"; + sha512 = "65766e0207ea300dae4d95023ddc732cf5f59662a894689e87620e6e08a3f658234293b666467eb1f76afffda29716b128d72286b1c9cd68cf574f7121b71792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/uk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uk/firefox-58.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "20579b4afeb36f5fb07a3a93e4c5837919df959f9ae98e25c39597e2f1446347952fedaa776d40bd606264cf935ff343cf69431e8c8f978dc8fcc60020f669a6"; + sha512 = "01aab08b333c16ac7156ca35580fc6502aaccdc269c6be29e20ea3ecf97104a3d0214d16bb65f1e3e7aab5b17ef3c637d948a2767594c36ab920c7086e11607d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ur/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/ur/firefox-58.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4466d3f53a1d68df8e7bf6074c2639d84e5a7bcbee32db522f8d3a771266454c1d0c9bad1baf52b27c91a6fbb779c41fbea50a84675e9530ce33b1bafe722c96"; + sha512 = "b282916667060259bb90452d08a2bb65cb1225cc45494c2c18c4982e710abbd345744b08bb9c2bd200073c2b470c3b3bddf7f9b6d652563e3c4a8cf6a6248391"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/uz/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/uz/firefox-58.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4234f1c10daec449867a4357a123be7d04ed3456b98a2d2e82a3ec3d85f7da167e5dab95ed6c4f4f1f44b9481608a80cb1ff1713bd0abe06606a15bce7df6d6d"; + sha512 = "9339ec640a3d4920fba39e69520477d9c00cdda5f1617067f19fb13b1c17cabd1cf1917001a49604686cd835839adcf3f206dcde14e7c4a98d579c7d8a19386d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/vi/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/vi/firefox-58.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fa5b72aec8b5a845ffe37588424059037ed1121f35047b123d39e7b6b11f0ff54731a974b7ceb3406adaa1705e14477a7ef189ce53305add2712cc7d433daf82"; + sha512 = "c318398809637623e4ecb187f4b531bfc1b9abe093cfecfefe2faa75990dad09b505d8f88e2556476c92cdfda491161af8e7fc27c68c8bbedf5d4abee8eda941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/xh/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/xh/firefox-58.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "17db5a14e2e9e4a022a6d1048f72e734f41de485f72ce45a6848b69db1a96bbafef25809b79a3f85fa70c6e7f43c9f1fb6f16472c294f13f1b77fcbb45d84dfc"; + sha512 = "08caf6844c3900624093ada61c92f7c74dc5533818745b8e85b15a093b640eda9686bb0d5d86cfec0c90df49e782c942693d4e0a169b7cdfecfd13827ae27ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/zh-CN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-CN/firefox-58.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e8570e0c589e298e84653302c85ccc46ef7b9362b5449a09a43eaaccaf2d3ba1b55475c5fb190067d596f85d9ac3cc037e5ad400454a2d49c8e9ad878bd8e04a"; + sha512 = "3046e58285f220ef7ecaea81c44063b8573f59ffc64dc12f698a184ad2f11bed3a4cb5d03a2bc105083b0fd84335d7477f81d3eac4bb28b961d38d9c886a9376"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/zh-TW/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-x86_64/zh-TW/firefox-58.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "51243e1c7a330f0043988904759fa8d7fb67e287ed47a6b6a18a12ade989346f4939874dbc6b15670217436f8132126b29fb641d60e8f338bb8985ee5411498e"; + sha512 = "cc453128e4720181d147552fe2452b5142b959e3e0cfd3e340159def69be169d272980066f9a34206da5f815ea54b8e4a062bf95ec4b1cd7ec7b3b83e2ae13b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ach/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ach/firefox-58.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a36499123874af16bf33d80ccf2a84dbd21f641155ded9d58e0c064a8cc5d9f034fb64d154f0ab46cebff191e9c9cc46c820026c53408329810a318556be6210"; + sha512 = "c26386414dd416bee1e4fe505da524a4c1de34ba8c25b2978a20c66a09f8e3c7339dfc4b5fa00f0d2c052fea1574e5ef1a5d74e67d39c7e717b54439d7dbb852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/af/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/af/firefox-58.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4c42737bcd7af2f9f0b6ae3415a56d82d360998f8bd0ab01b6b0cd5f72bbc84fff4045b3553a1a87f0c3258f46b526f9e9eb0c3dc8c8c66a2a22d5430fc38499"; + sha512 = "a8c4485e579f127882c0f00a4a90bff5d02bee5f28642257bfe0d6638fe9156ab10a00dfd48052aa4995dcecbe10b7247f1d4e6d9b424bf06e431a782b46b95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/an/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/an/firefox-58.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e821fd76b262744b740ee1a42092b954df2a6a552cfe305ab88e6ca8b2538045654f64f4e1a0e1446906f91896486f204518836148eebf19d306b4af0c2b4d6c"; + sha512 = "29e91d4e5ff020241ac81b810b893bdea9fc194090c78fc857d507d7bec8651f15a3c70f3fc245f0d5faa21a3cc44b6327c1a32444eeff3ae4d93a723e230e16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ar/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ar/firefox-58.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "de178b0791074179c76a9e0334b5c5f2bb3599e67ccf4c8ab1d9964952b17c2ec0c509e8e37d83332d1cef7b74ee3081eb4092001023c3a2f14d906a8c0e48e8"; + sha512 = "d1d936284a12f1718b69b279334aecd49a68e5dbabc65a5ade2af277ac7b8ea342ba4b580df95040ae057525d28a7c1852222ab2bd273c2aae74409a5533f74b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/as/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/as/firefox-58.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "a6f3ff8f5f31b5bea725175a27fac0872765f584a91877adc01dd42811b059b61706c53f64e4d1a0b7782c26998bbb2f73e865bed4f4e992762b5f90993265b8"; + sha512 = "49f8e1e8cbe6910a9fc8a812b3dcb7e694c2785fca1c65639d70a5d0fc82dcda9630a1e311df9bdf148d684c2173c761b6aa3926a425730dc35fe99b14124992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ast/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ast/firefox-58.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "dcc47a42af28f1814541f71650e24c653b5f99958b495aac3d0408ddd27aeb8d689d6244633c5a397d5f304dad3e8d2778e5a3573497e47c895a9f46365c40ef"; + sha512 = "a01eb17a9952055aedc3eb29126a826ef812c75f5f5b5a22af3125ab37b63e3e0ad6de0a5f68d0a5bf0b3d1c8fb1f721d4331f1afd30b6a3ee94a502d5931ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/az/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/az/firefox-58.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "41212665cbd529e935af5dcb8582b152e84bac8c7055b02f2a43dc6fe53e33bb882908feb71faaa8f34a026a64117a286e59422ba110bff8c04e18229bc418aa"; + sha512 = "7117993a67c2d0f3c0438afcbd87f22ce141063dbc66a1fea997f5145603f8e9d28b62473add81475bdfbad350d6e683d0c483ec2287f0a47f4e9b3bfbe92ec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/be/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/be/firefox-58.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "681e9c68187d9b53880494ab08300bc28b8536f5aae320dc9da6abfc8642c8aea2e2613b48d32c25309589f737743c733b361c543525106ed9373ecd3b40b891"; + sha512 = "9b3486fdb08f0aae375a74701e7904dc13b1e4db7a1489c4538d523bd4af91b882b9785fc4fbc3da2f6ac67745216ffaf7c48c173f840288c6e39b2fb8e78b62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bg/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bg/firefox-58.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "742cebc1e646a2d9f5d9d6c406ca1903f81faf21c4a38df0ce6edad8f7b96ee8b22d7ada34fbc24461f5e7644417d37b4dcac6a5a10f8b0ce11fdbfda9c01508"; + sha512 = "a917bd437926c8854786b4169ddb2a132bf4ca0e51c17a99a3cb814a1c1fa7fbc7c2ca46a0c7c91ada117ce4b2e89c955e1d60502c6eaefc9c57e0011459609e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bn-BD/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-BD/firefox-58.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0562b8bc93c1c768ca49e94a6285206e3402b45d9217c6679eec7f30395cfa500c35da7ab0e560a5fff3db5eb60e6085845a6a7b2ba7b695ebdf09990bdce5e7"; + sha512 = "51032301e619fdf9e9ac99c52f771e39425e9e8f063f71c491f0802f02993bda668e0e18196f4d10125ffc66fec760df0f98c19713f8b54b5b05c502067fa4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bn-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bn-IN/firefox-58.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "d459a21206cf140acff54ccf6d7557090ffb3eb752f62b91ea56a4c4138858ed9146d3edb6ee3252ebdd548f3435cb973c284cd0008207d46dfe5b8b12a6bf55"; + sha512 = "b76ea76976ade5df4866c2c54bef553924ec9d3bc229cc7513530ca81c4c4e118bbbbadbea8a64f27a061d0ccb061d7ec0e1a398a428892a2c59761b0a7392e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/br/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/br/firefox-58.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c23ee525c1c989264fbd1e00834cd0a1da1c470a54bebb5caf18502499f16917697f3b6de55ecdb9270ae11741420dd1def626603f2f945f2fea8ec6279f4b8e"; + sha512 = "7ba73fb0068862700bf64248987796837c44bb59ffec052638956fe205bb52780bf2ce9bc6b1a5347b173255e893de8b9380dbbb245d8a3552dfd1a6fb73f7cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bs/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/bs/firefox-58.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "dc254689e74cf7038fefe2b6b911cb75b96fbee105a44713828f8f7c9f1a9fd8624f5ce62205f26b4d287f73004edfde73d4fcc4431d2e4464d36e822f4667ca"; + sha512 = "5f2aa4be25f279212541716777012f87f5e65a57deb3b4dd84d4187d84db80ef3f8dede2adf971dae1fd9f4e6398db81f956f59df2f51f35f1893f581266fe0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ca/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ca/firefox-58.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3f358d601c182bdca9e82221e9e6061ee5d610cd42caf722e1597c6e3e47ea005949ce52d0e38d160a02e4f02f210328d631fc095b0a49af71e92919aeddbb37"; + sha512 = "2995ed991ab118d5e318f085a340113a0e71801cb2b781890dec674bf3a8142b9bd8b0bc23ee23bed72b1b7bdc7f0181abd4f4d23fc88b7930f710934d2943c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cak/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cak/firefox-58.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "274ebb0800585fd06dee02bb4a2a88cb4a64d39198e23fe481061b0cd96c281c2bc9983516614eea980c118fb98db01be2c0a387a8cc595da7a2144215f27230"; + sha512 = "dce6a70f1c59b01a2d3ac65c6f44adb9baa8e483dba84989e40d7388f9ffaea894e3107cc4a82ba6aa730770c681bd73b50d0ae2f248477f0b63192c45f142d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cs/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cs/firefox-58.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "dc688379b955cb619e1780c66368ebf5a09415a3b31c8d116c1182051281bec251a06ff15b54816e5f0f11f1c0246f33d2db42009035a7254702bd73d13ca83a"; + sha512 = "3c84b185de63520d430ef541cc95290868fb8ccb09829ef8887ee0559fc5da8182e890155e3d1bf4e82966c82837d05253fdf2d2115f376c4bb0d09c21cef339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cy/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/cy/firefox-58.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "f20ad279750ec9281ee9a800971a4538e43dc3587df35afe676e7980e965522dba2b6a9deb2d0b9acac31308de3a8a167ec8dcb05934503602483a6eeadf00f9"; + sha512 = "1561488521608643f3ce97da23052b8e968c1b8ad7ca38b966fd088368932976be0f503942ef65617248d3ae572afa4ecda3499c427845de32572d163d577c9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/da/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/da/firefox-58.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "b9fea0a664a02698423099a963787f8b5aa89f3aae8ce6be9962d9d8316e01547d2d3fe54f05116ad1fc6d7a68d6f72d65adcbe63de98bd4b16c8689190510c7"; + sha512 = "fda58e6fbf5243d5fed1b386ac8014efefa856ea3f8cdfca4e723f646dda2a8825356818bc8f06183a57337a5449ae3907bb3ac4c81bd7f9590d94bbc32749a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/de/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/de/firefox-58.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "13407206fe0fdd88793406c349e4f7a66132f2edbc32af12b7d30026d22cf721970c8e8494228fc80602cd57feb3dcdf17f0490580b2e33806f0b3bf03fc7ff0"; + sha512 = "d56395a97002f31ead2523179eec912dea7035a86c80a8788b21f272c6e6ac4095caff5520feed261f5ab5a2a2366cd12e223b23d276e01d1ef318b8c15db860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/dsb/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/dsb/firefox-58.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6d6661cc82de4eb37b0326f8cdbc55feaaf85cc44137af1bc217d609f42d97216402927021dbacf81cfe704ec8c1e42c3dd18f39bc1f7e6665984ccf3bd678ec"; + sha512 = "97538fdf8a2a1cc3c485210583d9c80db10b2d599d2b34bfffd5e3b29c092a8573f100cee5c69dbbc69fe67ba6e2c648715fbb9271704dc26e6b2fa98a8512c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/el/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/el/firefox-58.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "2e8d1ad194159f6d7e56a461d594b1cf998f073da332a1f1bfba46ccd76e0e5733a691608a16ee08207f45d16ca59766e774534024239b8d5b3be9156942b31b"; + sha512 = "4a12302d67b830098e74ecc5a2e785829c1602dfc3cdc20c1e4be5a2e58854128a68ef9fe459dc4baf7f1f87e8ac2a065061a259c9625f09098b364c6d12a393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-GB/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-GB/firefox-58.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "f45ccaa1b6684558a1c9b5e43907fb59be0ca466260950d701091e6bc1c6a9d18d1a8dd2b2dec77381450f61f99b632cb0f3c0269ff309321750e16577df697c"; + sha512 = "0ef9e96b43154f3b6d8e620183c092d38b8a5dfd7b762416b090e2754baee4564f6876bba9765cbf7499f5c658f2d352bb45769d852a683fd528573b53eff2d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-US/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-US/firefox-58.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e3d289363aa63cb459e1a1f4f18e893617bfc6f972a49308aacf126698d2dde0baffb3dacaeffae9471a8111eb332c753f376ebbe31aebfbce52c5ea84122a16"; + sha512 = "05046233531db36a9c9c16cf6247401ec662254e8e1b896abf557bb2f4043ee2ec1f83a04c9b1199877d66b50b41d47bef1ebe6236e21998406616b8251001ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-ZA/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/en-ZA/firefox-58.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a4c56c45280faf3dc65bba6de159f65b121972da5831664a70369b446aeda44f7614d01dde6a070df058a4bc2d42f32772e1003f64d277cc5bf8361f76fa2816"; + sha512 = "7ff1777a3aab71e9bdac1d41f777837cf91ca5f9ae353e6289812899fd10a4f58c13938cef0f33cb3d3a0e80b42c70034f7af22783e0b22495fe279cc497fa5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/eo/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eo/firefox-58.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "d79405fa9fa01f13a4a98797b3192f1feda51b26568e89746f6b25fed6b73c1f45f3e6bd69427547da19c7eb70508fdea0ff6db21e8d15211faf8da03b088e85"; + sha512 = "3b4a8b0fb29abbebb224cbdc4dd9ca62457d88394f653388915898fba9eed6d1cbed43f6b8fb7bebbf18963d368fbea6aeef5bf681c14d2d5e09747fbd42fbe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-AR/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-AR/firefox-58.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "f5751dc82ceeff378d78717ee5850edb4f160f3ae26c0efd70557014c96c765fe789fec2a8650f65c9fad67cf1253c00f4bdb75387162db1c914ed45dfb7164d"; + sha512 = "9409072b8aaffe4ed914832d0b545fefd20b9930e0529c38255f19a0ad524b66127d9704eae2b8623696560fb78169aa66d1b5bde358885dad4d00e010189841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-CL/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-CL/firefox-58.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "592c5f9a70e28521f75e16b79fa0852815f34b9570ecbab610a96892d9b13fae609a9050a4dd0867bee7b811cac67188c9a756bccc2d6d99821f9ce9db48a509"; + sha512 = "0bcdfe996b3a8f4810d464bbca0690d12f6262032a21e0716f86f793faa4e707d3c308e79aac5657d619ebca204d5f67667c6d3d09e405e887c338a859ea1faf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-ES/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-ES/firefox-58.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e3fd1f13087eac51a830acc760b83ff9459cf6a1a14136c43c8ab7395b22b01cb2627b077c5f50968023c47f31484818ccf18245d109610dd04e3e5627fdb65f"; + sha512 = "1f2aa1ec1c97cfdaff07b7aabf75b5e1bfc628fd8ee71c988af5471e570574453889a7bf40f9d3a4ec06889a4672518c986c3bc6fd35d7436d45c5c74507d801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-MX/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/es-MX/firefox-58.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "35ea8599e66c29f7fdf1f2ab5a400a0ccae4d0ded4bb3d509d0caf7a6449bb7944c794fe080b1364be055eedc8bac017b8281bd9a76b1d76def573d3191cd011"; + sha512 = "366dc93d1e6508b00987163e44ac2d6fd318bc9c80487a13d581926be7d3a88a6fbc6438effcefcfbe6a1a9794f2a692c385fec7503ea96feeabc5fe10cc7a4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/et/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/et/firefox-58.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "29e6013843c56fde01478cc871fe15c2f1485d41e87af30daf97e5c0f4e80ae14368601a2df43bbe3618fc878e7503007708b760d1f2a571b4993a99c2411f17"; + sha512 = "82b25a2e1ab4d61d89f5944495f69fcc7db33b3a7bb7822758b588ea7c3fe9ce3d728ba838760b93975cc52b105de77cd980d20997f642839680a20ccd5e1d4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/eu/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/eu/firefox-58.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "3f6ef7db13d1b8c8eaded290430a8462aab2172c4e813c9bf2f11f0e417485d88872a66628130987a37286ba474e8bddb9ef01e120dc2c6baf49bf9b5c5e67ce"; + sha512 = "6eacc4b6069f6bda6b08fca871c7cf08bd666f974bedff6c511652801e3718ef60ab97425c8ce6d1cf5aaac1b5b9a62990ab086ebfd9e76f646d491a19325b34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fa/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fa/firefox-58.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "14dc9bfa351de740e46a8a3d59c99d0de7ec5d890783f03a8b260217a02d1cf03a94c6a0d7411698f789e9b77c2e1def24b74d9754be821b1104964308a6322e"; + sha512 = "e3f4c57555c415a4d3830a6751c5444e07987fdf85ed0e122312bc4bfd0fbaf841cda7aeeb6aa161d48070844aaab316ffc163755481479f5d421ab8967aac15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ff/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ff/firefox-58.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "273b3a3c6d32f63de9a8b47cc6eedb7239e42cbf5b8e48191b2d9f9d88731a5da6957ad9bbadfc6bc52e591328a2a89540c4ff880cefda455ce1e5beb35492fb"; + sha512 = "695b44de161563727097da1d969c0a98fdbda51613ae8631a757410a502ab25038a9c356338b1178f7d35e0110e9772b3e2fb705e20d81787317b528ffd709c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fi/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fi/firefox-58.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1d71f85cb661c87bbf1c64c2711b45ce912aca629638d2b7953d0ee3256e7e50c920f400c2bcf92ce171be44134a66b28a34a3b38580da3ce2436dae1b0dd44a"; + sha512 = "1227a6e57a68c0ffc60f6d9eda20a41fe70e7da130bc705fa15e428539e0380e1f65739e791ec699f216588ba54e558ddb6242862396837229c3ef3b028a6346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fr/firefox-58.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "ef15d841348c23f35c2fd6cf93d86657d6e3308bc03935505b99ba1119a02846c2ca2c5c55cc0cde992d4e8af50bc612e086be34cfa61711858f11e6e256f7d4"; + sha512 = "c15980e0a1b4b9709416d362e36a3dab26502af4788b7c74d68e0ebd2f3ada6039d10af1e1d49885604c4c3b41356519e53c278f04b14729502d8044bc106384"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fy-NL/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/fy-NL/firefox-58.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "f42e5dbb7d16828aa2d5fb45faf44ef92b8ef29e5c49dc8a75540959cf6c153f7d423255c4eda765a9db69dbbc18e7b8a04bd3ec1329314c1d69bfa41ea32f93"; + sha512 = "dd38e22a986b558aea005900c2da53cbf28ea68a77bff428aea6ebaa09318439232cc2d5c8d0599fd8512ee4ca2488080297ffa61f2cac9547fd5257a01abd3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ga-IE/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ga-IE/firefox-58.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4fea194d08121ce95dc6891b18cbbb031e64f402f31c83b92c9044c8d9337f2b50d76017f4ecfa616f51e8188e6705e8e940fc2fed95b7d21d4c8385b656ece3"; + sha512 = "97ff02536814db1310bcf53adac31fd9e84a5e39d58f9d81dc2f70d40e6b608c450dbdb38edc83abbaeb0535f1a1c0b1511c77a161e6d0ec22b8cde71501be08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gd/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gd/firefox-58.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "614811dae0bd10f809ae048d47543fbdf0459320a8f9926280bdd8467b2859646b7201355777081638b46b77d3def96f8052b55c243ff524a22d2db4e20db864"; + sha512 = "7e8d8dc8c341ab3990b550392f92029b70f6d947119de13843e11a8067c2edcd10a02dc088396beb52b1d069e8f42732db8c514f822706de3f309061e649caa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gl/firefox-58.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "a20e1f54fd12acd5480bff14d24993c2d58a33618170813980a8a1f0b810140a99c7157d8c8eed3d56f8daaf2fbbd525c1df98e1a90cd0f6f89ec253e4b5b73e"; + sha512 = "31b57462e13e43e31e0e9073b353e1f5a3c32ffcf5c5fded188a1a61a973510479d5e04dc26437eba5445baca51f82311ee9470e3bed9a6309d40cd456da4763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gn/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gn/firefox-58.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "ccd057d636e8f3884db25ed91186a5c995b02eca0c3c7e07616364ce7d95e42dc1f3d1c6e9eb844c6bab4088127232bdd85e3f33898f681f837c3887ab0415e5"; + sha512 = "d54e50b52870747013ba457d205fd9d2632302309b9850171b968d66dc537357bf747e322420e70e5c029532b053e557da86076a25fe8c5f1a3491acc9906b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gu-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/gu-IN/firefox-58.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "fadc9a802e9322e2ab0f6b66bf8d938a5e3bfc67a1ac901c0d41d5ea82bd87be0165f50b2c5ce7a75c68f8db45eec8b0e7ea3de237f6c6f79d72cdf386cf3e00"; + sha512 = "d18427e64b54eb6aa1a1ee7ebfe4bdc3b219af28e7cedde55ae384d475ba88b83b9c6fe701ff849aeec32f8e6b184f2e3f910b407a9d200fd45ceaa18fc7d61f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/he/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/he/firefox-58.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9fd2d1f4087b247814282e2edab633fd865ebe94fc73906bad065e0af927f298f46306dbe7f36c98875b57bbb66aa5e51f37f5a5308f024eaa9a62f968916c0c"; + sha512 = "a7ac2db737ddeb870bbd136f8dea08306e8bc7158d7e880655cf15541ed26382086d270a6ff2bbfb332fcc3e53c7348a403bb889aa8ae5dd1cc6fd1b7844e768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hi-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hi-IN/firefox-58.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7a07dc67e58c295309768e84b2489413b6d8ff71a786d249b977a7bbba245f74c6d88e33beb934444a34de88a205233953f0b7be3a3628950b0c851c35c593d1"; + sha512 = "18263b33d5fff4154db809fed79fc2ae20590cc2ad609e2abe90b036420bcd38fda629c613750432ca4c06684c772cf567368ba2bf098719b501e329e55caf51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hr/firefox-58.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "5db4c7e305856d96899270e20b41c6db2c130abf25bd5eb47cbd2683e8097fb41d37bbd3c577253601c99d2bcedf42472bfce74cc4155a01de3998160b3a139c"; + sha512 = "f75aa782b03335b0197cbea1446cca56cedeb4be0282dff8bc0f1d6f6c8bf596113edcab650b6c8b7bf5a9ffe6bd14e0e29f2e82002a5c720cbf82f9dfca1b08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hsb/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hsb/firefox-58.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5729719fa57723f4c87c5f63f9c08b552e374d9ed9cc9f39aec49223be7b85d550074f680511c79c5b47cc0219dff687c7ac288781822a5bd10f4365cea88825"; + sha512 = "c0b987b299ba764ff5418be38e68c52b7caaf61480edc34d575ef58807b5289fabc25cb22d7d87dc8ba708d6fa4157d46237e0a31dafcbbe5f463fc945a620e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hu/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hu/firefox-58.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b0334bd7fdfe6737ca5fa1166c37204a6f0205f6756af31b8aa34da6df759f487a3c1aa88bc9cf2dcab4be8724a203e3d35509af4fcf03581c8c59023db532a1"; + sha512 = "58c7c346d0fdb16efee21d8802d3bc668ff4fd9497ceef1b7a96cb8bff01df647c32819a5606891e2b7a9283677bfa9624e33423f7ed1a9c6acd1c19414276fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hy-AM/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/hy-AM/firefox-58.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "33ac9a2a7a554c4662a9285124fb8050894c921ec72d7d3655197923e2fe3fadee007afb54a25bafb9ab8c9a0d898af52102bf629a604563d10f462001f08853"; + sha512 = "79e733f8be50ce4cab74d80dd8e4ea667ac9b2973bce27fc1f70a37b879e19b52ee423c2b360433d1e5e15a4143050e7943a3bdcbf709bc34e89302bb0ad7f35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/id/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/id/firefox-58.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7bc77cb0cecd1cb993b158670e448fd22bf982ecec84213c8c32634df32ba538fbee8eb834719dd99ef1087b6f8955effbe1776a3e150bf5fd2ccc90606bc215"; + sha512 = "5f49f449fd68cd4513ccbb541d3884e190b2a9897ba6267f348f4e7df9415a63e58a254d18f116cecd33f0e34a9022f4e34472bf2486e29b0ff17702f4790e0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/is/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/is/firefox-58.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "8a3fd3e89f503fe4c74b85e8ef87e1e332646cd150c95ff8685071bcc456bdeb09de46e256d13a53f5f8f4cd3172a12ec6c8096dbe54a9cf018be857b4997e94"; + sha512 = "6c5028ec47a18d9de6bfb4d99d54815b174ed51ccb74f84e0e1d69ad10940847d4655eb76b13281296575fdbb972d32df34e8e9849c8db4fd46a6dac4b4f0d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/it/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/it/firefox-58.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "8babf797e0b804e4e8b98a6261dfed27c93832966a66de71ba6794ffd3bf7d3b41ceff7ac4308ec9f978fab310baba5a87dec82f710014cc9dd6f27a520ceaff"; + sha512 = "dd4e79563c63cfcd76906dad9b28162bc9df443964a10fb0be7c2a201621d394d45ace33dbdf85d7acd040175528d58da243333d06ced80bfa96f8c6226aa3de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ja/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ja/firefox-58.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f3fd18b97b2880b3627e100ae20527eb998c7b9d11b2c38b628fd1372f7811cd40662cb5d199f12982fa35f8fb9e6923e2c8b1ecaf5634b6989e8b89480ff252"; + sha512 = "472f544038dce535691db40eae8cb06dcd77a468059a261cfe04186bedb4403ca209efd51a5b5efdedca323f70f4a69140614d13380fae0e01b49c85e5fffb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ka/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ka/firefox-58.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "4f69cc6927a6aea8496283c1c47961a38ed621b4a4563346506e4c138714824cd5bcba2f0c4d1226c643412ac071838693c0b3a2acd6fc9602a6f12060955f75"; + sha512 = "8337bbc594e6d7c0f862a99b8ad67fa7b86e55d372c5db850657eb7952f9abe2640c7bccf69568790099c8f9e7dcda65ecb28bbf2c18eeeb6760f3274f343513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kab/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kab/firefox-58.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "93fb1351b4c6271cbbf04e8bc8750569f5e3a4375559512055f4bdc68b7ef1c7f78c9354d5168e54d49bb0a529a380eacfb25a109e7f7ef2fdddb1bcd7bb9fcc"; + sha512 = "8d46fdff00c65f503f87b1d478b71621a2051c7ea7c24747f0793f6f6b7ebccaa39e8a61b35299078e2b49f07a17f7c4f744c97ee3767f598503faf7bae4a17d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kk/firefox-58.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "e4d849284c358bd297b07f557ae304cf9ae681733ee2acd232eda28abb9bfc38ad97916b00f257f56a9a514bfaff9b440ced15194dc3abf56b0af209221a7272"; + sha512 = "617ce9bd37cd1ef36251cae9a0738ab93bfc4eeac2f54912011343905047ea5d181c25fc891b8abe178f3632189fe62c38ea00910a1c4bea3d47907c0a2caa07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/km/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/km/firefox-58.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "0fa3bcf4b054c8033ca4ace9446b6062114889a9b3affa730ebf3ee23fdff470676919cc7086b5a13a215ef87b73aae306e667d0b1c18437b6265d5622972a8d"; + sha512 = "38ee6522276cd186ae63053fb15978f6eb5bfa8b2e78b3f2e4233d58ef53ac32307c936c454eb76e86e9f5d4845632a7b58e6209851a775c93629d0bad1473d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kn/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/kn/firefox-58.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7ff42d342f103c2b6f4f4050c7c79dd0687f87105e31dd80efedec34dea27dc5c9eeda16b79ea676d43f78a85e55a1e47c400e0faff9006bfefa55f183efb82b"; + sha512 = "462349b1bf91686f8212deb580166a3e0ca5dafb947c74b9786809626af68e43c4ac6e51c8351d028acb3c86d1f687ea9f94cf34c9b5085801c242d136a19383"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ko/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ko/firefox-58.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9fff35314fcb6031923b51db50e779564b7e5aea3068165bec73c6d8833b18579f87e676291a6570827aed29a1074ba54f08255c6125333da2f040c9ac404bb6"; + sha512 = "78e8eb72d89173676a0b65d7295f37b656791595c4def454604a83ad76e2fdf8ce40976bc91ee17219a320242e9a41568157f3754719ab9f9e0a7ce6cb4f66ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lij/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lij/firefox-58.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d574c03667da40589736295bad53fe22cc67d3f6dbc5281feba5d76138ecbace6daf7d39145d11ea794730c3606f6586fa58d3058fa7eb3f0d1336acf7958cf2"; + sha512 = "f51136d2e8e29af14aee4cc20e3fba6546effa40c681d3831a9ced7008a845e27e9bb80ada996d0d77c2c9ecc0825f6c7bbf1063797f71a153fe298be06e7da4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lt/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lt/firefox-58.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4c38dd3f72be96b2a7bec60a55e7ac0a75c13036c3b62d4805ac3f32efb6422b2a74807cefb87a3ad10f25d41c14d00055cdf09092ad9068bcddd5a46dded650"; + sha512 = "e1ba1b26612c2622853987fb802c4fd5e7433481b6721950813f76b6463b1320484383b25574733d75c5c4e547b52b3ad9d8687c1a28b511b07bacb9186f22f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lv/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/lv/firefox-58.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "fca51f322300f18b3e5c988f883fb352593c40988e5f0203008b71c725a162da0a15e67434a91af0e8dc63ad869280f6ead6714e2da1b4b6b83284fc56790688"; + sha512 = "894b82ffe22425e1c95c4e148c7dd58f5b14e2ec11a5a27594e0a00b8d5d57364080caf4da38f73c0af3962600d0051f6d6d436687f485cc178e6eab1d5733d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mai/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mai/firefox-58.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "650b729a0dc938c2a0375e967e89a2d6e95595bd9c0f8f0e9940dbb51be4ee80257ab7c7006eb933b4d21fb4cad053a4e55e2dee673c8f976a1f038e3ba5c1d3"; + sha512 = "7240f90b5a4b6cd68135b3436fa796de0e799316b8abc06c1c62bbe22ef9b6ae38bdcf1c60a5df97354ec5b0b69f64635ad6a88321a34a6b15e035bbee19fd53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mk/firefox-58.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "3c15491a97cf61676c6dd1705a281b2f85b4e2e4446645b20d7fd46b5968248591d11ec344544b42c00643a9a21bc3cc57665b7effcd03f9a8105d6a89fd876f"; + sha512 = "30769e066f1c0cc71f0e5139c893b3e887f4618640b762b666f85c208fc8bdddc53afd7f0beb0421e9c84f82a6b332321840c93ecc9635dff784185f2122527c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ml/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ml/firefox-58.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d76726b4d18d114ef391fa65e3396bef3e5d7896b90264e89e82673d0ee8be69633d831220908da30852994f1d5f782e6d6f221b0a93b028f543aa9899d2234d"; + sha512 = "6c3f77d4fd7fbc05b7812eff2e8c5ebb75d4fd97a1cb8797260da5d2e53e10def88cfe107131097e6b72968b4c827b998abc42df0443c24330be3a0b0622b715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/mr/firefox-58.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "b789f8e68a2020902bddcb95daf854cc784cc2a3319c2a145a5cb877755780699010b4162ffb124d0f5945e722ee6d7b0f0a1baedf277bd8d3c429b9d7870b42"; + sha512 = "60d8c8824ee7b414ada656310218cc87ad347b36e7192196b2d5c6a5e0958f9786589a3c3f896f1a99b19aa2419431e6aaafaf69b877240872f9ea89178ea699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ms/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ms/firefox-58.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "76fe657a616e786926740bd10bb8332cc520e08aa6944ecefe98824e5f0d059c6c93cf0e5968c11b153e55bc445a79939ef0b2a765daa69d6c72b8e25010f4ab"; + sha512 = "114c337fdceec43c1482ee60467526d7fc422f720400e2cd66259cb11c1aed46fc800b1b3fc32ca5e08ad85667bdff31cb31ecd19f66e63d29bdf8696f8e4477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/my/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/my/firefox-58.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "618224cff81d80523150cae7c020e8a29569fc7310fa031076ace7006bd8f8efcc4773b450de4ae4965445b277770603a7793287cb85714f0aa057584e636116"; + sha512 = "430ed92df431653d7c2f3750c6a7e3987424d9bc49359dcbe6f9c2b66c601e263cdb26f2428c9a1948de78ea51a78e0f1e6fc1538c4cdbc39a126c76050ea51d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nb-NO/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nb-NO/firefox-58.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "7f33f1f49e6ac31a022d1ba856e23d1b10a23aa2501550d5ffbdeed05c752c27b3345704bb9d15d8eead5115085b0ed00d5b5d53de9cf2290e753f04a4f3fc1d"; + sha512 = "c0b00789726e8020a5d8f853b73280720ba650f81cb4559e17578c862ab3d45aadd6a1948ff26e502bacd34d8c0cffa8d46ad6fd35d968ddcb4f8300dfcf44b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ne-NP/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ne-NP/firefox-58.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "892223856ff20d4cf7c601066ba6f3620b39fbf4e56fd89207f3d18b10b39bebc236d5eddabde57585f0e0c906dc035ed030d49b53bc346ce630581b9288654f"; + sha512 = "b90dc1fd628689c45f06800b3cadee034d6da54a3695959a927ac0466ba70378f4197bc5b17b39d9572a8369897aebb589d1ce7d2dcc0972a371100938704f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nl/firefox-58.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "f139e9420300a0276f9ff7b70fb1839ae9e2aaf089ccaddca782b8dd1797df80873cb8ebc91d37399c39772d5b381b30ddda8c41395065d2424defb709eae21d"; + sha512 = "ab802fa78343b4a2074d2a09187cc96b66c03a26d26f21eb158e90b30bbbafe6dd40d563c9a65c3b6c99f79edcca3615e1322dd9a4fe3ddf1ea527ae41b4b25d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nn-NO/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/nn-NO/firefox-58.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "50cd63ddb3f83f7c62916299d910d940930f046da612e3cce890310d271822acd87f971b5aee56aebc4011b1c414574c7c96cced936ba6f89a21bb93ea9bd356"; + sha512 = "4ca2889f2e0a7f19ff1e1f7fa95ef692188f78289e1830df5c72e27db761f599dc1022ce1f9b8c8f30eab92aa70381a1e721deff07fe130b1685e968cd3aaa68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/or/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/or/firefox-58.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ef73a14c8210d1b82e0ed33109027099a8d5dc3961476eedc31a92bd855a529e2be6411b196d0c4df97124c5be69ec4b6a245a936de1c0e8c609a0d17d51d8d1"; + sha512 = "f2da13fc423beccb7044af1b8ad8ae5b8728aeff5ad0bccf52625936b59040aa6db6fd8fec112be8cfa0baf5448ff4b9d0e179b35302c235e6b4dae01500660d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pa-IN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pa-IN/firefox-58.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "53fc6c822192bf96db817d32ea46f0570a83e296b1e4cdfa585503b02b961346b21751e22d50c056a6411ace168844df019e6dcb96346e02bc9deada71c5e237"; + sha512 = "ab193a72db52ab2208f7c6b5b5eca4756231cc31a7fc9f6adf434169ece5df5cca8800c952bca285f989dd2b5c8d7f825b0a0e99d2fa6a698a70a11fc63b1602"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pl/firefox-58.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a009db74e155f4a089501ab96d7c72c2baa2e2ad0e555ffe0ee0baf6b259b5bfbf422ed6bca4b012f7b1799db02dd0d13323b39e6f73c7e5877e8ea080f62335"; + sha512 = "31954e6be8bc114fab04c45f5ffa1f38c74ca147d790bf63130dac4fbc6f8213cf485216d5f50ceb87e60d587fbdb82fe7034c04182017b8120ec6995a9278a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pt-BR/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-BR/firefox-58.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c77a8c87942045b959058319fcccc35ff8d054842fc8d7332171f110e82595886746597614ec4884915ba8397c63ebce597dbab648d2f823a1fd803f8c662382"; + sha512 = "5cfe1e7d703cfa42a1033df3509db3e91788160079c9396d55356b3c7f0b848b59e6a8f704866dd14f2f0714e89830ad541da615c7d4209249ccc46b01eb11ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pt-PT/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/pt-PT/firefox-58.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6c09645104219be720c843f3065617184ac5731f354d4217347c662d2cc7cf66060b7805e16b032914f20e75ebddc72de06c3f7b520656bf7d5afd9c4ca517d1"; + sha512 = "124ce2632b461e53b2cd3474e4fbcb92554006bee72498356886a451800a15d91ffe32ac87451b61d32e6f9d60b04dd14f4ba081a535124c7e2816edc11ac287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/rm/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/rm/firefox-58.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a232ea477b7b0841eb5dce7efb722b81da8136ec974bbdd7739d0700b163953f0b07e9509b973afa3c09af75b0b08523fe94dee21aec919f40f57e2ffd9dd6f3"; + sha512 = "847f41ff0293f82425bfba1af30deb4858c066f738f0f9d3db5303092406358e9b11f6207ed732903b860f60c1c1b1f622c5c1d2113eed073d70d039dac4a6bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ro/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ro/firefox-58.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "887a70aa19415abe5bb2bb10f4e66e293177713612186567e9691b715e8b7b7ec3487509a111e8d9053241bc74d1bc9bcbf930931a14050b7c8b513076ed385d"; + sha512 = "ccd5ac724cd810dec2e1ddb3e48139d9f5768d56ded09c0e6576c0dae898df310a4c5815635f646c0aa91caaad696c0ec6338bf21dacde33b4675f320fb4bca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ru/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ru/firefox-58.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "efb8f8746d07a387d094e23c10f8a2ae3697e854b26a9ec78013f4fb2284a359bfa6cac686779fb8e1d72114c59e191f86240f02b61f4c748909dfcea45368a3"; + sha512 = "d003f707e4a481ddaeab11dffccbc46d0d7173afb081a5007b3efbb6e1ce8d081a4eb23017b87d7e22fc3741e117bdcddbd2393b578bae2d07a2c2c2bbe2d0a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/si/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/si/firefox-58.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "9b469c23762a85e1f536928d78df87da8cf2661f78e5a558d8caeaf504ef7ae54c54eb2c3b6ea00381fc2e83348e9f403bd1c106cb518148ebccd113b5e5f442"; + sha512 = "80e0e8c1ee6483a5b70140e4a6c0eb694f24dbce0a638700866ea8759063bba3f42c33ffaf465c7e8266fc764fe2983a2d6b098356dc6f4420eff9089c22331a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sk/firefox-58.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1ff839d7c631fba2510534032345fcf6397f694d035daff179382270a7889b6c2046b4b2bd6d7666c6e298146ef47cc9fac2b7c525d7c8f563b58b7fe11a5dea"; + sha512 = "9aec4b3085ac757137a8ead6829bee1ae26cc02a494f60a3aa44daa56f5cbe1201c7588a60682b3bdccccad75782bade43d092352c015213e5f16212f9fb2800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sl/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sl/firefox-58.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "766e06e574d0f4933f8bf3e50521b5025915797f25712a29f0961759410272fda59aeb869d4d84cad961b277f5fc8ec78b8c333ee0e60e52e07fbb99822973b7"; + sha512 = "2dc5d855eaedd125f8a3d828d85bc12ae47123f2f4be2bbf1e262c678cbd2607ee48c61e6fa70402da5e7ad549e2580e7d9a0a696e89ac5fee1da2154443f289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/son/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/son/firefox-58.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "60df99153af07b88fd888b232b570eeeb4cafe01ed1c85cd536774b03e121523689d6de3fa3d6335fe7e0c9534273ce571d7a3fa00034e1681b78f4012a8fe7b"; + sha512 = "7a1c4f86a4e459e80725b250b3a54be7c78397bd909c7a2081723571378578b7e672af380305ff9dae714e911fb209833833fd7cb3fb8a850f9d6a3b14f41cba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sq/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sq/firefox-58.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "97263478fbeeada0ff397723bd8c4e0935c88c25cfc259bb2906e8d0a2ecce8101f4cb5ea9457b8b0b3276de475e0a8fbe995faa1edb33ced17b98404ac1021b"; + sha512 = "45d20dcd82c6648c0429dfa0009aaf2d807efb7e9468ded4491a04dced5957d3bc9c1491c09c7f85ea63991283e2c38b2c906ebb338dffba1d0db4748e56246a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sr/firefox-58.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b822f5077378b3c41951aafed6f6b3ab174d9240058d69a05905803c2b8ab74791abfc1ce59550585f0eca9fd97e3c0325c9bfeef47d14b8eca039959ebbbd1c"; + sha512 = "799f0548e18cbf77a6daf6ec0f9c12e904fde3235e9d8a5564e06df45bc037f4a04de0f5bfb9e74f9fa7053e8fc7b39b5c55b03dba5e78cf4e1400c033077f5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sv-SE/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/sv-SE/firefox-58.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "20555a59e733f49b3714cd4517aa952a0e9306681f5ea1f33d9464ee50705187ad0e745ebfa00a64e4cd0aac4d7c3c3257cf04681e74e18037684e675b05df7b"; + sha512 = "c2c693ab974b4c26a0c786955cff61f3b0689bd272b00fe4cbdbd7701a57481724f0ebf8aeb8427c7b50f4419875e9ca10d79c534c0e3ca8db132bcf6436e013"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ta/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ta/firefox-58.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2d5721bc3519b766dc70163b8f91988b49512e4709d998239691c382a006bb06fd82b793fce843f976a55cffa8a0ff06711917e35233629945539c1f27453d02"; + sha512 = "0771a9cbb44102291142fab34dbfd704461da5c6c013b48c1ee22cd7cc92ebfaad7ccac5b87bf764489d66e8cec2e4056e9fcd62c3ddb734753a48022f7f8914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/te/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/te/firefox-58.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "28ff1470be8a12212ef2467daa9a363ef929fe8f6741678b5d17ccfa149b122bc2dd74478bb96e721725c87d6a3000878dd7b51d1e38e6242e6e286c3621b25f"; + sha512 = "699d8d52cc8e1bac02fbca3caa6504a028100d76fc9fe2492dfe214c5a96f0d3425bf541d2873133dd00e501dcc9d27894e613c44fc3cf9adedc0e08104524f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/th/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/th/firefox-58.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "935a7354cca219695f58592b1d6668ee3d305559ad9c30cfc274b63952bb133429528e38bda10d5cdeddb428133712da74ba621e2c831ae14329c22530f9ff91"; + sha512 = "13cf7e1740ab2f508983617ce27f991db8049070061cb4d31299b372a801abf7292edd185fafc73dd58c46d009c32a6b5103a77834b2ddb0cc420cd98f747e9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/tr/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/tr/firefox-58.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "9f30bcd90b0c5ae5b55dc74a1e4adf8b029d8b87ba4f2961a4eb47ff4c61decff4abfac4f4664f1e99653f05a1749a17c775ba323ac322ec1fe3e104a4c57cc0"; + sha512 = "a3439d157762eddcc1c09c4b687028b97004ac49144a3f26ea2a05a8eccc0a8b04659147ae7e8972ac16299d262586cc1d0c1bc69e5a309a0c82086cf61202ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/uk/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uk/firefox-58.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "eca33af02a5f2d7363688aa2636d407822dfe9b70fa003d085ca6b9c3089adb49d080204c5e94d89178ff952dc5ca6a9402446610eb3e4460e55cdb066b965e3"; + sha512 = "7767a4549265131e29a142c6f2a914b8699f2042a9da5831192668300acc564fbfe94009b3ea33a7bedc469a7585029685fa91dc752b46d7d7be5425776bc7c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ur/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/ur/firefox-58.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "6dc7bb3693fa86305bb50be09c7945f199450c286867f56e66721944a27894e3de7a6452801ef4d04b0339403900b46effb7d2282a81c0b042ccf4c49f758a47"; + sha512 = "b85f5c3067cf897079ff1de7c0de84756fb2224f703ec6825108efff52bed3a6e780b8410a58ed756e926a6033cd10c888743642f997b9c9d7390096c3b5e7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/uz/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/uz/firefox-58.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "1ab8b3aefedc0c50c76169c0890cc5e3c381b7f743bb901c5573103761ae67985deae20ac2ef5b5d0f85f848a82a8d60bc87336205e462ddd2f040ba3586f258"; + sha512 = "3febb16ceabdcf7395196f1aef6c5ecc6a09f45e63485207816e95dd5ec0ac9729c3644b8afa75d68241ad203459239bd7f5693c6d8aa7e59afb1a1f661015ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/vi/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/vi/firefox-58.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "cca1d12e5f34b78f930d7b7b53afce55567be0e9e6894b2af1d20a5c2c11df0531d06945d812bec956904fbd3ecb4921c282f8a9a520661c4988d2147d370dd8"; + sha512 = "d117eca28279af133e2dde8dc25d3f7c4dcdc97f683f4570aa9cb8965200dfd8799271958ed6113b9bee488fc3e17d772b1aa4a4d657a49f72914890752af13c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/xh/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/xh/firefox-58.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8ed571a58fe104ef53aa785d10481371adcdf4a38f449bdbc65f6ab532797d9c4d301f6f75868645aca291cdc10ae3b5b8d2fd1f8f116f9ef21b9d91e4264f24"; + sha512 = "4ce7c4627a7db67ebe85ddb134cadca8cc4ecd3a01d8895dcb8b691f85e01911818404cc7243b4f5e1df0133a204a1ce5289168cae0b7e1b0b2674a659fc6684"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/zh-CN/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-CN/firefox-58.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ca63b214cdd67857d69ba86263e3efeadddbfc0f35a6c13ba9308959bc158d481cd6930246f3b59b7c335399ccfcfe5fbbff5fd1cd62aa1316c1da96403dfae8"; + sha512 = "d0a73f00af50d70b055a1b2e89dc942b56d8d6e3a297407060a88a994dfcbd52fd60ec221e3afd9b6036500d27d861415ab0b25ceb443210321823e4e3b189e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/zh-TW/firefox-58.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.2/linux-i686/zh-TW/firefox-58.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "35bcec66fb184dddc9aab83fd91c561c396b6ae48bb9e027e4a64aa7aa60fd264ce4da917255370736ffb08fc42362bba61844ee0295c6b7adf721fb70d93136"; + sha512 = "a855e8de90b5b26e8d4fed05b48c5efd6626c9d793f30c1f0b71d9b062a4e253b8c417a44e581ea8edd7babf5bd536b4384dd494dbb2fa36d7f585e555cdd655"; } ]; } From f5e6a723b81a7e228940996cc51573d9bcf1e32a Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 8 Feb 2018 03:13:01 +0900 Subject: [PATCH 611/797] firefox: 58.0.1 -> 58.0.2 --- 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 930f0877412..61954492580 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "58.0.1"; + version = "58.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "08xgv1qm2xx5wjczqg1ldf0yqm939zsghhr4acbkwnymv5apfak3vx0kcr9iwqkmdqjdjmggxz439kjn510f92fik33zjfsjn7sd9k5"; + sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f"; }; patches = From 202fb6faeabcb6f78e711ac0dd48002e0f776c53 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Feb 2018 19:28:38 +0000 Subject: [PATCH 612/797] coq: default to 8.7 --- pkgs/top-level/coq-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index c27a2e7d39d..12a62ba3851 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -75,7 +75,7 @@ in rec { coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; coqPackages_8_7 = mkCoqPackages coq_8_7; - coqPackages = coqPackages_8_6; + coqPackages = coqPackages_8_7; coq = coqPackages.coq; } From 4442a377cb54ca6df3172fa0e7ac1268c30e0a69 Mon Sep 17 00:00:00 2001 From: Adrien Devresse Date: Tue, 6 Feb 2018 14:40:09 +0100 Subject: [PATCH 613/797] rocksdb: 5.1.2 -> 5.10.2 - Update rocksdb to last version - Also enable RTTI support for rocksdb, required for Ceph - Add missing which and perl package --- .../development/libraries/rocksdb/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index a791c899485..b37a9bc04c3 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames +{ stdenv +, fetchFromGitHub +, fixDarwinDylibNames +, which, perl # Optional Arguments , snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null @@ -15,15 +18,16 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "5.1.2"; + version = "5.10.2"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${version}"; - sha256 = "1smahz67gcd86nkdqaml78lci89dza131mlj5472r4sxjdxsx277"; + sha256 = "00qnd56v4qyzxg0b3ya3flf2jhbbfaibj1y53bd5ciaw3af6zxnd"; }; - + + nativeBuildInputs = [ which perl ]; buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ]; postPatch = '' @@ -39,16 +43,20 @@ stdenv.mkDerivation rec { ${if enableLite then "LIBNAME" else null} = "librocksdb_lite"; ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1"; - - buildFlags = [ + + buildAndInstallFlags = [ + "USE_RTTI=1" "DEBUG_LEVEL=0" + "DISABLE_WARNING_AS_ERROR=1" + ]; + + buildFlags = buildAndInstallFlags ++ [ "shared_lib" "static_lib" ]; - installFlags = [ + installFlags = buildAndInstallFlags ++ [ "INSTALL_PATH=\${out}" - "DEBUG_LEVEL=0" "install-shared" "install-static" ]; @@ -66,6 +74,6 @@ stdenv.mkDerivation rec { description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; platforms = platforms.allBut [ "i686-linux" ]; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ adev wkennington ]; }; } From 0525e823929dd9116aaba9f194ef629c83f80d81 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 7 Feb 2018 20:01:13 +0100 Subject: [PATCH 614/797] docs: Explain how to login into built vm --- .../manual/installation/changing-config.xml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 75df307a1b7..4db9020b960 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -70,9 +70,21 @@ $ ./result/bin/run-*-vm The VM does not have any data from your host system, so your existing -user accounts and home directories will not be available. You can -forward ports on the host to the guest. For instance, the following -will forward host port 2222 to guest port 22 (SSH): +user accounts and home directories will not be available unless you +have set mutableUsers = false. Another way is to +temporarily add the following to your configuration: + + +users.extraUsers.your-user.initialPassword = "test" + + +Important: delete the $hostname.qcow2 file if you +have started the virtual machine at least once without the right +users, otherwise the changes will not get picked up. + +You can forward ports on the host to the guest. For +instance, the following will forward host port 2222 to guest port 22 +(SSH): $ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm From 0d65e2e0e5b318614bf967c71308355939d9aaaf Mon Sep 17 00:00:00 2001 From: sjau Date: Sat, 3 Feb 2018 17:29:31 +0100 Subject: [PATCH 615/797] zfs: add migration path for new crypto format fixes #34559 --- nixos/modules/tasks/filesystems/zfs.nix | 27 +++++++++++++++++- pkgs/os-specific/linux/spl/default.nix | 12 ++++++-- pkgs/os-specific/linux/zfs/default.nix | 37 ++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 6 ++-- 4 files changed, 68 insertions(+), 14 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 2c0a165887b..5d05b99b697 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,7 +24,11 @@ let kernel = config.boot.kernelPackages; - packages = if config.boot.zfs.enableUnstable then { + packages = if config.boot.zfs.enableLegacyCrypto then { + spl = kernel.splLegacyCrypto; + zfs = kernel.zfsLegacyCrypto; + zfsUser = pkgs.zfsLegacyCrypto; + } else if config.boot.zfs.enableUnstable then { spl = kernel.splUnstable; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; @@ -75,6 +79,27 @@ in ''; }; + enableLegacyCrypto = mkOption { + type = types.bool; + default = false; + description = '' + Enabling this option will allow you to continue to use the old format for + encrypted datasets. With the inclusion of stability patches the format of + encrypted datasets has changed. They can still be access and mounted but + in read-only mode mounted. It is highly recommended to convert them to + the new format. + + This option is only for convenience to people that cannot convert their + datasets to the new format yet and it will be removed in due time. + + For migration strategies from old format to this new one, check the Wiki: + https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change + + See https://github.com/zfsonlinux/zfs/pull/6864 for more details about + the stability patches. + ''; + }; + extraPools = mkOption { type = types.listOf types.str; default = []; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index e0d1754dd74..5af10d77933 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -66,8 +66,14 @@ in }; splUnstable = common { - version = "2017-12-21"; - rev = "c9821f1ccc647dfbd506f381b736c664d862d126"; - sha256 = "08r6sa36jaj6n54ap18npm6w85v5yn3x8ljg792h37f49b8kir6c"; + version = "2018-01-24"; + rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; + sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; + }; + + splLegacyCrypto = common { + version = "2018-01-24"; + rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; + sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5489bc5abbe..c00bd286b7e 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -5,7 +5,7 @@ , zlib, libuuid, python, attr, openssl # Kernel dependencies -, kernel ? null, spl ? null, splUnstable ? null +, kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null }: with stdenv.lib; @@ -19,6 +19,7 @@ let , spl , rev ? "zfs-${version}" , isUnstable ? false + , isLegacyCrypto ? false , incompatibleKernelVersion ? null } @ args: if buildKernel && (incompatibleKernelVersion != null) && @@ -43,7 +44,7 @@ let buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] - ++ optionals (buildUser && isUnstable) [ openssl ]; + ++ optionals (buildUser && (isUnstable || isLegacyCrypto)) [ openssl ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; @@ -160,19 +161,41 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-01-10"; + version = "2018-02-02"; - rev = "1d53657bf561564162e2ad6449f80fa0140f1dd6"; - sha256 = "0ibkhfz06cypgl2c869dzdbdx2i3m8ywwdmnzscv0cin5gm31vhx"; + rev = "fbd42542686af053f0d162ec4630ffd4fff1cc30"; + sha256 = "0qzkwnnk7kz1hwvcaqlpzi5yspfhhmd2alklc07k056ddzbx52qb"; isUnstable = true; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/ded8f06a3cfee...nixos-zfs-2017-09-12.patch"; - sha256 = "033wf4jn0h0kp0h47ai98rywnkv5jwvf3xwym30phnaf8xxdx8aj"; + url = "https://github.com/Mic92/zfs/compare/fbd42542686af053f0d162ec4630ffd4fff1cc30...nixos-zfs-2018-02-02.patch"; + sha256 = "05wqwjm9648x60vkwxbp8l6z1q73r2a5l2ni28i2f4pla8s3ahln"; }) ]; spl = splUnstable; }; + + zfsLegacyCrypto = common { + # comment/uncomment if breaking kernel versions are known + incompatibleKernelVersion = null; + + # this package should point to a version / git revision compatible with the latest kernel release + version = "2018-02-01"; + + rev = "4c46b99d24a6e71b3c72462c11cb051d0930ad60"; + sha256 = "011lcp2x44jgfzqqk2gjmyii1v7rxcprggv20prxa3c552drsx3c"; + isUnstable = true; + + extraPatches = [ + (fetchpatch { + url = "https://github.com/Mic92/zfs/compare/4c46b99d24a6e71b3c72462c11cb051d0930ad60...nixos-zfs-2018-02-01.patch"; + sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; + }) + ]; + + spl = splLegacyCrypto; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22ce05089f8..a1d94b556b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13120,7 +13120,7 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; inherit (callPackage ../os-specific/linux/spl {}) - splStable splUnstable; + splStable splUnstable splLegacyCrypto; spl = splStable; @@ -13151,7 +13151,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel spl; - }) zfsStable zfsUnstable; + }) zfsStable zfsUnstable zfsLegacyCrypto; zfs = zfsStable; }); @@ -13657,7 +13657,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "user"; - }) zfsStable zfsUnstable; + }) zfsStable zfsUnstable zfsLegacyCrypto; zfs = zfsStable; From e90985e92a9e8d1e32109befb5bf4f25b4de1369 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 7 Feb 2018 22:15:50 +0100 Subject: [PATCH 616/797] gitAndTools.grv: 0.1.1 -> 0.1.2 --- .../git-and-tools/grv/default.nix | 7 +- .../git-and-tools/grv/deps.nix | 102 ------------------ 2 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/grv/deps.nix diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index cbcf4cd9aeb..dc111b29450 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }: let - version = "0.1.1"; + version = "0.1.2"; in buildGoPackage { name = "grv-${version}"; @@ -10,13 +10,12 @@ buildGoPackage { goPackagePath = "github.com/rgburke/grv"; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "rgburke"; repo = "grv"; rev = "v${version}"; - sha256 = "0q9gvxfw48d4kjpb2jx7lg577vazjg0n961y6ija5saja5n16mk2"; + sha256 = "1i8cr5xxdacpby60nqfyj8ijyc0h62029kbds2lq26rb8nn9qih2"; + fetchSubmodules = true; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/grv/deps.nix b/pkgs/applications/version-management/git-and-tools/grv/deps.nix deleted file mode 100644 index 8de555df2e8..00000000000 --- a/pkgs/applications/version-management/git-and-tools/grv/deps.nix +++ /dev/null @@ -1,102 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "768a92a02685ee7535069fc1581341b41bab9b72"; - sha256 = "1m67cxb6p0zgq0xba63qb4vvy6z5d78alya0vnx5djfixygiij53"; - }; - } - { - goPackagePath = "github.com/bradfitz/slice"; - fetch = { - type = "git"; - url = "https://github.com/bradfitz/slice"; - rev = "d9036e2120b5ddfa53f3ebccd618c4af275f47da"; - sha256 = "189h48w3ppvx2kqyxq0s55kxv629lljjxbyqjnlrgg8fy6ya8wgy"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "51eb1ee00b6d931c66d229ceeb7c31b985563420"; - sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; - sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; - }; - } - { - goPackagePath = "github.com/rgburke/goncurses"; - fetch = { - type = "git"; - url = "https://github.com/rgburke/goncurses"; - rev = "9a788ac9d81e61c6a2ca6205ee8d72d738ed12b9"; - sha256 = "0xqwxscdszbybriyzqmsd2zkzda9anckx56q8gksfy3gwj286gpb"; - }; - } - { - goPackagePath = "github.com/rjeczalik/notify"; - fetch = { - type = "git"; - url = "https://github.com/rjeczalik/notify"; - rev = "27b537f07230b3f917421af6dcf044038dbe57e2"; - sha256 = "05alsqjz2x8jzz2yp8r20zwglcg7y1ywq60zy6icj18qs3abmlp0"; - }; - } - { - goPackagePath = "github.com/tchap/go-patricia"; - fetch = { - type = "git"; - url = "https://github.com/tchap/go-patricia"; - rev = "5ad6cdb7538b0097d5598c7e57f0a24072adf7dc"; - sha256 = "0351x63zqympgfsnjl78cgvqhvipl3kfs1i15hfaw91hqin6dykr"; - }; - } - { - goPackagePath = "go4.org"; - fetch = { - type = "git"; - url = "https://github.com/camlistore/go4"; - rev = "fba789b7e39ba524b9e60c45c37a50fae63a2a09"; - sha256 = "01irxqy8na646b4zbw7v3zwy3yx9m7flhim5c3z4lzq5hiy2h75i"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "1875d0a70c90e57f11972aefd42276df65e895b9"; - sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "3dbebcf8efb6a5011a60c2b4591c1022a759af8a"; - sha256 = "02pwjyimpm13km3fk0rg2l9p37w7qycdwp74piawwgcgh80qnww9"; - }; - } - { - goPackagePath = "gopkg.in/libgit2/git2go.v25"; - fetch = { - type = "git"; - url = "https://gopkg.in/libgit2/git2go.v25"; - rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5"; - sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc"; - }; - } -] From 26cfb4fdd1b8c13afe1cbdd6b6a03c0b95aa3892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= Date: Wed, 7 Feb 2018 23:30:13 +0100 Subject: [PATCH 617/797] vscode: 1.19.3 -> 1.20.0 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 5f1d5c50d4e..8599ff8e93e 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.19.3"; + version = "1.20.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0qaijcsjy9sysim19gyqmagg8rmxgamf0l74qj3ap0wsv2v7xixr"; - "x86_64-linux" = "1kvkcrr1hgnssy2z45h8fdgr9j6w94myr2hvlknwcahzxrnrwr7k"; - "x86_64-darwin" = "19vkv97yq0alnq4dvs62a2vx3f1mvfz1ic63114s9sd6smikrg0g"; + "i686-linux" = "0lhfljcdb05v0p3kc6zimgd2z057397blfp56bhr7v7wnsi6i40k"; + "x86_64-linux" = "138kvqa5cixry62yry0lwzxlk9fs8hb4zqzmsd8ag1jjfma8y45k"; + "x86_64-darwin" = "1adnwlqf2kw8wfjf86a3xg83j1yqnlsdckksw82b06x3j11g91i8"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From 4dda0dbc3d8268bd3b986133e5e193fb82253b53 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 7 Feb 2018 06:11:12 -0500 Subject: [PATCH 618/797] elpa-packages: 2018-02-07 --- .../editors/emacs-modes/elpa-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9d37287d84a..233520f8fc6 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -768,10 +768,10 @@ el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.5.3.tar"; - sha256 = "095gpanpf88j65cbf4r6c787qxi07kqpvdsh0dsdpg9m3ivmxbra"; + url = "https://elpa.gnu.org/packages/el-search-1.5.4.tar"; + sha256 = "1k0makrk3p6hknpnr3kbiszqzw3rpw18gnx2m8scr9vv0wif4qmk"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -1637,10 +1637,10 @@ }) {}; paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "paced"; - version = "1.0.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/paced-1.0.1.tar"; - sha256 = "1y2sl3iqz2vjgkbc859sm3h9jhnrgla9ynazy9d5rql0nsb6sn8p"; + url = "https://elpa.gnu.org/packages/paced-1.1.2.tar"; + sha256 = "1hxbzlzmlndj2gs9n741whi7rj6vbcnxdn89lg2l0997pqmsx58y"; }; packageRequires = [ async emacs ]; meta = { From 7e9d21414dc6b9d8850f72a4f5584dcb19366410 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 7 Feb 2018 06:11:27 -0500 Subject: [PATCH 619/797] org-packages: 2018-02-07 --- .../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 f74ae6ab381..f011d361cbc 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 = "20180129"; + version = "20180205"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180129.tar"; - sha256 = "0cwxqr34c77qmv7flcpd46qwkn0nzli21s3m9km00mwc8xy308n4"; + url = "https://orgmode.org/elpa/org-20180205.tar"; + sha256 = "03045w9pr45byrj7wqzkb6i56d4r7xykfr066qmywspk764wmfyh"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180129"; + version = "20180205"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180129.tar"; - sha256 = "1bk7jmizlvfbq2bbis3kal8nllxj752a8dkq7j68q6kfbc6w1z24"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180205.tar"; + sha256 = "0pbs3b0miqmpjw3d6mcw61dqyy6gnpdq6m18xmkbfvk5nn9lv7i6"; }; packageRequires = []; meta = { From d2f7f2d3d37c7ccb1e4e6e0f217afabeb355e14e Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 7 Feb 2018 17:51:21 -0500 Subject: [PATCH 620/797] melpa-stable-packages: 2018-02-07 --- .../emacs-modes/melpa-stable-generated.nix | 376 +++++++++++++----- 1 file changed, 272 insertions(+), 104 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 507e7bfcbe3..9e579bebd0c 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -611,12 +611,12 @@ ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "ac-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -3775,12 +3775,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.1pre1"; + version = "4.6.1pre2"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "b50ba2e822ff3a780f9b5a323d48e40881a88fc7"; - sha256 = "10im6z3nrkn0yh8004jwk68gjl0lz7qq3dpj24q50nhhqabw9ah5"; + rev = "b057bd0758f63f41fd8853ee025c58368e33ed21"; + sha256 = "1s066clvar4ws0mingh68jrj87dak52grs8mnd2ibcf1kf21w08q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -3838,12 +3838,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "58f641960bcb152b33fcd27d41111291702e2da6"; - sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; + rev = "afdd191b97e76c8393f656336699419a2b39ca1a"; + sha256 = "10qiapg6kp890q8n2pamvnnpxwcgcldw20mp23pmwzh9nsvqrpbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -5555,12 +5555,12 @@ company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "company-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -6854,22 +6854,22 @@ license = lib.licenses.free; }; }) {}; - datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "0.3.2"; + version = "0.4"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "d99e56785d750d6c7e416955f047fe057fae54a6"; - sha256 = "0s2pmj2wpprmdx1mppbch8i1srwhfl2pzyhsmczan75wmiblpqfj"; + rev = "2a92d80cdc7febf620cd184cf1204a68985d0e8b"; + sha256 = "0lzdgnmvkvap5j8hvn6pidfnc2ax317sj5r6b2nahllhh53mlr4j"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; - sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; + sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj"; name = "datetime"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs extmap ]; meta = { homepage = "https://melpa.org/#/datetime"; license = lib.licenses.free; @@ -7935,12 +7935,12 @@ dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dotenv-mode"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "preetpalS"; repo = "emacs-dotenv-mode"; - rev = "8d45b98beb04f486eb13d71765589e7dccb8ffa9"; - sha256 = "00hm097m1jn3pb6k3r2jhkhn1zaf6skcwv1v4dxlvdx8by1md49q"; + rev = "574bf1e3dfa79aa836c67759d9eec904a6878c77"; + sha256 = "0rx0f9vs68lbrjmzsajcxxhv6dm3wjiil12xzqg924d7fx3b1w52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode"; @@ -8103,12 +8103,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c"; - sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq"; + rev = "1cca0834800e8f775a558e84fc6d4fdcb6a235d0"; + sha256 = "0vq1qz12kbphl9hfsnq1v2yzsy0p6v6wi4h9b3a0iwvbya4f110l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -8354,12 +8354,12 @@ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "eacl"; - version = "1.0.3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "ef58d13fbff4b5c49f934cfb9e3fd6ee219ef4b2"; - sha256 = "0xxxzdr6iddxwx8z4lfay4n9r1ry8571lj2gadz5ycff6f6bxmhb"; + rev = "ec601f3a8da331dd0a9e7a93d40ae3925bd06700"; + sha256 = "1kgayh2q97rxzds5ba1zc9ah08kbah9lqbwhmb7pxxgvgx9yfagg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -9160,12 +9160,12 @@ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elbank"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "e4b532373a32889b8ab3389bd3e726dff5dd0bcf"; - sha256 = "0kqiwa5gr8q0rhr598v9p7dx88i3359j49j04crqwnc5y107s1xk"; + rev = "245cbc218e94793909ecede2e0d360c7d86f3122"; + sha256 = "1qcxh8v5dj2wcxxs3qcdny00p906nj33wsxyswwa4jbhh2vfxz12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; @@ -9286,12 +9286,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83"; - sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591"; + rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b"; + sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -10256,12 +10256,12 @@ epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "cask"; repo = "epl"; - rev = "a76ec344a7fee3ca7e7dfb98b86ebc3b8c1a3837"; - sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr"; + rev = "fd906d3f92d58ecf24169055744409886ceb06ce"; + sha256 = "0d3z5z90ln8ipk1yds1n1p8fj9yyh2kpspqjs7agl38indra3nb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; @@ -12035,6 +12035,27 @@ license = lib.licenses.free; }; }) {}; + extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "extmap"; + version = "1.0"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "extmap"; + rev = "3860b69fb19c962425d4e271ee0a24547b67d323"; + sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap"; + sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j"; + name = "extmap"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/extmap"; + license = lib.licenses.free; + }; + }) {}; exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; @@ -12119,6 +12140,27 @@ license = lib.licenses.free; }; }) {}; + f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "f3"; + version = "0.1"; + src = fetchFromGitHub { + owner = "cosmicexplorer"; + repo = "f3"; + rev = "19120dda2d760d3dd6c6aa620121d1de0a40932d"; + sha256 = "1qg48zbjdjqimw4516ymrsilz41zkib9321q0caf9474s9xyp2bi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; + sha256 = "099wibgp9k6sgglaqigic5ay6qg7aqijnis5crwjl7b81ddqp610"; + name = "f3"; + }; + packageRequires = [ cl-lib emacs helm ]; + meta = { + homepage = "https://melpa.org/#/f3"; + license = lib.licenses.free; + }; + }) {}; fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fabric"; @@ -12248,16 +12290,16 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "0.4"; + version = "0.6"; src = fetchFromGitHub { - owner = "magnetophon"; + owner = "rukano"; repo = "emacs-faust-mode"; - rev = "85f67bc4daabe6fd8dc6f5195c470716b543faa1"; - sha256 = "0rmq6ca75x47hk2bpsk1j2ja62kpplgyanpiqq4hk6q259rd4lyv"; + rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c"; + sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; - sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode"; + sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z"; name = "faust-mode"; }; packageRequires = []; @@ -13346,12 +13388,12 @@ flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }: melpaBuild { pname = "flycheck-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -14228,12 +14270,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "f1dc9dff6779c0ce6ab0a1c0ae349df1194a314f"; - sha256 = "0j1s6qws773aq3si7pnc1xmlrh9x3v3sfdni6pnlsirv2sc7c4g9"; + rev = "e2878da13e7b87a824ebd6c842e9f552369b220c"; + sha256 = "091c8scwdxfrg710d1rkqad6l2y8hiw8f5jg4ayvrjm7d0s29hsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -14446,12 +14488,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "e574976f5d8df1089672549a913a86c4039ab2cb"; - sha256 = "0p32sxswyjj22pg25i509d9a4j8k7c6xkbv55pd8jvjfxc2hdy3p"; + rev = "81b858a79b29622a1db732f97225cad705c4acf5"; + sha256 = "04zxal7j58whcy384sscwc7npcqdjlq01jjjn0i35pf2v7r045xy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -14509,12 +14551,12 @@ fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fwb-cmds"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "fwb-cmds"; - rev = "57973f99cf4a185b5cccbf941478fad25e8428c3"; - sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b"; + rev = "7d4abf8aa13b2235e4e2f0bb9049ebd6b491f710"; + sha256 = "10xjs8gm9l3riffxip1ffg8xhcf8srffh01yn6ifyln5f70b063d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; @@ -14947,6 +14989,27 @@ license = lib.licenses.free; }; }) {}; + git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "git-attr"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "arnested"; + repo = "emacs-git-attr"; + rev = "c03078637a00ea301cbcc7ae301ae928b10af889"; + sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr"; + sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi"; + name = "git-attr"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/git-attr"; + license = lib.licenses.free; + }; + }) {}; git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-auto-commit-mode"; @@ -15199,22 +15262,22 @@ license = lib.licenses.free; }; }) {}; - git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "3.0"; + version = "4.4"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "7c66a878ee89861dcd59b5dfc598520daa156052"; - sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3"; + rev = "020d02cd77df6bf6f0efd4d4c597aad2083b6302"; + sha256 = "1g7gxa2snh8ya8r3wim834qszhcmpp154gnvqkc3b1gw8x7jdrql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq"; name = "git-timemachine"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/git-timemachine"; license = lib.licenses.free; @@ -16252,12 +16315,12 @@ grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-x-link"; - version = "0.4.1"; + version = "0.5"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-x-link"; - rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; - sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c"; + sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; @@ -18486,12 +18549,12 @@ helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }: melpaBuild { pname = "helm-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -18612,12 +18675,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "22ff951b092a3fbde8eadf284a24e86bb4694f6a"; - sha256 = "0argxi8dppgyfljwn654a7183lva74wnnwzkk3xlrvgngmir56kp"; + rev = "beb7e488454402a122b9dec9a019ea190b9b7dc3"; + sha256 = "0wclsv69v84d7bknnlralham94s7iqal7aczsvfxgj97hpwgywfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -19536,12 +19599,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "1d00ab870d06b946d94e5e6d340b85a3e51fbfb1"; - sha256 = "191w5di4f0in49h60xmc5d6xaisbkv8y9f9bxzc3162c4b982qfr"; + rev = "523df320197b587abd8c0ec4e9fbc763aeab1cf6"; + sha256 = "04jak5j4yywl7fn5sggc125yh6cy0livf55194mfxs2kmbs5wm0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -20394,6 +20457,27 @@ license = lib.licenses.free; }; }) {}; + info-colors = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-colors"; + version = "0.2"; + src = fetchFromGitHub { + owner = "ubolonton"; + repo = "info-colors"; + rev = "13dd9b6a7288e6bb692b210bcb9cd72016658dae"; + sha256 = "1h2q19574sc1lrxm9k78668pwcg3z17bnbgykmah01zlmbs264sx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors"; + sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x"; + name = "info-colors"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/info-colors"; + license = lib.licenses.free; + }; + }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -20942,12 +21026,12 @@ ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }: melpaBuild { pname = "ivy-rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -21759,12 +21843,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "56bafd9b1b022ebfd98cad022792957164ec56fb"; - sha256 = "02nmrdc2ldvfzyn3s9qrvq61nl93krc1vyr4ad1vkmbyqrwszyvd"; + rev = "d730208cff185ee86a81f8a5a6feadfea78ab9cc"; + sha256 = "0xfb8zi6jvwdivklc3lk5dzf8nnx05pm4fip44s4al6ajns8hgya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -22323,6 +22407,27 @@ license = lib.licenses.free; }; }) {}; + lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lcr"; + version = "0.9"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "lcr"; + rev = "3bc341205bba437c8fec4fefefaf39793c0405ae"; + sha256 = "0jvdnb3fn33wq7ixb7ayrallq1j5gc9nh3i3nmy03yg11h60h1am"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; + sha256 = "07syirjlrw8g95zk273953mnmg9x4bv8jpyvvzghhin4saiiiw3k"; + name = "lcr"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/lcr"; + license = lib.licenses.free; + }; + }) {}; leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; @@ -22753,12 +22858,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.21.0"; + version = "2.21.1"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0"; - sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx"; + rev = "e0a5627e6591e1cbb9f93aabc44adbdc50b346c9"; + sha256 = "0dhm7gdd1smlibj5jmzps97kwkpzcigbdp0l26baa2mkc6155y66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -23138,8 +23243,8 @@ sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; - sha256 = "03cmja9rcqc9250bsp1wwv94683mrcbnz1gjn8y7v62jlfi5qws5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; + sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga"; name = "magit"; }; packageRequires = [ @@ -23242,12 +23347,12 @@ magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }: melpaBuild { pname = "magit-gh-pulls"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "sigma"; repo = "magit-gh-pulls"; - rev = "e4a73781e3c1c7e4a09232b25e3474463cdf77b6"; - sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z"; + rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7"; + sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls"; @@ -28019,12 +28124,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "0.2.4"; + version = "0.3"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "4b4585264a28152f2eda0f7e5ceed132f9d23e16"; - sha256 = "1k3lv4qqkp87piwlwl3gahac1zpjzv397f65g4khbpby2kgg8dpi"; + rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d"; + sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -28331,6 +28436,27 @@ license = lib.licenses.free; }; }) {}; + panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "panda-theme"; + version = "0.1"; + src = fetchFromGitHub { + owner = "jamiecollinson"; + repo = "emacs-panda-theme"; + rev = "ae24179e7a8a9667b169f00dbd891257530c1d22"; + sha256 = "05vv4idl9h59jd089hpd09xcy1ix30bq0c4fif2b66170aychvii"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme"; + sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7"; + name = "panda-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/panda-theme"; + license = lib.licenses.free; + }; + }) {}; pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; @@ -30811,6 +30937,27 @@ license = lib.licenses.free; }; }) {}; + pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "pynt"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ebanner"; + repo = "pynt"; + rev = "bc750cd244141005ea3b7bb87f75c6f6c5a5778f"; + sha256 = "0mj8lkc40iv8d6afl4dba7gsbi0mgnx9ivanvczq6pxp5d4kgfsn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; + sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3"; + name = "pynt"; + }; + packageRequires = [ deferred ein emacs epc helm ]; + meta = { + homepage = "https://melpa.org/#/pynt"; + license = lib.licenses.free; + }; + }) {}; python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-environment"; @@ -32206,12 +32353,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9"; - sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56"; + rev = "98d668e85cf9ae84e775742752c5656dd2df2f17"; + sha256 = "0raqjbkl1ykga4ahgl9xw49cgh3cyqcf42z36z7d6fz1fw192kg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -35248,12 +35395,12 @@ swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }: melpaBuild { pname = "swiper-helm"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper-helm"; - rev = "f3d6dba865629eed8fb14f92dab1fad50734891b"; - sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64"; + rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008"; + sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm"; @@ -36192,12 +36339,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.6.2"; + version = "2.7.1"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "1ee2e6e5f6e22b180af08264e5654b26599f96fe"; - sha256 = "0gd149vlf3297lm595xw3hc9jd45wisbrpbr505qhkffrj60q1lq"; + rev = "6ca5319cdd581d323944584242a1ba45a115ee3d"; + sha256 = "1jcnzx8g742pfh9nv3gcsxdj31kfpjzl202by30pzg2xz54i48gb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -36380,12 +36527,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.12"; + version = "0.12.1"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "0de5a5fa2438890ae9c2ca61999042ab175df3e9"; - sha256 = "1wqlbbm71s1hvglsdp1qs7nvj6gnkjkai4rr8hhp1lliiyd5vmia"; + rev = "03a36853f141387654b7cb9217c7417db096a083"; + sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -37118,6 +37265,27 @@ license = lib.licenses.free; }; }) {}; + usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "usql"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "nickbarnwell"; + repo = "usql.el"; + rev = "4cd8f4cf5c2e75485343321f02d621915aef10e8"; + sha256 = "0cw25g8jvfjpzq3sabc3zbp0qynknzc0mq5psspcbxffk2qalbb9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql"; + sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84"; + name = "usql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/usql"; + license = lib.licenses.free; + }; + }) {}; utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; @@ -38863,12 +39031,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "ed3d0f4ccb2b28ff034192c50f244a97197d3911"; - sha256 = "0djh18lm3xn9h4fa5ra0jrlzdzwhvhcalipj73j5gmmfaif4ya9q"; + rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; + sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; From e843ef280e4743c349378388f36cf84cd8c01743 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 7 Feb 2018 17:52:02 -0500 Subject: [PATCH 621/797] melpa-packages: 2018-02-07 --- .../editors/emacs-modes/melpa-generated.nix | 1656 ++++++++++------- 1 file changed, 1034 insertions(+), 622 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 468b40f1181..5990dccd2f3 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -761,8 +761,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; - sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; + rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; + sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -778,12 +778,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20180126.2015"; + version = "20180206.202"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; - sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; + rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; + sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -824,8 +824,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "6ceeb7dd27b242123c69a5ae95b69d8ac2238a68"; + sha256 = "00cp3v1gwj0flmlzhghnxvy5zy7rfdrnvwv0c8704ddfsavxp6i3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1447,12 +1447,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20180126.2021"; + version = "20180130.1928"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "9367e4a277fdabde7433640fbae48407bab7c4da"; - sha256 = "0y71h25vi10qirn0q48csxd1xjhha17f9za9fdvfs7pcsqmkk8im"; + rev = "a038d91ec593d1f1b19ca66a0576d59bbc24c523"; + sha256 = "0f86xp7l8bv4z5dgf3pamjgqyiq3kfx9gbi9wcw0m6lbza8db15a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1771,12 +1771,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20180115.627"; + version = "20180207.945"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "64845a6b67627e897dd42d8302c25c03ddce2aee"; - sha256 = "0fb5pq5242xqss02si4nlwgy073kpvf909avwdngvyg6apyk66p2"; + rev = "366698400c555211c2082962a5d74f3dd79a78c8"; + sha256 = "1kzb15aqy7n2wxibmnihya7n6ajs34jxp9iin96n758nza92m59c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -1810,22 +1810,22 @@ license = lib.licenses.free; }; }) {}; - amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "amx"; - version = "20170923.835"; + version = "20180203.1043"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "amx"; - rev = "88ab7ccb2a88b5cd3ecc4d703ae9373df3e4971c"; - sha256 = "1n1zsrlj272scl4xcbys86d6gxnaq08vp5frd96i47c1an75p0xw"; + rev = "356393033980746eccff950c84c6e3c2984cbae4"; + sha256 = "12ady1k621difw8b00x8ynhynkra02nkcm22s2cyzh9vv4m505zg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap"; name = "amx"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/amx"; license = lib.licenses.free; @@ -1960,12 +1960,12 @@ anki-editor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anki-editor"; - version = "20180128.129"; + version = "20180203.2239"; src = fetchFromGitHub { owner = "louietan"; repo = "anki-editor"; - rev = "690121ce582105239f8bf20a9c011b8c6bb1661a"; - sha256 = "168lixn9s3s1p33qw8x6wr5ll6mikkx3316xfsql0bdnz1rkk6cp"; + rev = "4625f9ab0f82cd8586db6af455096f00affdd7fd"; + sha256 = "0pvh6bgmivnci3dmhq7j1g553b60479msqc705630zyk2qhf5dmr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8155d649e4b129d0c72da6bb2b1aac66c8483491/recipes/anki-editor"; @@ -2526,12 +2526,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20180125.612"; + version = "20180201.637"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "dfb500b394cfb8332f40d8b9ba344f106fdb9370"; - sha256 = "1w6dfnrz3gi2d800k5ih2daak5krnpddkzjhmv92nyvgrn7x3hd3"; + rev = "44fe79d56bafaaf3a688e5441298ec5f7bbf419e"; + sha256 = "12i39kl4fj1xhzrdw24i4mi2m3aj2w3isxpcyr48z23d1x0grviq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2987,12 +2987,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20180116.1024"; + version = "20180201.1853"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "fbe026c64f53bf5afa27c55fda6118d45cea7d5e"; - sha256 = "0hg8drfcd6y6mis5xz9b0a43d5agfsrw39ri2i2p6gcm4mii1041"; + rev = "bf5b76e472d22577fa406c7088a1c2d99fe4b636"; + sha256 = "08hrnv7jyzcnh4iyf5r3b1y4wbynk4fraxhkdgwmxzr666aq7cn7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3764,12 +3764,12 @@ autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autobookmarks"; - version = "20171021.1532"; + version = "20180131.535"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; - rev = "b40c69f2d1c419adad516bee81b07b99110e5cc3"; - sha256 = "0dailajx26dixlibqps5wfh224ps7azm453lmzxjc2d10mgapi5v"; + rev = "93610f22500ac207f86e159d411de15082a8befb"; + sha256 = "1ydqc2ry43sibf8xa99w2w6prxh5gmlmcinp0z67yhdcz4dh4v2v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks"; @@ -3974,12 +3974,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20180121.246"; + version = "20180205.2254"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "7f1da34f0d74e5a922400b05fcfada5df1c0e3ce"; - sha256 = "13pcd61a81f7cby5lk6hnasp95khhrgnqz8v738g2vwsqbfqbwyq"; + rev = "1a119d0b52f0755fa14ad4d8c6e00e2e720b7732"; + sha256 = "1im1bvrcy9163414328yfmsz2hb0whqxnd6wpmh8hvh6vpbmwaj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; @@ -4118,6 +4118,27 @@ license = lib.licenses.free; }; }) {}; + aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "aws-snippets"; + version = "20180207.622"; + src = fetchFromGitHub { + owner = "baron42bba"; + repo = "aws-snippets"; + rev = "a6e7d102c5b1143f4787a160cbf52c1e8ab48d09"; + sha256 = "08nbcddmi2fq6hf324qhywy29pwixlfd5lnd5qlfirzrvdyz7crv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets"; + sha256 = "1p2il4ig3nafsapa87hgghw6ri9d5qqi0hl8zjyypa06rcnag9g9"; + name = "aws-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/aws-snippets"; + license = lib.licenses.free; + }; + }) {}; axiom-environment = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; @@ -4313,15 +4334,36 @@ license = lib.licenses.free; }; }) {}; + bart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bart-mode"; + version = "20180131.1829"; + src = fetchFromGitHub { + owner = "mschuldt"; + repo = "bart-mode"; + rev = "3d8573713b6dbaf52402de9c15cb34eb3c89a67b"; + sha256 = "0192fc8fnkmnpwjf1qncvp5h7m8n1hlc697mrsn8ls7pnna01phq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode"; + sha256 = "0wyfsf7kqfghnci9rlk9x0rkai6x7hy3vfzkgh7s2yz081p1kfam"; + name = "bart-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bart-mode"; + license = lib.licenses.free; + }; + }) {}; base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20180114.1149"; + version = "20180205.1653"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "3492ce6613e974a329c8773e09a615c28b48aa10"; - sha256 = "140yxkg1gnfhmsw6pira2p0nq2ll1x8swi9rlngraxshldf0c6zv"; + rev = "10180e88d6d9434cec367b6c91222dd2fc3bd8ae"; + sha256 = "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4608,12 +4650,12 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20171214.2054"; + version = "20180206.641"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "b355c87723746dc61da464afba2adf9d4ece1db0"; - sha256 = "18l6423s23w3vri49ncs7lpnfamgzc7xm0lqv3x1020030m0lzp2"; + rev = "9f0de9cad13801891ffb590dc09f51ff9a7cb225"; + sha256 = "0q0i1j8ljfd61rk6d5fys7wvdbym9pz5nhwyfvmm0ijmy19d1ppz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; @@ -4906,8 +4948,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; - sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; + rev = "c94a05d3b8a247a1abc9d0739a1b18387c26839f"; + sha256 = "0q833z76fysv66anrng0skgfa3wc2gcb8rw0xr759rblxmxmnp1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek"; @@ -5032,8 +5074,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; @@ -5053,8 +5095,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -6560,12 +6602,12 @@ cal-china-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cal-china-x"; - version = "20170122.1100"; + version = "20180203.755"; src = fetchFromGitHub { owner = "xwl"; repo = "cal-china-x"; - rev = "2e9f8e17969a32268fa1c69b500d28590338a98e"; - sha256 = "1qqy0phjxqc8nw7aijlnfqybqicnl559skgiag5syvgnfh4965f0"; + rev = "3cd8288562eaebf47163431c3d908fc4ed469644"; + sha256 = "1zj9psr4rmdv40nyxyjlixh51alvm8fcdiv7fp5xzq7qxg53iz50"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1098d34012fa72f8c8c30d5f0f495fdbe1d3d65/recipes/cal-china-x"; @@ -6774,8 +6816,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "261c7144e18d54dd38ec1b0b48ae6e7c46eccb02"; - sha256 = "1687rg64i64if3mm0k8sjjbblpkshdhf5aksm8gx24gm1vw3yid6"; + rev = "f5a1ec53fc571b0bcf5bf865fb2df4be1c8ed863"; + sha256 = "01dcfz3wcrpb9gfcqnw5x3f3dvck747yzfyf3jpfxfwmys29cn8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7186,9 +7228,9 @@ license = lib.licenses.free; }; }) {}; - centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + centered-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "centered-window-mode"; + pname = "centered-window"; version = "20171127.149"; src = fetchFromGitHub { owner = "anler"; @@ -7197,13 +7239,13 @@ sha256 = "1z3zi6zy1z68g4sfiv21l998n04hbbqp660khind6ap8yjjn8ik8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode"; - sha256 = "08pmk3rqgbk5fzhxx1kd8rp2k5r5vd2jc9k2phrqg75pf89h3zf4"; - name = "centered-window-mode"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/58bfd795d4d620f0c83384fb03008e129c71dc09/recipes/centered-window"; + sha256 = "0w6na4ld79bpmkiv6glbrphc32v6g2rcrpi28259i94jhgy1kxqk"; + name = "centered-window"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/centered-window-mode"; + homepage = "https://melpa.org/#/centered-window"; license = lib.licenses.free; }; }) {}; @@ -7277,8 +7319,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "e7f50592d1ff0c8e2fa175e56190566f447fbaf2"; - sha256 = "10f2an6pmz7a088rllf7k1kcyllak6xr4fhvxqgvyqm1h1jbqjbi"; + rev = "50deb00b4a9a297a59879d3476e83cf57d39db5f"; + sha256 = "1warx0x4j8azznb3c2jm2yd6ykif0825l2k7cccd8yqnrkwl4xlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7861,12 +7903,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180129.1017"; + version = "20180207.239"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "c51903c8ba144ddb8e2b742db5daa572e09e6b97"; - sha256 = "066fvw3dgnrakl5bjpmkymnvv0nzhlbil15xhaywdygy2cylm00d"; + rev = "f43eda2fd14d355cd914a6f737641a508655a1e5"; + sha256 = "1dflm1zagby3i32ld35slzgisrds17ariws3nj5k79f8fb80ifml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8524,12 +8566,12 @@ clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "clojure-cheatsheet"; - version = "20161004.2328"; + version = "20180201.4"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-cheatsheet"; - rev = "57e877d9466934b5319989b542f93b42dffec9ae"; - sha256 = "1d61q50h4vxk8i3jwxf71rbqah7ydfsd0dny59zq0klszfz2q26b"; + rev = "85c382317a56bbdfac03ae95999c28fc0cde65d7"; + sha256 = "0w9l6nz583qyldz44jqdh4414rgm6n2fzbaj5hsr5j1bkdizq7xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet"; @@ -8545,12 +8587,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20180121.1011"; + version = "20180202.922"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "59e9247d64ca82d1e01bb21ee49df1220120fb0e"; - sha256 = "1ngirh0kp53i2qcvzkf84av8fijp23rfjfhwzkwhiihs3zy63356"; + rev = "5cf0fd9360dc5a9a95464601319062673d213807"; + sha256 = "07ignia68340fjd0qnlrmgb7p6v15xysjx30xxfvd215slpjc4qw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8570,8 +8612,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "59e9247d64ca82d1e01bb21ee49df1220120fb0e"; - sha256 = "1ngirh0kp53i2qcvzkf84av8fijp23rfjfhwzkwhiihs3zy63356"; + rev = "5cf0fd9360dc5a9a95464601319062673d213807"; + sha256 = "07ignia68340fjd0qnlrmgb7p6v15xysjx30xxfvd215slpjc4qw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8776,12 +8818,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20180122.1301"; + version = "20180206.948"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "21c1ca99393ea0160f0503a6adb8f3606d33926a"; - sha256 = "11kqczlc8rwq9v9wk15h8hzhdffz9nxifr9laa07bx74yiddxmyj"; + rev = "c98f1929c3d814e8d4c668da1da1a09935c0deba"; + sha256 = "0jdfd8j4fiw6vnsmpmr8r7b98dh9an84firnvj1q6wx9a84lfcgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8801,8 +8843,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "92cd3d06772ada13935790d66927ab4663c7d628"; - sha256 = "03f04yn0gphcd4664w73pdpmq46ljkvxbv7xyg5s084j5mk263hx"; + rev = "5656ebc87cab02762d242326c6e5397393e671d7"; + sha256 = "1hr5nq5c7cii700izscx9px62sgg97kjhv0n0a4zv28ghjx8gq2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9553,12 +9595,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20180123.1315"; + version = "20180206.226"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "d789f2643c11f7c53fc47ed9d9b271bb6f6718a3"; - sha256 = "0kqpjxbv9gfkki5cz78dslfgwwf2n15y32dq059lmbfm4mg9f5n4"; + rev = "3b14294a80e3c84242e38495022b3cda1b5bbbb8"; + sha256 = "1xxib3wz4cykshzr5sadqca83mzdm9fbx39qvm648vks5pvd2inw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9746,22 +9788,22 @@ license = lib.licenses.free; }; }) {}; - company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, posframe }: melpaBuild { pname = "company-childframe"; - version = "20180124.1744"; + version = "20180205.2236"; src = fetchFromGitHub { owner = "tumashu"; repo = "company-childframe"; - rev = "bb3d778bb12d47c7f2311eecb17985a5695acd31"; - sha256 = "1b1xyy0f20ls7v695vg6m5g0vb3pn7v7vdbsziarf2jaqgc8ps57"; + rev = "fb799c3c8f8099a0ec7d21beb3b90136704c741e"; + sha256 = "121qqb797vfpfxxkk0gvh5x4p03lb6aarjfydl88ah6rw5087dij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4fda072eb1e3f4feb9ad9834104f748f5b749a0d/recipes/company-childframe"; sha256 = "1l8bd9fnw49apvwjgrlfywascbczavpaxns2ydymmb6ksj00rvzy"; name = "company-childframe"; }; - packageRequires = [ company emacs ]; + packageRequires = [ company emacs posframe ]; meta = { homepage = "https://melpa.org/#/company-childframe"; license = lib.licenses.free; @@ -10176,12 +10218,12 @@ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20180122.1747"; + version = "20180207.859"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "0f750d4cbde7063472b1f25b7cef7e632ae307cb"; - sha256 = "1xszd359y7f93azf1b8805v4s99ql4hfajbz9nzwkb5py1jqxxn0"; + rev = "e09df153485787b2f789976578e62e9a8bac207b"; + sha256 = "1kxh45fsc8vhvpwfwi6cqiws77y7hyz4z79mivnmwl80cq94syrb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10306,8 +10348,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; - sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; + rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; + sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10459,8 +10501,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "6ceeb7dd27b242123c69a5ae95b69d8ac2238a68"; + sha256 = "00cp3v1gwj0flmlzhghnxvy5zy7rfdrnvwv0c8704ddfsavxp6i3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10494,6 +10536,27 @@ license = lib.licenses.free; }; }) {}; + company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-solidity"; + version = "20180206.821"; + src = fetchFromGitHub { + owner = "ssmolkin1"; + repo = "company-solidity"; + rev = "0687c09671403888b88e27d58e70f1bc969d1425"; + sha256 = "1clxzxyvnnf6mvadlqslbn7is7g2b625mnb4c5k7iyflc081wpz2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity"; + sha256 = "076z5jqh486k2lkh9rgbhs71bws4fba68pjybr9yyf0sdc5m7kc6"; + name = "company-solidity"; + }; + packageRequires = [ cl-lib company ]; + meta = { + homepage = "https://melpa.org/#/company-solidity"; + license = lib.licenses.free; + }; + }) {}; company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; @@ -10560,12 +10623,12 @@ company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }: melpaBuild { pname = "company-terraform"; - version = "20171215.546"; + version = "20180131.1503"; src = fetchFromGitHub { owner = "rafalcieslak"; repo = "emacs-company-terraform"; - rev = "1730e03aec5e67b751f50469c978e83326eae7f3"; - sha256 = "0ha98424vzb4sx03l88mc1mspjl9h5aypkj3jqyla7sxga8a3ifa"; + rev = "74dad245567e06e758e1112c0d75f3eccf48e32c"; + sha256 = "0y4giv3i947258j5pv6wpzk95zry8sn8ra66m1237lk0k9zhpfdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform"; @@ -10648,8 +10711,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "7f394d02f6f3149b215adcc96043c78d5f32d612"; - sha256 = "0q7y0cg2gw15sm0yi45gc81bsrybv8w8z58vjlq1qp0nxpcz3ipl"; + rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; + sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10875,12 +10938,12 @@ contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "contextual-menubar"; - version = "20170908.408"; + version = "20180204.2309"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "contextual-menubar"; - rev = "67ddb1c8eec62e2b26524c09585a4f25f03ebb11"; - sha256 = "06rfkv7q9brahjgaqvpixqb26v4a65hyphl7ymjx8qyyypzrzac5"; + rev = "f76f55232ac07df76ef9a334a0c527dfab97c40b"; + sha256 = "0zks4w99nbhz1xvr67isgg6yjghpzbh5s5wd839zi0ly30x4riqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar"; @@ -11085,12 +11148,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180114.1336"; + version = "20180205.837"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; - sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; + rev = "1f5c4ff1df9d617a79bc969b99d6c2c667f5eaad"; + sha256 = "1b0ig4gza8lwwlx0z5bwqn60cakq551bgm82wl1xdscwwzrrdza3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11232,12 +11295,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20180105.632"; + version = "20180204.1147"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "4d78ae8c90e8ebb903b8e70442989a69e46ff069"; - sha256 = "0s81jrmfql3cjh0bf6vfk3gpb94xqcpbkvjah11j0d0ijgw4y1dg"; + rev = "1c1e7eff065e1660981428ef326185c404488705"; + sha256 = "18b66rv73y6gx0hhjjfixywj0ig41rxb4k4ngpxap56cy7b8kfj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11484,12 +11547,12 @@ cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "cquery"; - version = "20180129.1017"; + version = "20180204.912"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "275bf669d14bfcbd342833c245fa9129c5ff76a1"; - sha256 = "0rm0m35sqwas9ayx8lvq19g04y3ndnhfgl7mpfmmjqab9pcqdrjn"; + rev = "e3ce2127f9937eb0a7b7a22e81f205ff150f4ecd"; + sha256 = "1p3idygppqi5xgbjq9pr5pqpm4isw1cb8qq8szf5mb6ypq2dlszm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; @@ -11803,8 +11866,8 @@ src = fetchFromGitHub { owner = "kkweon"; repo = "emacs-css-autoprefixer"; - rev = "2b18f38978845a18c66218e1abf0db789137073f"; - sha256 = "00y3ip6n0w9w6cyfrf3xqlrx2gqzq3b61n8c0bgjlvw85drjz2pd"; + rev = "a694e7e725074da99d90b18dd166707f1649bfae"; + sha256 = "0cd4i9xbc7rqsmaa73gj4p9za3g6x6xv54ngnkf6vprpg3g7lb6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/122e3813a5b8a57303345e9cd855f4d85eced6f0/recipes/css-autoprefixer"; @@ -12244,8 +12307,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "eb17d235aade6e338841bf4e53108e1a7c832190"; - sha256 = "1rf73qcyxf48pfxdrnr2bhqy8k5zj001dhixmg1d35z28cwx975n"; + rev = "5ceacd69d75efb44a3b997f41565038e5aa60dc6"; + sha256 = "1hfwl3flsl32z9p2fr0jvya51yv0gww6zgb2acvnzlpll5gvw050"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12405,22 +12468,22 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: + dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180125.116"; + version = "20180202.48"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "5fb1765fcf5ac896c8d439d7f2d4030672e7509c"; - sha256 = "11nj1x9yxdkwvpsz7lkc9msgnkbzkrcw088nfryic9398mnrrccf"; + rev = "c1c9bde9a83a87c46731466af56cd31262d057fa"; + sha256 = "01krdh3cz2ddhlhpyc072izm4y29qbpjkmwj0fq4vi5hcqzbalsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "dante"; }; - packageRequires = [ dash emacs f flycheck haskell-mode s ]; + packageRequires = [ dash emacs f flycheck haskell-mode lcr s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -12639,12 +12702,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20180118.743"; + version = "20180206.2124"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "c1991d4c22f356be21df6b3badd7233a94df7937"; - sha256 = "14d4jlsymqsggdw12drf1qi7kwad9f43iswkyccr3jwg51ax00r7"; + rev = "48a5015dd1314a8bcad48f2ad8866dd911001b01"; + sha256 = "0cs8l20fw34ilr7qir1p708wx925d3qkp7g4py2s2d8k1yf0kjmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12685,8 +12748,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "c1991d4c22f356be21df6b3badd7233a94df7937"; - sha256 = "14d4jlsymqsggdw12drf1qi7kwad9f43iswkyccr3jwg51ax00r7"; + rev = "48a5015dd1314a8bcad48f2ad8866dd911001b01"; + sha256 = "0cs8l20fw34ilr7qir1p708wx925d3qkp7g4py2s2d8k1yf0kjmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12762,22 +12825,22 @@ license = lib.licenses.free; }; }) {}; - datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + datetime = callPackage ({ emacs, extmap, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20180118.837"; + version = "20180205.1445"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "d99e56785d750d6c7e416955f047fe057fae54a6"; - sha256 = "0s2pmj2wpprmdx1mppbch8i1srwhfl2pzyhsmczan75wmiblpqfj"; + rev = "2a92d80cdc7febf620cd184cf1204a68985d0e8b"; + sha256 = "0lzdgnmvkvap5j8hvn6pidfnc2ax317sj5r6b2nahllhh53mlr4j"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; - sha256 = "0mnkckibymc5dswmzd1glggna2fspk06ld71m7aaz6j78nfrm850"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; + sha256 = "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj"; name = "datetime"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs extmap ]; meta = { homepage = "https://melpa.org/#/datetime"; license = lib.licenses.free; @@ -13395,12 +13458,12 @@ diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20180123.1420"; + version = "20180201.355"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "9ef21e4ea2389545417741e20a89d92bfd72d6ff"; - sha256 = "0fj4yjmvfbzqrcmngfbszvr1i8i17ap4lb99idyc9drgiq53xdw1"; + rev = "190622d3fa2c3237529ec073a8fa00aee06023a1"; + sha256 = "0jh270anr2ralixgwsc3wn48jnw3qwz6m18lg0sgwgzyajh0fpb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -15102,12 +15165,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20180128.2355"; + version = "20180205.1204"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "f7c05d390fa733ec7998025d407608fe9f67c111"; - sha256 = "18c3347n3x327qnpd0ab8j74zqs4yb5rn6gz0x2y8kknzzn4h76q"; + rev = "d84a0172202243f4fe0ae5738d7ea9b1eb2d38c6"; + sha256 = "0za6cq7wr7zpqjq5g6ac7zqnzq544s0zkkhsc0djcwc2x67vr95g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15144,12 +15207,12 @@ dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dotenv-mode"; - version = "20171123.649"; + version = "20180206.900"; src = fetchFromGitHub { owner = "preetpalS"; repo = "emacs-dotenv-mode"; - rev = "8d45b98beb04f486eb13d71765589e7dccb8ffa9"; - sha256 = "00hm097m1jn3pb6k3r2jhkhn1zaf6skcwv1v4dxlvdx8by1md49q"; + rev = "574bf1e3dfa79aa836c67759d9eec904a6878c77"; + sha256 = "0rx0f9vs68lbrjmzsajcxxhv6dm3wjiil12xzqg924d7fx3b1w52"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode"; @@ -15522,12 +15585,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "20171001.1233"; + version = "20180207.334"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "7fd55af3b0311ea24b68397054e705c835fa5ef1"; - sha256 = "1sgmd1zqdwa1f6y8d6vaacyipkqn2ivvaim1xndbkihgmhyn4kf0"; + rev = "7ba3e9d0303a3c070501faf79937abb11bf61155"; + sha256 = "19czzcy1yssylbk98cylnd6mwfh5fhb0wm68ab2h9nl3qs80rnwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -15983,12 +16046,12 @@ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "eacl"; - version = "20171109.40"; + version = "20180204.1911"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "0ee57b495036b6c1b54d668e84be373f8a1c8d9a"; - sha256 = "1fizb09g0dc9rzlj34n26vi12h3gk4mn96iyrsa60in5c9yn9f04"; + rev = "ec601f3a8da331dd0a9e7a93d40ae3925bd06700"; + sha256 = "1kgayh2q97rxzds5ba1zc9ah08kbah9lqbwhmb7pxxgvgx9yfagg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -16050,8 +16113,8 @@ src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "62a79c5d359674c95719dd129260e4e1f6e760bd"; - sha256 = "084a99klm1lpjvsfls1m2zgwrh4wbwwj4fw7xb84qw5fzzy32ba1"; + rev = "abf4dfcddacfc90ee39aad3c9e2e4615fb74c6a1"; + sha256 = "1kxkqpf0xq6w1g8qvy32hjqy42mz17c36wrkqqwdbxhbq7d5ckyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16071,8 +16134,8 @@ src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5"; - sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj"; + rev = "b3176d34f1e2850ab96795e264da6e05e23e280b"; + sha256 = "175by3aswpd00lhin69f2jkb1aqi487vzk3qa6wqp41hjpga6fag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -16193,12 +16256,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20180111.30"; + version = "20180204.1402"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "8c4735fbd7864a8420a16378ac2240fa60af5332"; - sha256 = "0g6prr8512dkr4mizqy1jkqc60w88i7kcx1lbarqi2mfkqdhhvg6"; + rev = "7212edd2f54f2e289230b8d884dfcb3155c65fcc"; + sha256 = "11fmi0pxx83qmhh62ilc6i2icrl7x8pj34rrkxlc5plyph8cczjd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16856,8 +16919,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "5eeb1b8c8d8e2f394724700f930c9063b9fd279d"; - sha256 = "1kx574bqjsgcri40qhkw8p2rg0rvcbwhbrmiyd5znprk5pz5x1ps"; + rev = "1844ffaf94a561ccd914c76a2f07fa03c441a424"; + sha256 = "1k52zwjmchz63v59gvgj1i7rc308yfl2bdhrd94fqkf0cy3nann8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -17004,30 +17067,22 @@ license = lib.licenses.free; }; }) {}; - ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: + ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20171227.259"; + version = "20180207.737"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "afb3e6f1e82abec5407c7a3335bf1c70fa3690d6"; - sha256 = "0q8c35jnxgxmbbbpz4iv3x45ylckq4qi0pq05am5rf5rywlw00v1"; + rev = "aed668ef5cf5c54aafe866690816ef1fd25020df"; + sha256 = "1vmn7bw3dy1mxhzq3qd8k21j8mpy289jjyfqcqszk6fk9y3mkzb5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx"; name = "ejc-sql"; }; - packageRequires = [ - auto-complete - cider - clomacs - dash - direx - emacs - spinner - ]; + packageRequires = [ auto-complete clomacs dash direx emacs spinner ]; meta = { homepage = "https://melpa.org/#/ejc-sql"; license = lib.licenses.free; @@ -17061,8 +17116,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "67dcb92c972f67f81c0667ee95d97f05eaa1907b"; - sha256 = "0yhcpcp22n4mj8yq2m9p020mzcmjcv3fb1vw7bnbz8qc42g58xai"; + rev = "63fa39d86deba5d03ac8f7f9a103e94d6c80739d"; + sha256 = "15jxnkvgk700qi79d8jj96ss2mb7yfsgzhi0mama4dp5gancps27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -17330,12 +17385,12 @@ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elbank"; - version = "20180125.823"; + version = "20180206.701"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "0b39f801ff614dd2cf36532ed12327138ac36682"; - sha256 = "1yk9mbjcw13lh8cwmwwq6i9ma5hrv7aiqwfsj0rn4x9vygsxwhgi"; + rev = "817047305e9db1260956ae5ac6b60c9027868895"; + sha256 = "0i5nqfjm69kbvnkvrcvfv8gbz0608cldmi3zwq2vpld7p35d5d26"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; @@ -17348,15 +17403,36 @@ license = lib.licenses.free; }; }) {}; + elcontext = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, osx-location, uuidgen }: + melpaBuild { + pname = "elcontext"; + version = "20180204.138"; + src = fetchFromGitHub { + owner = "rollacaster"; + repo = "elcontext"; + rev = "c223476b62a55b80f6b85b2e016d3ec0d7ec9875"; + sha256 = "1ynwgr1g421liyfyfli2cgfdqx3gijm4z9hd0cmhndfwalrb1xq6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12bcb0bfc89c1f235e4ac5d7e308e41905725dc6/recipes/elcontext"; + sha256 = "1firdsrag7r02qb3kjxc3j8l9psvh117z3qwycazhxdz82z0isw7"; + name = "elcontext"; + }; + packageRequires = [ emacs f ht hydra osx-location uuidgen ]; + meta = { + homepage = "https://melpa.org/#/elcontext"; + license = lib.licenses.free; + }; + }) {}; elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elcord"; - version = "20180125.659"; + version = "20180131.1446"; src = fetchFromGitHub { owner = "Zulu-Inuoe"; repo = "elcord"; - rev = "8fe9c8cd6b5f32aab28fa4e12e3af2c113c7c0eb"; - sha256 = "0ka732ij7ahrqx6xm6s7yncazlpw530ck9dxy06m2rax7gfm6l51"; + rev = "295ff2d976ed6775266576c5e30a3d06a84e3aa0"; + sha256 = "12mjmdr5kwmgpihnc943widbbw5pcp0gw1mcjf06v4lh0fpihk7h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36b64d0fead049df5ebd6606943a8f769324539e/recipes/elcord"; @@ -17435,12 +17511,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20180114.1000"; + version = "20180204.1405"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "63661980cef82a8032108f5ce14d5bd4f44d1255"; - sha256 = "1wanfvhx3wv3iych0v93kaxapg86vzgbsd8l7r460s8l2nl5yybr"; + rev = "478a976db3ea764f9c88c3302fb3bea1ab41f1ca"; + sha256 = "08qzi8wvlf64xfhhndnmr9xksk3n9whzvjqaikf5kz1jrygncnrp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17589,12 +17665,12 @@ elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed-protocol"; - version = "20171214.2319"; + version = "20180204.2003"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83"; - sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591"; + rev = "e809a0f1c5b9713ec8d1932fa6412c57bc10150b"; + sha256 = "0ly7g9a85r5vm8fr45km43vdl9jbzdqyiy9a7d95wx63p6aip7vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -18072,12 +18148,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180119.54"; + version = "20180204.1538"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "1fc5e18c3e26f085167201147f9fe2bfb6fd167a"; - sha256 = "03a1nai4l7lk7kh196wvpxnmhqvmqv6jkqgkr9jqk326k2d5mwnp"; + rev = "53ac14e86c0e34962da30a008b63a8069eaa9d81"; + sha256 = "0d89j1w790y18c1lcghqnvj9l8f9zmm4bcs9zp9z22z007cdnww7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18311,12 +18387,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20180129.124"; + version = "20180202.958"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "09bbb07688c0c14130c5e38837aa26b8d607829d"; - sha256 = "0623fzyjjx08i98zmxpq4mcamr83jqj76nfn8ck0ql9k3bss1zlv"; + rev = "99840665f3ffff36633d52b9970352fc523434a6"; + sha256 = "0hfpbfvk2f20sy1gia77aw7ndyxpc268bk4n2n6zlfb4j9jcp2sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -18416,12 +18492,12 @@ emacsql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20171218.1903"; + version = "20180205.1835"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -18441,8 +18517,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -18462,8 +18538,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -18483,8 +18559,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + rev = "75ac0448a5965c82c616c862cab180c241110fd2"; + sha256 = "0aplbc2c6rdkhzwg5b19xjrgijpdkhimaa4kah7mqqxdj7q1zfxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; @@ -19225,12 +19301,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20171217.1730"; + version = "20180201.1340"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "3d3ab18436ad6089496b3bce1d49c64a86965431"; - sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7"; + rev = "2819a9c2ae2bc6d095887c2cbb6f9bd8617f1e52"; + sha256 = "1cfr9xs268nwjjhx7n00h5sssm479bzd5f7c847hg6x2hyqkfzxb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19359,12 +19435,12 @@ epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; - version = "20180127.351"; + version = "20180205.1249"; src = fetchFromGitHub { owner = "cask"; repo = "epl"; - rev = "28af1ab1217c46367ab5f29d72a57fcc6d9cd45e"; - sha256 = "0hgqhzgbsi3gmnj0809mh1mqib4yrx16ibyn8j0h7v02dms4pk9q"; + rev = "78ab7a85c08222cd15582a298a364774e3282ce6"; + sha256 = "0ksilx9gzdazngxfni5i632jpb1nprcxplsbhgqirs2xdl53q8v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; @@ -19547,12 +19623,12 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20180118.739"; + version = "20180206.941"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "0fcfe9283f75ec657d513c901c35cdbd48c8d2b5"; - sha256 = "1byxpz6v272ilkbxf2br8qksczq7s7l1vjbcvwsii68r7s7lf1yl"; + rev = "9f4d7b93a3c7e12ac935b50943177923a8c01d22"; + sha256 = "0dd2v91rp3lai10258bszpd9wsa1lvx08xspsnijv64axh73yf7r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; @@ -19908,8 +19984,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "fc6eb93ae081ac5ebf715e53d0d2519067fcea95"; - sha256 = "07fizaia7pvq4fzjmw7461qn4mkl0346377mr2nqnva1h8r48mz7"; + rev = "cd9b6371a13c37f8f82586fcd82f212d306d8fad"; + sha256 = "19va8vcmxgkwbyj0zjdha3ny81nwdhg339x8n8bxrisriw2ihb07"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20533,12 +20609,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20180128.1545"; + version = "20180206.354"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "ec2c2f5649d01071ce9a7079072ef415f9426149"; - sha256 = "0sp1q6wrv3q0w8rlhj390v2584mdwswznj0nyp42bf8qdb74ba87"; + rev = "ae0404336d41fc3e5465b61f2bd2674be9abd574"; + sha256 = "12sav9x05xgpn14rm2zk67kdjkyaiq7hsgwlsr34x6ajiggy3is5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20701,12 +20777,12 @@ eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: melpaBuild { pname = "eterm-256color"; - version = "20171221.1837"; + version = "20180202.1722"; src = fetchFromGitHub { owner = "dieggsy"; repo = "eterm-256color"; - rev = "a5560abfa81242dc45ab0342e41e33f6c7e6bc1e"; - sha256 = "0md53lhpxh1yqirfjgx8fq8vsh5zbl2v2hn63nkyh60rv3sc4jkm"; + rev = "72b2d650a173c39648f1cb0f2b68fab5a6886d79"; + sha256 = "15vj55l71v9yzl7cw4yw7lc71045xa3y6q0hn8a5pmakmb6fiwdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; @@ -21037,12 +21113,12 @@ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180128.1213"; + version = "20180202.1722"; src = fetchFromGitHub { owner = "jojojames"; repo = "evil-collection"; - rev = "52462cb8bfc523f93e20aede2d1936c32fdf14b2"; - sha256 = "0h01pa5zwh3jf7kfdl4vy5f8lcv147m1pcsmkmkg51qn520qr7f7"; + rev = "f04fd5eef32728cb146d2dc5f3701b1d4733a2bf"; + sha256 = "12magy7l325cfi25b8y8gd5b9n3smhn3w07mxb4nbp3rfg7nv2db"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; @@ -21289,12 +21365,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20180116.653"; + version = "20180205.153"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "a1a62d2b562b9fc2172868e3b172207948d84bbf"; - sha256 = "1h999mqc84dfq2ysy2n0g2cbrqp2va41z2pdga54imfy899p7hmb"; + rev = "48feeba6f0d661cf0eed50cf3f524b8f09ff0bf0"; + sha256 = "1wsrjk95dlbz8iyi437iphw6ppx0naq081lzgdg0cm1hp57b7axa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21520,12 +21596,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20180129.401"; + version = "20180131.502"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "50bb88241983f0bf06d35a455a87c04eddc11c83"; - sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif"; + rev = "20270ab6b0a3a398942609f7acc3d0162b954591"; + sha256 = "0vnaplchyl1z9d8fhrc83157a6d97dgwdja4y0nm7bkgm1jqgbdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -21923,8 +21999,8 @@ src = fetchFromGitHub { owner = "ninrod"; repo = "evil-string-inflection"; - rev = "ac261bee68444c2cb9aaab25b58509e8f58efe35"; - sha256 = "1b9h7qpmaqwcdj742y76hrs31l7z9aynih9mkwdcnx5fi2a649la"; + rev = "f13a4aab75e5d50c0c63c126c4cbc0067d452d85"; + sha256 = "1i4vc8iqyhswa77awczgqi1vqaxx8png5is1hwisxf0j9ydsgw4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection"; @@ -22363,8 +22439,8 @@ src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "aca4fb0a6e460317ea1a04bdcb3e5175d30dc172"; - sha256 = "14iwsd1dck3pfa6hh2griwd3y02b432wi2pkknckzp61s912iz0y"; + rev = "739af91c9dcbe62f420760243688dc3a50367a31"; + sha256 = "03xlm19wbda8pk0bzrjr8d964zw4wfx1ql6ijvhqw70g7n94qanv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -22503,6 +22579,27 @@ license = lib.licenses.free; }; }) {}; + extmap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "extmap"; + version = "20180205.1047"; + src = fetchFromGitHub { + owner = "doublep"; + repo = "extmap"; + rev = "3860b69fb19c962425d4e271ee0a24547b67d323"; + sha256 = "1vjwinb7m9l2bw324v4m1g4mc9yqjs84bfjci93m0a1ih8n4zdbr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/extmap"; + sha256 = "0c12gfd3480y4fc22ik02n7h85k6s70i5jv5i872h0yi68cgd01j"; + name = "extmap"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/extmap"; + license = lib.licenses.free; + }; + }) {}; exwm-surf = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exwm-surf"; @@ -22661,12 +22758,12 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20180109.2042"; + version = "20180130.358"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; - rev = "f896674c527f41fac8faea2ddeafb2757c7b9766"; - sha256 = "0w605iw5p4z8jzvzq0608jpcp0hdk9x48w1rvqz9hmjncsi3af8s"; + rev = "000009ce4adf7a57eae80512f29c4ec2a1391ce5"; + sha256 = "0q3ylw0i1bg7pzsv4gj72jcfjjfh57vsb3fnfnhhh5i5vladiqsf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; @@ -22892,12 +22989,12 @@ fasd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fasd"; - version = "20161216.831"; + version = "20180203.745"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "emacs-fasd"; - rev = "5940b84dfa1ea7225b740d3a8dd215290d964873"; - sha256 = "1wqh7x0c1i0w5lfh0j7xilvp5vmwvbsblp2jd6bz3n5j2ydgpc00"; + rev = "f6393895bddbe9a1c77d4f6963a7e7ec6ff18bc4"; + sha256 = "1bjb20p2sp1avjmr57b3zf15w01fi7h4dd46zahhap1lrk9sxgx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd"; @@ -22955,16 +23052,16 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "20171122.414"; + version = "20180205.126"; src = fetchFromGitHub { - owner = "magnetophon"; + owner = "rukano"; repo = "emacs-faust-mode"; - rev = "720fd8f5f48be27ceae3c6e3c612b39304484a03"; - sha256 = "0v5i0z90zdbclr0sf17qm95b0hwn5lps253bah1lbfkpsvzxk4if"; + rev = "7c31b22bdbfd2f8c16ec117d2975d56dd61ac15c"; + sha256 = "0a3p69ay88da13cz2cqx00r3qs2swnn7vkcvchcqyrdybfjs7y4z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; - sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b362e7daeabd07c726ad9770d7d4941dfffd5b19/recipes/faust-mode"; + sha256 = "0l8cbf5i6lv6i5vyqp6ngfmrm2y6z2070b8m10w4376kbbnr266z"; name = "faust-mode"; }; packageRequires = []; @@ -23056,6 +23153,27 @@ license = lib.licenses.free; }; }) {}; + feebleline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "feebleline"; + version = "20180202.1420"; + src = fetchFromGitHub { + owner = "tautologyclub"; + repo = "feebleline"; + rev = "c6a8a955c0f441d4b4663fabd5cecdc92235b74b"; + sha256 = "09g67mkschca2vp73263xm5zf48831zfxlyyfcmkjpsvrgm83ii2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/782295d8c530878bd0e20cde7e7f7f8f640953dd/recipes/feebleline"; + sha256 = "0c604ahhv9c89r3hj7091zhhfpbykh4c23sn6ymqw4pp0dq4pgkj"; + name = "feebleline"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/feebleline"; + license = lib.licenses.free; + }; + }) {}; fetch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fetch"; @@ -23225,12 +23343,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20180125.1859"; + version = "20180201.2102"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "7be14de3c737e70606d208d8d443b89e58cd646d"; - sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"; + rev = "cf20dda6050b11bee871b55f758716d8daa07b46"; + sha256 = "0f4mkhdb56bnyp7wkg4bkv74rl51k4dxciv0zqf5x91lfzhz8jd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23882,12 +24000,12 @@ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "20180104.1348"; + version = "20180204.141"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "50dded94ad201fdc9453656a8b15179981cd5acd"; - sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6"; + rev = "9a90436f9208a8f4796ce0d5b08f9d1ba5dbbacf"; + sha256 = "012q3rdzg5zrqwx5ywq07h8bzpvv0lnldkv4p1wxlr9yzxxhrv4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; @@ -23987,12 +24105,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20180123.1419"; + version = "20180204.1346"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "31122714e1971d8403d9daf5815482bf5118c94d"; - sha256 = "0ag0ffh4lnnsiqfplnjlwd7lnvz3zjnw68a2pf17jgx28jwdqz64"; + rev = "b73ea4d9c25b4fbc17ed8250becf40c55e811231"; + sha256 = "1vy2cx53x55baixiw4wlcp14jpxazkwlzamwz01f86wiw3b7mgnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24911,12 +25029,12 @@ flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-mmark"; - version = "20180118.328"; + version = "20180203.932"; src = fetchFromGitHub { owner = "mmark-md"; repo = "flycheck-mmark"; - rev = "b73b40cb9c5cf6bc6fa501aa87a4c30b210c0c5f"; - sha256 = "1w75accl67i0qwadwp7dgpxaj0i8zwckvv5isyn93vknzw5dz66x"; + rev = "7fdcc48ff6ffa5e7db126a76f4948ab08b9eb8d4"; + sha256 = "0g6a8nm5mxgca7psyi127ky68mal0lj7n486fgrwsg3bxglbsk5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fd10423ab80e32245bb494005c8f87a8987fffb/recipes/flycheck-mmark"; @@ -25272,8 +25390,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "6ceeb7dd27b242123c69a5ae95b69d8ac2238a68"; + sha256 = "00cp3v1gwj0flmlzhghnxvy5zy7rfdrnvwv0c8704ddfsavxp6i3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -25289,12 +25407,12 @@ flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20170404.842"; + version = "20171021.151"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "a89c0298f5e8fdcb0c33833ca1eca64632cec053"; - sha256 = "1h2n1y69fxj2naxlyl7056rhggbpmh13ny2rcf0jjr1qnrrq756n"; + rev = "c5838f51d41e1330ec69b46e09f25f9764be1d2a"; + sha256 = "1app3vcv1myabj8wmla5dpifh63c21bmljqvvykz8a9d7hagq3gc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; @@ -25541,12 +25659,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20170614.1434"; + version = "20180207.843"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "7f394d02f6f3149b215adcc96043c78d5f32d612"; - sha256 = "0q7y0cg2gw15sm0yi45gc81bsrybv8w8z58vjlq1qp0nxpcz3ipl"; + rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; + sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -26637,8 +26755,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; - sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; + rev = "c94a05d3b8a247a1abc9d0739a1b18387c26839f"; + sha256 = "0q833z76fysv66anrng0skgfa3wc2gcb8rw0xr759rblxmxmnp1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -26822,12 +26940,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20180107.2123"; + version = "20180205.2330"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "361f2a58151c9e6ab52b59cdd230a3add461a2bb"; - sha256 = "10sgscfw70yw6khzl4nr1w1zh28g7rh4fwr3p2q4ny4z1zsxvbl9"; + rev = "1ad1c386b28e6e6d72df68c4131f2a6f63857afe"; + sha256 = "1xvm8cx73xs4qrc09khn8fi3zjlircmfnxdij0c98k4cwz60bf14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -27111,12 +27229,12 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20180129.312"; + version = "20180205.2116"; src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "5709e0b621dc56491d4b52782f190744be2ca0a1"; - sha256 = "0a29p14fa2xqbafdl0l5wgrch89klp0v5naqkrn2vii1gfkcyck6"; + rev = "9d19fb939a1835aacd6d82d7dddc2fc54874f665"; + sha256 = "0gxbqq66ry4dqvzmcw4izzbwxksbvf5h5nbhr5jb58q4vaq9ijj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -27241,8 +27359,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "e6406d573c58ac30eec0a263211ffb4f06437925"; - sha256 = "0ydfhnbn4z50l777y8c1b85mfvk71rvwbjrn43kyqxasxdry5n59"; + rev = "d2d2e1ac6e02d5d0739b613f9ca206ea06b9024b"; + sha256 = "1ghkf899k6vp0kfw7lnnk27fl0y6bbdkqg97vh4k7i06hsnmiw8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27300,12 +27418,12 @@ fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fwb-cmds"; - version = "20160523.535"; + version = "20180206.1549"; src = fetchFromGitHub { owner = "tarsius"; repo = "fwb-cmds"; - rev = "57973f99cf4a185b5cccbf941478fad25e8428c3"; - sha256 = "1c7h043lz10mw1hdsx9viksy6q79jipz2mm18y1inlbqhmg33n2b"; + rev = "7d4abf8aa13b2235e4e2f0bb9049ebd6b491f710"; + sha256 = "10xjs8gm9l3riffxip1ffg8xhcf8srffh01yn6ifyln5f70b063d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe40cdeb5e19628937820181479897acdad40200/recipes/fwb-cmds"; @@ -27550,12 +27668,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20180128.1821"; + version = "20180202.1825"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "33783307abab46433ce18273f562b3a729628e8e"; - sha256 = "1vzcfy9qw32xmi7h4g9vlnxp2z2f23s01nqgs5vp42vls5yzdirr"; + rev = "e1603edd6f64094495af34432f0d9be621173403"; + sha256 = "0qab1c3d9glp15sh1b1i40zlg50phhix5c2k0vr2i9j6wl8vc80b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -27571,12 +27689,12 @@ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20180121.1539"; + version = "20180130.2055"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "cc9983470cc5152c9de584e971ffc8bd38413616"; - sha256 = "039vs972f6gwk9b1wpzs0qkznh6y0jw7cxlc7q5v6hmkx67bch0i"; + rev = "63333fcc7fc181949601b75a4296fd3a338f287c"; + sha256 = "11lfia2jx1vaizd1afln0v5s8y2czkhrrdgn01j1mq104kapxain"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -27865,12 +27983,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20180117.1249"; + version = "20180201.414"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "f1b647faf5ce5f033728236b9263e7ecee8f536f"; - sha256 = "1hk3ww1q5h1zywjwsprx7268bq2783d03b0ydzv97klpqniw7rs0"; + rev = "b267bb6c55b0c05aec4d3fe0e9385ab0e1139463"; + sha256 = "10rwl2nv8gk9bzj7cwmgzvcsscgb83aw5ag9jj7sv638w4acmn21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; @@ -27886,12 +28004,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20180121.1435"; + version = "20180203.1017"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "8dfd995ca4b3b0f94dbf4cc09ec50b8ebedf5c0f"; - sha256 = "0vw4qszisjc07anzmgknxfcancldyq11i9z16w6rkdi1fb7in27l"; + rev = "1ca0c4ab534a894b83f5b923997f12855315b0ae"; + sha256 = "028rbjfvzyb28xw7wlk7468kh2irbcabfwrg1ph736w4wdzryp66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27907,12 +28025,12 @@ gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gift-mode"; - version = "20171121.653"; + version = "20180204.1358"; src = fetchFromGitHub { owner = "csrhodes"; repo = "gift-mode"; - rev = "f8c9a495e3c6a47dbfdcb719bcbd0f8522297340"; - sha256 = "1lpdx6lb2skjgqwsjcc8wzy6q85sp7d4y97xkibvvv4czchsg174"; + rev = "b8dcb86c7f83df0fbdc0da4f80c187423c936e50"; + sha256 = "01x87aam43xmhx7np9rvrdhln3pwn4zfn4d8s38rdpi77n9prw5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode"; @@ -28009,6 +28127,27 @@ license = lib.licenses.free; }; }) {}; + git-attr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "git-attr"; + version = "20180204.15"; + src = fetchFromGitHub { + owner = "arnested"; + repo = "emacs-git-attr"; + rev = "c03078637a00ea301cbcc7ae301ae928b10af889"; + sha256 = "05wzy8g0yjkks0zmcvwn9dmr6kxk1bz91xic3c08b0j1z5lbsdv7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3417e4bc586df60b5e6239b1f7683b87953f5b7c/recipes/git-attr"; + sha256 = "084l3zdcgy1ka2wq1fz9d6ryhg38gxvr52njlv43gwibzvbqniyi"; + name = "git-attr"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/git-attr"; + license = lib.licenses.free; + }; + }) {}; git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-auto-commit-mode"; @@ -28075,12 +28214,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20180126.913"; + version = "20180202.321"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "275a32b8af950f59324d69c39f01d653948f6481"; - sha256 = "1cm1ryd4hidaybv323gjbrqpdaicwr18ar7bhzkfjnkakvrb35pj"; + rev = "07ce571818734103182bed43fa73f580b0bb630d"; + sha256 = "1ya8mi37j8mrg926b0jz59j7xdpnrfr7r4f5m10qr19d1sl5zqa4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28327,12 +28466,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20170325.220"; + version = "20180201.1315"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "92f8ad4afc802d01c24426ff52ad6fefb3bb91be"; - sha256 = "1ljgc7jmll3534zj1r72gh4al909slhiriscqv9lmvqzdiy3l21g"; + rev = "020d02cd77df6bf6f0efd4d4c597aad2083b6302"; + sha256 = "1g7gxa2snh8ya8r3wim834qszhcmpp154gnvqkc3b1gw8x7jdrql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -28915,12 +29054,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20180124.143"; + version = "20180129.2300"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "dc46c72e1a4e759c04d17c0411a8c53c2f9915f5"; - sha256 = "03ia362bwkkkysfp2wz5jpqlvsjvvzgl06i1gcrkb1aa8ssb82lc"; + rev = "fa569827c916ed46e410e9f28e4b4d28f8567654"; + sha256 = "0x1i1xcd3d34c9c87isd39d9ra69ywd01ag0hgkkgdzrk44znshj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -29776,12 +29915,12 @@ google-c-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-c-style"; - version = "20140929.1118"; + version = "20180130.936"; src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "9663cabfeeea8f1307b1acde59471f74953b8fa9"; - sha256 = "0277vsj0shrlgb96zgy8lln55l2klzkk6h28g4srbpgkwz5xxsx7"; + rev = "cfce3c3a866cfa9ec12fff08d5e575ca875f787b"; + sha256 = "0h35802dp9y29yvrqvkhd2b9x6jkqlwz46k5lgvabsiddqq4x2sn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -30053,8 +30192,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "406990cbb165af7510b6282f88742c005edd2aa1"; - sha256 = "1pm5ndfxf6qmq4dlvawd4v8j75ipl12vbw13yxzrc5q0rfqqqgdl"; + rev = "81743157fb5ccf548d6bd5088c25ee6156a359ee"; + sha256 = "10jj1d9k0gg4an7hnbiavm2l4y4ppwxz49yi39821kbchygkl58m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -30112,12 +30251,12 @@ grab-x-link = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-x-link"; - version = "20161130.2147"; + version = "20180205.346"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-x-link"; - rev = "d2ef886097f59e1facc5cb5d8cd1c77bf340be76"; - sha256 = "1iny8ga9xb7pfd59l4ljlj6zvvxzr7bv468sibkhlaqvjljn2xq1"; + rev = "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c"; + sha256 = "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64d4d4e6f9d6a3ea670757f248afd355baf1d933/recipes/grab-x-link"; @@ -30217,12 +30356,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20171230.440"; + version = "20180131.1439"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "c8f1dd4ceb3b752bcb4a0122af45e3a197c4fa99"; - sha256 = "1b0azylab54183kf9nmpx6qb8hrr91fsxladwfmiljrcpvf6pdh8"; + rev = "823232a83a51e8a3f7b4db09e23658fc1a1c93ca"; + sha256 = "0a1svfbxw7g31rnf3lcjsy2x21s14c2gpbrzjpl06qa0p3cnn4db"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -30961,12 +31100,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "20180117.1302"; + version = "20180206.1739"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "fe0c7284f17f00cc6f1971a9bd565467faa0574e"; - sha256 = "0kxj49x16j7avbgry6advw4qixr76hdawfq6vy8rfj42kzmdj179"; + rev = "087af78262c40fddf9412fa73f7d4d8c6811282a"; + sha256 = "0s8hazfw1nd7sk7nky22d1lq8vqhfba5a2gm4y96s6g31h5wd71d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -31568,12 +31707,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180127.2219"; + version = "20180206.604"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5882f69be33e255b4f3cb182879c9cf5464364e6"; - sha256 = "0k4mlffs5a2k1g53dzrkqclhkcsyzvn9z1nmhwajhlrijx8z8ym9"; + rev = "1c4d5562eb2a5d33cf7d27ffdb41f80011614b3c"; + sha256 = "1imzkx0ngh61qxn8126z1rmhzmiqlmz19j3ky6pizzd6xazz2qip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -32030,12 +32169,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-cider"; - version = "20180120.1212"; + version = "20180202.1818"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "739589b6c6b3cedc71ca366da95fd1b147931c34"; - sha256 = "025z5dbrh5a9jwrfsckvmzd4nxq672m6bfikzcmhkvqs89kw1s2s"; + rev = "f498727b2a742560256942ea184dcb28c455fee2"; + sha256 = "1g7hy6fjym11yznzb8m5cn9bq5ys5iszf81hhwyia5n8qdvnlmm5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; @@ -32135,12 +32274,12 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20180127.2237"; + version = "20180203.2033"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "1ccbd68acab682d2d348aaff81022123939e53fd"; - sha256 = "1afjvdjqp91n44ijfc5kh8x5lmkiyncin5l25rfpxcljkfixblcr"; + rev = "87a68168b7c1490769305db0df60035e47799a75"; + sha256 = "0wiyz0kh2m2mpjhnl2mvsx2gvhkmmk0xaw432mxr48zz9jjnlha9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -32198,12 +32337,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180129.39"; + version = "20180206.10"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5882f69be33e255b4f3cb182879c9cf5464364e6"; - sha256 = "0k4mlffs5a2k1g53dzrkqclhkcsyzvn9z1nmhwajhlrijx8z8ym9"; + rev = "1c4d5562eb2a5d33cf7d27ffdb41f80011614b3c"; + sha256 = "1imzkx0ngh61qxn8126z1rmhzmiqlmz19j3ky6pizzd6xazz2qip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32975,12 +33114,12 @@ helm-google = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-google"; - version = "20171215.1159"; + version = "20180207.242"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "bf3b04e04db5bc99b621b90b7d58a5438db14c66"; - sha256 = "06848hjbwj8bkdinbmmzh2sc92l9chzwbglyfl17bwxkcdbxd54i"; + rev = "a2b8ecdd92a78acf75aa2503939077dd3a339843"; + sha256 = "1j1x853308ljmfygqvc11zidpmcz0ipdz8h2qisq692ga37vp79x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; @@ -34155,8 +34294,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "6ceeb7dd27b242123c69a5ae95b69d8ac2238a68"; + sha256 = "00cp3v1gwj0flmlzhghnxvy5zy7rfdrnvwv0c8704ddfsavxp6i3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34424,12 +34563,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "20180129.530"; + version = "20180201.541"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "2f5297294901d1845e2245bca76486c383f1c49c"; - sha256 = "03qb5al26qfn2sh3bwnvfyqxiwbxgmcwd4qkbad32nsk4s51d1z0"; + rev = "cf6158e50bb167991ed25b54a48e7e4a9eb59ab6"; + sha256 = "1yihqvjhnz9nfwz1lvgvkw7w43lirncnrfbk98831s2kr4zv83yl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -34445,12 +34584,12 @@ helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }: melpaBuild { pname = "helm-systemd"; - version = "20160517.2333"; + version = "20180130.2034"; src = fetchFromGitHub { owner = "lompik"; repo = "helm-systemd"; - rev = "0892535baa405a2778be2f0f013bac768e72b1f9"; - sha256 = "1yqwq8a5pw3iaj69kqvlgn4hr18ssx39lnm4vycbmsg1bi2ygfzw"; + rev = "96f5cd3ee3412539c2f8d145201f47c4f8e53b4f"; + sha256 = "0wyabh76q2lighd7qxpkzp35fkblxlz8g7p4lpgfwvjid0ixmnvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-systemd"; @@ -34694,22 +34833,22 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: + helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20180120.355"; + version = "20180204.114"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "6530314def5685772387f67d118ff31cbb2fad7a"; - sha256 = "13lcyzy6c2lhlxflxhm3h1m755s3m1fm9qakicb8iklvbzmqycbd"; + rev = "75f9b5fafd7b63bd701d1d9c6cb4c92b5fc8aeac"; + sha256 = "1r36kjfjzpgyzwk9qpbmmd8dpg26d5g93hxss23v3fff713b00j2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "helpful"; }; - packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ]; + packageRequires = [ dash dash-functional elisp-refs emacs f s shut-up ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -34970,12 +35109,12 @@ highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20180125.1126"; + version = "20180131.1216"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "highlight.el"; - rev = "2371d6d134f07ac648d525b7eafd4eecfb0e36fe"; - sha256 = "0x0mr52fy1cc6f710ibqy0fh68jpfb1gj4ddg173q0azb76m2klq"; + rev = "bb8694b8e642a45f07ce8897de0785c5a776441c"; + sha256 = "0s4fkxnd4x3j864mgaiv95iwdjmps4xj2mlaljljc8y04k9q5l9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89c619b90665385c8f5408935105c52b4d0290ab/recipes/highlight"; @@ -35933,12 +36072,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20171213.1334"; + version = "20180129.1434"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "64af52688eb09eb42b7228a4e8e40d4a81cd983b"; - sha256 = "1qz1zynkb1nanyi0ylllv80gzkgl2bgx9y82g07w1rfa86qgaghg"; + rev = "5a665d00dc8fda77bad2a43277d8809c23e46ab8"; + sha256 = "0w0zi393ixgi154c6dq2i1kf3kraqyfw8alfxcn6fhhxy1g9p02y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -36332,12 +36471,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20171120.1042"; + version = "20180201.846"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "1deed8a00e6936903cace1dac123364b6c0cde90"; - sha256 = "0jraj3l7w0bw2c6qkq1bfdfa2zf7xssmk9cdkdgbjjip5xvq31ns"; + rev = "cf961400796aea8b385b64ac0ad31c1e2500cf6a"; + sha256 = "03ffjrq4hidvxb6m4kk0xp8rmi53al16nab6lbid5brky67hvpmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -36393,12 +36532,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "20180120.304"; + version = "20180202.1447"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "6afe9a62ae9dccf8e2348d73f9d5637a906b1cf6"; - sha256 = "0d4x74g8s4x9q434kwfwyn2rvw4myayh7dr7r1nbh8gnijwrnpsz"; + rev = "523df320197b587abd8c0ec4e9fbc763aeab1cf6"; + sha256 = "04jak5j4yywl7fn5sggc125yh6cy0livf55194mfxs2kmbs5wm0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -37149,12 +37288,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20170916.1024"; + version = "20180207.219"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "5b14cc9fcaef509c50f25cff872fba5d70b2c799"; - sha256 = "1vlfqh616id2kh35diwig6jswq5q5z22zwrpbdxkginag3sq8732"; + rev = "412490db4387ad9d040bfb5854f25de4c40c2146"; + sha256 = "1995j0yvvls5i7zfxw8zwfk05in8b0n82k05qdrap29v6nq2v4bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; @@ -37671,12 +37810,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20180122.507"; + version = "20180131.943"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "b84d3553edc7db3d95fb1fe9a82a08a0661c72fb"; - sha256 = "0lqjkhidd2ambasvc52qkipjk88q4jivbm33r48bhw78bik7y8bz"; + rev = "71299e9bc0d3c75b25ef65e57e9a57c9a17294b4"; + sha256 = "0f9lnsz8fp68qr67l5rq2ippr1fc0rw8nk2f8cm9x90fd82fxwdl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -37713,12 +37852,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20180128.901"; + version = "20180129.1828"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "ec99211bbe9bef6d579a313ab6422694ef63b181"; - sha256 = "0d54m3g8ahz7xg06qb592ai25ydpjh0dzxxnhbp5jk2l0r0irwnq"; + rev = "630471b5141cb493305b623e6800c26bc91b3913"; + sha256 = "00jfx1bavyzla7cid9bhw6fcdfqw8bgnwr920kzg3wmfd8nfv5ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37857,6 +37996,27 @@ license = lib.licenses.free; }; }) {}; + info-colors = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-colors"; + version = "20180205.350"; + src = fetchFromGitHub { + owner = "ubolonton"; + repo = "info-colors"; + rev = "a8ebb7b8efa314c08ea8110d8b1876afb562bb45"; + sha256 = "0wvyf2w5s184kwacs6lbpjryx6hziayvdrl3crxir8gmg2kcv07m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d671ae8dc27439eea427e1848fc11c96ec5aee64/recipes/info-colors"; + sha256 = "1mbabrfdy9xn7lpqivqm8prp83qmdv5r0acijwvxqd3a52aadc2x"; + name = "info-colors"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/info-colors"; + license = lib.licenses.free; + }; + }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -38195,12 +38355,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20180117.921"; + version = "20180207.610"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "b6ef262dee10a92bc31935644e087e83957f6d74"; - sha256 = "1hxfmrq10r39inysa1x104siwdladpdpcdjqbniml0hcpzrdcpd9"; + rev = "7852d631fc2ae756e038966a60ac6529008d6557"; + sha256 = "1w8bsnvn2j3gvxyy3bgc9vdcn4hv6wwymwfbgphidda0h346akbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -38636,12 +38796,12 @@ isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isortify"; - version = "20171223.1812"; + version = "20180206.450"; src = fetchFromGitHub { owner = "proofit404"; repo = "isortify"; - rev = "2db50c1f585db8a8ec5fa28a90a8179516c16cd0"; - sha256 = "04wzq9cf1bzbyx3jn7anrzc1r64l23s073xqsfcqb8hgh2swcpl6"; + rev = "18c273ff401643fb903e90dff73c47a4b52268ef"; + sha256 = "18ziajgjij66g01fyrr1z95z4x2ynfvcyas92b2rvdc1dnsdhs10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify"; @@ -38804,12 +38964,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180124.1127"; + version = "20180131.1134"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; - sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; + rev = "1f5c4ff1df9d617a79bc969b99d6c2c667f5eaad"; + sha256 = "1b0ig4gza8lwwlx0z5bwqn60cakq551bgm82wl1xdscwwzrrdza3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38867,12 +39027,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170709.2151"; + version = "20180201.427"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "acd6322571cb0820868a6febdc5326782a29b729"; - sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33"; + rev = "9783970f7dc39aaa8263d420d9d1ed6912c8e19d"; + sha256 = "1fanxpynp3cigll0x3vknxr8r6plvsbyn34qs28zjfi0l062a8jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -38955,8 +39115,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; - sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; + rev = "1f5c4ff1df9d617a79bc969b99d6c2c667f5eaad"; + sha256 = "1b0ig4gza8lwwlx0z5bwqn60cakq551bgm82wl1xdscwwzrrdza3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -39056,12 +39216,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20180109.1933"; + version = "20180129.2051"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "efe35d2f579202ca14a90cfd46ecac624109558c"; - sha256 = "1vsgz2qg8mxd3lw590zzy9zn72lcvmrixp8j9h65gjqqdwz7xzwn"; + rev = "d5ce9e90003eeac54654d5ce1f19da55448b05f2"; + sha256 = "1jjlrz6af7mkdfg66qsrx6q879l4vxjsljl0fbkld77i9fnm005a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -39081,8 +39241,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "6ceeb7dd27b242123c69a5ae95b69d8ac2238a68"; + sha256 = "00cp3v1gwj0flmlzhghnxvy5zy7rfdrnvwv0c8704ddfsavxp6i3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39140,12 +39300,12 @@ ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-xref"; - version = "20171229.252"; + version = "20180201.1919"; src = fetchFromGitHub { owner = "alexmurray"; repo = "ivy-xref"; - rev = "aa97103ea8ce6ab8891e34deff7d43aa83fe36dd"; - sha256 = "1j4xnr16am5hz02y1jgiz516rqmn43564394qilckmzvi9clhny8"; + rev = "4d2c437b479733e4159a356c9909ed3e110403a1"; + sha256 = "19gzsphcmkzyihcijb0609ykv98ak24p3z4k0ifil5r40iss1d1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref"; @@ -40898,12 +41058,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180128.1459"; + version = "20180206.1333"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "14d73a1ffce245b1ef4bb962bd9d9051e2a9fe1c"; - sha256 = "1b8669qc8hpz99ybdpz60mls00kxqj1fj6xy522jrhyij87dws7y"; + rev = "d730208cff185ee86a81f8a5a6feadfea78ab9cc"; + sha256 = "0xfb8zi6jvwdivklc3lk5dzf8nnx05pm4fip44s4al6ajns8hgya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -41406,8 +41566,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "8776f284f75f5589d3b0c6f1e82795d73e9f3c45"; - sha256 = "0zhdj13bjvs8yxq1jndgifbniigbmpq35r27fsn014wg3ih5k17q"; + rev = "752f6d404a90f95e6cbaffe67fabcb4cf7f5d32d"; + sha256 = "1475nn4k0a7af3vk438w20ygrkiryrsaj34aqdimlaqabfgkj7gi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41486,12 +41646,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20180126.822"; + version = "20180205.1242"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "c49d137f10f8e07de915126a766eb1f59f7fd193"; - sha256 = "1sja17fd2gvl16jlya6cl2mj7lzg19vgl830yz1dc2iqvf3nnsfi"; + rev = "4be03d90ac8249ce31df3ef0edb71e0ca11b5ff3"; + sha256 = "19xg7xss7j1b8hq1wk3kvfprn1lsnym59728v144cxc2f801fh17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -42157,12 +42317,12 @@ lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lcr"; - version = "20180127.1229"; + version = "20180202.112"; src = fetchFromGitHub { owner = "jyp"; repo = "lcr"; - rev = "8a6306a08066aa6b17cba1d1f278cb359d6b6c6a"; - sha256 = "12fc6k71cly9xznh461sdlfb6vlp0pddvv7p0vdzr03mspw4qa9s"; + rev = "071d23ee5453741a8724d7f8bfa7f5c20612a29d"; + sha256 = "05gvij9lgs9hh04wnxb90zx9ncsdjyp36fjbmrqrq07xbkxaw82a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr"; @@ -42241,12 +42401,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20180126.1808"; + version = "20180205.1432"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "e098be20cf603f48dfe18c6237546a8c49e1f97c"; - sha256 = "140hl7s2gxhh14yx34d9ys4ryqp87qckvcjscqllnc51qmkjwf1r"; + rev = "a88e05d52b49048fe7cab543b2b21afa6ff0210a"; + sha256 = "17gcgddxsd2a66fcn6q9155i0chvbypg2k2ms6hlzq4p3c8abc7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -42816,12 +42976,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180123.1255"; + version = "20180202.917"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "aac21815d8fe833faf1043ee2ec582f96e56c4e5"; - sha256 = "1wmgpygadkkyrsxscrxvjdy314qdlrzgs3rg3kvmd5j9nhdiwnnv"; + rev = "327e54553c3216c480f2d2e51b06fee838a89529"; + sha256 = "1gqb95i8v2ayz36ml0gg73k54h94gf9wsqz5n73s0rdx2hmi9fbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -43131,12 +43291,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20180126.2158"; + version = "20180129.2352"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0"; - sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx"; + rev = "e0a5627e6591e1cbb9f93aabc44adbdc50b346c9"; + sha256 = "0dhm7gdd1smlibj5jmzps97kwkpzcigbdp0l26baa2mkc6155y66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -43695,12 +43855,12 @@ lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-haskell"; - version = "20171021.330"; + version = "20180131.459"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "778f816376c0a77d7404a123a5a1683e46394173"; - sha256 = "00j1b63q611qr76qf4nvkhlblcvbjakgljilwdh973k3zdc6a0v1"; + rev = "cf3739e96b623fe8b95617561bb29476d7553462"; + sha256 = "0739kclc6g80r38yjwwsyx7arc0z4jlmp4x7gmf30ijdpn32qb4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -43737,12 +43897,12 @@ lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "lsp-javacomp"; - version = "20171024.1547"; + version = "20180203.1204"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "ed23aaeee27e6253bed5752fb8fbb7a5fa61967c"; - sha256 = "096rbyv0qwa454p1ns7g0py9lni5r6h1gw85wm5mwr00shjzq23n"; + rev = "57554723983c5d76c21a7a5c16534066de6dcf23"; + sha256 = "0n105j1i8gwayfzwvr9d37b9ra35l9prlgx7vqblvv167q4w9d63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; @@ -43758,12 +43918,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20180124.2058"; + version = "20180203.52"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "213dd077ec181eb3f5b8139ed02cde82398ed5ea"; - sha256 = "1zqvpk65m6hfgharjvrmjwp88n5nkvz32ra82k57d3jkgbslxsw6"; + rev = "8df90bc27852da2cf05951870d94ce7920d8c09f"; + sha256 = "0pqk8p0z30p0j7lc5i2mvy7vmg8k5hphgwp4djhgm1ickm9pcx20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -43779,12 +43939,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180129.409"; + version = "20180205.809"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "111fcdb3929e015e95645548686687efabb3c7de"; - sha256 = "1hanr9njdyc5b6n5awfknb6rxnmskm7vikrpwbg3f6iiq56mzsbg"; + rev = "0a1543dc46e08450c2dcc8e086a30a8f6a896e79"; + sha256 = "1xs2g4nx3n8j6863kqcmzlrb8lni62198cx7r8zr96jrkf796njb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -43881,22 +44041,22 @@ license = lib.licenses.free; }; }) {}; - lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: + lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180124.414"; + version = "20180206.941"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "7aeff9326ec7664ab935cb4c4ada6062a0a26981"; - sha256 = "0v6jg9jna3bnxbkzx8k5d7is4fr0g1dfz6gyqqxpnd1gzjwq15w8"; + rev = "c5229342274da42691d5f094450295f4af179145"; + sha256 = "1qfmf3xwl8hcp93fbxfndlg8srs0cwkx7jhyg2n2b91c9m7d7d14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; name = "lsp-ui"; }; - packageRequires = [ dash emacs flycheck lsp-mode markdown-mode ]; + packageRequires = [ dash emacs flycheck lsp-mode ]; meta = { homepage = "https://melpa.org/#/lsp-ui"; license = lib.licenses.free; @@ -43905,12 +44065,12 @@ lsp-vue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-vue"; - version = "20171202.917"; + version = "20180129.1805"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-vue"; - rev = "9085d6c7646d80728d14bf5e4ec9037dfb91e3d1"; - sha256 = "1y9gd20rdyxih823b1x8ika7s6mwiki0dggq67r4jdgpd9f5yabg"; + rev = "faf976ee9b333919653b4b98e2886b488707e866"; + sha256 = "1d6sw5jsjhwd5bbl2p8k6hdwpg1pmnsmvbq8g33h80qlg05fwj60"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9eb7699630fd7e11f38b4ba278a497633c9733/recipes/lsp-vue"; @@ -44241,16 +44401,16 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180129.629"; + version = "20180205.629"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "275a32b8af950f59324d69c39f01d653948f6481"; - sha256 = "1cm1ryd4hidaybv323gjbrqpdaicwr18ar7bhzkfjnkakvrb35pj"; + rev = "07ce571818734103182bed43fa73f580b0bb630d"; + sha256 = "1ya8mi37j8mrg926b0jz59j7xdpnrfr7r4f5m10qr19d1sl5zqa4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; - sha256 = "03cmja9rcqc9250bsp1wwv94683mrcbnz1gjn8y7v62jlfi5qws5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; + sha256 = "1wbqz2s1ips0kbhy6jv0mm4vh110m5r65rx0ik11dsqv1fv3hwga"; name = "magit"; }; packageRequires = [ @@ -44586,12 +44746,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20180128.1035"; + version = "20180205.1714"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "f6273604ef87e1b513f69430af50600ee4b20deb"; - sha256 = "00cwc2qbspqjrxrz00vjfcfx4ydfj7q977d2gffsg2lkjyjspzpp"; + rev = "23030d205e2acd08b45c618c3c9d65b8f63fc186"; + sha256 = "1mqbmkjacamwbzyn67wa9q3x9il12w37r695npvlicrg1p5n9r3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -45864,8 +46024,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "1f8d635301d1f9849416c551bf1530e87e31d235"; - sha256 = "19y4iwi24p86d64n9075zjrjj6i27vpvwi898qanw1ih7spgpg1q"; + rev = "4e7aae56e5abf6deaadbda84fd5ec4e3e19c22be"; + sha256 = "0nb64i9ikkcbb6s21rzc2d5i84dpy0zvqk7f3zynlprzaqy11b7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -46321,12 +46481,12 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20180119.2348"; + version = "20180201.650"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; - rev = "c6cd9614d84e26065852aeb1942e8339e08e382d"; - sha256 = "0ypid82lvh5np326csm8y6c9ac7drqj6gdmqyzqbrn1m6lz9xkkl"; + rev = "2512521ba7f8e263a06db88df663fc6b3cca7e16"; + sha256 = "1yrawvvn3ndzzrllh408v4a5n0y0n5p1jczdm9r8pbxqgyknbk1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; @@ -46949,12 +47109,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20180104.429"; + version = "20180201.553"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a"; - sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626"; + rev = "031849ab863a29e7576535af92b11d535e762440"; + sha256 = "1xl6b71r0j90n9r96f6hfvd9fzwzwy7rmn44c1p2r76inyxvlyil"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -46967,6 +47127,27 @@ license = lib.licenses.free; }; }) {}; + monotropic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "monotropic-theme"; + version = "20180205.2000"; + src = fetchFromGitHub { + owner = "caffo"; + repo = "monotropic-theme"; + rev = "a5dc696e79115f96a2482ba2e01f0569c5e4c4be"; + sha256 = "17985wdlgz4d45jznl9df34826mm5xc8h5xcar70rdrw4gqp4ccy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/38222d109ece0030b0bfafb242aa100694b2bfcf/recipes/monotropic-theme"; + sha256 = "129yqjh4gaab1kjijzkzbw50alzdiwmpv9cl3lsy04m8zk02shl8"; + name = "monotropic-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/monotropic-theme"; + license = lib.licenses.free; + }; + }) {}; monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; @@ -47390,12 +47571,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170925.1338"; + version = "20180129.1637"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "546a62ada70aa89d325cc3941c8c9379a4c21553"; - sha256 = "1gbgsfd04jdw6jrsp13h13jkkac5ndrn684pl18q0wjgx9kk11b6"; + rev = "4eeb1a5115d60d064dcd79b9e0dd48619cd2ee4c"; + sha256 = "16qmqqq7297idr2x4fr22ihhx6z91484x0hpmskbh6fn05bvls2y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -47596,6 +47777,27 @@ license = lib.licenses.free; }; }) {}; + multi-run = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: + melpaBuild { + pname = "multi-run"; + version = "20180122.709"; + src = fetchFromGitHub { + owner = "sagarjha"; + repo = "multi-run"; + rev = "87d9eed414999fd94685148d39e5308c099e65ca"; + sha256 = "0m4wk6sf01b7bq5agmyfcm9kpmwmd90wbvh7fkhs61mrs86s2zw8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; + sha256 = "1iv4a49czdjl0slp8590f1ya0vm8g2ycnkwrdpqi3b55haaqp91h"; + name = "multi-run"; + }; + packageRequires = [ emacs window-layout ]; + meta = { + homepage = "https://melpa.org/#/multi-run"; + license = lib.licenses.free; + }; + }) {}; multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-term"; @@ -47981,8 +48183,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "eaa8c82b8e140f4c0f2e286ee14253b76e4639a6"; - sha256 = "1vy34f8gcaspjmgamz5dbxmjxjiixf0wmhgpr61fwd4vh5rvwcci"; + rev = "aae4f50f9f22d374eaaac2ce95e522f13dcc8fc0"; + sha256 = "08xgzrpp5l5d43j1b8ai3d41jzk9i70r2pqdcj53h79ml56bicgp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -48690,12 +48892,12 @@ ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "ng2-mode"; - version = "20180128.1006"; + version = "20180206.1128"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "43179216c08958486ed7a8e7a3766d1df11d38d8"; - sha256 = "1biww57phq5mcd80is38fnishj3jmj09iwiqkn6j03p53kvgqchb"; + rev = "00822c2e43ff4793cf030fbbd67f83cfdb689b3a"; + sha256 = "19qbs0c0q98rp506a8sj7wkigrk8xzv0s87q9bcl5zxk9jx6m304"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -49232,6 +49434,27 @@ license = lib.licenses.free; }; }) {}; + nordless-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nordless-theme"; + version = "20180204.48"; + src = fetchFromGitHub { + owner = "lethom"; + repo = "nordless-theme.el"; + rev = "3fb123eaaf7f38d024effdda4b3e88cc66e67300"; + sha256 = "0i5b7qg97qcgvhk8vv7x5xpwps06q140jndkz4i2rakg5hr3z98g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc0c7eec5bff1efa6be799aad36353a03a496a88/recipes/nordless-theme"; + sha256 = "0mfp2dm3z49fjgrw6sdc9yrn9a8q4dm5v3i3gi8bwx8zll70aq2m"; + name = "nordless-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/nordless-theme"; + license = lib.licenses.free; + }; + }) {}; nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nose"; version = "20140520.948"; @@ -49256,8 +49479,8 @@ version = "20180104.1635"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "12541fea7fe333f7c154a4a12a1d40394c2d6364"; - sha256 = "1r5a5smg2mc28wy3iq4sp8p0rmpqsi5ajk31hwc9lhldklz2c0nj"; + rev = "a9f1c7c294526afb2a2ac18003a654ea4c780b7b"; + sha256 = "0pv6rpymhf1m10011hw5plsfz18d7gm10w396dc2rm05c9szffjr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -50689,8 +50912,8 @@ src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "20517e96299e147ef349b9e8913f036a6c35399d"; - sha256 = "12wdqv5fkzrizl8ls9pbbzl6y0rf5pldsrxkfdl8k1ix2a03p8xd"; + rev = "764d8dfa931f2336fa9f469aea7d38bcb4990723"; + sha256 = "1h0rgcifhzqxb7glax7b7whxkcrrd1mmvsdn7z2xgwjla3qmx4w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -50832,12 +51055,12 @@ olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20171209.644"; + version = "20180205.2323"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "e824a21f5e284bc7e111b6f325258bba8396d9ec"; - sha256 = "07hz7nj81pj0vwql30ln8isypqyhwv4y36gfzs475hgjim2mvdh2"; + rev = "6893bef23e576fd776ca69517dbf0981a8dc4b2a"; + sha256 = "0jxqnc7cwrrl9kw0fng515kl9hblkqkd5yf2gqq7di09q3rccq65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -51032,12 +51255,12 @@ on-parens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "on-parens"; - version = "20150702.1506"; + version = "20180202.1441"; src = fetchFromGitHub { owner = "willghatch"; repo = "emacs-on-parens"; - rev = "16a145bf73550d5000ffbc2725c541a8458d0d3c"; - sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y"; + rev = "7a41bc02bcffd265f8a69ed4b4e0df3c3009aaa4"; + sha256 = "0pkc05plbjqfxrw54amlm6pzg9gcsz0nvqzprplr6rhh7ss419zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ea1eb5eb5a40e95ba06b0a4ac89ad8843c9cc2c/recipes/on-parens"; @@ -52373,12 +52596,12 @@ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-noter"; - version = "20180129.840"; + version = "20180206.1436"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "107fae73d5149a774d8c3a5d8a05c7355160388e"; - sha256 = "04269kll3dfh0jd8s6w6xdp90c9hbyfy68ifv1z30x67mz18chbx"; + rev = "26c081e71aeb7613a1adfbe3c2a352fbfd19c474"; + sha256 = "1mjqfw1xmpy0hwz442n5anwn69lrv2nqrk001qx3kgdl9z16wsdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -52785,12 +53008,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 = "20180129.719"; + version = "20180131.1914"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "3b16a4f7c98bcccd54a2d41d5ff7b5796b87a42d"; - sha256 = "0qiflgczhvav2wlgpy6fxm7vdh21ai75hdh00qs8b6d0d4i2mqhy"; + rev = "a96d36b425fdd4d90c9787f149fe3912c6f62147"; + sha256 = "0ar1f5ib6vdyzgdag7vxcfvhfnri1c71rx8pi9r0dv1mgkprpqkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -54170,12 +54393,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "20171105.0"; + version = "20171202.1713"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "93bd7b42ad4a70d7008470820266546d261222d6"; - sha256 = "078ihlpwajmzb0l4h5pqqx1y9ak7qwbrh7kfrqwd0jn114fah1yd"; + rev = "3d958203e169cbfb2204c43cb4c5543befec0b9d"; + sha256 = "057sqmvm8hwkhcg3yd4i8zz2xlqsqrpyiklyiw750s3i5mxdn0k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -54233,12 +54456,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180129.1108"; + version = "20180206.1515"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "ebb670b73be1b8759ce093c4101b198f12b5cea2"; - sha256 = "0ks6q0fgbyz0bq222dqh88fivkr150hlhb5kkibdr644bjwmcwcy"; + rev = "79616a30eb0ea40e6b68e1e32b46196a7a266a29"; + sha256 = "0n2sinp2pasygb5fmla8s2m288g3hpbm74vzw8f7p6drr2g7fmic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -54338,12 +54561,12 @@ ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-minutes"; - version = "20170323.835"; + version = "20180202.934"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-minutes"; - rev = "ad9632f35524ac546c6d55dfa827e8597669e1e1"; - sha256 = "07knwl6d85sygqyvc7pm23y7v4nraiq1wl1b7szkzi2knd8wzi0s"; + rev = "27c29f3fdb9181322ae56f8bace8d95e621230e5"; + sha256 = "10rw12gmg3d6fvkqijmjnk5bdpigvm8fy34435mwg7raw0gmlq75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes"; @@ -54653,12 +54876,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20171127.902"; + version = "20180205.1521"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "fc706968dc0bb60e06c5d21025a6ea82d3279e96"; - sha256 = "020cafc6mihkx6kzhlbxncyb8v7i3zs3l7gydivb6mhm5w36614q"; + rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00"; + sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -54965,6 +55188,27 @@ license = lib.licenses.free; }; }) {}; + panda-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "panda-theme"; + version = "20180203.2318"; + src = fetchFromGitHub { + owner = "jamiecollinson"; + repo = "emacs-panda-theme"; + rev = "f93ad6ded20d71cab9bf29a0c7040e07e1ba4f05"; + sha256 = "1y9yppkprbnqf59p94kkpxsma2s7z8cp195na05mdgcs0pmbs6l7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme"; + sha256 = "1q3zp331hz8l54p8ym9jrs4f36aj15r8aka6bqqnalnk237xqxl7"; + name = "panda-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/panda-theme"; + license = lib.licenses.free; + }; + }) {}; pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; @@ -55035,8 +55279,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; - sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; + rev = "c94a05d3b8a247a1abc9d0739a1b18387c26839f"; + sha256 = "0q833z76fysv66anrng0skgfa3wc2gcb8rw0xr759rblxmxmnp1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; @@ -55323,12 +55567,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20180109.201"; + version = "20180201.451"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "855e89446676f03065ed01e4a5c8dfba5eca3610"; - sha256 = "0s784pvv8jxiicvqcb9x0nynnpp0m431vw835qhp1pi1y4cfbbf8"; + rev = "da08fed8dbe1bac980088d47b01f90154dbb8d8b"; + sha256 = "1j5fdcqmqw62zvmwd80bjvkrr5vg59l5k6673hvvhjx77c8nvidv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -55432,8 +55676,8 @@ src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "bd1cadd5620279b5ee781434b4f0731eb9ad730d"; - sha256 = "017na2x0hrx4837w5xky3qnzrq3a36fi3mnjpdrv92pr06hbnc4n"; + rev = "94ac2ba2c6baa268a64cb4e96421f6f1bf96fd96"; + sha256 = "0prl9c1sl3426lsni1h4xcwlv3vvjl4nr6mbh9nb51fv9ak9y2sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -56707,12 +56951,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20180128.843"; + version = "20180205.2247"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "ff86ba6e5e9b9b27539eeec61a4adde65bb59f6c"; - sha256 = "0nh9sw9ykbgw8ljs3cqcx3c8aq00zz6ywlin4l3sjbhrgc2lpdab"; + rev = "5598dd31bac7dad1cd5e7c8eceefa4873800b4f7"; + sha256 = "06wjy4adr5xyigkvkpf2khxljhxkqgpv9r2gwvn55p9dqnabybs3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -57082,6 +57326,27 @@ license = lib.licenses.free; }; }) {}; + pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "pipenv"; + version = "20180123.1146"; + src = fetchFromGitHub { + owner = "pwalsh"; + repo = "pipenv.el"; + rev = "fd933729ff91e84bbac42fbf29571cb865465fd9"; + sha256 = "0k0g1zn90mc4kz112dkl4dz77nmkr1iwxk65d5mjsspg7jxf7xjm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; + sha256 = "110ddg6yjglp49rgn1ck41rl97q92nm6zx86mxjmcqq35cxmc6g1"; + name = "pipenv"; + }; + packageRequires = [ emacs f s ]; + meta = { + homepage = "https://melpa.org/#/pipenv"; + license = lib.licenses.free; + }; + }) {}; pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pippel"; @@ -57397,6 +57662,27 @@ license = lib.licenses.free; }; }) {}; + playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "playground"; + version = "20180207.1011"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "emacs-playground"; + rev = "0fe3fa1eaeb48cecd123d8a1de8c1da680128c76"; + sha256 = "1cgw4zqdnqagl4v19m3fy2979hl6b32pllgs2a4kzxdld1lc9658"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f062a74fe1746129879ad19c1735621f58509d33/recipes/playground"; + sha256 = "1xjmxkl8h4l87fvv1sr478r6mkmy9gkzw2fxmzqn5fcsahzkyg4d"; + name = "playground"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/playground"; + license = lib.licenses.free; + }; + }) {}; plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plenv"; @@ -58117,6 +58403,27 @@ license = lib.licenses.free; }; }) {}; + posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "posframe"; + version = "20180207.124"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "posframe"; + rev = "5456ca7f0aba63301c3d681d112419ec5742c5e5"; + sha256 = "0gdha5l619k1i1lalzr81114xva43xp6xbx3zd9b0r2cvyaqda5n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; + sha256 = "02chwkc7gn7fxaaxsz9msmrhrd62bji5hhb71kdm019x8d84z06w"; + name = "posframe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/posframe"; + license = lib.licenses.free; + }; + }) {}; postcss-sorting = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "postcss-sorting"; @@ -59194,8 +59501,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "da6b07a2e58cf6b6d5326b1f538e902aab3de5be"; - sha256 = "00baxp6nh6lskc0w5mm4w7m0pd0z6ai2sbpcl9ylcajqw0n4kknq"; + rev = "07f023188e929019f506e9b390dde70539ea857f"; + sha256 = "09fh3cc4x2yzydbgpmgh5gldhwgv56jdcbf1m22cql01rhc04qry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -59284,12 +59591,12 @@ psession = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "20171107.2313"; + version = "20180202.44"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "d087644db226e2c66481d3c248e26afa9e4eb670"; - sha256 = "1hb8cs8kkqpd96fb5dc8fysgg29fvay0ky83n9nawwzq516396ag"; + rev = "0d5091ae1090bad41d8e10a2f3f94a9e87711610"; + sha256 = "1h60j33nygivwa9hgn98ibyvxmxr02p338iq80z0nhqqkhzg24rp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; @@ -59853,8 +60160,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "pyenv-mode"; - rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820"; - sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn"; + rev = "eabb1c66f9e0c0500fef4d089508aad246d81dc0"; + sha256 = "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode"; @@ -59930,22 +60237,22 @@ license = lib.licenses.free; }; }) {}; - pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: + pyim = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20180128.405"; + version = "20180206.1419"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "37be07e2e585d1cb5964d7187fca22e863714056"; - sha256 = "1kgf363a7g7kpy32qw0n7iwlpkr93k4g6h84r3f0g58d8ckargm3"; + rev = "c670df2a338ca956b6103fd388f81a551bfc33f8"; + sha256 = "1pkjwcwz6xagamigsv25bxydda1yxzphw0xfclpi21raqnr9f1s6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; name = "pyim"; }; - packageRequires = [ async cl-lib emacs popup pyim-basedict ]; + packageRequires = [ async emacs popup pyim-basedict ]; meta = { homepage = "https://melpa.org/#/pyim"; license = lib.licenses.free; @@ -60063,8 +60370,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "60d471c36f0f390b4f51744eacd73ed99aae164a"; - sha256 = "07bwknfcf148vp6hs9jq3f2ixkkiwwg1xy9jck4disfvym81kqz3"; + rev = "19c4f6714a5a8da3e19c42e324fb31a57ddc696b"; + sha256 = "1mf54n2hz4936wi9a1dqd1fqq0ak36isd25q2b9sbvcq101gwhnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -60077,6 +60384,27 @@ license = lib.licenses.free; }; }) {}; + pynt = callPackage ({ deferred, ein, emacs, epc, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "pynt"; + version = "20180203.2100"; + src = fetchFromGitHub { + owner = "ebanner"; + repo = "pynt"; + rev = "76fa85dd0c791a6493d59bd564ce5f6ec20ab40d"; + sha256 = "06rhaqf5wkwk6xl8mp2kyyncnyjclvykal06iqj9sbd4kn5nnq5p"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; + sha256 = "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3"; + name = "pynt"; + }; + packageRequires = [ deferred ein emacs epc helm ]; + meta = { + homepage = "https://melpa.org/#/pynt"; + license = lib.licenses.free; + }; + }) {}; pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pytest"; @@ -60731,12 +61059,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20170314.146"; + version = "20180131.2246"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "bd6e385752c89760fdee7bdf331e24d1d80ee7e9"; - sha256 = "17vr2mbz1v20w7r52iqb7hicy131yaqhifbksvknx8xnm6z27pnm"; + rev = "6312f01470dcc73537dbdaaccabd59c4d18d23a9"; + sha256 = "1fqpqgkpn36kj3fb4na0w4cjwln05rvy6w1q5czas8z37rk2bs33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -61319,12 +61647,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20180115.127"; + version = "20180203.433"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "a5853d53a63e8a23b7b4c2ae0faf575623637c8d"; - sha256 = "0yalj4nn42g32xjr2s5hvlhinyhz1jjyx74494c018prybs16z75"; + rev = "28fa560afa5fe1ea871e5fbe35ba9b02e58b16de"; + sha256 = "01wkbp8118njr8s2x25j3ngrhp3jd2rw365ij1xjbgss30adjccf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -61511,6 +61839,27 @@ license = lib.licenses.free; }; }) {}; + recentf-remove-sudo-tramp-prefix = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "recentf-remove-sudo-tramp-prefix"; + version = "20180204.2156"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "recentf-remove-sudo-tramp-prefix"; + rev = "6d23ebc3f52b0a66236c171c45cc77a4d3aba541"; + sha256 = "0rzs9fmy1iqips6px0v57wnplbxmm3sbnk6xcszwhkwwp563hk32"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0bf1761715ee4917ba0823adbda03859d5b8131a/recipes/recentf-remove-sudo-tramp-prefix"; + sha256 = "01kdpx7kqd39a5hjym5plcj5d8szzghigq9mq186mggayg8q44cr"; + name = "recentf-remove-sudo-tramp-prefix"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/recentf-remove-sudo-tramp-prefix"; + license = lib.licenses.free; + }; + }) {}; recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recompile-on-save"; @@ -61661,12 +62010,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20180112.838"; + version = "20180207.1002"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "6737a3dba0501aeb275c1e5ee8833ee3a9a35845"; - sha256 = "0vrrwiz02vi21h11907lhbbkbl367nqd7ccqjpv2g6rsswsfrnpy"; + rev = "4c24963eb6eee494125b71578cf363cc1467ca99"; + sha256 = "1g9l61k9d76y9k7lamxzwrqyv16hvnkg6bmpyxj59gggkhw6km66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -61724,12 +62073,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20170322.1527"; + version = "20180205.956"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "55984dbd570c361e7d56d85f2d4ecfbcc567bda1"; - sha256 = "0amj5i69cgk0p0c3wlm68dgrav8in5n19msglnks210mbfd1vzhj"; + rev = "6b432bef019e7af38ee7145956fa28d512256420"; + sha256 = "0sf70cb3ahz42pb7lyp380w4k3698z6in9ng10pm47dv7j660llq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -62878,12 +63227,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20180107.2358"; + version = "20180130.942"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; - sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; + rev = "6ceeb7dd27b242123c69a5ae95b69d8ac2238a68"; + sha256 = "00cp3v1gwj0flmlzhghnxvy5zy7rfdrnvwv0c8704ddfsavxp6i3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -63071,8 +63420,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "bc05c3130a5d3237f04c6064297e56de5f73887d"; - sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414"; + rev = "90e0fc89a2b28c527fcece7ee90d5783694a4406"; + sha256 = "1lkicxingcvs4inxvkrpxknylf09a506plbzx6bfiq9dicsnlw14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -63190,6 +63539,27 @@ license = lib.licenses.free; }; }) {}; + rum-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rum-mode"; + version = "20180126.1622"; + src = fetchFromGitHub { + owner = "rumlang"; + repo = "rum-mode"; + rev = "893b1a26244ef6ea82833a9afbc13cb82c0cfb53"; + sha256 = "0lgahv25a9b2dfgkcm9ipyziiqnr3sb9l2dvzm35khwf3m8dwxgq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9f8ce2dee376f1f34e89e9642c472a148fca77/recipes/rum-mode"; + sha256 = "1838w8rk5pgp1hn7a0m83mfw9jin4qv5mkyl68hl3gj7g9lhn7sd"; + name = "rum-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rum-mode"; + license = lib.licenses.free; + }; + }) {}; run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "run-stuff"; @@ -63421,6 +63791,27 @@ license = lib.licenses.free; }; }) {}; + s3ed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "s3ed"; + version = "20180204.549"; + src = fetchFromGitHub { + owner = "mattusifer"; + repo = "s3ed"; + rev = "13503cb057bed29cb00a14dffe4472b5cb7748ad"; + sha256 = "1ak5nmay12s4ipmvm1a36kyny05xhzmj7wp6dry391db9n7g2wy0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/32ba78167bd6908b49f340f6da48643ac38f25f2/recipes/s3ed"; + sha256 = "08scv3aqnidz28rad5npz7b4pz9dx05rs72qkp3ybkk2vhqf2qwa"; + name = "s3ed"; + }; + packageRequires = [ dash emacs seq ]; + meta = { + homepage = "https://melpa.org/#/s3ed"; + license = lib.licenses.free; + }; + }) {}; sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sackspace"; @@ -63722,8 +64113,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "b635c493875e43e57102eb54bc80d008e3ca85b5"; - sha256 = "1vx7ybj4p5smal2sxa4j96dxfgzw184xxqn9m8y2s5lpwlndpz49"; + rev = "6abfe950893af1446f99103fb7bb9a790b3f2931"; + sha256 = "1v88h61jj9s9c5vvmypv9fb7h0kbki9xzwvxraaimz5fwgcqvlck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -64430,12 +64821,12 @@ semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }: melpaBuild { pname = "semi"; - version = "20160816.239"; + version = "20180204.1448"; src = fetchFromGitHub { owner = "wanderlust"; repo = "semi"; - rev = "6b9c62a76f22caf1476c837ee1976eaf0eaf38e7"; - sha256 = "0h0f6w13kiyy90vnsa4jlfdlsnd04wq6b0vrbmz74q1krfs8b0kz"; + rev = "44aa82ecf78273d8ff4c84f2121b885fb7149f41"; + sha256 = "1wl12gsz9pn4wzgbffv3ymr49kcxjggc2jx19kxqyjmwdnw004yf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi"; @@ -65543,12 +65934,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20171004.938"; + version = "20180205.1031"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "e7775d3bc5c6b73255814d0a62dc954e23a12c15"; - sha256 = "0pjhxhzzxrpcczwvd7b6a6q1nfmsr6m6mnlxn13nwf3r270grz87"; + rev = "be73a176a19fff8260369652f688a316e652fc03"; + sha256 = "1ifl1qsg6vxxmj3vysrvw94nn31x8krydin42vpp35w6pspx9f0z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -65585,12 +65976,12 @@ simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-paren"; - version = "20180104.1016"; + version = "20180205.1141"; src = fetchFromGitHub { owner = "andreas-roehler"; repo = "simple-paren"; - rev = "6a8c33443a1e8d502d272584a4a09b23a2342679"; - sha256 = "01lr9rndk5l2ssdqvrxikwhl9sswcp3hn233bjsq9kv6i5f9r8ca"; + rev = "f5cc9b4325a07efe92379a11a1a61035c9a1e8c4"; + sha256 = "1p931vqdnh6agrrzxf55x34ikb1x53mz1a17kskzlqchlzfmc3da"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren"; @@ -65921,12 +66312,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20180126.1033"; + version = "20180130.537"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "ae3b7e7ed63a850e9cb5130e0ca5544150d74156"; - sha256 = "1q27jxagllhmnc44b3rg1lkas1w2q6xv91j3f020gvasnzmbv5gh"; + rev = "7ea1ba6863ce864bbc91af2865885be5203c0b24"; + sha256 = "0l1hiz19y24mclm6na7ns85j3bqrvqbsk67g9ssxrxi5h67wxspf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -66089,12 +66480,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20180128.435"; + version = "20180201.341"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "f6dda1ec006ee67122d864e6069e85194a628083"; - sha256 = "1g92nksifwh7yvrwkwqzrhrficrlkyi04nw9ydrf8mkvn3svybgy"; + rev = "d47bab36259ad3d23d8c19879d60b552ee3dd89d"; + sha256 = "1w939s2229aswa6m93k5v0sjy3z01bkrsz9xdy3ibngdm1vaal3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -66613,12 +67004,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20180129.939"; + version = "20180204.844"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "05591f370ca31edc6c5ff0a762f8b03ebc1309df"; - sha256 = "1lb4j0gddzk6wb0wslhmvm09r2q1rl7vfwjraldyfzkfwspmb6r4"; + rev = "2e3d2850ea0736c390d69f7e4c5a9f55c680795a"; + sha256 = "1nxhhb88b9kwl3b2i7j3zixr1svl638igmanydjjzyx3xryb8vfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -68970,12 +69361,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20180115.1439"; + version = "20180206.1327"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "bcb2629e548de11d5eeca4a4f346b8a251b533c7"; - sha256 = "0rq93sljqa8r1vc47cwsrf2qnrl3rs1dixg6zkr9fr0clg5vz0jq"; + rev = "27c5c7722248baff572a0f3a672662618be4eebc"; + sha256 = "0pwd0cic3kj977171mpl0kkzas5l6cr806w1mhymcncgbybnr1pk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -69331,8 +69722,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; - sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; + rev = "0e70aaa672012ca067f207dab690bafab68c5bb5"; + sha256 = "11xxf1ymwy8pywh77x6ng8j99adpcd1qbrnwin9xnzbi7bjgbd3a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -69348,12 +69739,12 @@ swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }: melpaBuild { pname = "swiper-helm"; - version = "20151116.330"; + version = "20180131.944"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper-helm"; - rev = "57012ab626486fcb3dfba0ee6720b0625e489b8c"; - sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b"; + rev = "93fb6db87bc6a5967898b5fd3286954cc72a0008"; + sha256 = "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/674c709490e13267e09417e08953ff76bfbaddb7/recipes/swiper-helm"; @@ -69646,8 +70037,8 @@ src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "0118d3a041448dbf98c1ab8cc25ed75d7649ca17"; - sha256 = "0s1hamnrnh64v8sl816vd259y6j7r8rjy8avxwlfp65ah4xlcdcr"; + rev = "a6db84f988911bd394c9623e7df6f8ea42554cc2"; + sha256 = "0qy5d1lhsyahbpqp6rh5cccf8gvska0a20gv3d5nw292hrkdamvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -69704,12 +70095,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20180121.1007"; + version = "20180131.1624"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "466785ba8425308d00de1211bc79aebc0dd1ce75"; - sha256 = "16szrakal0l3p2aj133a16830zl7rcca357bbz0gj3n3vj9hiys9"; + rev = "ba902ce6602649aefda675e3c3cfcf20ac7995f2"; + sha256 = "017gif03773wlb0jfy45lsmq5vxqhghslxck9g6rgap22xn3xbcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -70862,8 +71253,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "d520d29a8bf4061b2f5f750122a0f87f4dc3da6e"; - sha256 = "1zfmmn2wiw2vb0c262nnn5pkfjm7md91rx18l65glcq4y7200ra0"; + rev = "875c2cfc84b3c143d3b14a7aba38905e35559157"; + sha256 = "145gbjizkkmdil1mmhsppmda22xg6blz81zqfsrd5aznwpiyw36q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; @@ -70988,8 +71379,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "3d556248a8b97310da49939195330691dfe9d9ad"; - sha256 = "0nz71cgi4ixs33x6f6lfdamsbn59sgjqn8x4z0ibssgb7ahahj2f"; + rev = "00645162ba1e73ea4fd6e7a47cecf910a29b3281"; + sha256 = "0zkh23l229cgs1azw0nmxa84mcf5yaq2f511p1xxz3v1dc2mdp33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -71068,12 +71459,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20180125.418"; + version = "20180205.413"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "6a62e0709cf1f78c0596973217a167d233ad4a74"; - sha256 = "16f418sk0b7z2kq047pz1lxwx1yanbfcjyp7jlhxajklwmmsv43i"; + rev = "636f52a6ba095433976fc8c463569c7e1b8761b2"; + sha256 = "0x0dp5c41w9jqywqx72g0crq0l6v516ljg1w4af3f2lhc46n80y2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -71881,12 +72272,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20180116.854"; + version = "20180201.1506"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "cbdf6fe7a25f5ff7aee786fdda83ce0f2de2bd2c"; - sha256 = "1ddqk466fjxmy41w9dm7cxx89f18di9410aqmfzhivsi0ryl8q3i"; + rev = "03a36853f141387654b7cb9217c7417db096a083"; + sha256 = "0kvg2gawsgy440x1fsl2c4pkxwp3zirq9rzixanklk0ryijhd3ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -71983,22 +72374,22 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20180128.1312"; + version = "20180203.417"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; - sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; + rev = "e6e82f10a4795063e47cf0f421d6f0f281976ff0"; + sha256 = "11zv73kz7qnqf1ml259cmhiqb1rl7rv4z5rvzvzaihrs5d9v1npm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; sha256 = "0zbnw48wrbq9g7vlwxapxpq9xz8cqyr63814w0pqnh6j40ia7r2a"; name = "treemacs"; }; - packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ]; + packageRequires = [ ace-window cl-lib dash emacs f ht hydra pfuture s ]; meta = { homepage = "https://melpa.org/#/treemacs"; license = lib.licenses.free; @@ -72007,12 +72398,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20180110.905"; + version = "20180203.416"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; - sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; + rev = "e6e82f10a4795063e47cf0f421d6f0f281976ff0"; + sha256 = "11zv73kz7qnqf1ml259cmhiqb1rl7rv4z5rvzvzaihrs5d9v1npm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -72028,12 +72419,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "20171204.845"; + version = "20180203.416"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; - sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; + rev = "e6e82f10a4795063e47cf0f421d6f0f281976ff0"; + sha256 = "11zv73kz7qnqf1ml259cmhiqb1rl7rv4z5rvzvzaihrs5d9v1npm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -72236,12 +72627,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20171204.1417"; + version = "20180207.836"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "a6d1589e256d861bfb51c59756b0aa25e88dfb89"; - sha256 = "0i9x6cvx61djavn35v8j4ildli0s9ixalxbwc4yb7sdax7379xhb"; + rev = "45f73c8fb4c6467fc54a5a905deea322ffae180c"; + sha256 = "1xhbnz0lv771bbpb6vizacdn2j47y2spdf42m72iv5iix6cgpnmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -73317,12 +73708,12 @@ use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20180127.1413"; + version = "20180206.1414"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; @@ -73342,8 +73733,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; @@ -73359,12 +73750,12 @@ use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-el-get"; - version = "20180122.142"; + version = "20180130.2105"; src = fetchFromGitHub { owner = "edvorg"; repo = "use-package-el-get"; - rev = "34f9feec6db0d9cf0a95544b960cf5d5c6a33621"; - sha256 = "1sjvzhnl2nk2wq440mqbai01r2zxyflsl96vxbbz9g9z8ak47k8b"; + rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947"; + sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get"; @@ -73384,8 +73775,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; - sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; + rev = "6af4b6caf67f5fbd63429d27fa54a92933df966a"; + sha256 = "13qp22m3sd1x84776d9v3h2071zj1xlmkdqi6s6wks6gk3ybyia1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; @@ -73398,6 +73789,27 @@ license = lib.licenses.free; }; }) {}; + usql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "usql"; + version = "20180204.1407"; + src = fetchFromGitHub { + owner = "nickbarnwell"; + repo = "usql.el"; + rev = "b6bd210ba3feec946576ab1f130d9f91ad2e2c44"; + sha256 = "1y1da6ipig7r5wcnb1v4pj0j56dsykvgy2pw0h4jxxibcr50pa42"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f6b968312a09d062fcc8f942d29c93df2a5a3c/recipes/usql"; + sha256 = "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84"; + name = "usql"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/usql"; + license = lib.licenses.free; + }; + }) {}; utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; @@ -73884,12 +74296,12 @@ vertica-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "vertica-snippets"; - version = "20180122.44"; + version = "20180207.453"; src = fetchFromGitHub { owner = "baron42bba"; repo = "vertica-snippets"; - rev = "61b33bb012801e6c883a72c829cddbbc4241590b"; - sha256 = "0n6gsblj6b3jnmjq9mgr0hx5jj5p4wg3b4mpvhilp3crw02zllw2"; + rev = "80f04bbe2f9640cae1612e2c6df8049bfd050624"; + sha256 = "16fhrzwr65k71ais1378rvr54qcpv5wpvcmm2w09nnrxn56zij8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56/recipes/vertica-snippets"; @@ -74283,12 +74695,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20170830.1148"; + version = "20180201.1454"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "a01e9ed416cd81ccddebebbf05d4ca80060b07dc"; - sha256 = "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm"; + rev = "31b292dc85a374fb343789e217015683bfbdf5f1"; + sha256 = "18ll47if9ajv0jj2aps8592bj7xqhxy74sbsqn07x9ywinxxi9mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -74597,12 +75009,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20171209.227"; + version = "20180202.2223"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "2a058670d9f65e7c9e5b203b31d5946bcb2bf144"; - sha256 = "1kpw9al401x7mwzan273dz38699hirz5rdlpwihmrvccpa279r6p"; + rev = "d4d08d452dfab8d96e090d007083532c82b0855c"; + sha256 = "1xx5032y85zl2xfa3nziy0py296rcsvb8akh8wwjcsdppagv60cd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -74828,12 +75240,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20180120.1009"; + version = "20180207.123"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "716893f9fd4dc9612f00a5dfe4b2b8e8fdb19762"; - sha256 = "0jl36d40454h3qljc8hgqxjcdzvi1xfk7zhld7y0d4r4n77r08r0"; + rev = "08e00718e8574a038880aa39d8707d12e12d3fdd"; + sha256 = "13hslj2v2nplww212p5i4sx3lhrkjqywfcyyrhin1sz1flhrfgpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -75206,12 +75618,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20180108.1930"; + version = "20180131.606"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "1219622b756f149efe4b44c625f2140c5229f936"; - sha256 = "14wfaqlixiqg79q6vb89jjvgvxwfgcdkgxyqh2bqsjwam9xksmlp"; + rev = "fce520f8af727bd33861f8d0f7655c01ea84ad85"; + sha256 = "1sgaln0d6rslvln4bvznkp401sizngwp6ypscp4gn95ygq2aam39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -76423,12 +76835,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20180107.1546"; + version = "20180206.1601"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "c7ebabe6ccff0bce35cf7feb1cef34f4c69aee50"; - sha256 = "1r4ld1b8dd39bggjhzj6rd3wan3yhw5sm3zi623yad7w48c4xpna"; + rev = "e00c4213ee8f77cc82691e7fbec7c84726fac926"; + sha256 = "1w5clsrhi8m9aqgq0cl2xx4mrm98g2fpwrxqs7xmmhy6wa0kjb9g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -76885,12 +77297,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20170102.1525"; + version = "20180202.1518"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "5873477fd7bd6e54142ab35fbc623ea9b55200aa"; - sha256 = "1328avc28barirwipasnhq81sn4nw6w6x6fffgqcxayv2r5bl1d8"; + rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; + sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -77137,12 +77549,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20170727.1531"; + version = "20180204.2333"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "28c34033194130d452d5c958b5241c88d42ca02b"; - sha256 = "1m3fr19sfkr7d94qzqkl7x1jmhpar2hnhq6mjscd3lfcqkifh6kv"; + rev = "7f4103736178fc6e3a9a9ba3b3d0516986ab8b71"; + sha256 = "0y153522yg5qmkdcbf7h87zcambgl9hf9bwk8dq22c0vgdc04v3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -77368,12 +77780,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20180124.1445"; + version = "20180204.1613"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "8b421bc78d56263a2adc128337540e50a1c19c6a"; - sha256 = "0ryzk38gdz87cr44nqn31wz74qjyrjzcnqwnjsisvzzz3ivhpdqm"; + rev = "caf3dba32006acd9196b06e0d9845786915f7b6d"; + sha256 = "04lkliy50m27f2s2mgaji9w9d17fg4d54j54qp8ybbaf3b6k1yra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -77496,8 +77908,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "7f394d02f6f3149b215adcc96043c78d5f32d612"; - sha256 = "0q7y0cg2gw15sm0yi45gc81bsrybv8w8z58vjlq1qp0nxpcz3ipl"; + rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; + sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -77565,12 +77977,12 @@ yoficator = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yoficator"; - version = "20171206.1630"; + version = "20180129.1252"; src = fetchFromGitLab { owner = "link2xt"; repo = "yoficator"; - rev = "5ad60258097147cdd8d71147722cc4203a59a0b0"; - sha256 = "0b2xzkw0rxbxfk6rxapy82zl61k51cis9nsnw67v7h2s2423jhcr"; + rev = "e0dc076cb0d1999cb41585b5f36322681109fe86"; + sha256 = "1vq07ndxrdry26dx3ci4yz1a1qdcr20yznj62y2f0wkyccrai9y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator"; @@ -77649,12 +78061,12 @@ zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zeal-at-point"; - version = "20170427.2042"; + version = "20180131.1554"; src = fetchFromGitHub { owner = "jinzhu"; repo = "zeal-at-point"; - rev = "50a1bd4240ff0db7c8f2046c3b00c5a8e14b9d2f"; - sha256 = "1xy9nbbk0fkd9dm8n0c0gy52vi34s6vgzbnab0hrghn6whs89ig8"; + rev = "0fc3263f44e95acd3e9d91057677621ce4d297ee"; + sha256 = "0aq9w9pjyzdgf63hwffhph6k43vv3cxmffklrjkjj3hqv796k8yd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point"; @@ -77795,12 +78207,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20180125.739"; + version = "20180201.246"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "f22ea6ed957440dccbb4a21bacc545d27830423e"; - sha256 = "0p317q99js4aynjvkxanwlbq0hb10njhzl9s975p7pi6abfxfkkm"; + rev = "553ba2ba9907e56bda1d2ebf142ba7cbf9bd16f1"; + sha256 = "1d9fclil0nf06gc9734y3p6clkxpwxa8nqh9mk9kpj8k9b36lxcn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -78152,11 +78564,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20171008.2152"; + version = "20180205.2109"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "eb6f5bf71b00"; - sha256 = "1q3xz4gwqb7ac49w0nq7zvl4n790wk6r97by1kldv54y2fj0ja9g"; + rev = "53a247d2c21b"; + sha256 = "1a45l3i1gg0pyka13z6hra3wyp6x564cz66gbi10sqly2jlwgxda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; @@ -78172,12 +78584,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20170223.1014"; + version = "20180204.941"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "febc2d02373312ce69f56c9dbe54cabea3e0813c"; - sha256 = "0sj30f87gvxbqwi1k7xxqc1h0w7n53630d04csqayiwvc6a2z2sz"; + rev = "1ebb00cea3f4d85422d733a51e989bdb237ae3eb"; + sha256 = "1r00a8mqrrr63amkb83qgnwsxymcad6s8q3cics643c1vs9piw61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; From 84f30286d276db315b3fbbca1e0b53cc8e2bef54 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Thu, 8 Feb 2018 09:32:15 +1030 Subject: [PATCH 622/797] awsebcli: 3.12.1 -> 3.12.2 --- pkgs/tools/virtualization/awsebcli/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 25752afd995..5e5f76975ba 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -34,16 +34,6 @@ let }; }); - pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec { - version = "0.5.0"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "07yx1gxj9v1iyyiy5fhq2wsmh4qfbrx158wi7jb0nx6lah80ffma"; - }; - }); - requests = super.requests.overridePythonAttrs (oldAttrs: rec { version = "2.9.1"; @@ -77,11 +67,11 @@ let in with localPython.pkgs; buildPythonApplication rec { name = "${pname}-${version}"; pname = "awsebcli"; - version = "3.12.1"; + version = "3.12.2"; src = fetchPypi { inherit pname version; - sha256 = "12v3zz69iql4ggiz9x7h27vyq9y9jlm46yczxyg62j89m2iyr5bl"; + sha256 = "19sgx43fyq35rqp0q8zbqavgg0k0n46iy1fqsxvw9lf0g0v62pjh"; }; checkInputs = [ From 469d49718ed128d520e36cc7ec682f0eb74b6049 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 6 Feb 2018 22:49:57 +0100 Subject: [PATCH 623/797] gitAndTools.svn_all_fast_export: init at 1.0.11 --- .../git-and-tools/default.nix | 1 + .../svn-all-fast-export/default.nix | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 33a055e624e..e5e36e998ac 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -117,6 +117,7 @@ rec { git = gitSVN; }; + svn_all_fast_export = libsForQt5.callPackage ./svn-all-fast-export { }; tig = callPackage ./tig { }; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix new file mode 100644 index 00000000000..fbafc5257d7 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }: + +let + version = "1.0.11"; +in +stdenv.mkDerivation { + name = "svn-all-fast-export-${version}"; + + src = fetchFromGitHub { + owner = "svn-all-fast-export"; + repo = "svn2git"; + rev = version; + sha256 = "0lhnw8f15j4wkpswhrjd7bp9xkhbk32zmszaxayzfhbdl0g7pzwj"; + }; + + # https://github.com/svn-all-fast-export/svn2git/pull/40 + patches = [ + (fetchpatch { + name = "pr40.patch"; + sha256 = "1qndhk5csf7kddk3giailx7r0cdipq46lj73nkcws43n4n93synk"; + url = https://github.com/svn-all-fast-export/svn2git/pull/40.diff; + }) + ]; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ apr.dev subversion.dev qtbase ]; + + qmakeFlags = [ + "VERSION=${version}" + "APR_INCLUDE=${apr.dev}/include/apr-1" + "SVN_INCLUDE=${subversion.dev}/include/subversion-1" + ]; + + installPhase = "make install INSTALL_ROOT=$out"; + + meta = with stdenv.lib; { + homepage = https://github.com/svn-all-fast-export/svn2git; + description = "A fast-import based converter for an svn repo to git repos"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.flokli ]; + }; +} From 72326cda8078c9bb5c8505505e534b0953754ac3 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Thu, 8 Feb 2018 09:36:31 +1030 Subject: [PATCH 624/797] flow: 0.64.0 -> 0.65.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 f90893ee79d..69ca68351ba 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -4,14 +4,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.64.0"; + version = "0.65.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1jvx2vx1d3n5z689zqm0gylmmjxim176avinwn3q8xla3gz3srp8"; + sha256 = "00m9wqfqpnv7p2kz0970254jfaqakb12lsnhk95hw47ghfyb2f7p"; }; installPhase = '' From 0b43d5a9cf99dec2cccfd74c13487ecf0635f731 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Feb 2018 19:36:21 -0500 Subject: [PATCH 625/797] linux: 4.14.17 -> 4.14.18 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 413e3ea32dc..dcd5ac0e8b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; import ./generic.nix (args // rec { - version = "4.14.17"; + version = "4.14.18"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jqa86bnnlzv0r0bvzvmbj1c89a5m64zrjfvfrjlwg3vy63r9ii7"; + sha256 = "0m73kz9jg6mylgql0zzypm76g6x7m3bq7dklivhkm4ldqg0r8sl6"; }; } // (args.argsOverride or {})) From 9f3d57a31f1d8b474aa2a5ff0a65fa13ad114647 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Feb 2018 19:36:35 -0500 Subject: [PATCH 626/797] linux: 4.15.1 -> 4.15.2 --- pkgs/os-specific/linux/kernel/linux-4.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index fa9d0b4bcda..1a5228f6768 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; import ./generic.nix (args // rec { - version = "4.15.1"; + version = "4.15.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ import ./generic.nix (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pxgs5wqmidwa5lz6q1m9gz6jyvhvlgy8r5bs48cm08b0vcwsvlq"; + sha256 = "16h346abbdi6k3handw8nblscyf966gx1q9xig4gbij73b10nspb"; }; } // (args.argsOverride or {})) From c46a833e6c91d50ef1adbd9ca0eec444b8300604 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Feb 2018 19:47:20 -0500 Subject: [PATCH 627/797] linux-copperhead: 4.15.1.a -> 4.15.2.a --- pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index d87ed3e8082..98cf66b48d5 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.1"; + version = "4.15.2"; revision = "a"; - sha256 = "1k9ng0110vzl29rzbglk3vmnpfqk04rd2mja5aqql81z5pb1x528"; + sha256 = "1rmia5k07pfx47qkc8nx3xiap6mxbwlry3jxrx4kwf3hh5cnqnsv"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 5da892433330879d4a1241f2cc5e394694927359 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 7 Feb 2018 15:59:06 -0600 Subject: [PATCH 628/797] zfs, spl: 0.7.5 -> 0.7.6 Fixes compat with 4.15 (cc #34459) --- pkgs/os-specific/linux/spl/default.nix | 4 ++-- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 5af10d77933..57698b5ad45 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -61,8 +61,8 @@ in assert kernel != null; { splStable = common { - version = "0.7.5"; - sha256 = "0njb3274bc5pfr80pzj94sljq457pr71n50s0gsccbz8ghk28rlr"; + version = "0.7.6"; + sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb"; }; splUnstable = common { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c00bd286b7e..868e354c7b5 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -142,9 +142,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.5"; + version = "0.7.6"; - sha256 = "086g4xjx05sy4fwn5709sm46m2yv35wb915xfmqjvpry46245nig"; + sha256 = "1k3a69zfdk4ia4z2l69lbz0mj26bwdanxd2wynkdpm2kl3zjj18h"; extraPatches = [ (fetchpatch { From 9bc383a9f370164ec994fd73ba389ba0657cff2c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 7 Feb 2018 19:52:03 -0500 Subject: [PATCH 629/797] oh-my-zsh: 2017-12-14 -> 2018-01-22 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 3374f32738c..8cfcb9ecbbe 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2017-12-14"; + version = "2018-01-22"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "c3b072eace1ce19a48e36c2ead5932ae2d2e06d9"; - sha256 = "14nmql4527l4qs4rxb5gczb8cklz8s682ly0l0nmqh36cmvaqx8y"; + rev = "37c2d0ddd751e15d0c87a51e2d9f9849093571dc"; + sha256 = "0x2r7205ps5v5bl1f9vdnry9gxflypaahz49cnhq5f5klb49bakn"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 11d9f3aae1cd3f33db0937b7c6dae403bf532ec0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 7 Feb 2018 19:56:19 -0600 Subject: [PATCH 630/797] heaptrack: 2017-10-30 -> 2018-01-28 --- pkgs/development/tools/profiling/heaptrack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index e97ff61a0dc..c8ae900630b 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "heaptrack-${version}"; - version = "2017-10-30"; + version = "2018-01-28"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; - rev = "2bf49bc4fed144e004a9cabd40580a0f0889758f"; - sha256 = "0sqxk5cc8r2vsj5k2dj9jkd1f2x2yj3mxgsp65g7ls01bgga0i4d"; + rev = "a4534d52788ab9814efca1232d402b2eb319342c"; + sha256 = "00xfv51kavvcmwgfmcixx0k5vhd06gkj5q0mm8rwxiw6215xp41a"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 427a4cd46301f615ccfb6e93f376eca5e4a46df8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 7 Feb 2018 20:13:31 -0600 Subject: [PATCH 631/797] heaptrack: don't be specific about boost --- pkgs/development/tools/profiling/heaptrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index c8ae900630b..8df9155eb5c 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, extra-cmake-modules, - zlib, boost162, libunwind, elfutils, sparsehash, + zlib, boost, libunwind, elfutils, sparsehash, qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ - zlib boost162 libunwind elfutils sparsehash + zlib boost libunwind elfutils sparsehash qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons ]; From a90f841769b0478afd39025f32e48038b8a165c8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 7 Feb 2018 20:53:49 -0600 Subject: [PATCH 632/797] heaptrack: Add dep on kdiagram for chart goodness --- pkgs/development/tools/profiling/heaptrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index 8df9155eb5c..f5f9a15dd00 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, extra-cmake-modules, zlib, boost, libunwind, elfutils, sparsehash, - qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, + qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ zlib boost libunwind elfutils sparsehash - qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons + qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram ]; meta = with stdenv.lib; { From 8cc3fcdfd485b96f7fcf83c45f1919b54e5eb838 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 8 Feb 2018 06:24:14 +0000 Subject: [PATCH 633/797] proofgeneral_HEAD: 2017-11-06 -> 2018-01-30 --- pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index 1cdcb9b8554..de72b24f87a 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (rec { name = "ProofGeneral-unstable-${version}"; - version = "2017-11-06"; + version = "2018-01-30"; src = fetchFromGitHub { owner = "ProofGeneral"; repo = "PG"; - rev = "2eab72c33751768c8a6cde36b978ea4a36b91843"; - sha256 = "1l3n48d6d4l5q3wkhdyp8dc6hzdw1ckdzr57dj8rdm78j87vh2cg"; + rev = "945cada601c5729edd16fcc989a3969c8b34d20a"; + sha256 = "1zjmbhq6c8g8b93nnsvr5pxx6mlcndb0fz152b2h80vfh9663cn8"; }; buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; From c65e36c9caec87873175095f07b052760b42e3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 8 Feb 2018 09:49:06 +0100 Subject: [PATCH 634/797] lib/types: add types.nonEmptyListOf --- lib/types.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index 88fc90d0597..a334db5c724 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -256,6 +256,10 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; + nonEmptyListOf = elemType: + let list = addCheck (types.listOf elemType) (l: l != []); + in list // { description = "non-empty " + list.description; }; + attrsOf = elemType: mkOptionType rec { name = "attrsOf"; description = "attribute set of ${elemType.description}s"; From 355de06fe474e5a25a4daca72c55681a0b7c6e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Feb 2018 03:20:41 +0100 Subject: [PATCH 635/797] nixos/tor: add hiddenServices..authorizeClient --- nixos/modules/services/security/tor.nix | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index fa4aeb22ae9..fed91756e76 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -88,6 +88,9 @@ let ${flip concatMapStrings v.map (p: '' HiddenServicePort ${toString p.port} ${p.destination} '')} + ${optionalString (v.authorizeClient != null) '' + HiddenServiceAuthorizeClient ${v.authorizeClient.authType} ${concatStringsSep "," v.authorizeClient.clientNames} + ''} '')) + cfg.extraConfig; @@ -619,6 +622,33 @@ in })); }; + authorizeClient = mkOption { + default = null; + description = "If configured, the hidden service is accessible for authorized clients only."; + type = types.nullOr (types.submodule ({config, ...}: { + + options = { + + authType = mkOption { + type = types.enum [ "basic" "stealth" ]; + description = '' + Either "basic" for a general-purpose authorization protocol + or "stealth" for a less scalable protocol + that also hides service activity from unauthorized clients. + ''; + }; + + clientNames = mkOption { + type = types.nonEmptyListOf (types.strMatching "[A-Za-z0-9+-_]+"); + description = '' + Only clients that are listed here are authorized to access the hidden service. + Generated authorization data can be found in ${torDirectory}/onion/$name/hostname. + Clients need to put this authorization data in their configuration file using HidServAuth. + ''; + }; + }; + })); + }; }; config = { From 7bfc62a3778d6d4388b817e172aa6262f6871b41 Mon Sep 17 00:00:00 2001 From: Karol Chmist Date: Thu, 8 Feb 2018 10:10:18 +0100 Subject: [PATCH 636/797] dotty: 0.4.0 -> 0.6.0 --- pkgs/development/compilers/scala/dotty-bare.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 60cb3e9a202..bff73337e9e 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "0.4.0-RC1"; + version = "0.6.0-RC1"; name = "dotty-bare-${version}"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "1d1ab08b85bd6898ce6273fa50818de0d314fc6e5377fb6ee05494827043321b"; + sha256 = "de1f5e72fb0e0b4c377d6cec93f565eff49769698cd8be01b420705fe8475ca4"; }; propagatedBuildInputs = [ jre ] ; From b6bcba6537a6f614f61ec7e852e60e390d285270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 8 Feb 2018 10:24:47 +0000 Subject: [PATCH 637/797] nixos/zfs: fix typo in enableLegacyCrypto description --- nixos/modules/tasks/filesystems/zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 5d05b99b697..30c54ddd0e4 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -85,7 +85,7 @@ in description = '' Enabling this option will allow you to continue to use the old format for encrypted datasets. With the inclusion of stability patches the format of - encrypted datasets has changed. They can still be access and mounted but + encrypted datasets has changed. They can still be accessed and mounted but in read-only mode mounted. It is highly recommended to convert them to the new format. From a600b621c8a23e16f588385df57b09f93b83ed2f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 8 Feb 2018 12:43:08 +0100 Subject: [PATCH 638/797] linux_4_15: fix a partial version downgrade on staging merge --- pkgs/os-specific/linux/kernel/linux-4.15.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index 53282fa9197..58f59ff0834 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.15.1"; + version = "4.15.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 0ff2f9be678e2abb55f4efb9226fc8c57447e142 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 8 Feb 2018 20:51:32 +0900 Subject: [PATCH 639/797] flashplayer: 28.0.0.137 -> 28.0.0.161 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 5749689bfb1..bac4a361a19 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "28.0.0.137"; + version = "28.0.0.161"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1776jjv2abzrwhgff8c75wm9dh3gfsihv9c5vzllhdys21zvravy"; + sha256 = "0xhfr2mqmg71dxnsq4x716hzkryj2dmmlzgyi8hf7s999p7x8djw"; 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 614f55d01d6..dc9c3358552 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "28.0.0.137"; + version = "28.0.0.161"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1hj3sfrspdkhq967fmnpgamgiq90k263cqfas94gp3dzslmkingw" + "0dsgq39c2d0kkdcd9j4nddqn3qiq5pvm2r67ji4m4wyv9chn518m" else - "1v4k6hzngm23xwxnh6ngplp2m0ga480sbcm668bpcj61krmi6xy4" + "0x26qi9qr01rppji5l4nwvmrhmq6qy83dsppbb7jqjmgyvknq5jd" else if arch == "x86_64" then - "0ijmrk6262a1xcf98g94vdlqxnik9f7igjy08j3a2i4b5bikq479" + "1s62gx2a9q962w3gc847x2xwlzkq4dkzbmvf74x5k5c2k2l9hhg0" else - "10a17dba4zy29padvi3fnv2s8v71q698ffqjp8ggsla42pjyhvkh"; + "1m5pcgz2w9f3jkm3hpvysc8ap20y458xnba7j51d7h7fjy6md89x"; }; 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 d5c4f993d8b..4528dd70cbd 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "28.0.0.137"; + version = "28.0.0.161"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0xr3hf828sm0xdnmk2kavxmvzc6m0mw369khrxyfwrbxvdsibwn8" + "0934vs3c51fjz9pr846wg9xn7h2qybswayfkhz0pnzcfnng2rrf1" else - "1wr0avjpshrj51svb1sfnshz39xxla1brqs8pbcgfgyqjh350rgn"; + "0pwi7pbfldiqiwc7yfy7psyr93679r025vjxmiybs2ap69vly4v0"; }; nativeBuildInputs = [ unzip ]; From 7a833cfcb88c9bc5e8035ae9dd4e6dd2cc577cb3 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 8 Feb 2018 12:42:19 +0100 Subject: [PATCH 640/797] nvidia_x11_beta: 381.22 -> 390.12 This change is done for completness in regards to [1] since we already support a newer "stable" version. nvidia_x11_beta now compiles on both 4.14 and 4.15. [1] https://github.com/NixOS/nixpkgs/issues/31640 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index a4d1629a684..f0f56f17bb3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -25,11 +25,11 @@ in }; beta = generic { - version = "381.22"; - sha256_32bit = "024x3c6hrivg2bkbzv1xd0585hvpa2kbn1y2gwvca7c73kpdczbv"; - sha256_64bit = "13fj9ndy5rmh410d0vi2b0crfl7rbsm6rn7cwms0frdzkyhshghs"; - settingsSha256 = "1gls187zfd201b29qfvwvqvl5gvp5wl9lq966vd28crwqh174jrh"; - persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963"; + version = "390.12"; + sha256_32bit = "1nkn7xvizfkqh2r9c1w740idb3d5x0df71bjmx4yskxjvrylqlxz"; + sha256_64bit = "1qr8aj6r95hn75w9szpyca69m6xyjd0cf1cq8qjxp8miwpfjnszl"; + settingsSha256 = "0n23nj3ljd2ra714dwrc1cq3xlq697qbbb2wc1zmi0zs85svx5j6"; + persistencedSha256 = "0zk6zqk4i731b892dkgagr5xibs2l26q43djilfx9q98sqiq19jb"; }; From bfcea0c05d6bcb83eebf92cbda6bfb334adaf589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 8 Feb 2018 13:02:57 +0100 Subject: [PATCH 641/797] home-assistant: fix tests by pinning pytest==3.3.1 --- pkgs/servers/home-assistant/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index bce0369cb52..057d4a384e4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -21,6 +21,13 @@ let sha256 = "0fzfpx5ny7559xrxaawnylq20dvrkjiag0ypcd13frwwivrlsagy"; }; }); + pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { + version = "3.3.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "14zbnbn53yvrpv79ch6n02myq9b4winjkaykzi356sfqb7f3d16g"; + }; + }); hass-frontend = super.callPackage ./frontend.nix { }; }; }; From 6bc889205a285859078f53959a833459d2371d9a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Feb 2018 13:32:55 +0100 Subject: [PATCH 642/797] sshd: Remove UsePrivilegeSeparation option This option is deprecated, see https://www.openssh.com/txt/release-7.5. --- nixos/modules/services/networking/ssh/sshd.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index d9b12d27816..e50c4dbacf3 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -375,9 +375,6 @@ in # LogLevel VERBOSE logs user's key fingerprint on login. # Needed to have a clear audit track of which key was used to log in. LogLevel VERBOSE - - # Use kernel sandbox mechanisms where possible in unprivileged processes. - UsePrivilegeSeparation sandbox ''; assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; From 266292a4bc85383cad815042bf7877975ca99a1d Mon Sep 17 00:00:00 2001 From: geistesk Date: Thu, 8 Feb 2018 13:17:03 +0100 Subject: [PATCH 643/797] fpdf: init at 1.7.2 --- .../python-modules/fpdf/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/fpdf/default.nix diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix new file mode 100644 index 00000000000..c09d54ad555 --- /dev/null +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "fpdf"; + version = "1.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yb73c2clv581sgak5jvlvkj4wy3jav6ms5ia8jx3rw969w40n0j"; + }; + + # No tests available + doCheck = false; + + meta = { + homepage = https://github.com/reingart/pyfpdf; + description = "Simple PDF generation for Python"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9b0a61d884..9db768bf463 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4611,6 +4611,8 @@ in { }; }; + fpdf = callPackage ../development/python-modules/fpdf { }; + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; frozendict = buildPythonPackage rec { From a38cb9411c1d68ddcf7d410593bfe07c08174442 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 8 Feb 2018 14:33:58 +0100 Subject: [PATCH 644/797] skopeo: 0.1.27 -> 0.1.28 --- pkgs/development/tools/skopeo/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 75732c71a23..de0d7fc54de 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,15 +1,16 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, runCommand }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand +, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux }: with stdenv.lib; let - version = "0.1.27"; + version = "0.1.28"; src = fetchFromGitHub { rev = "v${version}"; owner = "projectatomic"; repo = "skopeo"; - sha256 = "1xwwzxjczz8qdk1rf0h78qd3vk9mxxb8yi6f8kfqvcdcsvkajd5g"; + sha256 = "068nwrr3nr27alravcq1sxyhdd5jjr24213vdgn1dqva3885gbi0"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; @@ -23,7 +24,7 @@ buildGoPackage rec { excludedPackages = "integration"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}"; From 74e56de70ce85d482716a842d677300225f849c8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 8 Feb 2018 09:01:40 -0500 Subject: [PATCH 645/797] hipchat: 4.30.2.1665 -> 4.30.3.1670 --- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 770c2fc02c5..3caa75acb07 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.30.2.1665"; + version = "4.30.3.1670"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "0gk1h2p5apppw94353378b2z93c5kllhgadb91z1g3mczczsbm0n"; + sha256 = "0alqzay6bvi7ybrrdk5r0xkg4sx6qjsqbgmr16bkqxncxhb215ay"; } else throw "HipChat is not supported on ${stdenv.system}"; From f4ff322d7293313f30428ae0051b7a32dd729225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 8 Feb 2018 15:07:05 +0100 Subject: [PATCH 646/797] pythonPackages.pecan: remove superfluous patch --- pkgs/development/python-modules/pecan/default.nix | 5 ----- .../python-modules/pecan/python36_test_fix.patch | 13 ------------- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/python-modules/pecan/python36_test_fix.patch diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 688c75e570f..3a49a32a8a0 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -15,14 +15,9 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pecan"; version = "1.3.2"; - patches = [ - ./python36_test_fix.patch - ]; - src = fetchPypi { inherit pname version; sha256 = "24f06cf88a488b75f433e62b33c1c97e4575d0cd91eec9eec841a81cecfd6de3"; diff --git a/pkgs/development/python-modules/pecan/python36_test_fix.patch b/pkgs/development/python-modules/pecan/python36_test_fix.patch deleted file mode 100644 index 65e0733ab06..00000000000 --- a/pkgs/development/python-modules/pecan/python36_test_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pecan/tests/test_conf.py b/pecan/tests/test_conf.py -index 0573d84..7c98e16 100644 ---- a/pecan/tests/test_conf.py -+++ b/pecan/tests/test_conf.py -@@ -157,7 +157,7 @@ class TestConf(PecanTestCase): - - try: - configuration.conf_from_file(f.name) -- except (ValueError, SystemError) as e: -+ except (ValueError, SystemError, ImportError) as e: - assert 'relative import' in str(e) - else: - raise AssertionError( From e7fc9fe5e1a46ea561ef7c64a30ac7045e9c5dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 8 Feb 2018 15:03:08 +0100 Subject: [PATCH 647/797] pythonPackages.pytest-sugar: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/pytest-sugar/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 2965d169599..a266b461749 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -1,17 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi, termcolor, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "pytest-sugar"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "11lni9kn0r1y896xg20qjv4yjcyr56h0hx9dprdgjnam4dqcl6lg"; + sha256 = "ab8cc42faf121344a4e9b13f39a51257f26f410e416c52ea11078cdd00d98a2c"; }; propagatedBuildInputs = [ termcolor pytest ]; + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "A plugin that changes the default look and feel of py.test"; homepage = https://github.com/Frozenball/pytest-sugar; From 64fbc476b7dcccfffb66d2f46f20c45d15d29359 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Feb 2018 07:43:34 -0800 Subject: [PATCH 648/797] ataripp: 1.73 -> 1.81 fixes #34725 --- pkgs/misc/emulators/atari++/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index d669233e759..5a37b1b32c5 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, libSM, libX11, SDL }: +{ stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }: with stdenv.lib; stdenv.mkDerivation rec{ name = "atari++-${version}"; - version = "1.73"; + version = "1.81"; src = fetchurl { url = "http://www.xl-project.com/download/atari++_${version}.tar.gz"; - sha256 = "1y5kwh08717jsa5agxrvxnggnwxq36irrid9rzfhca1nnvp9a45l"; + sha256 = "1sv268dsjddirhx47zaqgqiahy6zjxj7xaiiksd1gjvs4lvf3cdg"; }; - buildInputs = [ libSM libX11 SDL ]; + buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ]; + + postFixup = '' + patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++" + ''; meta = { homepage = http://www.xl-project.com/; From 37fb8d3e11988f93e006eab9b94f7356652b2a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 8 Feb 2018 17:09:47 +0100 Subject: [PATCH 649/797] nix-bash-completions: 0.6.2 -> 0.6.3 --- pkgs/shells/nix-bash-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/nix-bash-completions/default.nix index bb945f40421..fb6fa24ac33 100644 --- a/pkgs/shells/nix-bash-completions/default.nix +++ b/pkgs/shells/nix-bash-completions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.6.3"; name = "nix-bash-completions-${version}"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; rev = "v${version}"; - sha256 = "0w6mimi70drjkdpx5pcw66xy2a4kysjfzmank0kc5vbhrjgkjwyp"; + sha256 = "1zmk9f53xpwk5j6qqisjlddgm2fr68p1q6pn3wa14bd777lranhj"; }; # To enable lazy loading via. bash-completion we need a symlink to the script From 2954c6ce863cd8eb05baadf592126a4a6a991033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 8 Feb 2018 17:13:29 +0100 Subject: [PATCH 650/797] nix-zsh-completions: 0.3.7 -> 0.3.8 --- pkgs/shells/nix-zsh-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index 29fb065a6f8..2bcff6b809d 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.3.7"; + version = "0.3.8"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "164x8awia56z481r898pbywjgrx8fv8gfw8pxp4qgbxzp3gwq9iy"; + sha256 = "05ynd38br2kn657g7l01jg1q8ja9xwrdyb95w02gh7j9cww2k06w"; }; installPhase = '' From 6b45dbd99c6078801dd49fd22c1f175b9fd19b31 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Fri, 12 Jan 2018 21:58:21 -0600 Subject: [PATCH 651/797] services.mysql: properly quote database.name --- nixos/modules/services/databases/mysql.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 36d5340a306..5b739050355 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -289,10 +289,10 @@ in # Create initial databases if ! test -e "${cfg.dataDir}/${database.name}"; then echo "Creating initial database: ${database.name}" - ( echo "create database ${database.name};" + ( echo "create database `${database.name}`;" ${optionalString (database ? "schema") '' - echo "use ${database.name};" + echo "use `${database.name}`;" if [ -f "${database.schema}" ] then From b21952e7669fd69479cd71987f4b1b9907842590 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Thu, 8 Feb 2018 18:46:04 +0100 Subject: [PATCH 652/797] spotify: 1.0.69.336.g7edcc575-39 -> 1.0.70.399.g5ffabd56-26 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 9ac0c49ebc3..35c5dff2710 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.69.336.g7edcc575-39"; + version = "1.0.70.399.g5ffabd56-26"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd"; + sha256 = "0kpakz11xkyqqjvln4jkhc3z5my8zgpw8m6jx954cjdbc6vkxd29"; }; buildInputs = [ dpkg makeWrapper ]; From 9d5ab32f012c2169ca131f01b9163b5878ef01a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Feb 2018 18:49:28 +0100 Subject: [PATCH 653/797] polipo: mark as vulnerable (close #33709) --- pkgs/servers/polipo/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index 1ca18d7d3a7..a7a0791b852 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -18,5 +18,8 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ phreedom ehmry ]; platforms = platforms.all; + knownVulnerabilities = [ + "Unmaintained upstream: https://github.com/jech/polipo/commit/4d42ca1b5849" + ]; }; -} \ No newline at end of file +} From 55bbcd4e489557ad68a262b53f13c8830a1437ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Feb 2018 19:55:28 +0100 Subject: [PATCH 654/797] linuxPackages.nvidia_x11_beta: alias to stable It doesn't seem much sense to have "beta" with version lower than "stable". --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f0f56f17bb3..d0348bd67d4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -14,7 +14,7 @@ let sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5"; }); in -{ +rec { # Policy: use the highest stable version as the default (on our master). stable = generic { version = "390.25"; @@ -24,13 +24,7 @@ in persistencedSha256 = "033azbhi50f1b0lw759sncgf7ckh2m2c0khj5v15sch9kl1fzk8i"; }; - beta = generic { - version = "390.12"; - sha256_32bit = "1nkn7xvizfkqh2r9c1w740idb3d5x0df71bjmx4yskxjvrylqlxz"; - sha256_64bit = "1qr8aj6r95hn75w9szpyca69m6xyjd0cf1cq8qjxp8miwpfjnszl"; - settingsSha256 = "0n23nj3ljd2ra714dwrc1cq3xlq697qbbb2wc1zmi0zs85svx5j6"; - persistencedSha256 = "0zk6zqk4i731b892dkgagr5xibs2l26q43djilfx9q98sqiq19jb"; - }; + beta = stable; # not enough interest to maintain beta ATM legacy_340 = generic { From 6dfb0be3ce59f5b8fe9a403305e98c720bf9a4a1 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 8 Feb 2018 20:07:50 +0100 Subject: [PATCH 655/797] perl-bignum: 0.47 -> 0.49 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 22bb6acf81d..e8bb59edff9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -716,10 +716,10 @@ let self = _self // overrides; _self = with self; { }; bignum = buildPerlPackage rec { - name = "bignum-0.47"; + name = "bignum-0.49"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "b084eac6d676d2acc4d60deed58e6e31b2f572b7b0be1aec9b93be92bad8261a"; + sha256 = "28685b271251927d327851e5951e38649524a4e50cb0d1d35d649e2b814f212d"; }; buildInputs = [ MathBigInt MathBigRat ]; meta = { From c086125ce556e8531e061ea24f79a0fc7416e010 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 8 Feb 2018 20:21:54 +0100 Subject: [PATCH 656/797] perl-Crypt-JWT: 0.019 -> 0.020 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e8bb59edff9..803eced86ba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2722,10 +2722,10 @@ let self = _self // overrides; _self = with self; { }; CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.019"; + name = "Crypt-JWT-0.020"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "26aaaaedc153b04bdaaba7df7ac2f7ce3bdf672c8d7111d09347a8d0c794725c"; + sha256 = "0587fc11435aecbbdc19b33f774d05ff31f19750b26a3588af93f33e8000d464"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { From d3fc84de945f7a0ab7b81df0ddaf2c752b4b4359 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 8 Feb 2018 21:00:12 +0100 Subject: [PATCH 657/797] perl-Sub-Quote: 2.003001 -> 2.005000 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 803eced86ba..25dad8b7645 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12859,10 +12859,10 @@ let self = _self // overrides; _self = with self; { }; SubQuote = buildPerlPackage rec { - name = "Sub-Quote-2.003001"; + name = "Sub-Quote-2.005000"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "9d471d8e13e7ce4793d5a5ec04a60fface14dd53be78dd94d228871915cfd1f9"; + sha256 = "44b145111bee7b0001818e77f7ce587153232dbc97351f4c5ed34522372b64ff"; }; buildInputs = [ TestFatal ]; meta = { From 76f3f22d2772b7aa288443a50c11d443f9f31ef2 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 8 Feb 2018 21:01:12 +0100 Subject: [PATCH 658/797] perl-Encode: 2.93 -> 2.95 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25dad8b7645..e078cb09b29 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4834,10 +4834,10 @@ let self = _self // overrides; _self = with self; { }; Encode = buildPerlPackage rec { - name = "Encode-2.93"; + name = "Encode-2.95"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; - sha256 = "2d06b0375c84a75cf3762685e6d94c3aef25833fd0427daa0ae87b04ae6f739c"; + sha256 = "d662794c6f834382527f67ca62e1715887f504cfd09e119a1302e584dd3cdcde"; }; meta = { description = "Character encodings in Perl"; From dfd300c81dfb7292d26cfbce3df9717ea408e410 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 8 Feb 2018 16:38:06 -0500 Subject: [PATCH 659/797] treewide: s/pkgs.fedoraproject.org/src.fedoraproject.org/ Upstream killed the pkgs server but src continues to serve up the exact same content, so we can just point there and all hashes should be unchanged. --- pkgs/applications/misc/pinfo/default.nix | 2 +- .../version-management/monotone-viz/default.nix | 6 +++--- pkgs/applications/version-management/tailor/default.nix | 2 +- pkgs/development/libraries/SDL/default.nix | 2 +- pkgs/development/libraries/isl/0.11.1.nix | 2 +- pkgs/development/libraries/java/libmatthew-java/default.nix | 2 +- pkgs/development/libraries/kyotocabinet/default.nix | 2 +- pkgs/development/libraries/polkit/default.nix | 6 +++--- pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch | 2 +- pkgs/development/libraries/spice/default.nix | 4 ++-- pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix | 2 +- pkgs/games/rogue/default.nix | 2 +- .../linux/firmware/intel2200BGFirmware/default.nix | 2 +- pkgs/os-specific/linux/gogoclient/default.nix | 2 +- pkgs/os-specific/linux/lm-sensors/default.nix | 2 +- pkgs/tools/archivers/unarj/default.nix | 2 +- pkgs/tools/archivers/zip/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/pyblock.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix | 2 +- pkgs/tools/system/hardlink/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 6 +++--- 21 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 6d0a348b1f7..1085fed0956 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { # homepage needed you to login to download the tarball - url = "http://pkgs.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2" + url = "http://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2" + "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2"; sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j"; }; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index c2006e9dd6b..c24d80e3f2e 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -22,15 +22,15 @@ stdenv.mkDerivation rec { patchFlags = ["-p0"]; patches = [ (fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch"; + url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch"; sha256 = "0risfy8iqmkr209hmnvpv57ywbd3rvchzzd0jy2lfyqrrrm6zknw"; }) (fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch"; + url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch"; sha256 = "16bj0ppzqd45an154dr7sifjra7lv4m9anxfw3c56y763jq7fafa"; }) (fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch"; + url = "http://src.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch"; sha256 = "1gfp82rc7pawb5x4hh2wf7xh1l1l54ib75930xgd1y437la4703r"; }) ]; diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index 424a402780a..4d41cad0d8e 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec { src = fetchurl { urls = [ "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz" - "http://pkgs.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" + "http://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" ]; sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh"; }; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index e71ad14b11f..e10d62bb98d 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 (fetchpatch { name = "SDL_SetGamma.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; + url = "http://src.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d"; sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv"; }) # Fix a build failure on OS X Mavericks diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 63140dba37f..e2d7d7ffd03 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; + url = "http://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"; }; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index df4a19efd2c..3b28c3a2bd5 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; + url = http://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 57eaf74d290..935f52eeb71 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patches = [(fetchurl { name = "gcc6.patch"; - url = "http://pkgs.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; + url = "http://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23"; })]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index aef627f8f1f..b0d8b2d89bc 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -26,15 +26,15 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "1cxnhj0y30g7ldqq1y6zwsbdwcx7h97d3mpd3h5jy7dhg3h9ym91"; }) (fetchpatch { - url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "1h1rkd4avqyyr8q6836zzr3w10jf521gcqnvhrhzwdpgp1ay4si7"; }) (fetchpatch { - url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; + url = "http://src.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh"; }) ]; diff --git a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch index 0b02b009725..8fe643e2c98 100644 --- a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch +++ b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch @@ -1,4 +1,4 @@ -Origin: http://pkgs.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD +Origin: http://src.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml --- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 +++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 808bfd4f811..c8e98d3d28e 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { # the following three patches fix CVE-2016-9577 and CVE-2016-9578 (fetchpatch { name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; + url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; sha256 = "11x5566lx5zyl7f39glwsgpzkxb7hpcshx8va5ab3imrns07130q"; }) (fetchpatch { name = "0002-Prevent-integer-overflows-in-capability-checks.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; + url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5"; }) (fetchpatch { diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 9f318afc67d..84365889638 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; + url = "http://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; }; patchFlags = "-p0"; diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index b246a94715e..05fd9ab523b 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "http://pkgs.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" + "http://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz" "http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz" ]; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index c87023bf336..e8ab77a509f 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "intel2200BGFirmware-${version}"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; + url = "http://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd"; }; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index 7383db95c37..521b81cd690 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; - url = http://pkgs.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz; + url = http://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz; sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; }; patches = [./gcc46-include-fix.patch ./config-paths.patch ]; diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 066946d8f0b..25b64499838 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" - "http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2" + "http://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2" ]; sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0"; }; diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 9537701ebe7..2505c012b26 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p"; - url = "http://pkgs.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; + url = "http://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; }; preInstall = '' diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index cb2d29e239d..6d979bbf33d 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz - http://pkgs.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + http://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 3ed145c82f2..6fb9bd98fb3 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" + url = "http://src.fedoraproject.org/repo/pkgs/python-pyblock/" + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 1da01bc2e60..b86c0e5229a 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { md5_path = "d249f60aa89b1b4facd63f776925116d"; src = fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" + url = "http://src.fedoraproject.org/repo/pkgs/pykickstart/" + "${name}.tar.gz/${md5_path}/${name}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; }; diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index ea062115402..57e3e63ca89 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.3-4"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; + url = "http://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz"; sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Consolidate duplicate files via hardlinks"; homepage = https://pagure.io/hardlink; - repositories.git = http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git; + repositories.git = http://src.fedoraproject.org/cgit/rpms/hardlink.git; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff318194ba7..b3640793612 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11348,7 +11348,7 @@ in { patches = singleton (pkgs.fetchurl { name = "libnotify07.patch"; - url = "http://pkgs.fedoraproject.org/cgit/notify-python.git/plain/" + url = "http://src.fedoraproject.org/cgit/notify-python.git/plain/" + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c"; sha256 = "1lqdli13mfb59xxbq4rbq1f0znh6xr17ljjhwmzqb79jl3dig12z"; }); @@ -13344,7 +13344,7 @@ in { md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = pkgs.fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" + url = "http://src.fedoraproject.org/repo/pkgs/python-pyblock/" + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; @@ -14013,7 +14013,7 @@ in { md5_path = "d249f60aa89b1b4facd63f776925116d"; src = pkgs.fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" + url = "http://src.fedoraproject.org/repo/pkgs/pykickstart/" + "${name}.tar.gz/${md5_path}/${name}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; }; From 7e76b127cd36d0310fdf98afd66e1999b4fc0d35 Mon Sep 17 00:00:00 2001 From: Florian Baumann Date: Thu, 8 Feb 2018 22:46:06 +0100 Subject: [PATCH 660/797] Multiple users with hashedPassword is broken in mosquitto If you have more than 1 User with hasedPassword Option set it generates ``` rm -f /var/lib/mosquitto/passwd touch /var/lib/mosquitto/passwd echo 'user1:$6$xxx' > /var/lib/mosquitto/passwd echo 'user2:$6$xxx' > /var/lib/mosquitto/passwd ``` Which ends up in only having 1 user. --- nixos/modules/services/networking/mosquitto.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 273ca797b98..d8135f4d0ff 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -212,7 +212,7 @@ in '' + concatStringsSep "\n" ( mapAttrsToList (n: c: if c.hashedPassword != null then - "echo '${n}:${c.hashedPassword}' > ${cfg.dataDir}/passwd" + "echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd" else optionalString (c.password != null) "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} ${c.password}" ) cfg.users); From 468ea40ffcdaddb302ccb61b2d784e695d4d8728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= Date: Thu, 8 Feb 2018 22:41:33 +0100 Subject: [PATCH 661/797] vifm: 0.9.0 -> 0.9.1 --- pkgs/applications/misc/vifm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index c43ec5efbaf..ebc951c5bb9 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "vifm-${version}"; - version = "0.9"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - sha256 = "1zd72vcgir3g9rhs2iyca13qf5fc0b1f22y20f5gy92c3sfwj45b"; + sha256 = "1cz7vjjmghgdxd1lvsdwv85gvx4kz8idq14qijpwkpfrf2va9f98"; }; nativeBuildInputs = [ pkgconfig ]; From 78a17f5765f24ae24ee87224dad16862451295d2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 8 Feb 2018 18:05:04 -0500 Subject: [PATCH 662/797] helm: 2.7.2 -> 2.8.0 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index f9548ce87f7..173402144cc 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,10 +4,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "9f04c4824fc751d6c932ae5b93f7336eae06e78315352aa80241066aa1d66c49" - else "5058142bcd6e16b7e01695a8f258d27ae0b6469caf227ddf6aa2181405e6aa8e"; + then "19sbvpll947y4dxn2dj26by2bwhcxa5nbkrq7x3cikn7z5bmj7vf" + else "0jllj13jv8yil6iqi4xcs5v4z388h7i7hcnv98gc14spkyjshf3d"; pname = "helm"; - version = "2.7.2"; + version = "2.8.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; From aefaab9516e2476ed0918626d6221d1a73af94f3 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Feb 2018 17:58:20 -0800 Subject: [PATCH 663/797] biosdevname: 0.7.2 -> 0.7.3 --- pkgs/tools/networking/biosdevname/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index ae36980a60d..93a98a10daa 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "biosdevname-${version}"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "dell"; repo = "biosdevname"; rev = "v${version}"; - sha256 = "183k6f9nayhai27y6nizf0sp9bj1kabykj66hcwdzllhrrh505sd"; + sha256 = "19wbb79x9h79k55sgd4dylvdbhhrvfaiaknbw9s1wvfmirkxa1dz"; }; nativeBuildInputs = [ autoreconfHook ]; From 1d1209381a04594678694b2d32723fce68de4910 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Mon, 5 Feb 2018 16:58:25 -0500 Subject: [PATCH 664/797] pythonnet: Init at 2.3.0 --- .../python-modules/pythonnet/default.nix | 84 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++ 2 files changed, 89 insertions(+) create mode 100644 pkgs/development/python-modules/pythonnet/default.nix diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix new file mode 100644 index 00000000000..98f714c8d53 --- /dev/null +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -0,0 +1,84 @@ +{ lib +, fetchPypi +, fetchNuGet +, buildPythonPackage +, python +, pytest +, pycparser +, pkgconfig +, dotnetbuildhelpers +, clang +, mono +}: + +let + + UnmanagedExports127 = fetchNuGet { + baseName = "UnmanagedExports"; + version = "1.2.7"; + sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf"; + outputFiles = [ "*" ]; + }; + + NUnit360 = fetchNuGet { + baseName = "NUnit"; + version = "3.6.0"; + sha256 = "0wz4sb0hxlajdr09r22kcy9ya79lka71w0k1jv5q2qj3d6g2frz1"; + outputFiles = [ "*" ]; + }; + +in + +buildPythonPackage rec { + pname = "pythonnet"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hxnkrfj8ark9sbamcxzd63p98vgljfvdwh79qj3ac8pqrgghq80"; + }; + + postPatch = '' + substituteInPlace setup.py --replace 'self._install_packages()' '#self._install_packages()' + ''; + + preConfigure = '' + [ -z "$dontPlacateNuget" ] && placate-nuget.sh + [ -z "$dontPlacatePaket" ] && placate-paket.sh + ''; + + nativeBuildInputs = [ + pytest + pycparser + + pkgconfig + dotnetbuildhelpers + clang + + NUnit360 + UnmanagedExports127 + ]; + + buildInputs = [ + mono + ]; + + preBuild = '' + rm -rf packages + mkdir packages + + ln -s ${NUnit360}/lib/dotnet/NUnit/ packages/NUnit.3.6.0 + ln -s ${UnmanagedExports127}/lib/dotnet/NUnit/ packages/UnmanagedExports.1.2.7 + ''; + + checkPhase = '' + ${python.interpreter} -m pytest + ''; + + meta = with lib; { + description = ".Net and Mono integration for Python"; + homepage = https://pythonnet.github.io; + license = licenses.mit; + maintainers = with maintainers; [ jraygauthier ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3640793612..ca0acaa6905 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14845,6 +14845,11 @@ in { }; }; + pythonnet = callPackage ../development/python-modules/pythonnet { + # `mono >= 4.6` required to prevent crashes encountered with earlier versions. + mono = pkgs.mono46; + }; + pytz = callPackage ../development/python-modules/pytz { }; pytzdata = callPackage ../development/python-modules/pytzdata { }; From 44d1f99a22dc4b2b8e70d831e2332eb32f8376fe Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 9 Feb 2018 10:20:22 +0800 Subject: [PATCH 665/797] syncthing: 0.14.43 -> 0.14.44 --- 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 1a79e31a05d..f5e8876e2b3 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.43"; + version = "0.14.44"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1n09zmp9dqrl3y0fa0l1gx6f09j9mm3xdf7b58y03znspsg7mxhi"; + sha256 = "1gdkx6lbzmdz2hqc9slbq41rwgkxmdisnj0iywx4mppmc2b4v6wh"; }; buildInputs = [ go removeReferencesTo ]; From 908fc5e14b59650d7b1ea5a0f9e85351f79b2439 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Sat, 3 Feb 2018 19:04:31 +0100 Subject: [PATCH 666/797] nixos/rspamd: options for worker configuration and socket activation --- nixos/modules/services/mail/rspamd.nix | 261 +++++++++++++++++++++---- nixos/tests/rspamd.nix | 87 ++++++++- 2 files changed, 308 insertions(+), 40 deletions(-) diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index b80aa48f2c8..09fb587e74b 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -1,14 +1,152 @@ -{ config, lib, pkgs, ... }: +{ config, options, pkgs, lib, ... }: with lib; let cfg = config.services.rspamd; + opts = options.services.rspamd; - mkBindSockets = socks: concatStringsSep "\n" (map (each: " bind_socket = \"${each}\"") socks); + bindSocketOpts = {options, config, ... }: { + options = { + socket = mkOption { + type = types.str; + example = "localhost:11333"; + description = '' + Socket for this worker to listen on in a format acceptable by rspamd. + ''; + }; + mode = mkOption { + type = types.str; + default = "0644"; + description = "Mode to set on unix socket"; + }; + owner = mkOption { + type = types.str; + default = "${cfg.user}"; + description = "Owner to set on unix socket"; + }; + group = mkOption { + type = types.str; + default = "${cfg.group}"; + description = "Group to set on unix socket"; + }; + rawEntry = mkOption { + type = types.str; + internal = true; + }; + }; + config.rawEntry = let + maybeOption = option: + optionalString options.${option}.isDefined " ${option}=${config.${option}}"; + in + if (!(hasPrefix "/" config.socket)) then "${config.socket}" + else "${config.socket}${maybeOption "mode"}${maybeOption "owner"}${maybeOption "group"}"; + }; - rspamdConfFile = pkgs.writeText "rspamd.conf" + workerOpts = { name, ... }: { + options = { + enable = mkOption { + type = types.nullOr types.bool; + default = null; + description = "Whether to run the rspamd worker."; + }; + name = mkOption { + type = types.nullOr types.str; + default = name; + description = "Name of the worker"; + }; + type = mkOption { + type = types.nullOr (types.enum [ + "normal" "controller" "fuzzy_storage" "proxy" "lua" + ]); + description = "The type of this worker"; + }; + bindSockets = mkOption { + type = types.listOf (types.either types.str (types.submodule bindSocketOpts)); + default = []; + description = '' + List of sockets to listen, in format acceptable by rspamd + ''; + example = [{ + socket = "/run/rspamd.sock"; + mode = "0666"; + owner = "rspamd"; + } "*:11333"]; + apply = value: map (each: if (isString each) + then if (isUnixSocket each) + then {socket = each; owner = cfg.user; group = cfg.group; mode = "0644"; rawEntry = "${each}";} + else {socket = each; rawEntry = "${each}";} + else each) value; + }; + count = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Number of worker instances to run + ''; + }; + includes = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of files to include in configuration + ''; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional entries to put verbatim into worker section of rspamd config file."; + }; + }; + config = mkIf (name == "normal" || name == "controller" || name == "fuzzy") { + type = mkDefault name; + includes = mkDefault [ "$CONFDIR/worker-${name}.inc" ]; + bindSockets = mkDefault (if name == "normal" + then [{ + socket = "/run/rspamd/rspamd.sock"; + mode = "0660"; + owner = cfg.user; + group = cfg.group; + }] + else if name == "controller" + then [ "localhost:11334" ] + else [] ); + }; + }; + + indexOf = default: start: list: e: + if list == [] + then default + else if (head list) == e then start + else (indexOf default (start + (length (listenStreams (head list).socket))) (tail list) e); + + systemdSocket = indexOf (abort "Socket not found") 0 allSockets; + + isUnixSocket = socket: hasPrefix "/" (if (isString socket) then socket else socket.socket); + isPort = hasPrefix "*:"; + isIPv4Socket = hasPrefix "*v4:"; + isIPv6Socket = hasPrefix "*v6:"; + isLocalHost = hasPrefix "localhost:"; + listenStreams = socket: + if (isLocalHost socket) then + let port = (removePrefix "localhost:" socket); + in [ "127.0.0.1:${port}" ] ++ (if config.networking.enableIPv6 then ["[::1]:${port}"] else []) + else if (isIPv6Socket socket) then [removePrefix "*v6:" socket] + else if (isPort socket) then [removePrefix "*:" socket] + else if (isIPv4Socket socket) then + throw "error: IPv4 only socket not supported in rspamd with socket activation" + else if (length (splitString " " socket)) != 1 then + throw "error: string options not supported in rspamd with socket activation" + else [socket]; + + mkBindSockets = enabled: socks: concatStringsSep "\n " (flatten (map (each: + if cfg.socketActivation && enabled != false then + let systemd = (systemdSocket each); + in (imap (idx: e: "bind_socket = \"systemd:${toString (systemd + idx - 1)}\";") (listenStreams each.socket)) + else "bind_socket = \"${each.rawEntry}\";") socks)); + + rspamdConfFile = pkgs.writeText "rspamd.conf" '' .include "$CONFDIR/common.conf" @@ -22,19 +160,33 @@ let .include "$CONFDIR/logging.inc" } - worker { - ${mkBindSockets cfg.bindSocket} - .include "$CONFDIR/worker-normal.inc" - } - - worker { - ${mkBindSockets cfg.bindUISocket} - .include "$CONFDIR/worker-controller.inc" - } + ${concatStringsSep "\n" (mapAttrsToList (name: value: '' + worker ${optionalString (value.name != "normal" && value.name != "controller") "${value.name}"} { + type = "${value.type}"; + ${optionalString (value.enable != null) + "enabled = ${if value.enable != false then "yes" else "no"};"} + ${mkBindSockets value.enable value.bindSockets} + ${optionalString (value.count != null) "count = ${toString value.count};"} + ${concatStringsSep "\n " (map (each: ".include \"${each}\"") value.includes)} + ${value.extraConfig} + } + '') cfg.workers)} ${cfg.extraConfig} ''; + allMappedSockets = flatten (mapAttrsToList (name: value: + if value.enable != false + then imap (idx: each: { + name = "${name}"; + index = idx; + value = each; + }) value.bindSockets + else []) cfg.workers); + allSockets = map (e: e.value) allMappedSockets; + + allSocketNames = map (each: "rspamd-${each.name}-${toString each.index}.socket") allMappedSockets; + in { @@ -48,36 +200,43 @@ in enable = mkEnableOption "Whether to run the rspamd daemon."; debug = mkOption { + type = types.bool; default = false; description = "Whether to run the rspamd daemon in debug mode."; }; - bindSocket = mkOption { - type = types.listOf types.str; - default = [ - "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" - ]; - defaultText = ''[ - "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" - ]''; + socketActivation = mkOption { + type = types.bool; description = '' - List of sockets to listen, in format acceptable by rspamd - ''; - example = '' - bindSocket = [ - "/run/rspamd.sock mode=0666 owner=rspamd" - "*:11333" - ]; + Enable systemd socket activation for rspamd. ''; }; - bindUISocket = mkOption { - type = types.listOf types.str; - default = [ - "localhost:11334" - ]; + workers = mkOption { + type = with types; attrsOf (submodule workerOpts); description = '' - List of sockets for web interface, in format acceptable by rspamd + Attribute set of workers to start. + ''; + default = { + normal = {}; + controller = {}; + }; + example = literalExample '' + { + normal = { + includes = [ "$CONFDIR/worker-normal.inc" ]; + bindSockets = [{ + socket = "/run/rspamd/rspamd.sock"; + mode = "0660"; + owner = "${cfg.user}"; + group = "${cfg.group}"; + }]; + }; + controller = { + includes = [ "$CONFDIR/worker-controller.inc" ]; + bindSockets = [ "[::1]:11334" ]; + }; + } ''; }; @@ -113,6 +272,13 @@ in config = mkIf cfg.enable { + services.rspamd.socketActivation = mkDefault (!opts.bindSocket.isDefined && !opts.bindUISocket.isDefined); + + assertions = [ { + assertion = !cfg.socketActivation || !(opts.bindSocket.isDefined || opts.bindUISocket.isDefined); + message = "Can't use socketActivation for rspamd when using renamed bind socket options"; + } ]; + # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; @@ -128,17 +294,22 @@ in gid = config.ids.gids.rspamd; }; + environment.etc."rspamd.conf".source = rspamdConfFile; + systemd.services.rspamd = { description = "Rspamd Service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wantedBy = mkIf (!cfg.socketActivation) [ "multi-user.target" ]; + after = [ "network.target" ] ++ + (if cfg.socketActivation then allSocketNames else []); + requires = mkIf cfg.socketActivation allSocketNames; serviceConfig = { ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f"; Restart = "always"; RuntimeDirectory = "rspamd"; PrivateTmp = true; + Sockets = mkIf cfg.socketActivation (concatStringsSep " " allSocketNames); }; preStart = '' @@ -146,5 +317,25 @@ in ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd ''; }; + systemd.sockets = mkIf cfg.socketActivation + (listToAttrs (map (each: { + name = "rspamd-${each.name}-${toString each.index}"; + value = { + description = "Rspamd socket ${toString each.index} for worker ${each.name}"; + wantedBy = [ "sockets.target" ]; + listenStreams = (listenStreams each.value.socket); + socketConfig = { + BindIPv6Only = mkIf (isIPv6Socket each.value.socket) "ipv6-only"; + Service = "rspamd.service"; + SocketUser = mkIf (isUnixSocket each.value.socket) each.value.owner; + SocketGroup = mkIf (isUnixSocket each.value.socket) each.value.group; + SocketMode = mkIf (isUnixSocket each.value.socket) each.value.mode; + }; + }; + }) allMappedSockets)); }; + imports = [ + (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ]) + (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ]) + ]; } diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index 35e534246b6..6b2e2dd3a53 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -13,11 +13,12 @@ let $machine->succeed("[[ \"\$(stat -c %G ${socket})\" == \"${group}\" ]]"); $machine->succeed("[[ \"\$(stat -c %a ${socket})\" == \"${mode}\" ]]"); ''; - simple = name: enableIPv6: makeTest { + simple = name: socketActivation: enableIPv6: makeTest { name = "rspamd-${name}"; machine = { services.rspamd = { enable = true; + socketActivation = socketActivation; }; networking.enableIPv6 = enableIPv6; }; @@ -29,7 +30,15 @@ let $machine->succeed("id \"rspamd\" >/dev/null"); ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" } sleep 10; + $machine->log($machine->succeed("cat /etc/rspamd.conf")); $machine->log($machine->succeed("systemctl cat rspamd.service")); + ${if socketActivation then '' + $machine->log($machine->succeed("systemctl cat rspamd-controller-1.socket")); + $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket")); + '' else '' + $machine->fail("systemctl cat rspamd-controller-1.socket"); + $machine->fail("systemctl cat rspamd-normal-1.socket"); + ''} $machine->log($machine->succeed("curl http://localhost:11334/auth")); $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth")); ${optionalString enableIPv6 '' @@ -39,10 +48,12 @@ let }; in { - simple = simple "simple" true; - ipv4only = simple "ipv4only" false; - bindports = makeTest { - name = "rspamd-bindports"; + simple = simple "simple" false true; + ipv4only = simple "ipv4only" false false; + simple-socketActivated = simple "simple-socketActivated" true true; + ipv4only-socketActivated = simple "ipv4only-socketActivated" true false; + deprecated = makeTest { + name = "rspamd-deprecated"; machine = { services.rspamd = { enable = true; @@ -56,6 +67,72 @@ in $machine->waitForFile("/run/rspamd.sock"); ${checkSocket "/run/rspamd.sock" "root" "root" "600" } ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->fail("systemctl cat rspamd-normal-1.socket"); + $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); + $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + ''; + }; + + bindports = makeTest { + name = "rspamd-bindports"; + machine = { + services.rspamd = { + enable = true; + socketActivation = false; + workers.normal.bindSockets = [{ + socket = "/run/rspamd.sock"; + mode = "0600"; + owner = "root"; + group = "root"; + }]; + workers.controller.bindSockets = [{ + socket = "/run/rspamd-worker.sock"; + mode = "0666"; + owner = "root"; + group = "root"; + }]; + }; + }; + + testScript = '' + ${initMachine} + $machine->waitForFile("/run/rspamd.sock"); + ${checkSocket "/run/rspamd.sock" "root" "root" "600" } + ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->fail("systemctl cat rspamd-normal-1.socket"); + $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); + $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); + ''; + }; + socketActivated = makeTest { + name = "rspamd-socketActivated"; + machine = { + services.rspamd = { + enable = true; + workers.normal.bindSockets = [{ + socket = "/run/rspamd.sock"; + mode = "0600"; + owner = "root"; + group = "root"; + }]; + workers.controller.bindSockets = [{ + socket = "/run/rspamd-worker.sock"; + mode = "0666"; + owner = "root"; + group = "root"; + }]; + }; + }; + + testScript = '' + startAll + $machine->waitForFile("/run/rspamd.sock"); + ${checkSocket "/run/rspamd.sock" "root" "root" "600" } + ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" } + $machine->log($machine->succeed("cat /etc/rspamd.conf")); + $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket")); $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat")); $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")); ''; From f41eb52bc90c46c1b91baafd4693f8326453dec3 Mon Sep 17 00:00:00 2001 From: mkgvt Date: Fri, 9 Feb 2018 03:05:11 -0500 Subject: [PATCH 667/797] rename: init at 1.9 (#34719) --- lib/maintainers.nix | 1 + pkgs/tools/misc/rename/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 23 insertions(+) create mode 100644 pkgs/tools/misc/rename/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 85e1e6171be..0302cc3bc79 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -449,6 +449,7 @@ mirrexagon = "Andrew Abbott "; mjanczyk = "Marcin Janczyk "; mjp = "Mike Playle "; # github = "MikePlayle"; + mkg = "Mark K Gardner "; mlieberman85 = "Michael Lieberman "; mmahut = "Marek Mahut "; moaxcp = "John Mercier "; diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix new file mode 100644 index 00000000000..e30c2e89349 --- /dev/null +++ b/pkgs/tools/misc/rename/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchFromGitHub, buildPerlPackage }: + +buildPerlPackage rec { + name = "rename-${version}"; + version = "1.9"; + src = fetchFromGitHub { + owner = "pstray"; + repo = "rename"; + rev = "d46f1d0ced25dc5849acb5d5974a3e2e9d97d536"; + sha256 = "0qahs1cqfaci2hdf1xncrz4k0z5skkfr43apnm3kybs7za33apzw"; + }; + meta = with stdenv.lib; { + description = "Rename files according to a Perl rewrite expression"; + homepage = http://search.cpan.org/~pederst/rename-1.9/bin/rename.PL; + maintainers = with maintainers; [ mkg ]; + license = with licenses; [ gpl1Plus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12b00338723..5faab0baf5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4400,6 +4400,10 @@ with pkgs; gsettings_desktop_schemas = gnome3.gsettings_desktop_schemas; }; + rename = callPackage ../tools/misc/rename { + inherit (perlPackages) buildPerlPackage; + }; + renameutils = callPackage ../tools/misc/renameutils { }; renderdoc = libsForQt5.callPackage ../applications/graphics/renderdoc { }; From 09d04f6b6fa9ee3c4189a105277f52501f1bad8c Mon Sep 17 00:00:00 2001 From: Lucca Fraser Date: Fri, 9 Feb 2018 04:41:18 -0400 Subject: [PATCH 668/797] electrum-dash: 2.4.1 -> 2.9.3.1 --- pkgs/applications/misc/electrum-dash/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index bde8d5b81e3..c98efa547b3 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { + version = "2.9.3.1"; name = "electrum-dash-${version}"; - version = "2.4.1"; src = fetchurl { - url = "https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz"; - sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000"; + url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz"; + #"https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz"; + sha256 = "9b7ac205f63fd4bfb15d77a34a4451ef82caecf096f31048a7603bd276dfc33e"; }; propagatedBuildInputs = with python2Packages; [ @@ -20,10 +21,11 @@ python2Packages.buildPythonApplication rec { pyqt4 qrcode requests - slowaes + pyaes tlslite x11_hash mnemonic + jsonrpclib # plugins trezor From d1c5b483d2cade5c48f295cf168a8c3d814e4f37 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 9 Feb 2018 16:41:49 +0800 Subject: [PATCH 669/797] yaml2json: init at unstable-2017-05-03 --- pkgs/development/tools/yaml2json/default.nix | 24 ++++++++++++++++++++ pkgs/development/tools/yaml2json/deps.nix | 11 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/tools/yaml2json/default.nix create mode 100644 pkgs/development/tools/yaml2json/deps.nix diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix new file mode 100644 index 00000000000..1a8d7f13aff --- /dev/null +++ b/pkgs/development/tools/yaml2json/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + + +buildGoPackage rec { + name = "yaml2json-${version}"; + version = "unstable-2017-05-03"; + goPackagePath = "github.com/bronze1man/yaml2json"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + rev = "ee8196e587313e98831c040c26262693d48c1a0c"; + owner = "bronze1man"; + repo = "yaml2json"; + sha256 = "16a2sqzbam5adbhfvilnpdabzwncs7kgpr0cn4gp09h2imzsprzw"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/bronze1man/yaml2json; + description = "Convert yaml to json"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.adisbladis ]; + }; +} diff --git a/pkgs/development/tools/yaml2json/deps.nix b/pkgs/development/tools/yaml2json/deps.nix new file mode 100644 index 00000000000..f907520cc87 --- /dev/null +++ b/pkgs/development/tools/yaml2json/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5faab0baf5f..82bb8b42e46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8058,6 +8058,8 @@ with pkgs; yacc = bison; + yaml2json = callPackage ../development/tools/yaml2json { }; + ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; llvmPackages = llvmPackages_5; From 00970f76f9f5d494d8a1fea790acac31e3578cf7 Mon Sep 17 00:00:00 2001 From: Matthieu Chevrier Date: Fri, 9 Feb 2018 10:00:15 +0100 Subject: [PATCH 670/797] theharvester: init at 2.7.1 (#34704) --- lib/maintainers.nix | 1 + pkgs/tools/security/theharvester/default.nix | 41 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 44 insertions(+) create mode 100644 pkgs/tools/security/theharvester/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0302cc3bc79..b73a2854c78 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -700,6 +700,7 @@ tomberek = "Thomas Bereknyei "; tomsmeets = "Tom Smeets "; travisbhartwell = "Travis B. Hartwell "; + treemo = "Matthieu Chevrier "; trevorj = "Trevor Joynson "; trino = "Hubert Mühlhans "; tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>"; diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix new file mode 100644 index 00000000000..f1bac7adba1 --- /dev/null +++ b/pkgs/tools/security/theharvester/default.nix @@ -0,0 +1,41 @@ +{ stdenv, makeWrapper, python2Packages, fetchFromGitHub, python2 }: + +stdenv.mkDerivation rec { + pname = "theHarvester"; + version = "2.7.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "laramies"; + repo = "${pname}"; + rev = "25553762d2d93a39083593adb08a34d5f5142c60"; + sha256 = "0gnm598y6paz0knwvdv1cx0w6ngdbbpzkdark3q5vs66yajv24w4"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # add dependencies + propagatedBuildInputs = [ python2Packages.requests ]; + + installPhase = '' + # create dirs + mkdir -p $out/share/${pname} $out/bin + + # move project code + mv * $out/share/${pname}/ + + # make project runnable + chmod +x $out/share/${pname}/theHarvester.py + ln -s $out/share/${pname}/theHarvester.py $out/bin + + wrapProgram "$out/bin/theHarvester.py" --prefix PYTHONPATH : $out/share/${pname}:$PYTHONPATH + ''; + + meta = with stdenv.lib; { + description = "Gather E-mails, subdomains and names from different public sources"; + homepage = "https://github.com/laramies/theHarvester"; + platforms = platforms.all; + maintainers = with maintainers; [ treemo ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82bb8b42e46..28a4515d49e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4870,6 +4870,8 @@ with pkgs; thc-hydra = callPackage ../tools/security/thc-hydra { }; + theharvester = callPackage ../tools/security/theharvester { }; + thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; From abfac62df5c9424acab73bec7d02a886bd50915b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 31 Jan 2018 22:18:37 +0000 Subject: [PATCH 671/797] alacritty: 2017-12-29 -> 2018-01-31 --- pkgs/applications/misc/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 7bfcc6e72c8..0f629aace45 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -30,18 +30,18 @@ let ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2017-12-29"; + version = "2018-01-31"; # At the moment we cannot handle git dependencies in buildRustPackage. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. src = fetchgit { url = https://github.com/Mic92/alacritty.git; rev = "rev-${version}"; - sha256 = "0pk4b8kfxixmd9985v2fya1m7np8ggws8d9msw210drc0grwbfkd"; + sha256 = "0jc8haijd6f8r5fqiknrvqnwc9q4cp93852lr2p7zak7dv29v45p"; fetchSubmodules = true; }; - cargoSha256 = "0acj526cx4xl52vbcbd3hp1klh4p756j6alxqqz3x715zi2dqkzf"; + cargoSha256 = "0023jpc6krilmp5wzbbwapxafsi6m1k13mvjh4zlvls1nyyhk808"; nativeBuildInputs = [ cmake From 3a2b0cdf5c9751fce19023f4e3948e19ac795b81 Mon Sep 17 00:00:00 2001 From: Hamish Date: Fri, 9 Feb 2018 12:37:29 +0300 Subject: [PATCH 672/797] nixos/traefik: make group configurable for docker support (#34749) --- nixos/modules/services/web-servers/traefik.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 4ede4fc2096..b6c7fef21fb 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -64,6 +64,16 @@ in { ''; }; + group = mkOption { + default = "traefik"; + type = types.string; + example = "docker"; + description = '' + Set the group that traefik runs under. + For the docker backend this needs to be set to docker instead. + ''; + }; + package = mkOption { default = pkgs.traefik; defaultText = "pkgs.traefik"; @@ -87,7 +97,7 @@ in { ]; Type = "simple"; User = "traefik"; - Group = "traefik"; + Group = cfg.group; Restart = "on-failure"; StartLimitInterval = 86400; StartLimitBurst = 5; From 0cdc0ac3a1a0423e077c82db5b6d7f54edc03ea6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 9 Feb 2018 18:04:55 +0800 Subject: [PATCH 673/797] screenfetch: 2016-10-11 -> 3.8.0 --- pkgs/tools/misc/screenfetch/default.nix | 65 +++++++++++++------------ 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 9ef0c9ebdf7..a9cd9d75de8 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -3,14 +3,30 @@ , darwin }: -stdenv.mkDerivation { - name = "screenFetch-2016-10-11"; +let + path = lib.makeBinPath ([ + coreutils gawk gnused findutils + gnugrep ncurses bc + ] ++ lib.optionals stdenv.isLinux [ + procps + xdpyinfo + xprop + ] ++ lib.optionals stdenv.isDarwin (with darwin; [ + adv_cmds + DarwinTools + system_cmds + "/usr" # some commands like defaults is not available to us + ])); + +in stdenv.mkDerivation rec { + name = "screenFetch-${version}"; + version = "3.8.0"; src = fetchFromGitHub { - owner = "KittyKatt"; - repo = "screenFetch"; - rev = "89e51f24018c89b3647deb24406a9af3a78bbe99"; - sha256 = "0i2k261jj2s4sfhav7vbsd362pa0gghw6qhwafhmicmf8hq2a18v"; + owner = "KittyKatt"; + repo = "screenFetch"; + rev = "v${version}"; + sha256 = "00ibv72cb7cqfpljyzgvajhbp0clqsqliz18nyv83bfy3gkf2qs8"; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,40 +34,29 @@ stdenv.mkDerivation { installPhase = '' install -Dm 0755 screenfetch-dev $out/bin/screenfetch install -Dm 0644 screenfetch.1 $out/share/man/man1/screenfetch.1 + install -Dm 0644 -t $out/share/doc/screenfetch CHANGELOG COPYING README.mkdn TODO - # Fix all of the depedencies of screenfetch + # Fix all of the dependencies of screenfetch patchShebangs $out/bin/screenfetch wrapProgram "$out/bin/screenfetch" \ - --set PATH ${lib.makeBinPath ([ - coreutils gawk gnused findutils - gnugrep ncurses bc - ] ++ lib.optionals stdenv.isLinux [ - procps - xdpyinfo - xprop - ] ++ lib.optionals stdenv.isDarwin (with darwin; [ - adv_cmds - DarwinTools - system_cmds - "/usr" # some commands like defaults is not available to us - ]))} + --prefix PATH : ${path} ''; meta = with lib; { description = "Fetches system/theme information in terminal for Linux desktop screenshots"; longDescription = '' - screenFetch is a "Bash Screenshot Information Tool". This handy Bash - script can be used to generate one of those nifty terminal theme - information + ASCII distribution logos you see in everyone's screenshots - nowadays. It will auto-detect your distribution and display an ASCII - version of that distribution's logo and some valuable information to the - right. There are options to specify no ascii art, colors, taking a - screenshot upon displaying info, and even customizing the screenshot - command! This script is very easy to add to and can easily be extended. + screenFetch is a "Bash Screenshot Information Tool". This handy Bash + script can be used to generate one of those nifty terminal theme + information + ASCII distribution logos you see in everyone's screenshots + nowadays. It will auto-detect your distribution and display an ASCII + version of that distribution's logo and some valuable information to the + right. There are options to specify no ascii art, colors, taking a + screenshot upon displaying info, and even customizing the screenshot + command! This script is very easy to add to and can easily be extended. ''; license = licenses.gpl3; - homepage = http://git.silverirc.com/cgit.cgi/screenfetch-dev.git/; - maintainers = with maintainers; [relrod]; + homepage = https://github.com/KittyKatt/screenFetch; + maintainers = with maintainers; [ relrod ]; platforms = platforms.all; }; } From 6ceece6b591de56507409d6c690dddd9854ba969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Feb 2018 12:20:55 +0100 Subject: [PATCH 674/797] nixos/dovecot: no " in mailbox.name --- nixos/modules/services/mail/dovecot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index c5cb06cf54e..b42c73b8666 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -113,7 +113,7 @@ let mailboxes = { lib, pkgs, ... }: { options = { name = mkOption { - type = types.str; + type = types.strMatching ''[^"]+''; example = "Spam"; description = "The name of the mailbox."; }; From 197d9a8d901ee51e64f8f5947a7be9f2f4c30789 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Fri, 9 Feb 2018 22:23:37 +1100 Subject: [PATCH 675/797] granite: refactor package * move build time dependencies into nativeBuildInputs * convert cmakeFlags to an array * use `with` in the meta section * add `ninja` --- .../development/libraries/granite/default.nix | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index e542718502e..8243775c6bc 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { name = "granite-${version}"; @@ -11,16 +11,32 @@ stdenv.mkDerivation rec { sha256 = "15l8z1jkqhvappnr8jww27lfy3dwqybgsxk5iccyvnvzpjdh2s0h"; }; - cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [perl cmake vala gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + cmakeFlags = [ + "-DINTROSPECTION_GIRDIR=share/gir-1.0/" + "-DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0" + ]; - meta = { + nativeBuildInputs = [ + vala + pkgconfig + cmake + ninja + perl + gettext + gobjectIntrospection + ]; + buildInputs = [ + glib + gtk3 + gnome3.libgee + ]; + + meta = with stdenv.lib; { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; homepage = https://github.com/elementary/granite; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.vozz ]; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [ maintainers.vozz ]; }; } From 8a7fd9d41f06606ae83d7ef0c8af46ff7aafed7d Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Fri, 9 Feb 2018 22:30:09 +1100 Subject: [PATCH 676/797] spice-up: init at 1.2.1 --- pkgs/applications/office/spice-up/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/office/spice-up/default.nix diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix new file mode 100644 index 00000000000..88b65be0765 --- /dev/null +++ b/pkgs/applications/office/spice-up/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, fetchFromGitHub +, gettext +, libxml2 +, pkgconfig +, gtk3 +, granite +, gnome3 +, json_glib +, cmake +, ninja +, libgudev +, libevdev +, vala +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "spice-up-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Philip-Scott"; + repo = "Spice-up"; + rev = version; + sha256 = "0cbyhi6d99blv33183j6nakzcqxz5hqy9ijykiasbmdycfd5q0fh"; + }; + USER = "nix-build-user"; + + XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ + "${granite}/share" + "${gnome3.libgee}/share" + ]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + vala + cmake + ninja + gettext + libxml2 + ]; + buildInputs = [ + gtk3 + granite + gnome3.libgee + json_glib + libgudev + libevdev + gnome3.gnome_themes_standard + ]; + + meta = with stdenv.lib; { + description = "Create simple and beautiful presentations on the Linux desktop"; + homepage = https://github.com/Philip-Scott/Spice-up; + maintainers = with maintainers; [ samdroid-apps ]; + platforms = platforms.linux; + # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84b01ae9422..65b6ad13cd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11090,6 +11090,8 @@ with pkgs; spice_protocol = callPackage ../development/libraries/spice-protocol { }; + spice-up = callPackage ../applications/office/spice-up { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srm = callPackage ../tools/security/srm { }; From c6bd327af869aba4db98f10b3f85659853f8518a Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Fri, 21 Apr 2017 20:00:45 -0400 Subject: [PATCH 677/797] darktable: Removed unneeded dependencies Based on what LebedevRI told me on IRC and in https://github.com/darktable-org/darktable/pull/1474 --- .../graphics/darktable/default.nix | 34 ++++++++----------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 787ddc72ec9..e9932b93fbe 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,15 +1,10 @@ -{ stdenv, fetchurl, libsoup, graphicsmagick, SDL, json_glib -, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib -, libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2 -, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg -, libpng, libpthreadstubs, librsvg, libtiff, libxcb -, openexr, osm-gps-map, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg -, mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon -, epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3 +{ stdenv, fetchurl, libsoup, graphicsmagick, json_glib, wrapGAppsHook +, cairo, cmake, ninja, curl, perl, llvm, desktop_file_utils, exiv2, glib +, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg +, libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt +, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 }: -assert stdenv ? glibc; - stdenv.mkDerivation rec { version = "2.4.1"; name = "darktable-${version}"; @@ -19,16 +14,15 @@ stdenv.mkDerivation rec { sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32"; }; - buildInputs = - [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk3 - ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif - libglade libgphoto2 libjpeg libpng libpthreadstubs - librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt - libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml - colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core - libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme - osm-gps-map - ]; + nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop_file_utils wrapGAppsHook ]; + + buildInputs = [ + cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif + libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt + libsoup graphicsmagick json_glib openjpeg lua pugixml + colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme + osm-gps-map + ]; cmakeFlags = [ "-DBUILD_USERMANUAL=False" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0cca97ea84..84ad04e4ce7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14651,7 +14651,6 @@ with pkgs; }); darktable = callPackage ../applications/graphics/darktable { - inherit (gnome2) GConf libglade; lua = lua5_3; pugixml = pugixml.override { shared = true; }; }; From 6f56749b071741b8f54254c5522e82d37290176e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 9 Feb 2018 10:48:11 +0000 Subject: [PATCH 678/797] asciidoctor: expose all the bins asciidoctor has multiple binaries, expose them all to the user --- pkgs/tools/typesetting/asciidoctor/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index f494f191159..02b57ee3a13 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,12 +1,18 @@ -{ stdenv, lib, bundlerEnv, ruby, curl }: - -bundlerEnv { - pname = "asciidoctor"; +{ stdenv, lib, bundlerApp, ruby, curl }: +bundlerApp { inherit ruby; - + pname = "asciidoctor"; gemdir = ./.; + exes = [ + "asciidoctor" + "asciidoctor-bespoke" + "asciidoctor-latex" + "asciidoctor-pdf" + "asciidoctor-safe" + ]; + meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; homepage = http://asciidoctor.org/; From 3b6f8b5b154d75872a52ffbd3ab9dfebfdf03022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Fri, 9 Feb 2018 16:17:22 +0100 Subject: [PATCH 679/797] youtube-dl: 2018.01.27 -> 2018.02.08 (#34762) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index c4595a1a94e..0386896d97f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2018.01.27"; + version = "2018.02.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "14vbm8pr6xdrdbk8j9k4v82rnalbdpk2lcm7n9wj6z6d441ymji9"; + sha256 = "0iq5mav782gz0gm00rry3v7gdxkkx4y1k0p20pvz32ga4id5k1mg"; }; nativeBuildInputs = [ makeWrapper ]; From 855e66860ab2d200d79e0853d8c9b6e8a769ac42 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 9 Feb 2018 16:16:43 +0100 Subject: [PATCH 680/797] gajim: 0.16.8 -> 0.16.9 Upstream changes: * Improve Zeroconf behavior * Fix showing normal message event * remove usage of OpenSSL.rand * a few minor bugfixes The really important part here is the third point about OpenSSL.rand, because the rand attribute no longer exists in pyopenssl and thus Gajim doesn't even start. Also the fix-tests.patch has been fixed upstream as well, so we don't need it anymore. Another change in 0.16.9 that's not included in the changelog is that there is a test_nogui target, which is also run by the CI upstream is using, so let's use that and remove xvfb_run. Signed-off-by: aszlig Cc: @7c6f434c, @Mic92 --- .../instant-messengers/gajim/default.nix | 15 ++++----------- .../instant-messengers/gajim/fix-tests.patch | 13 ------------- 2 files changed, 4 insertions(+), 24 deletions(-) delete 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 b01c6497fb2..42c51049557 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,9 +1,6 @@ { stdenv, fetchurl, autoreconfHook, python, intltool, pkgconfig, libX11 , ldns, pythonPackages -# Test requirements -, xvfb_run - , enableJingle ? true, farstream ? null, gst-plugins-bad ? null , libnice ? null , enableE2E ? true @@ -25,13 +22,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16.8"; + version = "0.16.9"; src = fetchurl { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "009cpzqh4zy7hc9pq3r5m4lgagwawhjab13rjzavb0n9ggijcscb"; + sha256 = "121dh906zya9n7npyk7b5xama0z3ycy9jl7l5jm39pc86h1winh3"; }; patches = let @@ -46,8 +43,7 @@ stdenv.mkDerivation rec { name = "gajim-${name}.patch"; url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff"; inherit sha256; - }) cherries) - ++ [./fix-tests.patch]; # https://dev.gajim.org/gajim/gajim/issues/8660 + }) cherries); postPatch = '' sed -i -e '0,/^[^#]/ { @@ -74,8 +70,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pythonPackages.wrapPython intltool pkgconfig - # Test dependencies - xvfb_run ]; autoreconfPhase = '' @@ -114,9 +108,8 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - XDG_DATA_DIRS="$out/share/gajim''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" \ PYTHONPATH="test:$out/share/gajim/src:''${PYTHONPATH:+:}$PYTHONPATH" \ - xvfb-run make test + make test_nogui ''; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch deleted file mode 100644 index cb866bb2d73..00000000000 --- a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 4ffe462b10f1bd55afe9ea6d92ee44dccaf1f2f5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 9 Feb 2018 10:25:50 -0500 Subject: [PATCH 681/797] docker-edge: 18.01.0 -> 18.02.0 --- .../virtualization/docker/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 56436d047f2..339d3e8490d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -209,14 +209,14 @@ rec { tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_18_01 = dockerGen rec { - version = "18.01.0-ce"; - rev = "03596f51b120095326d2004d676e97228a21014d"; # git commit - sha256 = "1zffaxwkfz8ca76f5ql5z76mcjx37jbgv2kk75i68487yg16x0md"; - runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; - runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; - containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; - containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; + docker_18_02 = dockerGen rec { + version = "18.02.0-ce"; + rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit + sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m"; + runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e"; + runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln"; + containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55"; + containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84ad04e4ce7..d192c3dcf4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11167,7 +11167,7 @@ with pkgs; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; subdl = callPackage ../applications/video/subdl { }; - + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; suil-qt4 = callPackage ../development/libraries/audio/suil { @@ -14711,10 +14711,10 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker { }) docker_17_12 - docker_18_01; + docker_18_02; docker = docker_17_12; - docker-edge = docker_18_01; + docker-edge = docker_18_02; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; From 7f6c4e2703792d9e2405331607a8798a632eccd2 Mon Sep 17 00:00:00 2001 From: Geoffrey Reedy Date: Fri, 9 Feb 2018 08:32:28 -0700 Subject: [PATCH 682/797] libproxy: fix building on darwin --- pkgs/development/libraries/libproxy/default.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 614890e929f..bf9e2d079cd 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib +, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 +, SystemConfiguration, CoreFoundation, JavaScriptCore }: stdenv.mkDerivation rec { name = "libproxy-${version}"; @@ -16,7 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ]; + buildInputs = [ pcre python2 python3 zlib ] + ++ (if stdenv.hostPlatform.isDarwin + then [ SystemConfiguration CoreFoundation JavaScriptCore ] + else [ spidermonkey_38 dbus networkmanager ]); preConfigure = '' cmakeFlagsArray+=( @@ -27,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; homepage = http://libproxy.github.io/libproxy/; description = "A library that provides automatic proxy configuration management"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84ad04e4ce7..a747a516f66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9894,9 +9894,7 @@ with pkgs; }; libproxy = callPackage ../development/libraries/libproxy { - stdenv = if stdenv.isDarwin - then overrideCC stdenv gcc - else stdenv; + inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; }; libpseudo = callPackage ../development/libraries/libpseudo { }; From c4658ac0a4ebb8a5a5f5fd4305479d9f3ee7f714 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 9 Feb 2018 13:34:19 +0900 Subject: [PATCH 683/797] rPackages.pbdZMQ: fix package loading on Darwin --- pkgs/development/r-modules/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 4510308d3e5..ee1fb24b309 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -285,7 +285,7 @@ let pbdMPI = [ pkgs.openmpi ]; pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; - pbdZMQ = [ pkgs.which ]; + pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; pdftools = [ pkgs.poppler.dev ]; PKI = [ pkgs.openssl.dev ]; png = [ pkgs.libpng.dev ]; @@ -393,6 +393,7 @@ let nat = [ pkgs.which ]; nat_nblast = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; + pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; qtpaint = [ pkgs.cmake ]; @@ -776,6 +777,14 @@ let PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); + pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: { + postPatch = lib.optionalString stdenv.isDarwin '' + for file in R/*.{r,r.in}; do + sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file + done + ''; + }); + qtbase = old.qtbase.overrideDerivation (attrs: { patches = [ ./patches/qtbase.patch ]; }); From 814a9310dc05df88c677b8acb44303e183af35a3 Mon Sep 17 00:00:00 2001 From: thorstenweber83 Date: Fri, 9 Feb 2018 17:02:23 +0100 Subject: [PATCH 684/797] python.pkgs.awesome-slugify: fix build (#34764) It broke because Unidecode went out of its defined range (Unidecode>=0.04.14,<0.05) with commit 57e9ed3719e5cef086a3463513e8805c761c3cf4 --- pkgs/development/python-modules/awesome-slugify/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix index 105c70c28b3..945c941dec4 100644 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/pkgs/development/python-modules/awesome-slugify/default.nix @@ -3,13 +3,17 @@ buildPythonPackage rec { pname = "awesome-slugify"; version = "1.6.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "0wgxrhr8s5vk2xmcz9s1z1aml4ppawmhkbggl9rp94c747xc7pmv"; }; + prePatch = '' + substituteInPlace setup.py \ + --replace 'Unidecode>=0.04.14,<0.05' 'Unidecode>=0.04.14' + ''; + patches = [ ./slugify_filename_test.patch # fixes broken test by new unidecode ]; From 56a21983f9289079be6ef22b7fb60d9707132fb3 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Fri, 9 Feb 2018 17:16:32 +0100 Subject: [PATCH 685/797] typora: 0.9.41 -> 0.9.44 --- pkgs/applications/editors/typora/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 22e7c3d31b3..7c6d186b883 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.41"; + version = "0.9.44"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "e4916f86c7c12aec8fd59b3ef79c2a4d3f77b02a0a9e962916c688871c9fda1d"; + sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "18960fb4b2cd6cf9cb77025a4035a3258f1599b1d225fb673b49c1588fa272d6"; + sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3"; } ; From bd92592e7ed7de61ae48c9b84ab15ba2c3c70032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Feb 2018 17:52:28 +0100 Subject: [PATCH 686/797] pythonPackages.pytz: 2017.3 -> 2018.3 --- pkgs/development/python-modules/pytz/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 96f0ad136a0..65f3d80bdaa 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,12 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2017.3"; + version = "2018.3"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "fae4cffc040921b8a2d60c6cf0b5d662c1190fe54d718271db4eb17d44a185b7"; + sha256 = "410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0"; }; checkPhase = '' From 334dd9cbf5ee84a62648d6e0e927b5ac7ab7458a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Feb 2018 18:04:23 +0100 Subject: [PATCH 687/797] abcmidi: 2018.01.25 -> 2018.02.07 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 941c5e343b9..6915f8a9071 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.01.25"; + version = "2018.02.07"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "18h6gqhh75qdi8krpp0m2pxbxi0n08wrh8xay477jm3vaggyr8s9"; + sha256 = "16hdv114hs5agg288kpbijqw53wdiswjmprpbhy7kgdjnp9ijwxw"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 9622cdb69f60d1bb6aad9158fce9dd6205c5ebc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 9 Feb 2018 17:08:28 +0000 Subject: [PATCH 688/797] flexget: mark as broken --- pkgs/applications/networking/flexget/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 105239aca02..585e0c847da 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -75,5 +75,6 @@ buildPythonApplication rec { description = "Multipurpose automation tool for content like torrents"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ domenkozar tari ]; + broken = true; # as of 2018-02-09 }; } From 209f8b1acd4c855d223d93f02caf3ccf6cec7e32 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 1 Feb 2018 10:34:03 +0100 Subject: [PATCH 689/797] nixos/release*.nix: Clean nixpkgs sources by default Currently, when building NixOS from a git clone, Nix has to copy the entire repo at >1GB into the store by default. That is not necessary and causes a dumping large path message. If you need the old behaviour for some reason, you will have to specify it by passing the path to your repo explicitly as the nixpkgs argument like this: --arg nixpkgs '{outPath = ./.; revCount = 56789; shortRev = "gfedcba"; }' --- nixos/release-combined.nix | 2 +- nixos/release-small.nix | 2 +- nixos/release.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index d4f77ea445d..9d4a551a958 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -2,7 +2,7 @@ # and nixos-14.04). The channel is updated every time the ‘tested’ job # succeeds, and all other jobs have finished (they may fail). -{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" ] , limitedSupportedSystems ? [ "i686-linux" ] diff --git a/nixos/release-small.nix b/nixos/release-small.nix index e9f3cfb4de5..24c448449c1 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -2,7 +2,7 @@ # small subset of Nixpkgs, mostly useful for servers that need fast # security updates. -{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" ] # no i686-linux }: diff --git a/nixos/release.nix b/nixos/release.nix index e9d145031c4..2c605500376 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,4 +1,4 @@ -{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] }: From 01460745602c2c31f2ce6d7a22ff80602894679b Mon Sep 17 00:00:00 2001 From: symphorien Date: Fri, 9 Feb 2018 18:40:39 +0000 Subject: [PATCH 690/797] nixos/tests: add predictable-interface-names.nix (#34305) --- lib/lists.nix | 8 ++++-- nixos/release-small.nix | 1 + nixos/release.nix | 1 + nixos/tests/predictable-interface-names.nix | 27 +++++++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/predictable-interface-names.nix diff --git a/lib/lists.nix b/lib/lists.nix index 8f67c6bb0ca..f2e6bacdc98 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -440,8 +440,12 @@ rec { init = list: assert list != []; take (length list - 1) list; - /* FIXME(zimbatm) Not used anywhere - */ + /* return the image of the cross product of some lists by a function + + Example: + crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]] + => [ "13" "14" "23" "24" ] + */ crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 24c448449c1..2b532c70763 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -41,6 +41,7 @@ in rec { nfs3 openssh php-pcre + predictable-interface-names proxy simple; installer = { diff --git a/nixos/release.nix b/nixos/release.nix index 2c605500376..16f00e78faa 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -326,6 +326,7 @@ in rec { tests.pgmanage = callTest tests/pgmanage.nix {}; tests.postgis = callTest tests/postgis.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; + tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {}; tests.printing = callTest tests/printing.nix {}; tests.prometheus = callTest tests/prometheus.nix {}; tests.proxy = callTest tests/proxy.nix {}; diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix new file mode 100644 index 00000000000..b4c2039923c --- /dev/null +++ b/nixos/tests/predictable-interface-names.nix @@ -0,0 +1,27 @@ +{ system ? builtins.currentSystem +, pkgs ? import ../.. { inherit system; } +}: +with import ../lib/testing.nix { inherit system; }; +let boolToString = x: if x then "yes" else "no"; in +let testWhenSetTo = predictable: withNetworkd: +makeTest { + name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; + meta = {}; + + machine = { config, pkgs, ... }: { + networking.usePredictableInterfaceNames = pkgs.stdenv.lib.mkForce predictable; + networking.useNetworkd = withNetworkd; + networking.dhcpcd.enable = !withNetworkd; + }; + + testScript = '' + print $machine->succeed("ip link"); + $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); + $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); + ''; +}; in +with pkgs.stdenv.lib.lists; +with pkgs.stdenv.lib.attrsets; +listToAttrs (map (drv: nameValuePair drv.name drv) ( +crossLists testWhenSetTo [[true false] [true false]] +)) From bd3379c4434334bd5bccc2fb91ac64a02ca77fb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Feb 2018 19:47:39 +0100 Subject: [PATCH 691/797] haskell-generic-builder: include build-tool dependencies in shell environments For a Haskell package "foo" the environment foo.env now contains the build tool dependencies required for compiling the package in $PATH. Fixes https://github.com/NixOS/cabal2nix/issues/331. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index eb66a6f8922..de37a8e9244 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -384,7 +384,7 @@ stdenv.mkDerivation ({ env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; buildInputs = systemBuildInputs; - nativeBuildInputs = [ ghcEnv ]; + nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' From 2c134357345d4166d62db2e4cc029d004f28edae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Feb 2018 19:52:21 +0100 Subject: [PATCH 692/797] haskell-generic-builder: revert "set LD_LIBRARY_PATH in shellHook" This reverts commit e73e5c884f5770110d99675db8495bb1535a6308. Please don't set $LD_LIBRARY_PATH! Instead, pass appropriate --extra-include-dir and --extra-lib-dir arguments to "cabal configure" to ensure that Cabal knows about system dependencies. --- pkgs/development/haskell-modules/generic-builder.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index de37a8e9244..14a8a628b58 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -72,8 +72,7 @@ assert enableSplitObjs == null; let inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast - concatStringsSep enableFeature optionalAttrs toUpper - filter makeLibraryPath; + concatStringsSep enableFeature optionalAttrs toUpper; isGhcjs = ghc.isGhcjs or false; isHaLVM = ghc.isHaLVM or false; @@ -392,9 +391,6 @@ stdenv.mkDerivation ({ export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" # TODO: is this still valid? export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - export LD_LIBRARY_PATH="''${LD_LIBRARY_PATH:+''${LD_LIBRARY_PATH}:}${ - makeLibraryPath (filter (x: !isNull x) systemBuildInputs) - }" ${if isHaLVM then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''} From d436d3dac538cd4d5ec44d8fbe951db41e6041a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Feb 2018 17:22:39 +0100 Subject: [PATCH 693/797] pythonPackages.dateparser: 0.6.0 -> 0.7.0 --- .../python-modules/dateparser/default.nix | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 21deadf146d..fdc408e1c4c 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,47 +1,40 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, isPy3k +{ lib, fetchPypi, buildPythonPackage, isPy3k , nose , parameterized , mock , glibcLocales , six , jdatetime -, pyyaml , dateutil , umalqurra , pytz , tzlocal , regex , ruamel_yaml }: + buildPythonPackage rec { pname = "dateparser"; - version = "0.6.0"; + version = "0.7.0"; - src = fetchFromGitHub { - owner = "scrapinghub"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y"; + src = fetchPypi { + inherit pname version; + sha256 = "940828183c937bcec530753211b70f673c0a9aab831e43273489b310538dff86"; }; - # Replace nose-parameterized by parameterized - prePatch = '' - sed -i s/nose_parameterized/parameterized/g tests/*.py - sed -i s/nose-parameterized/parameterized/g tests/requirements.txt - ''; - - # Upstream Issue: https://github.com/scrapinghub/dateparser/issues/364 - disabled = isPy3k; - - checkInputs = [ nose parameterized mock glibcLocales ]; + checkInputs = [ nose mock parameterized six glibcLocales ]; preCheck ='' # skip because of missing convertdate module, which is an extra requirement rm tests/test_jalali.py ''; - propagatedBuildInputs = [ six jdatetime pyyaml dateutil - umalqurra pytz tzlocal regex ruamel_yaml ]; + propagatedBuildInputs = [ + # install_requires + dateutil pytz regex tzlocal + # extra_requires + jdatetime ruamel_yaml umalqurra + ]; - meta = with stdenv.lib;{ + meta = with lib; { description = "Date parsing library designed to parse dates from HTML pages"; homepage = https://github.com/scrapinghub/dateparser; license = licenses.bsd3; From 1cba74dfc1541673f91b91c3ab50dbdce43c764a Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 1 Feb 2018 22:54:18 +0100 Subject: [PATCH 694/797] setup-hooks: Add autoPatchelfHook I originally wrote this for packaging proprietary games in Vuizvui[1] but I thought it would be generally useful as we have a fair amount of proprietary software lurking around in nixpkgs, which are a bit tedious to maintain, especially when the library dependencies change after an update. So this setup hook searches for all ELF executables and libraries in the resulting output paths after install phase and uses patchelf to set the RPATH and interpreter according to what dependencies are available inside the builder. For example consider something like this: stdenv.mkDerivation { ... nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ mesa zlib ]; ... } Whenever for example an executable requires mesa or zlib, the RPATH will automatically be set to the lib dir of the corresponding dependency. If the library dependency is required at runtime, an attribute called runtimeDependencies can be used to list dependencies that are added to all executables that are discovered unconditionally. Beside this, it also makes initial packaging of proprietary software easier, because one no longer has to manually figure out the dependencies in the first place. [1]: https://github.com/openlab-aux/vuizvui Signed-off-by: aszlig Closes: #34506 --- doc/stdenv.xml | 14 ++ .../setup-hooks/auto-patchelf.sh | 174 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 192 insertions(+) create mode 100644 pkgs/build-support/setup-hooks/auto-patchelf.sh diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 3a7b23baaa7..2a3316b8d01 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1802,6 +1802,20 @@ addEnvHooks "$hostOffset" myBashFunction disabled or patched to work with PaX. + + autoPatchelfHook + This is a special setup hook which helps in packaging + proprietary software in that it automatically tries to find missing shared + library dependencies of ELF files. All packages within the + runtimeDependencies environment variable are unconditionally + added to executables, which is useful for programs that use + + dlopen + 3 + + to load libraries at runtime. + + diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh new file mode 100644 index 00000000000..0f9d7603d48 --- /dev/null +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -0,0 +1,174 @@ +declare -a autoPatchelfLibs + +gatherLibraries() { + autoPatchelfLibs+=("$1/lib") +} + +addEnvHooks "$targetOffset" gatherLibraries + +isExecutable() { + [ "$(file -b -N --mime-type "$1")" = application/x-executable ] +} + +findElfs() { + find "$1" -type f -exec "$SHELL" -c ' + while [ -n "$1" ]; do + mimeType="$(file -b -N --mime-type "$1")" + if [ "$mimeType" = application/x-executable \ + -o "$mimeType" = application/x-sharedlib ]; then + echo "$1" + fi + shift + done + ' -- {} + +} + +# We cache dependencies so that we don't need to search through all of them on +# every consecutive call to findDependency. +declare -a cachedDependencies + +addToDepCache() { + local existing + for existing in "${cachedDependencies[@]}"; do + if [ "$existing" = "$1" ]; then return; fi + done + cachedDependencies+=("$1") +} + +declare -gi depCacheInitialised=0 +declare -gi doneRecursiveSearch=0 +declare -g foundDependency + +getDepsFromSo() { + ldd "$1" 2> /dev/null | sed -n -e 's/[^=]*=> *\(.\+\) \+([^)]*)$/\1/p' +} + +populateCacheWithRecursiveDeps() { + local so found foundso + for so in "${cachedDependencies[@]}"; do + for found in $(getDepsFromSo "$so"); do + local libdir="${found%/*}" + local base="${found##*/}" + local soname="${base%.so*}" + for foundso in "${found%/*}/$soname".so*; do + addToDepCache "$foundso" + done + done + done +} + +getSoArch() { + objdump -f "$1" | sed -ne 's/^architecture: *\([^,]\+\).*/\1/p' +} + +# NOTE: If you want to use this function outside of the autoPatchelf function, +# keep in mind that the dependency cache is only valid inside the subshell +# spawned by the autoPatchelf function, so invoking this directly will possibly +# rebuild the dependency cache. See the autoPatchelf function below for more +# information. +findDependency() { + local filename="$1" + local arch="$2" + local lib dep + + if [ $depCacheInitialised -eq 0 ]; then + for lib in "${autoPatchelfLibs[@]}"; do + for so in "$lib/"*.so*; do addToDepCache "$so"; done + done + depCacheInitialised=1 + fi + + for dep in "${cachedDependencies[@]}"; do + if [ "$filename" = "${dep##*/}" ]; then + if [ "$(getSoArch "$dep")" = "$arch" ]; then + foundDependency="$dep" + return 0 + fi + fi + done + + # Populate the dependency cache with recursive dependencies *only* if we + # didn't find the right dependency so far and afterwards run findDependency + # again, but this time with $doneRecursiveSearch set to 1 so that it won't + # recurse again (and thus infinitely). + if [ $doneRecursiveSearch -eq 0 ]; then + populateCacheWithRecursiveDeps + doneRecursiveSearch=1 + findDependency "$filename" "$arch" || return 1 + return 0 + fi + return 1 +} + +autoPatchelfFile() { + local dep rpath="" toPatch="$1" + + local interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")" + if isExecutable "$toPatch"; then + patchelf --set-interpreter "$interpreter" "$toPatch" + if [ -n "$runtimeDependencies" ]; then + for dep in $runtimeDependencies; do + rpath="$rpath${rpath:+:}$dep/lib" + done + fi + fi + + echo "searching for dependencies of $toPatch" >&2 + + # We're going to find all dependencies based on ldd output, so we need to + # clear the RPATH first. + patchelf --remove-rpath "$toPatch" + + local missing="$( + ldd "$toPatch" 2> /dev/null | \ + sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p' + )" + + # This ensures that we get the output of all missing dependencies instead + # of failing at the first one, because it's more useful when working on a + # new package where you don't yet know its dependencies. + local -i depNotFound=0 + + for dep in $missing; do + echo -n " $dep -> " >&2 + if findDependency "$dep" "$(getSoArch "$toPatch")"; then + rpath="$rpath${rpath:+:}${foundDependency%/*}" + echo "found: $foundDependency" >&2 + else + echo "not found!" >&2 + depNotFound=1 + fi + done + + # This makes sure the builder fails if we didn't find a dependency, because + # the stdenv setup script is run with set -e. The actual error is emitted + # earlier in the previous loop. + [ $depNotFound -eq 0 ] + + if [ -n "$rpath" ]; then + echo "setting RPATH to: $rpath" >&2 + patchelf --set-rpath "$rpath" "$toPatch" + fi +} + +autoPatchelf() { + echo "automatically fixing dependencies for ELF files" >&2 + + # Add all shared objects of the current output path to the start of + # cachedDependencies so that it's choosen first in findDependency. + cachedDependencies+=( + $(find "$prefix" \! -type d \( -name '*.so' -o -name '*.so.*' \)) + ) + local elffile + + # Here we actually have a subshell, which also means that + # $cachedDependencies is final at this point, so whenever we want to run + # findDependency outside of this, the dependency cache needs to be rebuilt + # from scratch, so keep this in mind if you want to run findDependency + # outside of this function. + findElfs "$prefix" | while read -r elffile; do + autoPatchelfFile "$elffile" + done +} + +fixupOutputHooks+=(autoPatchelf) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb9bcac3518..45cf17897bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -79,6 +79,10 @@ with pkgs; { deps = [ autoconf264 automake111x gettext libtool ]; } ../build-support/setup-hooks/autoreconf.sh; + autoPatchelfHook = makeSetupHook + { deps = [ file ]; } + ../build-support/setup-hooks/auto-patchelf.sh; + ensureNewerSourcesHook = { year }: makeSetupHook {} (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) From 13dda44b8b5c30aea813ec2a2fcff6b6dd8a9b0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Feb 2018 20:21:12 +0100 Subject: [PATCH 695/797] haskell-with-packages-wrapper: don't bother with extraOutputsToInstall symlinkJoin doesn't recognize this parameter, so this functionality has been broken ever since 4b77d425aa5970f39f0637894075d2df8c1575c8. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index aa0090e4cff..d858787f43c 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -56,7 +56,6 @@ symlinkJoin { # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; - extraOutputsToInstall = [ "out" "doc" ]; postBuild = '' . ${makeWrapper}/nix-support/setup-hook From e1b168398179834ff0ccae6071a2c64b38a7dec7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 17 Nov 2016 11:53:51 +0000 Subject: [PATCH 696/797] nixos: export packages of the current configuration (its `pkgs` argument) Allows one to access a package configured with overrides given in `nixpkgs.config`, e.g.: nix-build ./nixos/default.nix -A pkgs.ffmpeg --- nixos/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/default.nix b/nixos/default.nix index 0e45a1cd75e..45da78e9261 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -9,8 +9,6 @@ let modules = [ configuration ]; }; - inherit (eval) pkgs; - # This is for `nixos-rebuild build-vm'. vmConfig = (import ./lib/eval-config.nix { inherit system; @@ -30,7 +28,7 @@ let in { - inherit (eval) config options; + inherit (eval) pkgs config options; system = eval.config.system.build.toplevel; From 6ae627b01e3137bba53fd45153d6adfc59ad2466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Feb 2018 20:37:56 +0100 Subject: [PATCH 697/797] pythonPackages.pytest-httpbin: actually run tests --- pkgs/development/python-modules/pytest-httpbin/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index caa2c27e3f8..cfa24fdfe52 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -24,6 +24,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask decorator httpbin six requests ]; + checkPhase = '' + py.test + ''; + meta = { description = "Easily test your HTTP library against a local copy of httpbin.org"; homepage = https://github.com/kevin1024/pytest-httpbin; From 3a2ee6e5c3bfae64c604859c7cc1ee6b069ea5b5 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 15 Sep 2017 21:07:24 +0000 Subject: [PATCH 698/797] linuxPackages: introduce `hardenedLinuxPackagesFor` and cleanup some expressions using it --- ...head.nix => linux-copperhead-hardened.nix} | 0 pkgs/top-level/all-packages.nix | 26 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) rename pkgs/os-specific/linux/kernel/{linux-hardened-copperhead.nix => linux-copperhead-hardened.nix} (100%) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix similarity index 100% rename from pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix rename to pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12b00338723..eeff517ebf1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12876,16 +12876,12 @@ with pkgs; ]; }; - linux_hardened_copperhead = callPackage ../os-specific/linux/kernel/linux-hardened-copperhead.nix { + linux_copperhead = callPackage ../os-specific/linux/kernel/linux-copperhead-hardened.nix { kernelPatches = with kernelPatches; [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long kernelPatches.tag_hardened ]; - extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { - inherit stdenv; - inherit (linux_hardened_copperhead) version; - }; }; # linux mptcp is based on the 4.4 kernel @@ -13019,8 +13015,6 @@ with pkgs; ]; }; - linux_samus_latest = linux_samus_4_12; - /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -13172,7 +13166,6 @@ with pkgs; # Build the kernel modules for the some of the kernels. linuxPackages_beagleboard = linuxPackagesFor pkgs.linux_beagleboard; - linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); @@ -13198,19 +13191,24 @@ with pkgs; linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); # Hardened linux - linux_hardened = let linux = pkgs.linuxPackages_latest.kernel; in linux.override { + hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; - inherit (linux) version; + inherit (kernel) version; }; - }; + }); - linuxPackages_hardened = - recurseIntoAttrs (linuxPackagesFor linux_hardened); + linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); + linux_hardened = linuxPackages_hardened.kernel; + + linuxPackages_copperhead_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead); + linux_copperhead_hardened = linuxPackages_copperhead_hardened.kernel; + linux_hardened_copperhead = linux_copperhead_hardened; # alias for backward compatibility # Samus kernels linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); - linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest); + linuxPackages_samus_latest = linuxPackages_samus_4_12; + linux_samus_latest = linuxPackages_samus_latest.kernel; # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; From ac073fe77ac72382d699aec2d53682c18f0dc7a4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 15 Sep 2017 21:08:01 +0000 Subject: [PATCH 699/797] linuxPackages: point linux_hardened to the hardened default linux, not hardened linux_latest --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eeff517ebf1..a308704e2c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13198,9 +13198,12 @@ with pkgs; }; }); - linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); + linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux); linux_hardened = linuxPackages_hardened.kernel; + linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); + linux_latest_hardened = linuxPackages_latest_hardened.kernel; + linuxPackages_copperhead_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead); linux_copperhead_hardened = linuxPackages_copperhead_hardened.kernel; linux_hardened_copperhead = linux_copperhead_hardened; # alias for backward compatibility From a5227789d280477d806f05d29c3021a7b5bcfd89 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 15 Sep 2017 21:08:13 +0000 Subject: [PATCH 700/797] linuxPackages: add more predefined kernels with Xen Dom0 --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a308704e2c8..ce60ac1b9ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13188,6 +13188,8 @@ with pkgs; linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); # Build a kernel for Xen dom0 + linuxPackages_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); + linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); # Hardened linux @@ -13204,6 +13206,10 @@ with pkgs; linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); linux_latest_hardened = linuxPackages_latest_hardened.kernel; + linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); + + linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); + linuxPackages_copperhead_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead); linux_copperhead_hardened = linuxPackages_copperhead_hardened.kernel; linux_hardened_copperhead = linux_copperhead_hardened; # alias for backward compatibility From ee3220440da59e39154b520353a3d03a1abf3405 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 7 Dec 2017 21:26:30 +0000 Subject: [PATCH 701/797] lib: implement `compare`, `splitByAndCompare`, and `compareLists` --- lib/default.nix | 7 ++++--- lib/lists.nix | 24 ++++++++++++++++++++++++ lib/trivial.nix | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 97d7c10192a..77cfa712557 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -56,7 +56,8 @@ let replaceStrings seq stringLength sub substring tail; inherit (trivial) id const concat or and boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info - nixpkgsVersion mod functionArgs setFunctionArgs isFunction; + nixpkgsVersion mod compare splitByAndCompare + functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; @@ -71,8 +72,8 @@ let inherit (lists) singleton foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists - reverseList listDfs toposort sort take drop sublist last init - crossLists unique intersectLists subtractLists + reverseList listDfs toposort sort compareLists take drop sublist + last init crossLists unique intersectLists subtractLists mutuallyExclusive; inherit (strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep diff --git a/lib/lists.nix b/lib/lists.nix index 8f67c6bb0ca..f7e09040a5a 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -385,6 +385,30 @@ rec { if len < 2 then list else (sort strictLess pivot.left) ++ [ first ] ++ (sort strictLess pivot.right)); + /* Compare two lists element-by-element. + + Example: + compareLists compare [] [] + => 0 + compareLists compare [] [ "a" ] + => -1 + compareLists compare [ "a" ] [] + => 1 + compareLists compare [ "a" "b" ] [ "a" "c" ] + => 1 + */ + compareLists = cmp: a: b: + if a == [] + then if b == [] + then 0 + else -1 + else if b == [] + then 1 + else let rel = cmp (head a) (head b); in + if rel == 0 + then compareLists cmp (tail a) (tail b) + else rel; + /* Return the first (at most) N elements of a list. Example: diff --git a/lib/trivial.nix b/lib/trivial.nix index d8d51298143..a928e1dbca9 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -81,6 +81,42 @@ rec { */ mod = base: int: base - (int * (builtins.div base int)); + /* C-style comparisons + + a < b, compare a b => -1 + a == b, compare a b => 0 + a > b, compare a b => 1 + */ + compare = a: b: + if a < b + then -1 + else if a > b + then 1 + else 0; + + /* Split type into two subtypes by predicate `p`, take all elements + of the first subtype to be less than all the elements of the + second subtype, compare elements of a single subtype with `yes` + and `no` respectively. + + Example: + + let cmp = splitByAndCompare (hasPrefix "foo") compare compare; in + + cmp "a" "z" => -1 + cmp "fooa" "fooz" => -1 + + cmp "f" "a" => 1 + cmp "fooa" "a" => -1 + # while + compare "fooa" "a" => 1 + + */ + splitByAndCompare = p: yes: no: a: b: + if p a + then if p b then yes a b else -1 + else if p b then 1 else no a b; + /* Reads a JSON file. */ importJSON = path: builtins.fromJSON (builtins.readFile path); From a7d75ab6489dc5834e8402db374b4d0f1e774d53 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 20 Apr 2016 21:46:02 +0000 Subject: [PATCH 702/797] nixos/doc: push all the `enable*' and `package*` options to the top of their option group Why? Because this way configuration.nix(5) can be read linearly. Before: > virtualisation.xen.bootParams > ... > virtualisation.xen.enable > ... > virtualisation.xen.package > ... After: > virtualisation.xen.enable > virtualisation.xen.package > virtualisation.xen.bootParams > ... --- nixos/doc/manual/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 8079a2feb29..9ee70ba59b7 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -6,7 +6,7 @@ let lib = pkgs.lib; # Remove invisible and internal options. - optionsList = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); + optionsListVisible = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); # Replace functions by the string substFunction = x: @@ -16,7 +16,7 @@ let else x; # Clean up declaration sites to not refer to the NixOS source tree. - optionsList' = lib.flip map optionsList (opt: opt // { + optionsListDesc = lib.flip map optionsListVisible (opt: opt // { declarations = map stripAnyPrefixes opt.declarations; } // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } @@ -32,8 +32,22 @@ let prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources); stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; + # Custom "less" that pushes up all the things ending in ".enable*" + # and ".package" + optionListLess = a: b: + let + splt = lib.splitString "."; + ise = lib.hasPrefix "enable"; + isp = lib.hasPrefix "package"; + cmp = lib.splitByAndCompare ise lib.compare + (lib.splitByAndCompare isp lib.compare lib.compare); + in lib.compareLists cmp (splt a) (splt b) < 0; + + # Customly sort option list for the man page. + optionsList = lib.sort (a: b: optionListLess a.name b.name) optionsListDesc; + # Convert the list of options into an XML file. - optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList'); + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); optionsDocBook = runCommand "options-db.xml" {} '' optionsXML=${optionsXML} @@ -191,7 +205,7 @@ in rec { mkdir -p $dst cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON - (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList')))) + (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList)))) } $dst/options.json mkdir -p $out/nix-support From 660806066abc4a64ac44b53b2b1a20f5ab4d920b Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 20 Apr 2016 21:57:33 +0000 Subject: [PATCH 703/797] nixos, lib: implement relatedPackages option This allows one to specify "related packages" in NixOS that get rendered into the configuration.nix(5) man page. The interface philosophy is pretty much stolen from TeX bibliography. See the next several commits for examples. --- lib/options.nix | 9 ++++--- nixos/doc/manual/default.nix | 34 +++++++++++++++++++++++-- nixos/doc/manual/options-to-docbook.xsl | 9 +++++++ 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/lib/options.nix b/lib/options.nix index 769d3cc5572..e10c86dd506 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -14,6 +14,7 @@ rec { , defaultText ? null # Textual representation of the default, for in the manual. , example ? null # Example value used in the manual. , description ? null # String describing the option. + , relatedPackages ? null # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix). , type ? null # Option type, providing type-checking and value merging. , apply ? null # Function that converts the option value to something else. , internal ? null # Whether the option is for NixOS developers only. @@ -76,7 +77,6 @@ rec { getValues = map (x: x.value); getFiles = map (x: x.file); - # Generate documentation template from the list of option declaration like # the set generated with filterOptionSets. optionAttrSetToDocList = optionAttrSetToDocList' []; @@ -93,9 +93,10 @@ rec { readOnly = opt.readOnly or false; type = opt.type.description or null; } - // (if opt ? example then { example = scrubOptionValue opt.example; } else {}) - // (if opt ? default then { default = scrubOptionValue opt.default; } else {}) - // (if opt ? defaultText then { default = opt.defaultText; } else {}); + // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; } + // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; } + // optionalAttrs (opt ? defaultText) { default = opt.defaultText; } + // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) { inherit (opt) relatedPackages; }; subOptions = let ss = opt.type.getSubOptions opt.loc; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 9ee70ba59b7..66fa4f0ba43 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -15,13 +15,43 @@ let else if lib.isFunction x then "" else x; - # Clean up declaration sites to not refer to the NixOS source tree. + # Generate DocBook documentation for a list of packages. This is + # what `relatedPackages` option of `mkOption` from + # ../../../lib/options.nix influences. + # + # Each element of `relatedPackages` can be either + # - a string: that will be interpreted as an attribute name from `pkgs`, + # - a list: that will be interpreted as an attribute path from `pkgs`, + # - an attrset: that can specify `name`, `path`, `package`, `comment` + # (either of `name`, `path` is required, the rest are optional). + genRelatedPackages = packages: + let + unpack = p: if lib.isString p then { name = p; } + else if lib.isList p then { path = p; } + else p; + describe = args: + let + name = args.name or (lib.concatStringsSep "." args.path); + path = args.path or [ args.name ]; + package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); + in "" + + "pkgs.${name} (${package.meta.name})" + + lib.optionalString (!package.meta.evaluates) " [UNAVAILABLE]" + + ": ${package.meta.description or "???"}." + + lib.optionalString (args ? comment) "\n${args.comment}" + # Lots of `longDescription's break DocBook, so we just wrap them into + + lib.optionalString (package.meta ? longDescription) "\n${package.meta.longDescription}" + + ""; + in "${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}"; + optionsListDesc = lib.flip map optionsListVisible (opt: opt // { + # Clean up declaration sites to not refer to the NixOS source tree. declarations = map stripAnyPrefixes opt.declarations; } // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; } - // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; }); + // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; } + // lib.optionalAttrs (opt ? relatedPackages) { relatedPackages = genRelatedPackages opt.relatedPackages; }); # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl index 5387546b598..7b45b233ab2 100644 --- a/nixos/doc/manual/options-to-docbook.xsl +++ b/nixos/doc/manual/options-to-docbook.xsl @@ -70,6 +70,15 @@ + + + Related packages: + + + + + Declared by: From eb38b8676a3185141c49478f1a2c6374c55f27a9 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 7 Dec 2017 21:26:36 +0000 Subject: [PATCH 704/797] nixos/tmux: add related package This is a trivial example of `relatedPackages` option usage. --- nixos/modules/programs/tmux.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index 1eb6fa6bf2f..4a60403a282 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -61,7 +61,12 @@ in { options = { programs.tmux = { - enable = mkEnableOption "tmux - a screen replacement."; + enable = mkOption { + type = types.bool; + default = false; + description = "Whenever to configure tmux system-wide."; + relatedPackages = [ "tmux" ]; + }; aggressiveResize = mkOption { default = false; From e5268344feedd21ad1f59c43fea28be49d27e347 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 5 Feb 2018 15:24:46 +0000 Subject: [PATCH 705/797] nixos/adb: add related package This is an attribute path example of `relatedPackages` option usage. --- nixos/modules/programs/adb.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index 18290555b79..f648d70bd9f 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -16,6 +16,7 @@ with lib; To grant access to a user, it must be part of adbusers group: users.extraUsers.alice.extraGroups = ["adbusers"]; ''; + relatedPackages = [ ["androidenv" "platformTools"] ]; }; }; }; From 06adc17455257324ae555bb1544643ee3a42d313 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 7 Dec 2017 21:26:42 +0000 Subject: [PATCH 706/797] xen, qemu: passthru the path to qemu-system-i386 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++++ pkgs/applications/virtualization/xen/4.5.nix | 6 ++++++ pkgs/applications/virtualization/xen/4.8.nix | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 91b02f7ad1f..68ab979ecfb 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -101,6 +101,10 @@ stdenv.mkDerivation rec { else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; + passthru = { + qemu-system-i386 = "bin/qemu-system-i386"; + }; + meta = with stdenv.lib; { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index ec3fe9ccf22..22799a7af8e 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -248,4 +248,10 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; + passthru = { + qemu-system-i386 = if withInternalQemu + then "lib/xen/bin/qemu-system-i386" + else throw "this xen has no qemu builtin"; + }; + })) ({ ocamlPackages = ocamlPackages_4_02; } // args) diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 6eedca18960..44a52a1026a 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -176,4 +176,10 @@ callPackage (import ./generic.nix (rec { -i tools/libxl/libxl_device.c ''; + passthru = { + qemu-system-i386 = if withInternalQemu + then "lib/xen/bin/qemu-system-i386" + else throw "this xen has no qemu builtin"; + }; + })) args From 0d1a6432100e10b833fdb5557329f9e0818ecbfe Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 7 Dec 2017 21:26:49 +0000 Subject: [PATCH 707/797] nixos/xen-dom0: add related packages, make it play well with them This is a custom attribute set example of `relatedPackages` option usage. --- nixos/modules/rename.nix | 4 ++++ nixos/modules/virtualisation/xen-dom0.nix | 25 +++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 562be13a3f6..7351482f957 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -210,6 +210,7 @@ with lib; "Set the option `services.xserver.displayManager.sddm.package' instead.") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") + (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) @@ -220,5 +221,8 @@ with lib; (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ]) (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ]) (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ]) + + # Xen + (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ]) ]; } diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index c7656bc309c..afc5a42f8b4 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -35,24 +35,19 @@ in description = '' The package used for Xen binary. ''; + relatedPackages = [ "xen" "xen-light" ]; }; - virtualisation.xen.qemu = mkOption { - type = types.path; - defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386"; - example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386"; - description = '' - The qemu binary to use for Dom-0 backend. - ''; - }; - - virtualisation.xen.qemu-package = mkOption { + virtualisation.xen.package-qemu = mkOption { type = types.package; defaultText = "pkgs.xen"; example = literalExample "pkgs.qemu_xen-light"; description = '' - The package with qemu binaries for xendomains. + The package with qemu binaries for dom0 qemu and xendomains. ''; + relatedPackages = [ "xen" + { name = "qemu_xen-light"; comment = "For use with pkgs.xen-light."; } + ]; }; virtualisation.xen.bootParams = @@ -158,8 +153,7 @@ in } ]; virtualisation.xen.package = mkDefault pkgs.xen; - virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386"; - virtualisation.xen.qemu-package = mkDefault pkgs.xen; + virtualisation.xen.package-qemu = mkDefault pkgs.xen; virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored"; environment.systemPackages = [ cfg.package ]; @@ -339,7 +333,8 @@ in after = [ "xen-console.service" ]; requires = [ "xen-store.service" ]; serviceConfig.ExecStart = '' - ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \ + ${cfg.package-qemu}/${cfg.package-qemu.qemu-system-i386} \ + -xen-attach -xen-domid 0 -name dom0 -M xenpv \ -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null ''; }; @@ -448,7 +443,7 @@ in before = [ "dhcpd.service" ]; restartIfChanged = false; serviceConfig.RemainAfterExit = "yes"; - path = [ cfg.package cfg.qemu-package ]; + path = [ cfg.package cfg.package-qemu ]; environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains"; preStart = "mkdir -p /var/lock/subsys -m 755"; serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start"; From a5524e46f91ee3059decce5e17ba064cbede9295 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Fri, 9 Feb 2018 15:48:18 -0500 Subject: [PATCH 708/797] looking-glass-client: restrict to x86_64-linux The AArch64 build fails after trying to pull in tmmintrin.h: ``` ../common/memcpySSE.h:24:23: fatal error: tmmintrin.h: No such file or directory #include ^ compilation terminated. make: *** [Makefile:29: .build/renderers/opengl.o] Error 1 ``` Which are SSSE3 intrinsics unsupported on ARM. This package also likely would not be useful on ARM, as it requires KVM and a compatible KVM guest running the frame relay (usually Windows). --- .../virtualization/looking-glass-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 16be0cc5b6d..e9cee250385 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = https://looking-glass.hostfission.com/; license = licenses.gpl2Plus; maintainers = [ maintainers.pneumaticat ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From 29160973a7971d734a643bb6eba2ab5889c0e04c Mon Sep 17 00:00:00 2001 From: dywedir Date: Fri, 9 Feb 2018 23:59:16 +0200 Subject: [PATCH 709/797] exfat: 1.2.7 -> 1.2.8 --- pkgs/tools/filesystems/exfat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index 831594973e2..47ff22ae20d 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "exfat-${version}"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "relan"; repo = "exfat"; rev = "v${version}"; - sha256 = "1sk4z133djh8sdvx2vvmd8kf4qfly2i3hdar4zpg0s41jpbzdx69"; + sha256 = "0q02g3yvfmxj70h85a69d8s4f6y7jask268vr87j44ya51lzndd9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 6da71d97d4773e98c38fc4da52285a241a01750c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Feb 2018 23:24:30 +0100 Subject: [PATCH 710/797] python3Packages.pyhomematic: 0.1.38 -> 0.1.39 --- .../python-modules/pyhomematic/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 094274cefec..1191b09ec38 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -1,19 +1,19 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub }: buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.38"; + version = "0.1.39"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "15b09ppn5sn3vpnwfb7gygrvn5v65k3zvahkfx2kqpk1xah0mqbf"; + # PyPI tarball does not include tests/ directory + src = fetchFromGitHub { + owner = "danielperna84"; + repo = pname; + rev = version; + sha256 = "1g181x2mrhxcaswr6vi2m7if97wv4rf2g2pny60334sciga8njfz"; }; - # Tests reuire network access - doCheck = false; - meta = with stdenv.lib; { description = "Python 3 Interface to interact with Homematic devices"; homepage = https://github.com/danielperna84/pyhomematic; From 896ea4b731bfd98e95bc3b344b7428089de3a3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2018 22:18:25 +0100 Subject: [PATCH 711/797] qmediathekview: init at 2017-04-16 --- .../video/qmediathekview/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/video/qmediathekview/default.nix diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix new file mode 100644 index 00000000000..9d34ab72f0c --- /dev/null +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "QMediathekView"; + version = "2017-04-16"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "adamreichold"; + repo = pname; + rev = "8c69892b95bf6825bd06a8c594168a98fe7cb2d1"; + sha256 = "1wca1w4iywd3hmiwcqx6fv79p3x5n1cgbw2liw3hs24ch3z54ckm"; + }; + + postPatch = '' + substituteInPlace ${pname}.pro \ + --replace /usr "" + ''; + + buildInputs = [ qtbase qttools xz boost ]; + + nativeBuildInputs = [ qmake pkgconfig ]; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + meta = with stdenv.lib; { + description = "An alternative Qt-based front-end for the database maintained by the MediathekView project"; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3462be10bfe..2d5874e1fd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16781,6 +16781,8 @@ with pkgs; qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; + qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; + qmetro = callPackage ../applications/misc/qmetro { }; qmidinet = callPackage ../applications/audio/qmidinet { }; From 2f0e3327eacb131394ad375499ccc6e4daf43919 Mon Sep 17 00:00:00 2001 From: dywedir Date: Sat, 10 Feb 2018 00:34:42 +0200 Subject: [PATCH 712/797] bcachefs-tools: 2017-08-28 -> 2018-02-08 --- .../tools/filesystems/bcachefs-tools/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index fc4d3f505cd..0a5017de53c 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,29 +1,25 @@ -{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }: +{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium +, keyutils, liburcu, zlib, libaio }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2017-08-28"; + name = "bcachefs-tools-unstable-2018-02-08"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "b1814f2dd0c6b61a12a2ebb67a13d406d126b227"; - sha256 = "05ba1h09rrqj6vjr3q37ybca3nbrmnifmffdyk83622l28fpv350"; + rev = "fc96071b58c28ea492103e7649c0efd5bab50ead"; + sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; - preConfigure = '' - substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.lib.getDev stdenv.cc.libc}/include/dirent.h - ''; - installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; - homepage = http://bcachefs.org/; + homepage = https://bcachefs.org/; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; }; } - From bad837fd3bfbdc7cc70b9cba2185e7ebe8361cb0 Mon Sep 17 00:00:00 2001 From: dywedir Date: Sat, 10 Feb 2018 00:41:04 +0200 Subject: [PATCH 713/797] linux_testing_bcachefs: 4.11.2017.08.23 -> 4.15.2018.02.09 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 9 ++++----- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 69dfed1bd04..5aae37418ce 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,15 +1,15 @@ { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.11.2017.08.23"; - modDirVersion = "4.11.0"; + version = "4.15.2018.02.09"; + modDirVersion = "4.15.0"; extraMeta.branch = "master"; extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ]; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "fb8082a13d49397346a04ce4d3904569b0287738"; - sha256 = "18csg2zb4lnhid27h5w95j3g8np29m8y3zfpfgjl1jr2jks64kid"; + rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4"; + sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib"; }; extraConfig = '' @@ -20,4 +20,3 @@ buildLinux (args // rec { extraMeta.hydraPlatforms = []; } // (args.argsOverride or {})) - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45cf17897bd..8672e2882a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13009,10 +13009,6 @@ with pkgs; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") From 2941217227b56834dfb3f06e43d7ba1b054cedc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 9 Feb 2018 21:59:35 +0000 Subject: [PATCH 714/797] Revert "squashfuse: init at 0.1.101" This reverts commit 17210fee46826873a623ffd6b691da3d897277e3. --- pkgs/tools/filesystems/squashfuse/default.nix | 65 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 67 deletions(-) delete mode 100644 pkgs/tools/filesystems/squashfuse/default.nix diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix deleted file mode 100644 index 75b6deccc83..00000000000 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, fuse, pkgconfig, pcre, - -# Optional Dependencies -lz4 ? null, xz ? null, zlib ? null, lzo ? null, zstd ? null}: - -with stdenv.lib; -let - mkFlag = trueStr: falseStr: cond: name: val: "--" - + (if cond then trueStr else falseStr) - + name - + optionalString (val != null && cond != false) "=${val}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "--without-"; - mkOther = mkFlag "" "" true; - - shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - - optLz4 = shouldUsePkg lz4; - optLzma = shouldUsePkg xz; - optZlib = shouldUsePkg zlib; - optLzo = shouldUsePkg lzo; - optZstd = shouldUsePkg zstd; -in - -stdenv.mkDerivation rec { - - pname = "squashfuse"; - version = "0.1.101"; - name = "${pname}-${version}"; - - meta = { - description = "FUSE filesystem to mount squashfs archives"; - homepage = https://github.com/vasi/squashfuse; - maintainers = [ maintainers.genesis ]; - platforms = platforms.linux; - license = "BSD-2-Clause"; - }; - - # platforms.darwin should be supported : see PLATFORMS file in src. - # we could use a nix fuseProvider, and let the derivation choose the OS - # specific implementation. - - src = fetchurl { - url = "https://github.com/vasi/squashfuse/archive/${version}.tar.gz"; - sha256 = "08d1j1a73dhhypbk0q20qkrz564zpmvkpk3k3s8xw8gd9nvy2xa2"; - }; - - nativeBuildInputs = [ automake autoconf libtool pkgconfig]; - buildInputs = [ optLz4 optLzma optZlib optLzo optZstd fuse ]; - - # We can do it far better i guess, ignoring -with option - # but it should be safer like that. - # TODO: Improve writing nix expression mkWithLib. - configureFlags = [ - (mkWith (optLz4 != null) "lz4=${lz4}/lib" null) - (mkWith (optLzma != null) "xz=${xz}/lib" null) - (mkWith (optZlib != null) "zlib=${zlib}/lib" null) - (mkWith (optLzo != null) "lzo=${lzo}/lib" null) - (mkWith (optZstd != null) "zstd=${zstd}/lib" null) - ]; - - preConfigure = '' - ./autogen.sh - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45cf17897bd..f56831eabf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4710,8 +4710,6 @@ with pkgs; squashfsTools = callPackage ../tools/filesystems/squashfs { }; - squashfuse = callPackage ../tools/filesystems/squashfuse { }; - srcml = callPackage ../applications/version-management/srcml { }; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; From 3be3c2906ed6e8a60f4adbbe8ff18fbbd2797d0c Mon Sep 17 00:00:00 2001 From: SLNOS Date: Thu, 1 Feb 2018 00:00:00 +0000 Subject: [PATCH 715/797] stunnel: fetchurl more securely --- pkgs/tools/networking/stunnel/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index deac3746836..0d328c02d37 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -5,8 +5,10 @@ stdenv.mkDerivation rec { version = "5.44"; src = fetchurl { - url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1692y69wl7j6yjgnrrzclgzb34bxsaxjzl1dfy47vms7pdfk42lr"; + url = "https://www.stunnel.org/downloads/${name}.tar.gz"; + sha256 = "990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299"; + # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", + # not the output of `nix-prefetch-url` }; buildInputs = [ openssl ]; From 40bceae84ed8ee6c660ccec8bb826576b272ee6e Mon Sep 17 00:00:00 2001 From: SLNOS Date: Thu, 1 Feb 2018 00:00:00 +0000 Subject: [PATCH 716/797] curl: fetchurl more securely --- pkgs/tools/networking/curl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 16b22e3f255..dbe2a663935 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { name = "curl-7.58.0"; src = fetchurl { - url = "http://curl.haxx.se/download/${name}.tar.bz2"; + url = "https://curl.haxx.se/download/${name}.tar.bz2"; sha256 = "0cg7klhf1ksnbw5wvwa802qir877zv4y3dj7swz1xh07g3wq3c0w"; }; From eaf55b1946b964dad073381e9e6ec00c27d03f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 10 Feb 2018 02:07:31 +0100 Subject: [PATCH 717/797] eschalot: init at 2018-01-19 (#34773) --- pkgs/tools/security/eschalot/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/security/eschalot/default.nix diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/tools/security/eschalot/default.nix new file mode 100644 index 00000000000..d628a28023a --- /dev/null +++ b/pkgs/tools/security/eschalot/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + pname = "eschalot"; + version = "2018-01-19"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "ReclaimYourPrivacy"; + repo = pname; + rev = "56a967b62631cfd3c7ef68541263dbd54cbbc2c4"; + sha256 = "1iw1jrydasm9dmgpcdimd8dy9n281ys9krvf3fd3dlymkgsj604d"; + }; + + buildInputs = [ openssl ]; + + installPhase = '' + install -D -t $out/bin eschalot worgen + ''; + + meta = with stdenv.lib; { + description = "Tor hidden service name generator"; + homepage = src.meta.homepage; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f56831eabf2..3a2eb7c918b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1103,6 +1103,8 @@ with pkgs; envconsul = callPackage ../tools/system/envconsul { }; + eschalot = callPackage ../tools/security/eschalot { }; + esptool = callPackage ../tools/misc/esptool { }; esptool-ck = callPackage ../tools/misc/esptool-ck { }; From 5c746a0a847d1ba9419094445bb55d6ab405a9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= Date: Wed, 7 Feb 2018 23:18:30 -0800 Subject: [PATCH 718/797] nixos/pam: support for Google Authenticator --- nixos/modules/security/pam.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 3fff9e78aa1..f39f64033ca 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -46,6 +46,18 @@ let ''; }; + googleAuthenticator = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + If set, users with enabled Google Authenticator (created + ~/.google_authenticator) will be required + to provide Google Authenticator token to log in. + ''; + }; + }; + usbAuth = mkOption { default = config.security.pam.usb.enable; type = types.bool; @@ -284,7 +296,12 @@ let # prompts the user for password so we run it once with 'required' at an # earlier point and it will run again with 'sufficient' further down. # We use try_first_pass the second time to avoid prompting password twice - (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet || cfg.enableGnomeKeyring)) '' + (optionalString (cfg.unixAuth && + (config.security.pam.enableEcryptfs + || cfg.pamMount + || cfg.enableKwallet + || cfg.enableGnomeKeyring + || cfg.googleAuthenticator.enable)) '' auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -295,6 +312,8 @@ let " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring ("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")} + ${optionalString cfg.googleAuthenticator.enable + "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} '') + '' ${optionalString cfg.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} From 7d781805cf501391e4237a2a35ee3566fc16f14e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 10 Feb 2018 14:10:29 +0800 Subject: [PATCH 719/797] firefox-beta-bin: 59.0b7 -> 59.0b8 --- .../browsers/firefox-bin/beta_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index b1fc3672369..63de5391e99 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b7"; + version = "59.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ach/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ach/firefox-59.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3e65d2c444354930d29b7dc783cd97c221c7f953ad896e4eb64d641ab5d4a402fff5cfb2cddcbbe90697ad2d3acd44440451d0cb23f9578affc2664216eba874"; + sha512 = "7a5679be37565bd52e2758e6f8bf4068d2a6aa24fc70b89730a904b1be91576422bde7373aec93bca4b8169cd475b22c8404485773abb88f85fac8683b90f8ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/af/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/af/firefox-59.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "d8d5fbd2399bd0d49a588cb3c4d727e7eca5521da15bd0d7730ea08a188d4bef69d23428d856afa454fcbc9242e0515ebeddc14d67ad6587366b263a3d8c7ebd"; + sha512 = "84bcc29fe8c378f55a9aabb308a153eaa9c5a5eff99fdb44e5738f0e71f263e5aa2131d7efa059b630efb14b7a603f0b080a1919f84c0acff0735fac64cafd62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/an/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/an/firefox-59.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "52a52c510b708817e0bf4e920330de88e5bc0f318fdfcf5c159f97f6a0ae86f2c4c0ff91dc40a13f0a0ca90aa1e244d8406a5fc3899fe67f071579b4aed04110"; + sha512 = "47ababf55be74a76d88f95531d3553094566597520ee7e675ce0f49c2d4ab572dcdde26b7e73dfd81fffea95758259f23029849d5e7a420830dd54b03a6ce21e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ar/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ar/firefox-59.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2e8636ba9d87262d499bfc39653d88c9f0aa7cc1dd23741c822b2404a290cdf0830934599b822f903b64b705160349964a8dee558a0ff5ecb478d2954a82bf51"; + sha512 = "c32c3424b22facb570f8f5f79421d8a5e1cbfd1fc7f449996b17cd916314eb77e333c4beb2bb4bf97c47da3724a4a88b65727be6d3a781982840c32c1aba7e38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/as/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/as/firefox-59.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "98e773fcfabb91df80d8840f36aa0846347aa4a7ffce0c0822a60a0cff98bdcbed354ec1a9be595a1f7bb62650c87e9c9d4effafb4f6ed38aa334a6e6b2ed5d0"; + sha512 = "b611ab04d133504f8d63ed3084c479d45897647050b67a8fd073c70da2c0a7e0d2630a4e631172ff7a0facd35b966c3ddbdb289f65c3429bd552ede47be36504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ast/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ast/firefox-59.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f287cce2e529fdfc3226bd2bc8b022b59512f5209bf883a0993c7a342c065e21418bdf1846155d96ecc48f78ac1abf29109a2785d955b66715eaaf0bcafd113e"; + sha512 = "320d330074e3af53a68457844ea965beb4ee01d89ddb56b3d5dfad74e91645e99ec45c35d06a30e778cd2b0706fac0e7e750f9f834e7a0eda4fb8c8f3284aedd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/az/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/az/firefox-59.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "049401d9ac0572ac8a90e915334803a00c301a86dd328cb8724d3361914d98f98ae6dfb8dd1156b4c3c5ca5d59bab7a054b4499edf8c5cc7a74fd1cb31228992"; + sha512 = "f6f6576815b4a41ecb6fb108cb54d5c1b26ac6488af2377adc55f3495a40ac8911c19fe376160243d8d700028433ce80294ff6ac05d8ac36c00199e7732f36e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/be/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/be/firefox-59.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "f20b6aa2fa8cf5b7b9eec16ba89586e27ac383af9a7092b555e56df5d7f582fd5256e9cccc85c3c086c63296937bf76f1c906ea17570b73e0426577984258be4"; + sha512 = "6f23f77ec1f547a95e1c41b075b023d2228c5ad8a144846ce05c637d0a025c5ea590f93ccc824eaa4f751ae751009a00cbc0bb96f570671fbb4d83edb9fd236f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/bg/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/bg/firefox-59.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "5d84f7ea9fd24602afa0895a77542a09f5e4f631141c8881d46c4f8736349f10c4ad0e33c1a0eced92d4c39f7f426ad03b99c626be5ea51a0d773450c4fadc4a"; + sha512 = "db026f8b44d0e43f872d4959d5e59f9f0e8687ae6e8eb719ad9e5d22d4fd752b0d17f4420cdb7bfc366ca8b999611e111adf13e115046c951897cfac88b9201f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/bn-BD/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/bn-BD/firefox-59.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "80a7225cf9627590c4c670022b4e58855220587907ef46490d3ad84cbfbc57ad28e7e58eb6d1504c0fb4be96ae8e6097cd2b429da80965f36193d08b897049a4"; + sha512 = "2858d77032c2ba1ccc121b07f0e19a9bc016f5a547f9156f18a6e4cd21e44c500aef61e99d7231cfec90a9d8bc6a55c2a0fd9b85a274cd778bef85d9f5571185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/bn-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/bn-IN/firefox-59.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "279d04ca1f681db821bdbdb2738d72b7af3a9758ca28740247bd91b9954cbda7266195832a2531dafeef29e8b73f8f76d663480eeebb4cad2b8337cd374eae77"; + sha512 = "47d847b39e17627aef8fa5de993161ab90eacc4caeb144aca108598b5f426301c705d2bceb7e4def44b718434273798f9546a5a7cce857f1e8c49a085a104ca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/br/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/br/firefox-59.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "d67c3ade13bfc56f3faed53cc3c7b0855077285a1ae0b496fde764878eacea7841f4a5abeceb44bfcf8ecde996e702b584b04fefbcfcdfc616e9995fe2877145"; + sha512 = "7a364e793d8f48b72ffeeff38c04fc82fd0f96255e0ca4773799f55536060a44beb41c40e2fc22073b9850426ef2b720f34c178d209d905701a2197c5dd0ec19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/bs/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/bs/firefox-59.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "a18ce7d17baae587d85dcc4a4f61d9ef32a9495599b47bf85d89c18393669afe9e951e35625f00185e3763b02634528fda08be5e0d0c5b7aba9834acb118e40d"; + sha512 = "d41e363242651761d02be942b3f1d5389c5e641d5607e7ef2a627ab91734b1ce34bc6b08116c6979a71890f6953a2599a50988286269a221a70b9d0a9c97984b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ca/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ca/firefox-59.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "685cccbbf74215dbbdabe38fd363539f8e271e5098de54e2b7ee5a6574cda8a5fc769b53c304416fbed1cebb8fe2abb6eb58a524fee090065de86ad7230a99b7"; + sha512 = "4683f22b09a2cefd8531ce550f80d553e5f8daa871f979c69cc3f13c726119c6943909f900250971b0036f384f2b763bdc3a4afcd1926878b0ac4933074083db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/cak/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/cak/firefox-59.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "d5a6090bc511f14c16ecb27a9d4f7e7010a219a9cb31d97ba86a84948a704d3c606addb62c7e512a09d7d3f4cb6864d389448932052d1bd273569ca5ea6922ca"; + sha512 = "8ff49b2d2cf4a28a5e7c0856d7f350442858147a0a2671bb90318c507ae6cd4c505310f110aa7026cdf9ba9a1c7f413528ccfaaba3d732a403997a27a905697e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/cs/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/cs/firefox-59.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "e8694358003a728a1407571c9367367cfe06bba7aedcbc3f85d6becc0a6187c18acbbf42cafac79b1f75f497a3aa71c064e2386bf87a28e2781760d1557e91b7"; + sha512 = "4bef0725cbf85e2e7f9700df01a0b0c92de45d06cbe61dd9f623fcd87f485dc8dabe6a2000250771af17105f4b9530d69d19d2899da6f00fbf13ec98dad10732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/cy/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/cy/firefox-59.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "196315b1ebe44f8d2f30c462768070c4abd09c07760460a8b9d1f615b9ffa8b35174460d3423c5672d3854cd9c19b918d8d3de88699f557c547daf3696de8b26"; + sha512 = "8a3541e9f70aaace1f2b5b6f0d73aab8c6e28130e83abd55ad6ff9ba6687ed44156a43db7fa84d26807d258fbe18f37c49632698837553b9c37f561e88d3c5cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/da/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/da/firefox-59.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "98f50f26ec4491e6a26c42d1419785652d9265a8359b61e8808289683ed3a8571ba03efcd9ee3ead4c5a11bc4797d9da6532ed396984710160165ad568e44ac0"; + sha512 = "de8e0ce9a44082fe43c719ea6c1167b178f5a44b6db8ceddc0e4a1434902f5534fb62554201ae3b72c6d79c1a6de2123ef93b248715eeb93b90ee50f09c24a86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/de/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/de/firefox-59.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "cef7bb0ef85aadfc94b347d9468be7d31e619e3f45d352e4e5a4fb5cee47da875a6414f7e1123d4bf4d890e95f318ddb9345a2523fc198d848107104c7912057"; + sha512 = "b409a74ffd41ceb63c8e0af992f5c002a2dc2261531ad300a6a0b5d2c44b5456a9cfe26707b15f76b9194cc142077f82f14cf7bbdb90546d15687a58136219da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/dsb/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/dsb/firefox-59.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "0f577f81f2e7e2c0e006d9b2bae14a16f0f39f40fd31cbc20e0ad2ea114bd1c9f77e657805804a8b6268d79becb2a5985f01a2ab4ab1acd900e99bb1a2f0c8d2"; + sha512 = "ad1bce56157ada39bece9eb4e8e1f554403dcdf75f97161ea7d90779e15857f07a5874df2d0a94de83c482c0a0442500b3943e3b7723f77bf093cdc188d40099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/el/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/el/firefox-59.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "66bbd80dd17a4dd4997b5069ac8f647c73e008e9f9dc77d7d96a45a98b25c27a5b94006d47cdf7533bbbb8643be459b03a97bf358dbd09de704a62d1e7eb31ff"; + sha512 = "bd17f4605999760e8eaf57447bffa572839a7591e2ffa865cdbb85098b7c39019e068ee23b132f03d1238a51e631a1e5e8144835018c4920e1df0fc521f35140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/en-GB/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/en-GB/firefox-59.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "12004229b82b6da02e3aca50091dceba699a0b18951832396143ec2363094d49172e9e7b69ff93e39fc6139f4a07f92ae54a97dd2a40efd09d95c884fb987c6c"; + sha512 = "e4f4a7e9b57286ab268c00794f554297e7b67f19e78f0886e7981ba6834e89e8b337f904d4e2727bda6c6a7b7a1d20b494ffc29caf3e8d5ee2aa909942432981"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/en-US/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/en-US/firefox-59.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "46adc60ef2d377275df83fbaf84d2f0ceff4309546e233b35784f0e4f0c3f12a34cf63c58515b97ead5b77528598a760773650232273c91bd370dff1dacc4b9f"; + sha512 = "2a9d56be247596357a1e395c40f0c8eb0110f8ad57cf956a1fa14a7b82fa6f0ad5b6f3e7c87b67015fb10a817a93175a35e7a50dad2ad65094f19755f9e887fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/en-ZA/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/en-ZA/firefox-59.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "a2b3b7474164cad6b67af21b0a3a4d2c3ee7d43e5fc7dd2955839ab2da05e04d2b8f317a0fa51905dfb2fe44b83c79f0f3b3dc40bc3d611811d5fde1f981ae5a"; + sha512 = "2421e480966ceb46f2b271ead15f7e9c1ab817170835ad6195d725ec8bbc97a996b6e591de4071e9f3a1870e012f464703a715f6cc55a89e4258a0d0e48c6878"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/eo/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/eo/firefox-59.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "40b648e0634c26877573cb20c1647e1f21ce443ce661f60cdefb649eb63118d9e3985ab4e990d4c21c16ee2a411f72081ab2ba72a5fc7d946370f087a78cc226"; + sha512 = "f391d03c23dc95e39415631b8cda76e9a0273ab3c363ac82bd5729aabbb9dff1533385e6bbc0396ff96e91f481364bafae2af9b4850b589c63e3870208a7edc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/es-AR/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/es-AR/firefox-59.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0d4ffba6fd279195242ec7a8763afaffbdaf3e8067ddb15f8ab4f364d667fa5d75e7ece71ff463c654983a22b252e326860d128a35307c0e083e4b87ee110cc5"; + sha512 = "485744d2bc192e35e5020cfa81d462af9ed4ebae8b5f9f863bd041b3c161ee0bb499f483629b9af28c81db9893abf16201bb5b37bd17aa385da3f278e45950d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/es-CL/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/es-CL/firefox-59.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b68c59a82ac1baf51101f852e88ab05bf5c4e12f287599e42a4b4651478db98855bc0c91c4f8b883b808054849fec7d1dceb51307bc586b0406f821783fc2865"; + sha512 = "769dc0e88f9e1589bc05167eca358cc7385695017cbe2cd184056b76d25d92ffe93cf031bfa35434306d41acbd4f7876fb3eebbc4684b371108cecc9ece254c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/es-ES/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/es-ES/firefox-59.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "1860e94c2fd22d4e8ee3e7f0cda996beab77bac7ae71c979fa09b76ecd82ac881793aa487b5c8c9689842d6ba5a483969dc53bcb786fe2785908aadf99611037"; + sha512 = "7d6f80386b2bfbd6107b2ba3be2dc8726d8d6861c2c0e1b2257389b326b31fc68de762f4ab48689c6320627ba853ccd9dd8861ab72e8b8f2869ca6aa503e6983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/es-MX/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/es-MX/firefox-59.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "8f3142a498c86ebe1ed87dfc9ed639a752f74cb2a2dbfcd7321926b6361de7d5323c6fd6da2753970711e0a5b3b3856ee833b5e5d1cc43b6f44fbe7bd7c4f999"; + sha512 = "e340785fb6d63522a612a0f7b1b21265bf612853e38a96103c88ac4f50770b7aeffbb5b946c2e604af8aed837be92acc83e2adbe15b2734eff4c3bd68834c6e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/et/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/et/firefox-59.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "5214ae6b0903b7471d3fcd0c7dc7912048f227a0ae41fcaf642fa967b8a2bc9363eddba3901bad6214a846c4d4fb754c120db8c439d82687f1822f5375fbefa1"; + sha512 = "f7c549f58c036bd19ad286517b0d77188c84c5308c5b55553a1e37e3b437e39bb95e58428ebe9e47e4239dcbbf4be63204cab94d11175c5e11d04616fb5411a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/eu/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/eu/firefox-59.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f3ce78c131f3bc6ac970e85c2b609a5c23d623b7698437714d58c9156410dd78ed0fc80387360f53079247d7344ad0edbdfd2ce2e0bed1646ec10a5dd4f1ff41"; + sha512 = "ed62617a487ad37f1338fc339b35fe603dbdb041cbe3cdb846266587c06ea1b1c3b1a8d46647b9d7d5d61f694942e0f151b8e7dd54cc59f3955065abf1b204bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/fa/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/fa/firefox-59.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "16bc896ab4f79cbb2ecb58fe316b8e7c14eb88845818171a29f17bcac3858c4a9d81d240b20cbc0a4ecb086f40b9d391f840880fd886ef00bb6a67f9734b3cc4"; + sha512 = "d1efa424618df3357b132a70fea5a382566dfb0400053c0377ad3f847e3d17c59d4bed9c44b0762c2efb10211f11d921efcb3c80495d85e8651af67c14c4c57f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ff/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ff/firefox-59.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "daf3afebeac97a8856954821f9641a1beb603e72a744f19cb0aee1002f7a111082f8acf42ba8dd6838638542b74673799add7e968c56225e8f427cba2ee23b79"; + sha512 = "ab0d89d1924ee0cca13a6d47113e6fe70e6fc89c4524f464ecaf809071b019e2c39bd459179d851d91e341361a963c6d108194b33fa9b507ea3443ea506fdb91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/fi/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/fi/firefox-59.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e54ec25a8940bcee63cff4aee8a1997090283aeecf187050f7ceadd12003e39af7e88c66b971d1ee74ba047f07b08cccfc99758134418b6d1279d1fa857d33fa"; + sha512 = "24ac3b3603d9c72127b4dd4c1b217a58f4c80d89b5a035dd44b47a49c93b03ecb64e561c25fa14e9b6062b72e8b8e2ed6f912ac13fbf98c1cf20e4ccecc8dd90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/fr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/fr/firefox-59.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b7111be3579ea977130e16754537f9cea9e0fd3367f012d1f07dad4eac9d3e3e2824ec62a6aebead60ee93808381305e8b018b1ea619e45cb40bc58e46088574"; + sha512 = "66f6554775d37257fbd0c53a03cc8c026343b60cfa5b30ab52ea86474ee3092a9ae1e072a63b8540c703ae1639ea9eaecc0160f20f0d479532afd873828beac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/fy-NL/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/fy-NL/firefox-59.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "8a9119f30ffa587f19f9090a230623c0023215b321ef446789abe12f62939580445dffbedb55e9f0056c9a28529f77c0209a8190ba26a4a052a372dd8e26d925"; + sha512 = "46e196145686f562b78af07ac7841f873ccbb1bde655faa105edcf37edb5a79583e4f76c083b6e84988b877f383191fdef46344e50c02d400d8b8a76bfea6f07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ga-IE/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ga-IE/firefox-59.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d91a3b6059a599af0ffafdb42750e09d180494c8014a8d21096c732cc8a0130c742f3a81f455aaa1cdb7e523fb05e6c15903a80ada19734005aebbce8f9a46b0"; + sha512 = "32958f4ac49a0959f84d78074bd4273502ebfef0ba387e45c326708346ff2b684d1087f9733912ddba51a2bd6f8ad2d9b9bc0f4fd2dad86cddb19d2651de46ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/gd/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/gd/firefox-59.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "600a4192e86441011126eee380c471962d8e1835e66284ecb297ca7aecffc85606de887f0c5c9b29fa65847b79c3cf97e9334db7a7a176b5325591651f3bfcc2"; + sha512 = "09aaaa2838283d99b6d7bebc8f3082b600a40c1550acf3afe8fb35b3241d26205cd38ab5ec74906a9c5f486eb8313292e45c5c2cf419fc99c2d4a8c07016a57b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/gl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/gl/firefox-59.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "bbcd942f72ac78835d5ab063d5714008a2dc3476257fb39fe3dbb52ec0e865806a3da19cd54bd5fa02dd96b5cee6d4535f156d74db81b398c0dd9691293ed624"; + sha512 = "e86690748cc89097e71344981e27c1ebe52b4915961befba70127ba4236647d9e812fba6f34a138133c3638e9b21c066e0bd8ae7fba29293a7727567b2c57988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/gn/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/gn/firefox-59.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "da51bdcfda6521ae2c78364a9149064391d2c3538fdbee6420b3741526b56e5efb19faf9c0803be6739f82b59352e82531993b77d7f669ddb5a1fd3303e3f4b3"; + sha512 = "5bfd6c720ab56d583ef909ed79676ca4137be47ab65fe418a629367b190823dc98870844ab78b1b30370436abe666d18eaf22c9794e1bf3e5c7c61b474d6813c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/gu-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/gu-IN/firefox-59.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ae9f123c7360a3e40dc44a10f02e271606bc81948a80a758416c389691bee29e95c4309cc6c405b39ce2035b662c14057cd59411a6e0b3e7a704c4d3073f5ef6"; + sha512 = "743b8cab80b21829c8200fd11318a0fbb2a0384c17f962c1e5f2113fad5afa4d92df1d566f5fb34e6c7856dd4eac9e90a8e45c1e138bf307d12db0603371f50d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/he/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/he/firefox-59.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "e80ba21f7f49e4bd301d0d1126aa8ff001fde7de9d9ed062fabc2b0acdc3a03026664b3326d824cdca04ef175883e68ae7ffea51ce0bf901a8e4a62a7b66e491"; + sha512 = "644fa8ebec00b73e6bac18564a6b4d2548cba910a4117a55d4262f539859904876f7917c1f7150a20eb279aa9a00e050d233cd638f7d5201b035bbe017f1528a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hi-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/hi-IN/firefox-59.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "3106758a39991a5aaaede77c0096f5a075cf01168991f13511dc76ac51c8f2482c35db60c9c09f957816fef7ee05128900ef33c22f4d2f02d0a0ef9976cba79b"; + sha512 = "d470007681136d69f5183db099bfdaeceac426d7d52664622263cb6695a8ddaeb522b79ac66874036cebb2979dff85978fe1dfbeb00871120bd492334662a3dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/hr/firefox-59.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "ba38912a2a52edd6e0e593efaffb2814a1ae1172f4b9a218e23e2813a63fc19357e0f25cf1a95433ca2bcd62c66bf7e586f9ae0c0148469100061484ce1e3385"; + sha512 = "f246b46f4b74598ef026ba756f1e910f70611ff9926ab51e71d3b9d5fd9c32b05e3d4bcb00bf6bcf3efee5fbd6f974c1b96542faae4cd2bbe897941ea197d3fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hsb/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/hsb/firefox-59.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "9a6b5f20273c15ef9a6b4b6bae8937275fd60fc07f1a0cfa84645250d4164dc463c5856d0cf89d1a8185a855043e858c159dd125cbbfaeea7dd4dc23342ede4a"; + sha512 = "418799fc9328eee34506c970d237119af7dee1ebf63cf50da8533cad7f9127bc209c70ea36c8dcdfca21191342dcaee997dea29921bfb5fc75ce5b5b9caa6d8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hu/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/hu/firefox-59.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3e4f112cdb3bb0c001decac6d6d962ca889619397cfc29bb669cf3ade9b0bd027eb32ac9f403e993662e11af2753f892de5b6c92f621d848bc6c7313ffb2dc9f"; + sha512 = "79da43b79f016ba04b7a3d7192fbb2c3b5230d68c316ef0674609f63bb94532b680a404cda57509c0b0d6c4c318b3d2a67a49f45198126549c3d8714ddb8448f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/hy-AM/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/hy-AM/firefox-59.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "754504af24990c27ac58c2ee7c2ee7fddaf993f27c51a90d3e670a07d9f56b374c5ec714cd58e9ffe85a27a927d7c7f0e56cdfdac0b2b9b3addddf02f576a97f"; + sha512 = "db92e6638603ddc2d9a142350ce9442cd77fcc289150cd02b5b7d21774380f5b56ff3b40c1c4432cf1a3c696442265caeff0a846f2a351e4b4bb16289a8e1558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ia/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ia/firefox-59.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "01f45a179832050cc58b604d7aaa7e4dbdd2070cd7114d05451ac92a065770b8b330729a0eba67e631fc3fe0a80c5b5b531f7c7cce6a1baba9ccec4b942439dd"; + sha512 = "ab0b76e444481e61e979804b4e7dcc921ff431937bbd2020135d2de9bcf8a48cf0a02aef612f25c68feca8c8179b6563ad3ac0885a378fa38f9901039f852474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/id/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/id/firefox-59.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "68dd5621de1108b0467bcd4757311e110f3ef6033b1a80e115a5f6557b9fc7e2bea54369eb435c64169d0c5ab565f70862bb058cbfafd300522172053286f483"; + sha512 = "a10d95b9d84cc11d700124398db9bd8cf4c43187a6abfa18386b98e4e4aa36e13a1ed970b888c1f64fb9d7824722c4f91b4550a7e9c2e18d71611a4db76aab40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/is/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/is/firefox-59.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f084fdabded21fef8d540ffd8ed601e1cc1ea635ece52e84aa9a98dee4e598792d17f6556be1425694e6e0e22a1fcbae8f8eb3ce35289b7bdb13a53498fd0d77"; + sha512 = "f04533d77d87d9a72d8b5653ba21bf369a6053d433d11d96a7a5a178c52efd925623c4c674bb948cc4ab1e9fc9cacbf0deb1b02df541a9fafb6f882f4c4cbf8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/it/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/it/firefox-59.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2e9804302e6693fdd00bdc90b0f86990ee6ef9e4a22b5c9dd00b06421cbd7acb858cf1f0bd3a5ce2804908ede5007dce5932bcbff8e4680c9aa73fae32a04ec5"; + sha512 = "6da026b76ae0a11f2a5f07b5f11519735d80d833f65ac1dfb2b89d4a98584553d271daa4ca430495dd5c218cf969f94f7166b99bcf0e706bc8ad5fe74adda157"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ja/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ja/firefox-59.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0d1aa8fcc51517b39047cc75cd8a31ce92a76bb2b55b5e45f84309bc8d4a98c77a9ffe8f6c0373683dcf158a5d3105cf0022b57c653f651f1670144e9e24a3f6"; + sha512 = "39916deed05acd7f379f7ed92e6e654e0bc2e2f6916e23ad22a042d4444015ddbc8ae0aadb92f7bd054024005d5a7a57eb37ff9e155c1b17d533b8234f16d919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ka/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ka/firefox-59.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "24dfe34f7cefc72cb203964b3ba9bdae478a00ae2dd6f3b696d2ba9068f97a1a572f0ca3758e103c1d7db091d3bbcd1394d761725f7826aa5c54b0e6fa764f57"; + sha512 = "aec118afeb98eeb3e973d55f10309a9caeecff81b0b0fe8af515a573c01a82f98b3b22b76fd6495cb4456fe9a1d0e8c3f78d254b1019a4acf707081bdd94c277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/kab/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/kab/firefox-59.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d4a29601d95ae248b0bf8600e3b41a6556d1545bfbbdda6c6a7a121d62133000464e91da7b093f6d3363f3e605d867201afd98abc1bd8923ae09384a8d9a8c3f"; + sha512 = "78cce423d7cfc6c6e268bab1bc21ed5afd97fb7289a5e1e66769e002789fceb65925161a3374651a8fee51aca263356395338d4d001e34592bdbb51a48c61e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/kk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/kk/firefox-59.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7e88143c60f7ebfcace8755f4256531e3c8d4e2938a73f1c87e3f0b1a2abc66bee6afc0371b7e2ecb4886edd99076fe75f02603a6e66399f1ba2d0d8ddbdc6c7"; + sha512 = "d10b0a2af08fbdbaad2cdbacd1bc09a990d1b4ddf8923b4fe6bb9d386a918132e5ab427027f97cd8df0892ac474e669c7f67fdd07a0d1c6e24978f8ceacd5670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/km/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/km/firefox-59.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "eb99cbe22484b5d22dce43fb94c3007f405d33c63bce26a6cdff6007b2d766460a8eb1efb1e7f361fc8c5790eeec043f33d906bdcbb97aaab5adf77ec02312ee"; + sha512 = "4eb0b1ff636b6d177d8adc06b3452a460115c78399c1f1f41cbca1f728f492881765876e0fc429ffd5232d996d9d2dfb08c3465fe541a4ea52b0540e7f7b1131"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/kn/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/kn/firefox-59.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c0ec9419d38ccfb454c3110337983eca1e1880879d2931a8b5f3e8afa5db8971ed9aee749e3f39aafba93fb8e3a00315e04c3195768c79612e28d3ce761db897"; + sha512 = "a4f93038db440f03034398f8a95fbf9f329622a0c6efba0b3a0621e7eb03d223aed352ba4c29584ae5335e60b4138360f3a53f326224372777355d1feee93e8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ko/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ko/firefox-59.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "216d95c9c072899a8068da5380a0392ea8d4177e8b10650513e40dd321cf3cf7fc4c610128e0ba4a3b1d1c5827518dd12215a659563c8795d42fa72a49ea50c6"; + sha512 = "5229674900d3a2c68a6d43adade5c8bec81f6570d0d068d1ca8b9afa02db5e743271b3da0f32a90ed513adefaf1179b9bf5747160542bfbc393191db2160129c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/lij/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/lij/firefox-59.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c241539eff21d2254b1d814872c3a286a66bccaee816dd1349304b3cce5283c9f7632734dcecd6d244a16ecb85ada87f17d87e8e29730f7be87c93feed20c16d"; + sha512 = "e1334ca736e90dcb27e4e61de29ea97b06c9281e249fd0760a913abe4b8d9251258e6c759c8865418dd83b373451cd9d63c48f6edee636bbbfda926bf04f033a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/lt/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/lt/firefox-59.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a6d62935ab22d643e9fb9fc1efa483adf4dd712e7d1f03fbd9f671fd36855be40a3d0174f74de5a9f04cf1759b7575b7c4fb7e51c102c354bf03acca4b232e59"; + sha512 = "7aa3c280fbf1f2464e1cc93d8e4d90bcc734f481159d587ff6d852885e1ada4a9e4bd9a3d40bc21de49d1c25f98d8e0d831377b57f87e69857a6a3ba8d2619de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/lv/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/lv/firefox-59.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "4142142354d50628a37205c7d574ef4f658631812443ae80f1bfb5d91bad06c9d19a4abf623f275618dcd8b2a480e66e996eb64a0355eb41464b52354d7c52bd"; + sha512 = "156a644f32e1a9fbcba08dd0f9578a491ce3116d1cf7b5000afa0e806ba4ef117d4c510a6e1778cc59eac1a78c43762ec2acd8133d9e32dc45a500f62e8112c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/mai/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/mai/firefox-59.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "be10c9342e80e790f784c587d01b487f2cd46c6c42c1b47f7beb4530e334b7c049fa9b47fb90096f8b09516c2187b94b9235c29e9c3cd7bebd2ee5227584f499"; + sha512 = "41f2e24c583108609810ef3d71865bae844f2b91ea065c77303e85e33957f3e5159dd1bce7365964fa0025762255b86252b967070fa76929405efc7420af3dc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/mk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/mk/firefox-59.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "5abece65b4d84b0598e15f07d733225b6df44b26e33f423385ebd29913085ca3d55ffea434996f225c851a52f5b2578798b041d7b54e75c47b3359bac0649e9f"; + sha512 = "481dd8089ef122e439ea85334b6f7e12f90267a24aadbe47cd881fee7b09a6baa3642698690384385f809d9f4296c842d3fbefe4318e685948d283692856757b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ml/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ml/firefox-59.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "68681a27512d1b3a74401ca6e20764d445ba7c5e5f0185bb85eca2b41d02af646cc588d0b26ba74f5498b57f7cd7a340d8367d231b3322da6a396f17ec8eb1ca"; + sha512 = "8ef67ebc596cb792743b9def3c345a8ff7480a68a626ac1fa7132db31f4840c3546f69f9c5a7da72244f91e5f9de69001b88a59563c95651f3b80961a7355495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/mr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/mr/firefox-59.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "2faebaa271ec1f8e8c20a8f4435600e85e05fce3fbd84a71c8344418a38cf86e5dba7044ab0b63b258c0eea941acc853c56450794ce55924f351488561a1a950"; + sha512 = "f3047434026557bb352f9722fc4f38b406308cdb93994a273c0258bffa2ae3c6ff3cd4871569caa5dd71b12b5c579d1ebb67d82e795ad148b1b8534676ef68b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ms/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ms/firefox-59.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "404dbe7b486451f829a0de61b4c3c952e56d5e5697b00a1a1e8df490f9687c196f49a8f82313fbcdc37d3216f46186bd3f53e025a73b26bf91236cb5ff66e57f"; + sha512 = "5199c8f96e20243307e48b44fc0fe2e8a31fdf2d373bc4fedc8966f2fa66e24571d3846257886246bfd24bf2091425cb77212152629566fa15268ecf61211590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/my/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/my/firefox-59.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "e0d692cfaed0048c084db7d067d2955759722897dcc0cf8da817b48ff814c8872993f302303604a010f000d66cc96d1fd74a103fe4534bec719d61e88031b2bd"; + sha512 = "f8c2ba413be712a1b63d5aaedc7076286c760598f5801c6ecc699a065e4d1bdb8bee88303cc80a6b852854d4a554e13eda5cb4feafd7fecd35aead17c7897266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/nb-NO/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/nb-NO/firefox-59.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d28ac3a815508ea0f26caca4ab3df89d4049d0351dc6a4882b5894c1d1d7b511d83f93696047ad1c71009df7b8c84a7b7ea08ea2932e287a39d06c3e42f7803f"; + sha512 = "9819f2aba48618b433e953dba16df1635de581ca534f6f3dda2293ac92f1a0b49cd3b4a6f062c89f65ffd642b4e93aad236bef15013fb9ef5847f589a9b7f673"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ne-NP/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ne-NP/firefox-59.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "0085cbeb3e8d9251c54eef886a96a22ce050e47657680b8cbf9c2c214652b62b8630acd86252a3159b7753c994cf8f8703c4aa70a68fc07122365f4d8dd9b969"; + sha512 = "8e8d22459e75ef90d5a77ccb4b4d50206a6db84881021e7ca17a6c04967e08bd7702eb7a99c11a7744190ec3892cc5a68e2199ded177825bd1e9c673e8d3a9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/nl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/nl/firefox-59.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "61001591ae3fc54a9c63d9489c71708ef6cf6c8bb7ba317413fb35cdc89a49185f352d155c4e8dae7166352a5a1f7ac01114e0c754b9cb8bb062d01e7fb95bbe"; + sha512 = "8129da9c224a976827180f7b7edb1236229005ad071724570a56b24a6de52bfe7179ec0e2b85453a1cde939564f5e07162fa8d249db0817de35adee826550b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/nn-NO/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/nn-NO/firefox-59.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "10fc0a716314217c083b637a90e19c120fdde47ed6938b0297bae90e1c416bcd65ecc3c370d828b032317e1796f627899bb1f03a3ca0d91cd0ec8a71c7ccf2a2"; + sha512 = "fd6750ae992f9345eb4818ab9ef76ac205372ad6be5e4fccdddd0072c0134250583db1e98093287ecf26f25ccb87fc07683bd82445a521ba8566cef7a60b1ced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/or/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/or/firefox-59.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "7ba403c5d4d1ca6e36fab9334dbbc13762c78268ce2b18887c09cd77f45bd3693a66e0479be8db0739001a79001a610d5c2b406ea1fdd006488303238253ad95"; + sha512 = "26e919e0aa33bc2bcb51bd49690d1dadf9dc33dc35727d9aac90467a8e7694b2c244ad046aaf803a2a756091aad72a57c3e0c54175964fd4809f144c63b8735f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/pa-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/pa-IN/firefox-59.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "b2174880a46140b39da9088b64d007920d9217d4f56af6a9ec1ab8993435ff947370774451e4eb66347e1f2f1d52c1fb517e625e640637bd2bb6dac177ec04cf"; + sha512 = "4cab7857eaed38323dc71359735564a47851f063e81291419e52467322e5726438a44fdec972f799528f1e0fab749772c1519d7af0e834540992fcdf3569b044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/pl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/pl/firefox-59.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e3091eea6dddfcab2348617ef8f2cf79bb5d1dc91a5e62f55fe52d0563b6de0311f212ac2bda1805de1a8f5378557a022f54015e8a93a67054377f6152cad29b"; + sha512 = "f95b8d5e79c3b618cf4c8f9d4e2f0e3fcca8d3915de8070d626b8785c35be52d832081ec9521baf6b2034633cab11d97ea205e62ddf00f8cfd242ef282a2c54a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/pt-BR/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/pt-BR/firefox-59.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3e284e7a6d4c344c4b17b5035120a6c2188ceb6a61a207e26c0135a51c40ea3b6ddc848ef89267ae42e22cf9f53f9fab09401a50525832b9da73f7844ea9e6d4"; + sha512 = "12c2a2dac0faab5bc1f475fc3f098c7cbe3cd791112f22e797153958771d2124eaa476e5d9427e196e59d5cb9a8c23ae16937fc15b9ea6786f9226fd47000879"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/pt-PT/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/pt-PT/firefox-59.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "1cd7d9330ebddce696c33f0f3cac40ebf46bd427291b8ba54c6cc5b671e33739b79dd88a48981018adb67307663fcccbb88d389d3ad582f7da90aa31840b5f3f"; + sha512 = "e3867564a068a260a87fd4db0086407128ab82e79a6a9dccc498098a942c1ef6beed1886be2b65e38106e1715a8801d6f16bc712e083d0f63cb8fcd558f79688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/rm/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/rm/firefox-59.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "88c34a7c643585e3ec2a8d962b496280b292226276c1d40bf7ca45ff3a4e4cc8a1a1616d111aea8be1a1c3d5953a5f68fdc1e2d2d4453b1b53b9f4a629aab260"; + sha512 = "53f8d98bb0aeba2bc2a2e2b5e9e3f40a0d9ffbeb350d530afc8ac72dd0f58dcba1c0e3097322954c7990c2cd81cb9c6794eeca85d4f39802aff7874d8597fb31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ro/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ro/firefox-59.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "f4deca05c0ddc05e45e70011ef7498879ec628c904c5aea015b12e6c1de2682d4c8bb482225a156e69de00fa114b55f26f4ad3eebb42cf9bf5b7f86ce7a65880"; + sha512 = "a36e9f3cbb6a8b7f3f19ac8f08ca0148d028579aea7e9012cc412621db2e0a4532617daf98f0f4df09cb362ab69e01aa68d747eb71eecf67dddb5543e94fd53a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ru/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ru/firefox-59.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "f183ed0fd79da72b197a0cdea80127d26508accf5b95e3ebba993a4a23a48e94e88c28360f87ec66703c18539883a190a36662f46a93fbd34dd148f82ccd1d58"; + sha512 = "626fb189b0c9483e1cf2c3a62dda08080ebe4c28f0244181d29629883d1a422c6f5c677331b4d6918edba5e9971dfd398dae8dba16470de8da583d3c8af39859"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/si/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/si/firefox-59.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a1420ab2d3fd8c9b60021c0f5393421b48032edcc8d9afc7c668c6f28751ff1027506fc1b03595f8e4365255828b43ecb97181e94df06c5e44a2ae8f7e7004f5"; + sha512 = "81ef8fd0a03aaa9bc3c8ad12474068e876cc5ec1cf1699918e9a158dda16097a17f80a57976fb25f16a9f8e438d06b432cf1f24c72f6ccd97894f2c6f89a14bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/sk/firefox-59.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "25da744b5010fea325db824a64ab0da1fe05a7db22530d86f0451d7b9bc675a6797689cd6e08ad1aa64687f3551e87a688d83a080eac206f45461e235a3dfe81"; + sha512 = "d174e431f1f8c33561bcdce1907df4daa08c82fd960f4c7d5dbbb7c598257a5475129fdb7ef7fe9a0865f1f34736fa1ac3c3f688443d8f15ca4af9d106bbf9cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/sl/firefox-59.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6c0a8fa5b16c8e3245418ba97b253e2728483158b9ec52a3a13f490b0fb672c5827f17c8aedde921f28ef49f89a3da08a0c0993b96e7f76c85b07139464a53f8"; + sha512 = "10ee73bea46c0e4b042ee3620acb7a3310d75d1807b3ece2e0d917181a925082293d62efd9b6e9311b54413a3673e011bd708f1557c2999ca1a258e3e45c9a50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/son/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/son/firefox-59.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "8b9c9a098dee9c3f06178c7098031f9c8edd9842ea18f693f4c6b967244465280e50753f3d3cfcab747bc9b268a31b8454b9daf2270defce2dc79507c440a79e"; + sha512 = "2100bad6b0fa387f7d50fde738e239a883191be0015d139ac93b10f00b1c646dd1ca1d0dbf2a8cd36a15f4b3a7aeeeebe7d925201da69a7a8d4261483bc581f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sq/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/sq/firefox-59.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3fc18a556f335e596c0bbc59b45f9bdedd0a3561ef6b79cbbb60b94d19e5afaebfd54427f89bb7f01c25414bcfa673d6fe3ec22b106c3f7b490176534e336694"; + sha512 = "7a2937382cd2e33ba7bc398b7fc2428adbf8f8b41c6c60f1f0cc44d8590dc67ae0b8512f2bbc2cab3e9e09ad466e65d39debecc100d83ee87cdfffe57b2026d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/sr/firefox-59.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "416374a53023bf6cfc08bf917251a594e16885f0059ee0c5eaef79fdd54aa194991de4c5a113fc472cf0488c50b758df73a02d922d8dbc2a9a89408964109c6a"; + sha512 = "3519a2630de8828cc66314b3f1a5b8253262d27a68098d0bef8a3b4bc5aff1b8035cb29c2d64e3fa9470295d9ad32cecf5a6c5e17434a03becacbfdd3fdb7dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/sv-SE/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/sv-SE/firefox-59.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "cbc001b118f6daee089f6b42bf19be812ca222ba5719108e1f5950dcb2af2d3bb8a62a202f4e8590acf882e83a303e880a99cd62e4c1eaaf9a70a250febb4cee"; + sha512 = "a2fc7e664d7b56d5d7b79be9d79d1a782c00708778ee1654e59d31c1b2cbe53bd1eacb20f3264ec592aee13689aab611a3217b3994cc37a590f3c4f2df539092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ta/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ta/firefox-59.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f35901d6e4bad37bee03e681c3389ead5a8b73b07b5c64ec0b82032f48bf982bb7219a0c2d4d9c946ec269007e225f9faca4184cc108e20ebaa09b85fac744fd"; + sha512 = "09f4bdf20c9610838896d7626e51f9f2f940deb07e08d483c63aa7c1fb0ff10e9a54b160334edf4d60a92136db5eae109d237329fac1aac1602f715e92dae5e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/te/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/te/firefox-59.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "377f22055a2d03dc4d95eff9db7bc89b9ac3808b4d8272c7cf7f6a1abea809b55239e558d55c7e212bde10adf93f63011fd0824658a8369e304c96a9579a0a73"; + sha512 = "a0899a1618e9d6e53fbf1816d7860d1b1e415628e8e3c9a5303f70a974fcf7169b54c1e50f297bd3444527598d3e9cc936349ab0a7462252d7e542fd4c7f1612"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/th/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/th/firefox-59.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "bdaf8277120e197e9a1d7fbc9684b32e756e42ffd43b20d6a470e20a501bc106eecb4e871fd9b64fffb4e1564ce22c3bc1e436f0cb4dbef62e3fc2b0df0fb679"; + sha512 = "38ec92b8462d92587eed1e947c35b40349d2dcbe67cf1ba2a125cd72f1bb1bac1084d2944229648348cfb305667bd3c7cd48ac90c2706f897eab72bc7756ead6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/tr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/tr/firefox-59.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c601b1a4567f6024c4c5610c1db1706cfea08f81dfce65eb08ad662f863279a2f2a728dcc49848384f8aff3f450f2c0a6b1293de0555973e4db5b7e25b8e0faa"; + sha512 = "4a32a49a037d5f9aa51a856547f484cc93b80a6b1ec78dfc3cf21d47fa6d6f508bffac58306a30c67d160244391a1c63b763b12f4e2b67cf020c2d93c2f64680"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/uk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/uk/firefox-59.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d5dc30d0bf86fe0240598746dae09448dea668723648a2ff2872b7ac9c0ab88f644dd0ef0a5e7d89614a8d95d634ddfd9b1b47c10dd65a5507fca0297373371e"; + sha512 = "b1b6030725cb6f9a4be4ad5c8633b939f9b3181470b402a213bfcb92ce88e22951f335b9b38d517b0c176b939b641bb29b9cae422cf99b198bebbebf08a2a270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/ur/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/ur/firefox-59.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "d162ac867611a8338ecf33e030e72fdf2cc59bfdd0a19288e1f32319687f82f838579ee03c36cddf2e1fa60b919daba38e767b991479a34fb716048b65b74f0d"; + sha512 = "71266b7c66e41c8e0fa3ef570dc5b6da803bdb2518d01799b3ce5a89c76101b086f990691cee02c68cccbae94c53064e0368ba8888ba31ce3ec0c588e98125c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/uz/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/uz/firefox-59.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "36d8e51f05af66a44e9026a8a622f0b889522bd4e8f9b24fc1736cafbe23e0d0c49bf6aa0d95e80ff14386863574fbd452773077c1b907a9f781bc99e2ad2125"; + sha512 = "bdb611c69d7ea6fa78f5dbe5e42ccc466cf84ba0f64305b4b6723ec29c959920605e1602ef8bbdc2f36153819920286aaa7e463c614485c7226fd3b1193cba27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/vi/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/vi/firefox-59.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "13facc99f73c27a806d5a0cbd91aa382a5fc5571596072bec53d0620c8fb8567f9ff47326f2a1522a6adfac97508bbd5a26ef45e83904a03c9c15010d258d564"; + sha512 = "543e7a078d5d17f13d014e21ac9e849453015031819b6ba1fc0154afdc314ed5d1d98aad6b8fe2c2b332891dac2192d5d540511af940d4fab8a0f6f89488ed5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/xh/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/xh/firefox-59.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "70e2c375339fcc0f1fd5b22a57d2db4b616a15a21a18b1e0eb6552991c7c5278d5b02dde0b46df416f9ac8cd1695e3b4ece356ea904b2b0e24263ba6069cdfff"; + sha512 = "6ae353a3941f1143c8850bc5f547b9ba77cf4389c8886b819da3a69ddef89c66ac65b1872d6b9ee421a6b3dc8ce5daf4fba6c1c9c70bc6854f570592dc08143e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/zh-CN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/zh-CN/firefox-59.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "19c13d5be892d236f9ed84a1bc98cd917da65f71f9b5f84326035fe89372749ef904591ebc94cbf1e682d339a47f7bf517803e82fe5fb9eee2ce5287d3c8193a"; + sha512 = "3b9da6da2e026608da7e0ca8d0a38a71b81189d9421bb2d8a779f582decf23a3357c7a8f776bafb979621edd10c3e4feed1ccc1b9de3b36f0f3a2757be513778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-x86_64/zh-TW/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-x86_64/zh-TW/firefox-59.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "266334663a7c64288a206846824b566d3b10965847a5985846be3c236ce04ef14e776c3ca431238fd6b16787f0ae9812c7b2e3b51a97d8cc3e413fbf33fa735a"; + sha512 = "16d174a5c9ef9d42a69ef8e357329d8a32c6c7b84edee4383261d0143d6f996effe418c25cc1730b0429fb29177f9ace4cd5ea084be5ab4961ee9161abe5c787"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ach/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ach/firefox-59.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9a5e7424861cfb768f749319fd7134fe96fa107461f0797bb977afdfe1f7114d557fa81ad764541f2eedf7068cb8198fced24a28299f9435749f3c589c5d5755"; + sha512 = "46a324dcc6f6d541807737fc05b96db257317df2570c1ea3330690ad1a178e87376912ffb59337a8d73a41286b63dfc10e2d60534019ac4143892d03cb112e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/af/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/af/firefox-59.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "03ac5b87f8163993c8ebb2eb697da4ca9f8478081711c08ba64f358c31d1eab4966121426db0be5e1b8751057520f4d65f2066401409478c02efb6ae4057bb97"; + sha512 = "df7f7a4f01163a40389a0302990640450d630437b04b18b5b2465c7dbbb0c7a69dc8ebb5137eb8341540fdd99283b31fc10b9e3713124d6bd56f86ceec4ab894"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/an/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/an/firefox-59.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "cb1dc3676ea619a57b554d672e67cdde7f093c3d9023fd9dbb742f1d7bf42e31bc7caeaef050ef093961f3f9b1a39eac000a1325c0a5b87d6fe0d225bbfc89f8"; + sha512 = "331bbc61e4e35ab23f12f499f27ea57d5d68db92aaf2376d67b36da87773c6ab23dec48f9843c2af4c40d236e1a3e03a354a492e42c3c2075ddff9c05440ca91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ar/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ar/firefox-59.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a86e8e3604df864f253e6efaf368e4c86e17cc4c6623e883199738719aaed12dd9c64ff247b6053d2d964a0e9f94bcae831482c49bc92abde8f8a1966060c542"; + sha512 = "c7c5f9b29053f8576b806b373f42e9c20e10a068e9bd3984a35a9a5a4c57a7b62e4fafec159cb821585575ec287725fef1e8ae43b79f4275e3b2e38fc1c47686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/as/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/as/firefox-59.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "ac1753bd1d2cbabc491af4c702356b96a5d9c5b8c58c943dafc8e07a97cde66f1b7ca916f5b087813d31f31ec040db0d230eddc2a66dfa89b4483f885a786ca7"; + sha512 = "cea048beea793a1dc07c9fc7c114604f4dddce6b83522da399d8c47e771a55614fe4436793ec34cbc140acfd1ba2b12b9d67d4448d33e27048b6d792387a9e65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ast/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ast/firefox-59.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f789595668fd6ad641c0936f5481ec293cabaea2c6903eda04fa27469dee4b89d1c555a11a8c1ad2dbbd79251fc524819618c2062ace66fc378834274cb27bf4"; + sha512 = "fe40b1d1f6ae5f5193c9ce37e080dea6fdedd5e5fb7d09b0d5e70117625101a3a1add748a6ac343ca2c5ff4a732470f68babd8fbb1a00942354e7b8c4fbc1d87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/az/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/az/firefox-59.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "86d6a34d83cebd116eecac1a86a47bcd23a13e9987b87c8c085ef3abc7708d68a35fcc4ed42d1d775b3f8689e9190b0697f502eb599f5113de5a88acead3a72b"; + sha512 = "a6c76629c2e34da1367cf3af91957816c9c785708f5f07c36a7846a84ef84d72b06ba83035360aa53a7775fd5afffd663255bdeb402ed9195011c0a0678f9bdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/be/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/be/firefox-59.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "fd712d859fb258ccca1ded5c2b6f1504c4a595d12e1b04c044dc7106dadf705220081eb804f3ee09c6a3486700e7fd57de70b338e6eab2042725c45e17cc3463"; + sha512 = "c5d7f954d9f35830334e978026699bfca8b0b09b9ab8d593f254af82afe71c01c483a0d7f85e27f094cd9f3aade61d1cb2524dc57bfa78e30a50535fa04650fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/bg/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/bg/firefox-59.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0bb8ed3fc60d49d00102f8e3d40efa150a7d5ab83c027dec8eb8557658a943c0296e1f584b959045c1e0d5136daf4e6f8e9aa95f9f27bb657f91bb578f0b00d3"; + sha512 = "eccc8da9d0d913eee6f7d81e9fc50320240d67e0d62f3f3105526b0061b56c1a87a9393dd4986122a1f9e9aec01b8b2ae152ec2cfe459d1ae47d14418012fc45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/bn-BD/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/bn-BD/firefox-59.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "34d3bb745e6edbba7d4304830c18a7c5a5da056378e6ca699b9e83f022a8f04d8fb5bed1b65949e8959a0351c5e53caa0499dcfa9dd96afc6a8bf8f11982e924"; + sha512 = "0eb34e5e674d5e7cb444debc87a2008c92449bac23734c9e123153efbc8e11419830ffadba10ea9f1708233c553a2ca3af6c4721aaa96da3f8c59cafb6c01b2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/bn-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/bn-IN/firefox-59.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "f003b192727a1b02a5107529bffc3eb6468fa5a82de129bdac599f8dfefc5dbb3d7765faba2602adcd525a317562395b2a59805d8a54b6039ac84724f69cd7f3"; + sha512 = "76200f522ec79ea7f182938060caf74e76dd69daa5309171e3b0315d8fd62e8dc045799712d6d3be321da54cb8f28f287ccacdcdb3609f756ccb7dd9f94d0960"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/br/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/br/firefox-59.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "212efc4ac796e5b8f6d1484c45241b9dce9f42ef52d5fa93fd0f84a44818f4d9db97bfc133f7b2ebd1358780835e76f8c6de37571dbef0b5d8bdb140a9ff53db"; + sha512 = "1fbbf4eae7c6e9266e9068d00778362f7f46be274078c66bfb250b4e6dd6f67b8a28a87070287933e5f77b422155a7d933a6584e884a0e7b5bded303ac6349d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/bs/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/bs/firefox-59.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "84e0228d40124c74d9ab71d24ba49a19d313f3ff14bda2eec8021ceee87a4481819dd597440824a0463aa16f438f93a0480489039fccf50d2c659f72c652e122"; + sha512 = "e514ffac0888eb9e699489f95dc54d223f12350885ad26ca4e58763acf33994e7fa737d28a94d31faed27aa09294dbbd785e9530806b30cf233514dbeefeb05d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ca/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ca/firefox-59.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2e0561f245f23fac9d357953b9df048ab1a0ac99d4e2bf46b4cb212414ce7b1ab16ff636805d12993445887e29ae368140ad8977dce3aec0545f0c6d7c6a592f"; + sha512 = "440c02325178c7b102b78aff88effd5d2934c0901136d81b23851ea18888f90a2255ec389014f1cae76ec146d59646a11211716c82b2a9fd81b39c58d34b5bd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/cak/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/cak/firefox-59.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "8b636a3364542d630dbaa5e771e5193d265502d843c01614d45133db046edd0721e9230db4961905548654c6d5cad46fbb67523f7882c8897881c80d22abaf3c"; + sha512 = "9bba1de85c5f93e80c14793ebd947f8297d9aa69489b2057964d3fbc58d541cbb9f6441ab969b863e603ed1ca1e80fd6d4cf9b208beb8fa99207a9994fc99b42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/cs/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/cs/firefox-59.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "37cea23bd4c4304261ea9a654d02b5150c67f9cc96d2b21cda86fe238e115dbff1b6972526864ed642478103a2c3d905cb6047dcc6f178e6752aca09b468b96c"; + sha512 = "9a047cd1ea40fc79c285ebeecb327810453950d0912619e044c1142b38f30edc2fdaf5ec191995eafcd00e0603f53439a881196621203a2266863a6145531637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/cy/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/cy/firefox-59.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3a80282d24498926d52b2419fc6feb6afc49c676ad09cfb09462f052cecfca908f2e4717a2ee3db1f8eb9603cdab184f169fd78de6f1d68c1c03b2b4a72ab1f0"; + sha512 = "fa2e78cdf7823101f7a1ece26c69b02733daf121700e062875efbc9f30aefb4cba75a6313089d8085ae5f8fba0f28ec05556c5e4c4a13745e5455678d8b9633a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/da/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/da/firefox-59.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4b6b9a9a0d9bb9c1a84075d1a8b206a819579a8cd428ddd16c63c23f4923a738eca5bf57aaf7eba9f42ac359afc6b9398f3658f403a92157958fd5b3da7ce3f3"; + sha512 = "c24c0cb23bf600f3b5ee7b79603562d3b990ea8572f510f7b24e23c63af9f617e7de7709941cffc36a4b97e4eb8c5ebe832f07683d5317b9d563fe5f52f09988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/de/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/de/firefox-59.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "15af7cc97168d4819eeece47922e5451bdc8978bfaf155192a44081e95a1577ef6a1aa2343d60b00384281a8cb1ebe81800e66fdbb33c76a2ee912e06df5372f"; + sha512 = "e9d2b0dfaa2d3242e6849b3e0f4296e630312832928ec4516f01b420d5ded0d2917e682d6446fef3d9b7afbf6e83daf1e0c77d3204063559e1993c59c51845ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/dsb/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/dsb/firefox-59.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0c7442993fee304ba321b8b56ef67d5bf65def7939185fb40bf94dbd836de06f8c6eea66e220c789dcd7588f14a68b87dd5a5cd4464b2235c9e99d0acb8ff8df"; + sha512 = "70c76d6c00d8b6e96a23f65929cb61e16d1760f3e4b4ec825352be00257241ba1a80fb53ef2647b0fa67864f22f001454297ebb2d1c9cf62b7af2c85f455563e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/el/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/el/firefox-59.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "c6d3247275a39ae9ff2adc90efd4c3376bb1bc6ed7f43136a992895f168fe2050ff60d8d8d67f7a0a383742d7ea83cbc34d7ce4d2a111516a56c51d799c0ce0f"; + sha512 = "445cbfa311edef36218171c25614fb4ad07f8754ef07a85fbc011da90f013f869aeabf8ba9329177bda6322c16d5082e9e35c762475008b20ee078476bf347ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/en-GB/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/en-GB/firefox-59.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c7c0fdbd50d6ef56594b62188cb1d11985f55dc1aedf2a30f3103bfdf25c6f0c84d13d5531494bcef7ae37d986e760c2b0f9d85a1b247fa714521fa45a8ef10e"; + sha512 = "bfc0e1b94493da21753ca1d8836219c61bbae48d7229478eddd2a955f46836e782b945d1867c36d4e6f30e773fbca3aead456b3d50355cd7a08dee3e22631a02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/en-US/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/en-US/firefox-59.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "aa91a4c738077320133ca7cea6b202848e2b002c80bca688faaf6b8216517cf474f978c2417016ff9c3e266dbd7cdea3b6322bf5090e989321fc313619907ade"; + sha512 = "c7e2e18681c95e320e93dafa1d3f71ea11e59c4344b7723eb7bcb91404cf820ed8377ff1dfa9b934b9f29354920b4c0c892f58133a353fb53532c30190bd3684"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/en-ZA/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/en-ZA/firefox-59.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "38580c6a8a651e35c065ec1e7dc5c5bfee3508b999f4e61aee246bcd724b27fd97e4deb8b8ad654f7dd5b13d1473f2935f65c1e34deea3b186c8ae43c732dd2e"; + sha512 = "8578c50dba6745bb3ab7edd5eb194dd6a543cfa91d0d87962ac6f56dd48427b8ab231d3bb0faa3159b4520a68720695ef20f5c1a07258ab433cb42cac04050ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/eo/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/eo/firefox-59.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "32329deee77ebda40643f0559a1a4ab0a1fabcc7107a0ba5cdcc1404a15c333bd9562e3fc4475ca3bcdc7fa54433f1479de45bfbe1b89812b29c07ca08d1f292"; + sha512 = "5f9d54e745d8653a23563f05c31a82bd5d3e03815eea7e7d5a7913da59a155dd8b3d32a30eace52f28845ea4025105b8ad149f96b4f2f8ca933a8b8d6afce44f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/es-AR/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/es-AR/firefox-59.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "219665c031095847052ed940870ec64e768d77dd245b532d1c2d1923fd876ef4395fdbc3d2d5b0952fb9fdf3b48828a831a27a29f36d6ed8423fbfaa44a1ecc6"; + sha512 = "ea191f2decaa43833c2ea00a9c4bd62b8cb09ab0eb93a58e1cff168426b9423fade3735a9f7400904c0b63770d837a9f04910be59d04ab9baa21c4b90f078b75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/es-CL/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/es-CL/firefox-59.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ab05372c3ccd2e5f9fa1c65724ed967122c2fe4a394b791f83db8adfefcd71b1649c2b08023f4a74a61b60ee776e587f4042f4bb0b7240bfefa4c6b9b9f04986"; + sha512 = "f136c7c626949523fcd5e86cb9d48ae8badcdb26ae73a4ff99bbfb0b37c9ef958cd5837f248d4b715e2c57ea05e3bfb9342530bbc8a8a5ea957da77df069650c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/es-ES/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/es-ES/firefox-59.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8d6c07ba7f5b449eadb99af41e29ee528d79d02f7d30026f7e41a18480df6b60e106505686197fe49e945308507286198d95f54ae0a2f78f991077f80c73e36e"; + sha512 = "3a6eeb375beaaad5174c795bfa21b7d80ba8be2ad1197628f40888754f410c6488eaf90f548acc320610c61bc63e365ae0890d4f6429d3bffa85def93dba70da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/es-MX/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/es-MX/firefox-59.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "b3d51d406174dd5beceb8e64f96204992fd9c6a78cd6755a77f2d9369c4f6a0af6fe60302ad569a196a959ef2a300d88e6e2d5a1a9ed384adccd8f3aa153255e"; + sha512 = "87a30abecddbcef1a7caf79639464a95731594db82183517f94dbb85935f8a10f455179a1fbc450c3b13548c06467834372001fe80adffa022a03861f628b22f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/et/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/et/firefox-59.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "db72e3a7f8af8986beb3d0fd298cfed7d3e4c9249f8f493fcaedd347eb5363f3fd00247f9907c14b670445f2270805d3acd0282c622a5dbdb9d380c895a5d276"; + sha512 = "59906aad2ed7e7c8f0810b06fae5cfdb895dfc270ac7192b0368fb392e2993435dfd84c7f14e019a661b845b1b34f11f46a77e902bc6bc626e0e68e016e895ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/eu/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/eu/firefox-59.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "89175a40d203fb1b8eb4ced857ba41343314d3c2459431af70a9a6007a79f0def548752827925f3cc5255af2028dd2b9fbcecdfd6dc9349dd73108eea1a2605f"; + sha512 = "46c4f3f72d428df57bccbb8ff352ee0679d0824403e9129fcb33007cfe98babc54c08b645b9fef5f523e2e86de92c4aa7358a76ddb0b22161f2bc035bd56ee2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/fa/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/fa/firefox-59.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "ec604a5c013fe8227d0936ac6573d73835e7106ed2103cc355664ef130786332316f0f499eb72c47bca73ff700174cdc4d413fd97dd646dd879c4f73e29f93e9"; + sha512 = "31052ddbb5d4048a56a7412b89cda13fc23d4561659e59b80953bb56ef06eb6ab7a4a54ebc3dc6354676f83933b9a72ed9e5e07360970198caf0e7f7e1f27ba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ff/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ff/firefox-59.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1131768abae97f961fb4bc0ad992fe5e5f625d319774d7110dbf57d0c1cb1e225109df631fa7ee19b8f93631fde0547c7a0c9c8bae7bfd980339a1e0ce959ac1"; + sha512 = "3c746da1484144590676429b2f01557f63e599bdccc7c39a776a6bf5bc45bb327507c635a470f25b9b3d0635eecbc1daa74cf1a6a912613c51624cf978917635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/fi/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/fi/firefox-59.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d5d17451cd8a6959116c287460dbaaa7cce8c6df298b719532458c047c38227e2ef0d7e83b15a07d10237e91aec6e40545c9516b4c2371d305ca58cd66fcb4e1"; + sha512 = "3e1a1e4f492860fbc66c6ebed874fcb6378bd226f095a1ca9f78366f3e27ff82f1c1433fb015e33ad3ec379225d721862c5ad5f8108d2e55c7e6539eb504828f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/fr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/fr/firefox-59.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9afc9b5befd542614841b0c50fd43cffdd427b1bb39deddc7c8d21a5cc3ec1120b894b9d63b88c72d00870c24fe62495cb3741d47b5e4cb595a3bfdfe90e2922"; + sha512 = "3ec49a0ea7f5391826b29e3b9a8138c06edfff9ccee3c5b5807eec1d654491d4c2b231bb1050398962f3a2a741ad69c3d40287769a71e20fee4d381664764fcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/fy-NL/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/fy-NL/firefox-59.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "648b5ae2ef6d71d18a9940aaf6c300d0588f646bf59eadfdabfb6fce4ff0982e2af6ccbb4263b2c5e6857ebc63ac3b790b7c200473e39e6d0fcf56ee2ec8ac88"; + sha512 = "0e52fba6d487701735860353d85e7f4e098f6a288b5c7f9cc59349a93e72835f459e1c43df3effb60a8d0768ed4b83059c0deba0a564b8caf5e7ef5b863e719d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ga-IE/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ga-IE/firefox-59.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "69133d78216d60a5f382d4ae76942493561fb078d95f071b9c85c581addae7cb6c63196817eaa0be51c455d7c79a20aedc2d67d5e029702138ba6a9558095652"; + sha512 = "4d4b62000b6b6b0ed2c8c2e98f1924839ed2bd3473bff8f6a236fbd32e7de86eba77f33dd50e22adab6c64453b16347d4311b92dd9a0f86174b23c12582d7bb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/gd/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/gd/firefox-59.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5dba88817cfedb0ac685c004fdeef01a7d52044afe82be7a3f19413eff7c71613c0d48d1a9391bf83c0eb4424f8e4d95b4d1aed31c1fbadea41db79a48d4a3f8"; + sha512 = "20cf21dda2bb4dc1ca03f08f137638ebd5eea4cb9f6b7edf32b050a58ce650eb095e61be1ad5c36d5a6e6d334c82daafc6e287e67a8ccbe62c69656382082f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/gl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/gl/firefox-59.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "00456e95352f2e04df7fe04b44e08b2d39ffadae21e814caffd564d025f415a290b2520dd89433a92091f849531815a038471440f5fb44d7dfd5e912ebcf5194"; + sha512 = "799af61af18f793efa4676604b2b2c927a928423e9a5808c0e423ea992045f779bc3e12070939bf17ba336f5096c52d6e78a8890022534732b54d77ad2b39444"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/gn/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/gn/firefox-59.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "ee8c2b933f3ff613a2a128b5b39b249d197e1ac496e8963a1c052e0d6294f1f9892fa0518601bfd083f6ffbd3d227e0595fce8fb6d07e6a68e089bc0244594dd"; + sha512 = "1b967afc065356c8d11427227d3a7f875a0e20bfeac8e92e6d41662d0fc2cf4bc628a4e1b7e16375fc1c5f22030a305df1cfeb4ed75bdaa4c76fbdf68a99a0a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/gu-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/gu-IN/firefox-59.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b15b68da16c332b64c83eb061b30241b1dc55a1351919e85b5eb1c6f7fd7cc52de758877f2941d054a2956467d4ad206613e465dc0f4fb00ca492b644f62d45d"; + sha512 = "4fd246b25233e8599a87ae6706937952d0785d6fd5e07eb387fe7a85f9e461d7b3e3d322f3ca487b042f01a8fce7314c12d38e1ab89b1ea1cc9faacaf30f88e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/he/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/he/firefox-59.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "8eca58078181d992a0f391bae88c17cfabcf6c92e168be95a8bee52deb7a578df321ad9847189fbca5ce45f16f806e2003418f0864fc2e615378e8b25325c46a"; + sha512 = "7bc065cfb368e1d7236d2d65337d494aea4dabfff02931cd89fb11e1e49e69473706bef88c54dbb14906edb29c4fc30bbc7a8aa116d50959d90bf30416da7038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hi-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/hi-IN/firefox-59.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "35b1eb4bf5f7e1c641572cda773aad456705be7093da4c14e862d3d520915717e5169957f37dba4de23d262e4d018510abb1056b21ee45ba1cc79267c5a84ef4"; + sha512 = "73a3c38a08585f67634ec3201934b6f95167e3ad8c0c2a12813cfe41b12667a3d91d0b9f110dcb05ef7d6447fa1e7ab39e995ea495d14e4dc4a07fe0820cd976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/hr/firefox-59.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "c71bd71e0d37a64199daa25fe44c411f3c79898c6c03d4b5d5eda5ef3f1fcf41c85079028a2a5b99546eec3fc2a309feb1c4fba2ccf16806ae5be4ac8a39305f"; + sha512 = "fb730ec100781fdd7ee6c24562f46995d2c79aa8084519f22ab4b016f50a92f53163c45ee03c60d9d7e09aa28aa18a3796f2e38054ee69cb50c639bfabf90073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hsb/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/hsb/firefox-59.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f8bd829213230fd808934336a0f5156b4c96642cf64ce427e91492c98b2e73bad3cd35bb55666a18a8c172bb5263e8b4adbb60329b8de98cf2fac265ea19b8ff"; + sha512 = "016e1d7342c00db6122bf30d3fa11b2d5f045bc942f8f0fa0dab86364712e7117a4bbfe708c8b758e4f95a6a03793d9ac86985fb3ead048bac726cf2398e1d6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hu/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/hu/firefox-59.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "0f3bcd9d2d480f604c58b9f94f191a3a619b97956e83381dcc960c00d2fba9a387887c3fca299ee1879dff91e4840de9c7ffad595f23b2f5e227dd3dc34a11e6"; + sha512 = "66d88c77f981c0d131ce80511e3d4267c6948157131a7b033e13da6eb230aec49e6c5d31dfb79cf857d746539530e178c8b09acc8fc5735eebd61c74b3eaf521"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/hy-AM/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/hy-AM/firefox-59.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "155b09619ee496d9c8053a0899c66bb00a19a78fc8719199f44d2ff2606d08160015a6a06c89713d6afc522bd91dcf2093740e33eeb090d8f4e600904fcdf89d"; + sha512 = "3ab76a5515b635e4d75b5ac98d55d36c98b48535cb8c6f07550dce3e4e0a6443847157b9121ff71052a1a2f0256c3ee93a13c820525eaffb10592a25ec18893e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ia/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ia/firefox-59.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "f781ea27696e5f8f38a3219ab3ffdf19f6331f4c6d010a536d1a6a4dec8e0d48b57a85f001b18a8482cb0f87271b55fe5aff4e0f00b56819af700a2e779f91ec"; + sha512 = "ccf008d64f6fb83ebb75290000eba8d0901ac4701ff89720f30d338934c0dc3581bba70e80ebd53bcd6623af2b68e324b8d71cb17142b18b879f86c92f244fc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/id/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/id/firefox-59.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1a7334ebfc93b5fa2a5f08441b8f7174681db2dd1d4ccc263dff9fbfe100aaf5071f6ddce0af0949defe96726db417b2b7b153d8f4482a4621c87983ee1aaecf"; + sha512 = "d56cf734628d8fd76d9f0b44fd15056ec17eeeca96e610002b482a10e1aa2f2f1a14d0e1a1099709d32b822b2a83149b75184eb22719b030a92ec5a8f176777e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/is/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/is/firefox-59.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "83924a63452ae7d25ce52b450bc93fa98fd6850186abb65c0a8747dbe8de81f301a35ff8b97024345beb3bdad2a14edfdb322448632f59ea5c98dcd1843f47ef"; + sha512 = "c1c4d5e8ca2ab2c0652521045e0931b0510c7d583b63d7605e9949e1f2a4e02e3b453a95cc2f2754f4390e1149e580ca79a2869909add6fd966fe10c297914ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/it/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/it/firefox-59.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a47898144e749f3ac34ac1000b61056a848ea628925cb80edf0e25fd88a0f9982e983407fbac0b888c1f572b3a046b446fa300d44de7c3464fa34091d5657ecb"; + sha512 = "5f331e0245b00140964ab52cba883d41c7e9cb0be849081db7feb80db723d0e815457c288d4e349666670036d6c8f79b92505ed39d00dd8c26808c76fab551fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ja/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ja/firefox-59.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "54ada3e3bcb01f50986f4374c897d3e434498e1e4a66a3212e0257de06e98603da90901912fb051bdb7920b3b99fa061acf0144d53693d12967a4a9504f318a1"; + sha512 = "7237a882c47aad6cc66adc067959e383aa947ffabec7ff65c83c4851cacdaa78c5ca914ad0fe07ae3cc0df938fe16c9f6eaeacb3c56aa3de53497b8f893bfec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ka/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ka/firefox-59.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "163581e05f2c836b03cf741bcb7ba8c914d14fd1a2cc5fe2d92617250bf2656595c429737e736c7832034c50aa3c7b8da6f5f854fc33b2bf3648e242b920141b"; + sha512 = "4d0f88c403b844feb573679eb6b2a370c94c9019fc994ebc557887dc37d7f77a6590402dfc02499a996567fa16c9c39b3cdc6cc08eeee90467d8f01004a46f9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/kab/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/kab/firefox-59.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "18b571ac6ae220d7949af5a22b41d702ffff6d5db80cd9629baf3d705e596b61d7b937ee128008fd280014c9dd1923684b118b49e836a8f2bbe6c941a159a17c"; + sha512 = "de105bc67ac9a91424f83f39440046d9c4d33908bf1680c1f606423e89e1120ae7c1deff94f90054fe70ade80263a07173225d5bfacb1196b4e45a420b458445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/kk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/kk/firefox-59.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6f4f5c540ec833ec855949df56ae290c1ed267dd14cf32fef6bc11ecd392f2b1630a2558125612cf10b2b806565ff24cc3bc5f7876324f3f05dbc688398ffa67"; + sha512 = "709a8d7fa3dfd3169f4282894fd0f8344b2ff445595772ea436f1633971c5d29d4004fd54e6b981b34847e5e89b42e6df4f183eadd87b63a958e9be4371fca75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/km/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/km/firefox-59.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f9704ca7a6be1301bc5fb76e92284ff957f40b4818425bff00ebb83c5fb37e12b2cb7ea6f994794e8712446e0379a3f86385bbbbe6f88a4c787042cbba89067e"; + sha512 = "0a4b29e52ee101c1c25ede2af7aab05c1178152cfb6d36ffc9e71bc0e22924f274178ad5f1a0d7ea30975bec86963ad464e3b304201050b451d6f9f9b1e164d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/kn/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/kn/firefox-59.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7d57847bf55573c998917b316210c83156f817eb00d2412322061723a04651926ca780a7a33cb458770034faddfa94c4f0ae4db7a514d251b88ef151fe9aba2a"; + sha512 = "ecd93c818a70be60b24ea9722908f63d13e72b3c2aab3aa02dfb88509f14d28dc04d9df484994cdc7c430df2c62b49ceaa517dcb6107a7bf3df5c1cda3333bb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ko/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ko/firefox-59.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "36644dc921bd12925ba507cb75e35f0461c923cc460009d55119fba5af1cf9d5fa54958687b5aeb20d26ec2914d883402883de9af4762ec170f56dd55952b0b7"; + sha512 = "4a77a865e32e4d923282fc58b671a8454b18e10d313afc269836e119f6259f5c7e042542b86601580a0e207b8c53c03cb084ca53a41d2612e9578e2015f25ca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/lij/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/lij/firefox-59.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "827b1051c1991881dd1bfcb9b00f68f6a2452d38ffb3165b229647fef559607a2de64ef311fd9f4d9ddb3169c884f3ea83d215e5e45a3d821597ed2237fdd6d6"; + sha512 = "8b361b45f9645fd994d42d2f651c0e8078e91dcb5e84d3ae5932c96f537eaf49cac79478d149a1d9ff69a8e35fa2ff1e6a28aa7e19edcc2475a99129e6fccd45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/lt/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/lt/firefox-59.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "bb1e0a5972b2c9c213e89d44c377bb64673eaa5c09df7bd2e5dd8043ee6314bd4afd502f83957a5eb8c0d3e3ee2bbd8674079821b0df2d30f8129161341944a1"; + sha512 = "541775594bd38b9e119e634188e25484c81af4c866b57bff35c4d7e0687cc6ff521c7fb83d101fcd402e33d6f1167e9e589f58670f00849b33fce7a8a254053c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/lv/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/lv/firefox-59.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e11ec9804f6bc83995f1c34d49d56e9946ecfc6fca8f7f31186199523b7f3a5affb7f1754c73167f690a2423a881ab5c1dac8e2c55fd4ab894c62290ba87057f"; + sha512 = "e33d481466cbf76b8f85f863740b35ea6e2297c601fb66f346e675696e30afdd6f18a42349dab8b35f9d8ace3a7aed998ae3bf717b3dc3a40fc55a054dc007d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/mai/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/mai/firefox-59.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "da17e25f57efd0a194f7a57bc671e66bdc525340994f03db8b0dd0c40f61ae896a967aed3cf511da2819c313b171dcc68466320a8a28293b19ab738ec0097a2c"; + sha512 = "40ad054948f808628e9f4e42a3dcd254158894396c6525f0c53a3a497773ab61403d04ff320d920e9be4c905dfb3ba4fba5d089e6a9176090db00f47ca2fbc32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/mk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/mk/firefox-59.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "1bf2ba8167d24fe69cb515650190967279bbd75aa34ff0a5795a83ade81e652cb6ca9bfe23569910f0422db2555cf73deb3691438f9c26d820e657961cdbf561"; + sha512 = "43f8c89635df0c66c145616adf1f79509711eb88033b3bf1d1ac595d08be42769ba9f16c141b87dcf9a4a068d32f9838b0774692bce42031757ecfdcc40a6ae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ml/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ml/firefox-59.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "ef0d9ea155893e96edf36b19bb70b2b3eb7744f6c7785281d7c60726fcb770056f7dbd4c05dfb5b59188d17b007d2a94354bec4bc72ca569e8741f5d47d9654f"; + sha512 = "1de2b834375739ba60d0b399391eecf216ffba67a73c0559c8ee005dd0a97b814d3dd52370b82b8801919da7ecb9da6b5d689a9d7a6786d5c51b2db068e1108f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/mr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/mr/firefox-59.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "6dd7908b55346747aedf192ff46ec123fd1b7ceb834e498eb38dc2d2c4cff0250546479a27eca521abab09c44e015c86ed4decde5be79f3637eb4695c33c7511"; + sha512 = "b928c245b10fb8886ffd5d2d769e02d5f25ca5ed0de8588a76b9f09abd4c95b8d0caf9dc74051c891231cdaa30e74d80c71e0906658e0cbd51e3626e9cb58244"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ms/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ms/firefox-59.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "fb499428bb57cf2652339a59068a2074024a05ac7cb9e714ebae76a3b53cfb2a8c2a7fe6790bbc4d4acfa13e7631553835656792e7347581e70a1897a6731904"; + sha512 = "b06522dceb246c76cfc6d781040c09998abd1779da9f0d2582cfadea5bd5d1512878559ecf9d650801f4fc02b6002d2ab9b0e579169ba800eb71da99952003dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/my/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/my/firefox-59.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "069a4959386a53224420562fc332ea875d784de3dea9580c5cfd6d1454a445f316fe49b3168571688e4f23b9ed5885b1e4a7ce624730bba8e1838bdaf4f8fc91"; + sha512 = "696bb8015a1c2f3174bc640114dd934b886c509b60cb426ac35e28c5d7d016d444385c08cce79a7d36e66b3205d1d5439ff25146053e6e82af0687c989793ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/nb-NO/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/nb-NO/firefox-59.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b64f833994ce5e8d5b89a78711a4034d6d86143a4a91ad042b82d77adf4ede663ed0d879481ec20b7a3bac4ec5f82e6fc61c71e67dc465a01fcdc066db04e2e0"; + sha512 = "367e0c808e806b8b77eacf0d105bb8acb680f7b3cbc6c03e85e2992921dbb4c4b1dac92c4bc7f7f6edeb821451f0c28045ff16dac1ec424e3e132581153e3793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ne-NP/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ne-NP/firefox-59.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "0e949450785e51392b5da8db8281481fe0bdedf9b6291d8ae769f81030906e7f2617d8e92f24030e2bfcc0a69547370c156c3a7a898cad916c0ae649e15f7c0a"; + sha512 = "04f31732e2c972e0551b306e8f4bc4e0bd722ac11f0f9c515014e2ebff19718a39be18d1f33334fac1059774a5a8258a8da42ed82a8a273003a42509fb81928b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/nl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/nl/firefox-59.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "979efe980485b36a9c6017f26515b25782a005c90105b653638e33f28fe0d872984039480f3b660b0e3dea4c89e520eb704dd606a930a6c9935b31b12a41f5ea"; + sha512 = "0ac378a9403af162361ab93af52f7893ed830f86d36b04a681fe164dedd33d55e629f26f3fc4a7ab804344c0dca8b5fdcac5dbed4b84d6d1a4684161eef5d64a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/nn-NO/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/nn-NO/firefox-59.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "ea118a39c4eb5529d5ae6782a09151e7cf588214f58efa9f9da9f8ce869ba0d372aef7eb3c04024c407ec79861a052b47ef180bb1ec281c2d23a4050584be144"; + sha512 = "a9d3edc5e508e3041cccfa2d1f342615272169b4f8d07f169733697f6ea87988367f97945ddbd2a7703a93b5fa7c7fd39db76714cbc5bd790a7bad6f339a55a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/or/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/or/firefox-59.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "66275b64f529fdb1dd7ad54ea2f7145b1788983eee48202deda505ac03634e09f037fb9ac34fe0368781165749303741bfc1532d6a5e073aca2a719d75234bb8"; + sha512 = "8b59c41b4411cf682f80b2a7523147873aac97a74eddb237e268b60568c070f23a6df2e8a96688514ae56f71aa309a8a46bedc56701967ff949b2f9294ce80c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/pa-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/pa-IN/firefox-59.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e409196d50caaac3afa8feb8c37689efae67c1f2b8becede52d1be745196ba76dff6fd23d844de87b001782f5daae5526f104e3f91b9109fd786c3b034470fa8"; + sha512 = "497ac10f29eacd91d7ffa5725eae100861511c585396088acb8a58610fe6772bb59b0b9232b01b64fdbd2d898b6f6fabdecde93e53ba618962d133d33662a3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/pl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/pl/firefox-59.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "d29638eb8aa9284355ab6fe7617ccb8f803269003bccd306872a40025c4b0e64dcb18cb76be6179368c00b3d75cee145fbc5f90f43799b03d82fd7ae64934403"; + sha512 = "4ffb6128f7008b53ec165926145deae81a09242a2f59680ab482a38231e2f64ed5549514f0f51759eed7108ee6fd56d4fe1f5233c94f50d0e6978c0a34a46199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/pt-BR/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/pt-BR/firefox-59.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ab750a46b5cadb7b6c7279c63a1328a597fc3764063764d5e76419f795c100859ea29a580d1e75254c5e8ecf33863ebf29d4e641c3bcf98bda4939de22a05cdb"; + sha512 = "41648efa9f8dedcc50c6979875591551851db4bf3acff127ef90331481b921eda4a97c067ba0d6aaa7d6f5bf58d5522f6f810445bae3c1765e515afd552e3ff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/pt-PT/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/pt-PT/firefox-59.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "247e4ddb9355ce2efb3081ddb16c7af74627fb2d24142f875fa2567178c8b0252b6ad252304630781d189c2aad96aefcba023fb728b01172e0ed8abf442fde90"; + sha512 = "9f1bab89fb8e9f1c5441bac66623b3cc4a0b0f24f7f0563d488c866165db52a5264838a3c00e0023325c4c93a3c4020c801355a7db9c7f281aafd3db0418f88f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/rm/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/rm/firefox-59.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "24cab3b5b8b3c198e22b8c9c9455d55850bf105a7d3869c2b381225746f914b01e683ee343ec93a0a85b7d8139b0d76690e468da9e1d7a193ded7df7a6ed7f48"; + sha512 = "5b012c79032022605ee5285bf74b0aa20af118839cbd0518fb8e492a745501d790d231ac498ffde23c8246d5107bfb8887d801a1e29b9e235b89ef9049901a33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ro/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ro/firefox-59.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "7dd76552ddfa66a0ce3a6b0a05f0a1ad872971e32a443757f3f2d8400a1149314de581629c63263c8c06be6e40f6fd49cd8e8b809204df9a8a0549d15440871a"; + sha512 = "887493e1572846b4b3d832f05646e54cc1e577367887976d70fe81042289e292dcfec8b9790664b2388fee5dbf1b304a5a482bc55e15732e196cd81fc50bd617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ru/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ru/firefox-59.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "c40e3c8e8e5cfadd5ca1293daacb5ec095d05110eeb215c357aa5f23832f8bd7fe3af6c973bd1c5392eeaa34e68078efdbaa7b30f556d4bda57525d9f926c456"; + sha512 = "194d098e80542630b372990e2968f1c0735b6c79627ad9ffe20920f1a2bc0a066d1bb6c5e989d2e4b08f5f26b1879f6a30994226fd34caa42bd92e6128231586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/si/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/si/firefox-59.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "15a461b4afceda96952397caf0e87a4544050e5358d69bad5dd177e638145080e69a5057c985b4fd82c0673e40a4ad06acc648088db598213c63fffed9533d7e"; + sha512 = "6bb7a4a08884b0c9e5c9b7fc47907a1dd6fd1610902ea90d66406ec7e8554e24389c78257d2640eeba6d0b479cd9c61858d72b9a8c82c7f728e81651dae6b623"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/sk/firefox-59.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "47e5c2856c8af12aac094777db9b1def8a7ececaeb8c9162d5b13055c730b5f8d9808ee3a1fd5a34d7506271302b80454820dd0fe1e91c1592eda1b42ca98bf2"; + sha512 = "bb570dc6b7e90b6b306df3c0788fac77ca03dfaad6b66b1f0e7a561eaf52001169864b4a43c871cc5a093fa0f4d9f2eb89dc5b47345a290d61c132c188d59cef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/sl/firefox-59.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "48636b22f8082a8187948928e00846d3b9a7f1559b371db6a79090bafd5a66ae7c9d12f86bb6ad5ae316e4363a2c035aa589c30834de5115816dd308b6235315"; + sha512 = "42128cf51c68134990fd83827e523425d061af473185b815610aa358dddcb51c55c72436e609301da23cec7d9c98b0830cfe168c86779881184a30e856d58306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/son/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/son/firefox-59.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "64ae45771519e16f2d1eebae70cf33a5c49ce0c0a303223b008348993dbc306c603f7713453a36cbd66052217c46182350a79fee65fc6ff895224e665a33aa5c"; + sha512 = "ec1f820ad1e274abdd5f368a8f9e71fbf303420e4a3c5fad252ac9ba6ac36bcafc44c59c0d48d30dd0f9f43c4caf01305357b009e9fcb80579a015976d750a3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sq/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/sq/firefox-59.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "e4ad57bda0fb4496f519ccbd5f227b4c9f5ee35d7f9e2f6774420c776e3e99c95a1035d2aefc292069cbb099ee1ed3c5b318d8bf2c58c0a3f716dba8a1b35264"; + sha512 = "ae4dfcb80492a281c4195c2ce8b15662f8d6693546fd98f240ffa54497e4c5fe2c160e80477c78659068ce37668f61ebc55156df1d384aa4b12689f25622b3c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/sr/firefox-59.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "a5712102f6d2f2747b98d35248f961bf53506eacab08df9bd20195719505824c85e3c07698da60374c350a614c655257bce89bc94bf687acb94fee47edf9112f"; + sha512 = "eb0162d7aa3e9b4d0ed04f59fc32c5bdc9e6ef1ad4da3feb3370143fa248111e96e734a75081d788cfe85e164c44363230536be6e0b58c2dae08c870ef26a5a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/sv-SE/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/sv-SE/firefox-59.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "9bb15232cba9c1f603b5f60b5ff6d4e062a850651702c3400ddd834eaf4a9a96c9b005dece5ee5e626b37a69be0da8ba91a580a5a3a40db1bc5d4cda9a8c7d1b"; + sha512 = "73a5679f36f4cacd1b5017a6a4584b4323ddf65459442a86ccbcbdd3a8f7397a06ba4ff7b12885ee0ed14275cf92e3d06a61bfa71e4c7cac2423a965cf3b5d78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ta/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ta/firefox-59.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "02f81d91d0f0b87e00591ebf321e506896831eeef861d8b96f6f9bd0d2c124c7c0d7581e127fa3b73af0b7e79877a887fe0745a3d48af5f3b9b433f803d7bf10"; + sha512 = "9097d997df48a574ac708dc8891d52af6da3526d0eee5b8568830aca34e5ec7782aaec19cc741476a6c8529e7373d6b9da9e690df4caee2f8040d0d09e21dce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/te/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/te/firefox-59.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ea860c1576f11fd157cfd6db0d25e8addf89d8716936d5cef670676f6a95115c0d8cc4efa5a4e89e9567b79eff70f722102f8b6bbcbb7f66de76795275b737b8"; + sha512 = "cc8fefd0d8eb97d444e8877558b48208fc6b8960f86c73c3ba332699ad437981713b85ba039c2335e5d37270866c1a955bd1dce6dcf42fc78b03d2e679f7683f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/th/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/th/firefox-59.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "4852e8105186cd861edfb47934541d6b077d9ea726c8447052bb222f810b9ece378e4000711f03ef83200baf496a9ed9d91b0a211d425e7d5de28c3b559d2505"; + sha512 = "62f90b756dd973722c8b24447332fa947c26c699b8808bc6934884d6fec2f5573d9d9593ec4e3711d9f23002198b75164bda51222e8c529689b852628e35d816"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/tr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/tr/firefox-59.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "d50f36904e01dac829da3461380af518c0472e4cc065d79dc7850afe2bd1ce75fc3e684995dd180af8c298799dc08dc2182e250d9743545a7f218b984148d1ba"; + sha512 = "87cfdbfacab87adb24f08fa93115ac8bbcbec2210914f8e8e977a09328c39eb8f181d53ce8e626b0f581241233e961c8bbd69f8dbc43fd5540da8607411732d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/uk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/uk/firefox-59.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "14b1e4eaffbdedfaa8ddf5bdd5dd8d151f9e0bb2a726af71f3df2902404393418f9e7ba02802dd78fa594d4baf84b9b97cf580cade137a0c9a7141da09a0ef0d"; + sha512 = "8c273c2bffcf05a5d2cb59d041f2866ce1c55081e79fe7ea51a5e8854b74489dc71cf75b8fb17d5d9bd5704e970bdb14d468d7da35340f18ab37c7893b5aea18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/ur/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/ur/firefox-59.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3228104d28da0ca46cf43094b4913d3c4d27680f0c50e86bb1225e8a5f07ad4a8ba8dfaaedcf0812eaf79afe1340f529d52c3a8866ee9ffc2cbf5c5b3c5734c4"; + sha512 = "1307bab876c23b2cbfceb27adcd56617c6e420f2e8822d7ea4ab0b933d05c77d2f9e06e2c0242659633e13fff71a8e565cc77e6356a884caee0f90a1de5c1d4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/uz/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/uz/firefox-59.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "8b25f8467ef5fef92a9443f6e7d57caf4fb5ad2f99f7ef14b3124e94373fcae9b57215eaf55fbbc35ca393645ef8435e3147d7333b1a4818f89539ee2175ab79"; + sha512 = "7bbb7e8ebddf34263b0513875811623d11d3488798bd33384e722e83c36ac7f4f1260522c805fea486ff3f9056153c89f36f5e28899b0082e30866cf29a6d32e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/vi/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/vi/firefox-59.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "54884aec2814e4fdc4b7df84a021135e834de412c58147c3075514c3bc6fe0fd562981d8d08d9ed8d85e1b543cefc31f8603c1a6643d1f7da141cbbe3f2307f2"; + sha512 = "fe50de233efcce8008005aee2c271ded0cafc013c44a0a7934fa966da6e70fc3197522385f1da7563ab5e825c4b42d56352fab7f68aee506dc732a2974ac3a9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/xh/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/xh/firefox-59.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "e6614561d3407910f3db30d7418f6de60d1d0422bf893cfa41bf727faa984f6266e471290247ec6427e9dd57076d02ee7745000b38472aba7720c5060707e326"; + sha512 = "3832b8bf84a7db06463e301352bae16497616c400d07d9f95f87cad0b4b765ea59bd580812363026d2f69f5381bfbacccbacada976a54e4e9bc8d8941ccf5bdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/zh-CN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/zh-CN/firefox-59.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c88fe1439dcbe0d96beb8fb7d6895f909eb0a17f8cc4466b2d170d2312cb476a1e52d2326d6749d155aabe8bf0c7fbe19f5e2037c23775857aa1ad3d119de747"; + sha512 = "2420b34ef4298e6a707cfaccaf503dca845cf2f862db0148b84bbfd61d53127bcd6b7c6e65aaeb2a65867cc27787f7a2486db24a41a8938397d15652741c6120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b7/linux-i686/zh-TW/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b8/linux-i686/zh-TW/firefox-59.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "d76ccfb87bf55907d0871982ace63fcf58e788a784dd000033b513043f1e3f57a5e273b7d4c8b000e15af05e9ab8bff15411bdecc23dd701187823128ac94513"; + sha512 = "b0e1665171b4df6cd81a9333f42306ba1f631b7e140e963bf4f8f5da338adc520e0e2c44fe455c4a911eb54f4a34d2b8c935782956865d0f22ce8d4cf810dd1f"; } ]; } From 58cf763f8b72aae1f4e23688a277414c9cae438a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 10 Feb 2018 14:10:45 +0800 Subject: [PATCH 720/797] firefox-devedition-bin: 59.0b7 -> 59.0b8 --- .../firefox-bin/devedition_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 2ae02a2d796..504260b8eb7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b7"; + version = "59.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ach/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ach/firefox-59.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "961152dd8e528c2f0ecdaffb14140077580e00e443f5f4bfbdcb40fe72edfad2c717840cca452efc2a79e4ecb349f2bdd5bb4cf09561a9592d3e23422abf4575"; + sha512 = "1234478d8ec5a88e47bc5636983757a98e3472c67b487e2884af8dcae224bb18bac729bf965aa0f19b9593ee3d5a30c434215c7f561d9d1ec17327835e0158fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/af/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/af/firefox-59.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "381c880d2d8c7dee4407a746a7131cfca0af5be12e679a5f100b7b5a40a24fe395e4fb9730d16a2226068059e1412e0258c0944508769a3d2893b25aafdf4c7a"; + sha512 = "7416ee067675ffa238a212434b214a42190d231c7e42288cd0929bc9020c41a9b799acc29b0e9ad83fc2ed1c5170f1a614065f70a10be0c2be1f5f552d7d38c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/an/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/an/firefox-59.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "3834da540f1752d9f3fb62e3d3d5b5492b80a9c3ea9d857db638c8bc0ea509bbbc384c132759d1f5e236f28d4c1a416fbbd341b6cef5609714e00f91eb125057"; + sha512 = "d741d398d8f5185410370aab54d0691f0db22cbd1e7acdcef84d7381de790fed4a3b35ceaad2166af268c00de568a3d4fc15875325819d66b0d5fd1d6347504a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ar/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ar/firefox-59.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "638687264659e77c0d4442220c33adc5d236ff8dd2af342743b21cefda8f6206acf680b5537c3ab11e44191981360ba990ca316e6669c691cfa362f065cbf427"; + sha512 = "67a164df79c473fc0276491b7efc7c469f37a5c81aca0990e33a349f01bb42f0ad3fdfe1b5161cb7f8a0cb553eb9998fe8c8f97d37d8e2f1ff6b02d6626f1e51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/as/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/as/firefox-59.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "3e5e370948f981286cade0c24057a7281ba4bd6b65a6145b2eabd24fd4b20b13efbf313aaafa5480aa2ab8791597f7aab4ea493d72c3ffa57fe9e59dec44a7c8"; + sha512 = "a2d2f0fc0cd5a261fde714aa7f2a9c5024e8a5fa37092af829236f20c929e4f617d3aba6637e10e3f18d26263811a329527dda6233b92be6a08d01c7e362a435"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ast/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ast/firefox-59.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d47e8c4006f5f668ae7ca816b55779e1c60680fddb06fafc7b3eed39d7ac81ded9d6417a392ed8306d1d8bf3243ba71d8e4771c1813b8903c6d876299b9004f0"; + sha512 = "b465990d47cf16bac8ac85768d8ef31a9798d2b8e92cc5273bdb7c08f59b22c960fb59b5b7a7179170741f2e68fc6a3222b306346280d3e2b03a467561d6fe1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/az/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/az/firefox-59.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "17d277712a27038e4a6dccc17e4005f1c1d0d24b20c53f498ea5413dc3245ebd21cfaaeae8b1c6e0b2372430953c317e51286c3239422bb56163ca96bdaadc05"; + sha512 = "03ffc8c5a40e30a160bb8c6221ca064bd9d380e9d5f2dddbc6efd3fed9146f7f7d27eea5267f6fdaebf668ecaaefbfc2e4b8c138095ff416f56a17c42e875908"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/be/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/be/firefox-59.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "80cf57e5db1139a681aacf8df482a01d05b102b2697bbe3dac695a77af4af36020404e5c90ab21d51196db4a4c2fd8e426c8db382b1f33a480fd4197ad9a380b"; + sha512 = "c271047d953aab016d7d8fd2ba083e85be9d054fdff8edfdd30a1c8c9cb5aa5143ca17b21efdc6c892e6891cdb2aee218a280c4cc79c3acf0bb8a742861f0dec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/bg/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/bg/firefox-59.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f5e55817b04933066dda30e44678db6e8820a08f13413eeabf0623467e417275552097fc6cb5a0fcb10252306ee39194da2f458c7c4efd5ce002645d28d50973"; + sha512 = "0533ec11c0e0565a096f9fe9fd6fc8987248d42bd4810d577f79de337b96d43b5ad55d9751d9dd112f2685fbb3367cb10e68bd22df3271a5f5f39dc7524e9f04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/bn-BD/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/bn-BD/firefox-59.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "1af4624598a603f8bcbd9bcd7a2f43c4da6273846bba91babed5f8f0ad85819d63d4ef18e31eea5b3e07646fbb2091ecb0efb6571d512263da5f30b6cb5c4535"; + sha512 = "d5320b2cee57c325b07d76e0909c60cde3b9db5719623e252c3159f5d8f9a6c2ee315f31d02b189facc7845bf961eb466e05c35ebf97e43865efccabb6b16536"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/bn-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/bn-IN/firefox-59.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "57c0404e44eb0cabea7a396b7160bc0ca0920bda01df97ace1808f7ac71bbe7666e1e2d014f940044a03c17dc92684a3f5cad0a3f41af76b5ce4f41324d7247a"; + sha512 = "3359ecfe64dce6ed55755a937ae4cf8e14abc4aae7d1f6bc81d44d858b535457811bf2ec9585e0e0fcc7ac6a2f47059a1d278268fcdf4ab60577790580237f05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/br/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/br/firefox-59.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "bc0d94882c925da3e5862b3b0a3af3ff02a0c998b12216c9d73aa2bbfc29e832e3096cdd9d3b784847b5a8eca2e5e0315bc92e6c5f72139c7dde773edb048107"; + sha512 = "77eeb4d2f8020def420edee3d375194d7f17aafc710c7cee202770cf655481680ee30c0301a8918ac561021f863b0f99ffa7745495178100a46609b51ea354a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/bs/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/bs/firefox-59.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "35a35e4437020264f4fe5db74ac0392b473b7151938d133b7bd144ccc3316667e3c541427af0df148f28bb883ecdd6e0e04ccb8d26e49bebbf0e3b205667cc34"; + sha512 = "66cb0498e80758d3d095c384260f688435f951b55c463f8dc5e01f06141fdee08c72085bd26cb89b1b980a6982609053a30ab025db354479701d29c0a2610ea7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ca/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ca/firefox-59.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7b82048d987575f22808dc4eeb246d409e9dcff5bc398af192b64cf1406827b70740d5dd413f3acd403e2bc5b1e27bf1bcee4e37e2e66c6624bb67db60dfdee3"; + sha512 = "c46776231c97c19d7d8d01f30fc3b5d82e86eb0d80f76c1bd37aba0f1ab6e6bd02d34bb42624c822dbdf95a71ff517b26c23871c929c1d5aa74d668f5c96f25b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/cak/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/cak/firefox-59.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "92d4fcd7577ad4018ee39bfa39737e10ffb195578e5b33d5547dd1a2094f645d0550b8027b99293a74555e8cc5ec2db8f2c2069d3606fca999dfaac750004637"; + sha512 = "9818153ee20a93d5248f37d0137f1f756230f6310a881d0a513a37e24926729671bdf4f4a34364082554ae9cd4d2127da6f63f9363b72e973f5a382f03081030"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/cs/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/cs/firefox-59.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f8780c1d59ca551bab613e470b4fcb05ce22548c3302a8b79f6076f74aa19e9e19c999c04ece8ebe1c0fe062fc9477d829aadbd43d3f0e4153ba6c7b471d8db0"; + sha512 = "b346401c04cd24376825dba22b42ae6662c29cc1d5c976ff64bd191ea274b987e5805064167cffd05ef9b53a5c1e9274d6c69e4ff05293fd9b7a035ec405b55d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/cy/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/cy/firefox-59.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a9d0923be5ce8e7e337f01c357af4b12d667c28dc0808b996dc370a5841f1de30a54def5aae5b5de341bb0a80071bec506334e7fbbdcfd3bcbf0c29ea8c815aa"; + sha512 = "290b2cc2321a3813c3c1d8d3312aaf7c5a8d4176ef47cda5361ade335b65fa8e1f51f5a45775e8244e81bbf43f0bc059e6c01744feae2b34f18ca1b02745c3f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/da/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/da/firefox-59.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4f1f21d7550716f9b4fb6d4edb46e94e5bc21d3420b569ef0008e21d3ddb6f7408bf4c598645681a883f473b24d8c5890a06e56c2944dc1cff592ade914bfab9"; + sha512 = "ecae65469a3d5123b115eddb0fd0dc87967103adfa3a7f32965870f2acb8b06f0300799e6b8c736014294d627e5ed1277a80b8ba45661d05fdb9f8f57ad46d11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/de/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/de/firefox-59.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d008e19dc34d61bfd2d5e00603f54cc3167d0498a4baf9e1e8ff911f4a68a254f7e6f79ca40de24f57571520a9ca33cb95fd65b9418258ba3a5201cca4dea45e"; + sha512 = "1ec3fe1a851db8cf8f5225ec1c9391f3b4db9936283f907977565d86122fd96c41f0ca5755b55cfb0f61bd7aa6a90f0c12855265e2c14444ce6b26fb1313447f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/dsb/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/dsb/firefox-59.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e66e1445ac7888fe6e95a062266c48ae5d525f67e971499be9f1370518435d56486e01173ef70424395e5be3181a2975d424f3b0c9950e5f7c963fd316581ec7"; + sha512 = "cfb192b32a1ebf48eef3eea556e1fd3ebb4f0233de4bd458faadc1740f75ab1ebd5927a61a6ae458cb98528e5a1e0985ac2f2a25598b76d74d0ce3924810a0fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/el/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/el/firefox-59.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "32dada39256e7e9127bc55216658033d2ec4602880f3662a3e4aa7c95528fa6d0c4ad22bbc8985006328a20e7baa91d7b2582d37dab2c81e17af870f15a40f34"; + sha512 = "5cf997e60d9de581f5cad50e33a2815de05e5d8f833230f96dbf95560f6e2c1130140e0dcf7df26da6ed1eb948612aa1e11f9b4adb5803f1f67c8fdc6ee858db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/en-GB/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/en-GB/firefox-59.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "26dead041f7d9daa017182aac7c0ba2771d3ae12f79f113701b232a1488d41b875212416347b4627b4b3599686e00c4af8f2f7ac60ad319f3ec8b7100d13bc0d"; + sha512 = "cd7764c9589632c55773582053aadf6a68b8093ea5cfd2de2252f8373a26ecd6190055db098a90bd658611dd1e2a4df39badec608972786e1d7a06be21dc4215"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/en-US/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/en-US/firefox-59.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d14f0fb3471e243567effcda8af8cb3776e5c00a5e533a64cdb2d575a875143423c8de029ef0ce76f282ddb30824b43ef65771e5e458ae361648ad01221a305a"; + sha512 = "af0fbabf5826f110dc07960e7414ed87ae4c99046db1bd7bc09948fc0feedfd21c05e25ebbdab6a7738db0ac2d127fbda0e1fcf0d1bcb8c2cbb5250e3cda256d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/en-ZA/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/en-ZA/firefox-59.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "2a681c87ddfd6dd3c96a2e949aa021c30614b11c6b7e2fc1fed23702dc906f6550829516e3031f8bca7f0d76c694aa92fd1521bbe24e55979684d19c66b82a8d"; + sha512 = "c5bf9c39c2202847a89cbef4578a5b6b73f8aed255c33e368d3401ccd98081ba9a6e58999c955e6f63ad6e78c9d3b1455fb9bdee541288be5e7db7d4a3e47a36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/eo/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/eo/firefox-59.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e73c26899a8c999afcab0f0bfb68eb0c382af57240c12b8c05c54566d3800761a0c7ea5ee7afea719144edb3dc16a105a9531f8655bbb692c24f4858a8142f49"; + sha512 = "2d28fac2bca21283a4bc0fbbf99bfbbe2fb39eb95d5dadd05ce933ac3f2f88468ddcd17ace652c2a888ba3023d4f373afe685ed78b447429b1fcc8893171931f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/es-AR/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/es-AR/firefox-59.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d25bba346b583364936b839195513bf3d691cbf2bb7d328ca5c5c62d527768ad9c32093746da6ace27849d3742586b81ce1f0ba364f6017f8747cb28f4ffcade"; + sha512 = "43ac6a43c5b9b46249c50a584fe89d4d3af7e62ee0f90bbd05ad722ec7914c4e56d6858e647ab1a3f9c24b7a783ae22bc3f97f660f0a25d891558c34f9c5317b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/es-CL/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/es-CL/firefox-59.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "9f7cb3fc3cb97866036dfebdf7de553a39e258a05c4cf08427b87f8b3a3e9481e445f1e0ba1ecc42f32c761f8c4b781daeb12cbcdd6f6b0cc7f1e52597bfcaae"; + sha512 = "8b2b9513950e0d46c675e2d6d3e149bc9df99cbb67ab4e1b7e9d39d30eed791a59b188a82c46ab3821b6e48f26a1f7b72eb0bf55add47d9a89fbc628046a8dbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/es-ES/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/es-ES/firefox-59.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "1c9cefb35ba887f309d46ed819cbb1fe1a64f4cbd85d7a8a8e1978e45b5ca0e4312d4bb0e2192d2b74ce5b9bb730ccf7753c13c571d2b4a2c6afa95def1df102"; + sha512 = "74f57ee6276a3f9a085507f897d467e65549bba8bf32bdd723eb5a81bc3ee472f2311d110f1a42531fca81f3a88fb672922394f45148b8061f395d6f2fd90853"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/es-MX/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/es-MX/firefox-59.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "02094483d2fce3e15b644b38480b13044240beb463d78ff39500c1454706501d1d0cfd0821f1bd47b76a463e03ecaa96efe5c73cfa455feb2a662e430e310a78"; + sha512 = "91b361d7961acc256fcc626e3f544ee7e3cbe3f05c1a3c83e2d9500926fd4538c458122005d41d9d241302ed8a20b064a30496e7f3cbc55d05b15cf3d6239cf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/et/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/et/firefox-59.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c230a89e2df456a3c10f6bc8940ed9f9dd1193b597d725280b2cb0836d04b7d31aaa0b13fe420c97d6fef5b640b95cf48410e42e68bcb9f9eea0a5fbeaf87f87"; + sha512 = "c37694170a90eb7205295b534fe8e4c9e0c587f160fd8695bd46841fcf6ef2407d793b6ea34c72bba8f6791bf6a16eb25f8ed751075f3a82914062c137ca1540"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/eu/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/eu/firefox-59.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c88f9df7d9fb076c8ee905609c0edd994a71d16b34007dbb1caf71c224cfdc0d376d4d98d56780339c98f38708776712d1f60f759fa7e5fe7cffab9fcdf7720a"; + sha512 = "7efda4e27afe7ea0e187b60fb9945aed5127110424ca3f68f913c61f448ee09aa44f32cd97406982e2bda188ff849891baf4b6f64655a6a3b985c9c3223364f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/fa/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/fa/firefox-59.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "2eb87394f23b8f342f51851a4fce181ae146fd349c2bb96dc50319273f010d411f0ca94d40a775295484e4c686c6b492b659be77da04eac8ceb6ac8a1f290ca3"; + sha512 = "7e5ef9648c6d00521ca448ef8f5e21cbc90819059c2328206b8600340e5a6bafd2785b52dfaf3b85325eeffb05934c5678f36e213c3de889504d5aefff98f3e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ff/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ff/firefox-59.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "6d0c15b38dc00c7fc95645cfde8d852963f18eb6351fd1a85d9d6fdba7f540399e77cd377eea1b548090a5abcebcbe5409a494d270a49ae7374bf1d3b8b4b5e6"; + sha512 = "a62faecb54c04ff503184bc5b25d1932768b6ca4ce8c20beede6c7659d5c1ca7070bcdc5f4d57a2ea42eabc99511ae37d48bb35ec88be518fa6745637ffe603d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/fi/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/fi/firefox-59.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f414c5106a4e02ec54df22fad69e317f4e8b88e9c210bef6d7e6f5992b2aaa7e2508df77f3ea6bbf8d17913d30681f7834e3a71f26d0f191a247d0abcac332c6"; + sha512 = "4c76daea3bd9459ddc5c39c2f72c19105ac8f18ec36120113348dea8f898212c97283ea497b6661ab1a79b436df7e4326c76569b82a973e4a0af2b792321907e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/fr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/fr/firefox-59.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "309addca4b8bed098662a14a268f13487e7068eaecab908226a882d25ba808dfc42b093215c05c1d0157840beed56e4e1afa54e4c0f8a9fc4ef790fe080f8034"; + sha512 = "a54d6b99e2f31e7d747eea5c9bb4013a00c916f2a3f89f538a2b0596f8b0350d187ea720fe3de9ae14bc719d33c554de6f609096c7a219eae8fe708d7ca38602"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/fy-NL/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/fy-NL/firefox-59.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a9acf176c8a5e8bc2dd8003b35753d5562711c5103ec907384e4ce8fba37fce61bbe0d7af92c4954c82cb05e5f6cad40dad0c94322b2f7701ad37792e12928db"; + sha512 = "1e4592fc8cdca8d23d1a5a1c7822caf3133bb4d2705344e48c53a496df58efdaa8d26882a42da046d97e6a43d21fb3ef8f7e0cd1b5cd2e867e92020119dfae3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ga-IE/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ga-IE/firefox-59.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "e412b2df7251ed261068b68f84083cceedc04887655332b65a2fa2375b31a1d8ffd5aaaf9fa797debafeb7c9547d9f8a8a2dcb7432162a284df6136e4973aae3"; + sha512 = "5772703aa922adfd5cdabf4b251d9f7fd85613b92bc648a7f86dc5aaf13d13e485bf1b95d2dba8a8bf4b9a1603cd64ba074fa236db183edd708ccff867ccd376"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/gd/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/gd/firefox-59.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e341bad41d315361d02f394beef986c058fbac300ef99106c12cca119ecece0cc2b279425512747d7413dbd6346b940aead7b52914845edf284435f1754e16c0"; + sha512 = "6180f260d5be34cd9fb52be083ac869bbb72af7804f1528d02da9bfab699f3b434f0fdd43812dc16e43678cf9ab86f42adf990487f604de21fe3198ac71abc3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/gl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/gl/firefox-59.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "a9cc122d5c7f12793620371466603124d3e709934ac4654aed7cd04039f812d8a04a32c076f91d1f1b01abd6502dc6858cf7452f0d6338f59ea5e6e31faf28f4"; + sha512 = "230815454662dca5b4ce778e3d88b7689a7ed864e75ffd1dcd306e26366bdf652b032dad469836f6d8dda836d2d205c8d41ab84823b72f67955ce06101f7d652"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/gn/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/gn/firefox-59.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "70f311fa7d3b60e6a2ee633485efc2bc5128aa20f2b8e470d00a709f2c9c5deed5cbe67bfaea39fd9df39fcfb1118ffb2bb0d58a3429753816268e4cc41e333b"; + sha512 = "7c8b0d419f6d3914f8840a6f8ec46973243578e17fb3352598d27ae2178519b935d2fd5bf33d5b7bc78c8e4a660047bbe37a81d84186e39169fce492b0fca11a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/gu-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/gu-IN/firefox-59.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "04ea260cf70357f51adda2b8a7c8a782ed153e1ac6b82da90f232f04393426f55f371bb203b7ca885cf14d579c1585f02c8c11b13fd60f4d175865a546c71501"; + sha512 = "70e71c46c71ea9d2a91e4e39d77265e4352db3dd2804de9363131647c6dbcc12542bf20edd16b24ccd8c3d07234d38bb1bdc8db1c7260def06f0347cb2574467"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/he/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/he/firefox-59.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "e130d7400c4908f93acbd85082e3d2f52d992f12b209fdca66d01292682b4835c97cd416bfd931429559e270464c62228bd2c888189a7976977742eee783405e"; + sha512 = "ea409a856a9492cad5c6e562e7a3b9ae24053e51384c98b93438f23193c476e8257a7f2bceb6a253ab24dccb04805846cad13942254cb754b4d80ec848e74286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hi-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/hi-IN/firefox-59.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "c44008381dace09de874b77e566b77836667842161e12d14ad1c497f1a7b11aa6a43312c6a814fef710681ea1b72d22c5d2687312c32bd7acb835f2479fd2522"; + sha512 = "8a290e9e0d9c2c732c70910400cda71fa282c5201cfaccf92a36639dee75f12539408659e72207de46c6579c2ad158a3511b8065494ed75eea5e72ab44a1d080"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/hr/firefox-59.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b28f9b876a5acf1ff5e4d6e6eb09ba611f9d41a55979f0176c49854f9b70de3e82e62fe9a1c2f4ee66947821d27bb31d33d6696f3e4aa3e0fef4d280d18cec86"; + sha512 = "6a4c2e8d21dd79d9998d4c683ef8cc35a44c5c1307b9be1ced0befb5a933d431dcb651060ad44d03261a63a3707799cd14c04dcfb453809fd806dcdeed2f8d88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hsb/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/hsb/firefox-59.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8f38771672364db97fad3301adab291e21d68aeb70eeb184333063532c8712ebc482968d82843b452434155fac0ab9688d021e486690768cf97bf4fb8c9de217"; + sha512 = "8eaaf4cf1e22806d040298ae0b22a34b56a1d613d73e7fa10c2990eb0bf2a174177b36fbb0e8a4cc74264d3657d4bffa9aa66e184dc2342b0cb72aababb1825d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hu/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/hu/firefox-59.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "1556f2803d220d0fed67330ee002f410b06fa5b9834ccd0dd6162dedd29a1f21fa3aa560bc3b3866b03c2b4727171f99edfe47b39d0f2c09432aca653897ceab"; + sha512 = "7e492e77fc993a6cc31f0b4103475c4b4ecce0ce6ab6cf103f7901e26beeba0c1ded6bf1c66c9d70e955aebc839f3b8c4dae0d22bf1c9a6c6cd0218746905c38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/hy-AM/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/hy-AM/firefox-59.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4ac7ac5b6fa1c416b4e803d0e3c63d465e5f36779477aa9d0a1ae3dc806bda447d7f6400301190d55c149053a1c0967b5d2483f42db1e247670c06befb4f9fc8"; + sha512 = "9077842c68580070ca00e43e5c69ce45146367ca5f8c725d9c7133677751c518c5780d1a1b1b39ed52aef9c72dc969798520c3cf87d16f15d6c960590e2eb79a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ia/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ia/firefox-59.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "2913d70d998e673433ecdcd50bb9631071b8b92900a641bebd97c5cd431c6f6af5a2ff74d77349e9e25807f4a577f8f3a663a05997f96b025763ece6d344fa47"; + sha512 = "4841db6f124717fb76c2e83dba1a850073f078b5ca7c2f5d7523dc61c30a0365d3835fbe4297bbdb5d9bbdbf82527c0c7a7771194d8fae839ac8ba4c1b24b813"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/id/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/id/firefox-59.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "cd27f8cffefbb560cd475b9c2cfd7c47bb4b9e6daf80e326d2bd1b9bb194744413f22e8a33cb2ae14c88ac0c29bc7e823b1cc7321ad9bd3bc26b02009580afa7"; + sha512 = "68229843c9402bfab0167df5ee3dc91b5783edea3f1442ea7a26df34ff4c9ca56fe3877a20f63965d39b9428d7c1d5cd024fd5701f3244c15842462259f170f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/is/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/is/firefox-59.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "1c23920cbee7a4353515c22330e3d16adbb4a0a091978d6421802559f6b87045b951603efec4e9891fd736aa2bea92b3c64a9e06f16688c7a748ff6d98672317"; + sha512 = "b2d3c1be3c04175fb09f577961f971a10e961133346c7507638933fa5d9ff12fb20e633aa7e209f333fa3c6bfb0056304f3931f1189e893f6a3ee417b3ce4c1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/it/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/it/firefox-59.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "c93650c0be00e550139a639376919c422756d75438c41097ab9de0cc832feba26a2dabd7c148208dbc855036916218b5bdbc0e9cd94d09995a3f55b7ab8ecdb9"; + sha512 = "4b8066916a0d0e902c1771b54a26046bd1e3f4c9958b709e32aa7de10616cf2b9c3213951815bc44d3ca70285727a2357a3f9575efc8dfb7e824ea3e28fe28b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ja/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ja/firefox-59.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "c639f3892b1f6866e50c558232e9deee161218653d79df2c241094020763224a0520695a0b8652eec811da8893cbdfa005e062c6345475c73d2b92c574c92cef"; + sha512 = "f24ae72e02b5533042b99b876d033df72bfa8a9a976f95933250fc2f74bd23023a340624dadef8c9ea4f6cfaaa9baecea612a159edc2b1fbe91bb903f2c9a5b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ka/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ka/firefox-59.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "14e3e3dca6eefa71972abe021e9291f90df974480555fb450ecc0051c1257fbe84e9f4af2b8b6a62be4e88f44c0a25801d61ba334b0e8a9720003367111dc9f1"; + sha512 = "598e4d1fab5d6487f61cf1b3af17e02670da6cdb0eef561c9793025f21a1e9e7e34901247f7d5b13f214404e144242a7c8acd2a3cf0eb24e27681164ccb43c11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/kab/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/kab/firefox-59.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "b743173cd98d4a7c89933bbda814898938cbee6fa5c1210d884782296646a8907221e56e491844b6960cf2e1cb35a21b147c7c990950395c69d912129c4797b0"; + sha512 = "d895ab11efd67d2dae80dcef36a131c41c7ecd45ae0253a04b46cd5b7547c4c72bf7085d2b973ca3c2b068650277465ca664093878854db58ff78ede9553fb4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/kk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/kk/firefox-59.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "edae9784f6bd3257e87738c730c1d65d0f01f506840ff253b6deca672599d00e43acf0d3eb96cc0c9377324b7fda6f61acc3bf90ca594012f60e8e81c49acc07"; + sha512 = "e49d420a557e15c28a8160953cf16314b5964a4851cabcbe8826704a29b4c8de5cea1b1e4711acdb18ab0680fe0462367983f8928c5ee707284a063611541a57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/km/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/km/firefox-59.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "eb6f7ad4648fed20d58d8f6a9a61ae46536e3e56621f4247602cd17fbb97d1dea9a3c0636e4c5fa6b4deff6cff483a33def52c95fdc49b28ea86f901d8db00fc"; + sha512 = "d1b5b6ee5cc17686efd7272ef2fbd7911bd77636810d706699b0d6692f3be9db647717b9aa4fb363bf97ee8f007e8fa3b06b3d2adb2ace4d5c555dcd0d293b2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/kn/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/kn/firefox-59.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "86b0dd43fd99c9c2c344c82eaf2f4af5268a60d7a1294b9a5f871f338a3279a11749afd18753ff2d0815f026933e91f32e54e8ed6c5a7b1a219ac9e2246391d6"; + sha512 = "7d332985cfd4f7ede307a222dfeafad60b06cabd6b190c30dca0206bdec80171e1487bc67dd622fb66dfbc255536d1a386162dce08bee9cf6e8dadfb3824c713"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ko/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ko/firefox-59.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "ee609c2de7255a3ece758132f3948c795410b7049795f673614339b24014c053beb1c59000809c47029e9c81961914b7285344f3109ee80fe05c6798684dd847"; + sha512 = "d91834e6083e1a4d7e282b40bf6974db74e32a0e5187f7ea001fa886c15224178d4e2fdca4979b1940e2d6e9f30eeaf9bed5823cdc60b9639a091553c11dbe30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/lij/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/lij/firefox-59.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "fcfba569e0517d0bc48103c23aee700548e8f1d10fa0211b5ad491e7d9b3d9a72dc983cf921c65012d279ef4b6042147af0c3528ea3c0c000254f699bcd7ab0c"; + sha512 = "e64824d7cd6a1bc62fbb787ac42774b4076dc848b771dd8522750fa172f7f545e0d29d72c099998f2621f6c03c32e74d69c2561785ed421d6e25e3a3e9200fb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/lt/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/lt/firefox-59.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ebb525ff271d70f16dc42110e5402707dcee3c7c1d9ffe25eb6780dc5cb9b9cd184b64c526068091ec142415f9725e8aa12b36262d5b160b09b1f7ff97c3541d"; + sha512 = "15f08c788d17c3fe941a3d5156f5e3035b52ea49e2302d7b519bd0dbe7d462291c0dc802b3205429188ab959867314aef4cfc540bd5efb567e615860e3661929"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/lv/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/lv/firefox-59.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "5dbd95878117362e362f5409dc335ccd38b2d244efdfc8ade8c43169458019cac0abede38a89272346aa1a6578e818d5446a58ba702a174294e529ba9399b380"; + sha512 = "df592f38b27915ebba86912a4006217eab4be380aa6cce25281e35450bbd57a30c78c180dd2bf86c12fb148ff3893be59654caf3d79a060f2f4d0c907643c6c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/mai/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/mai/firefox-59.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "af19940acbe5855000f033817b8284c4912af9d69671e5b7033c56a8981adc33980e8d467b61622db3215376956992faefdba651a44067f1b43f07dab7389a20"; + sha512 = "de8af180b757a6958a5b580f3efc4c07a14be556555ff452227d34ecedcfea675b9d50ffe4f800f2cec2b3d88a7a7046ae30edc4d4122e9f66d439b794d41acf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/mk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/mk/firefox-59.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "a58fd73fdbd55763db914b19bed6360395ddfea414726171abfd7f4b87a19b33b2af2ebbece8f2ecfdb444cc2eb0cf26673b3dcee972bfcaed59108d39b5099b"; + sha512 = "715eb42ef2fc6ac4763432046ae5c418bb3138782fe3627433e5d35ac0dfb8e4216bb6a6e320aa59facdb117ffbfd699dcdcbb906400b291e57367fbba32c841"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ml/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ml/firefox-59.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "93966e5b37e2dcbd29ba5a8c1207716f7aeba68c95aa984ffeaf3aed64a2b0a5a0e3c22400ca2cf75d12d56975001bf96d2f04f89131690528cc1ca91aa8e911"; + sha512 = "449dec133d211fdd0eb60dcf0634908d938d457c0b2c9cbfc91c9013476d72920ff537095bf3fe0f7968436a2792b62240d186a5e6070eecf0e53e29c29bbaec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/mr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/mr/firefox-59.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "bd790dd2755ce4a601a3a0f43dfd340beded583904a9087f24b810a2ef6dce5a0afcb62f225bc68c650b9f15139a5272a9b9c35d86a4a8a7f1c2d7b9373dc92a"; + sha512 = "83e500a45a92e8356d8f38b39d24ee7ba0ac499145598069ee821802002cfeb0c09ea8531cc0241f7f943712c193def0467f6032792b8c9afacb9cae005eba43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ms/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ms/firefox-59.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "f0379a677348c7701b919af4eb26025559821079d1ff153493432f40fd348e5e473f563f4eceef5cab864335e2962efd75c1ae1eaa1ced328672fc8090fa4443"; + sha512 = "b2965936af2f9eabaf131894dae9ae2b5eeddeb1d2d8925da1a5981a63e259565911a86611f6ff47dd1b20c0401687ba9f472ac16a3b82cb2c7e3487f0a3e0dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/my/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/my/firefox-59.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "31dbfcdb0117e3e82c9fca9bd1779d05c58482b165d1439e70c3fb81a49ec157d6d30f0be0225e1b5e4ceb5b9806886d6dc8afe6895b52f3c271c0c3f374b378"; + sha512 = "83bcebfa31c621992c114b7b805e2314b2e05ae0bd6e25f8a94c867efca7cf34f2f08d7a0ca0c8c40b3af8c9a01882597c77c287c28a2d397631055804c00e0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/nb-NO/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/nb-NO/firefox-59.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "0cf3b29b39b6880f4d4b90c0625a2031b6fe3aaac8f5b841c40c9e8140c7d3c6710ae3ab7444cf471bd4945c946f51fec7d3daff4fd67d80beb142df32890841"; + sha512 = "78ff6dfdba1c8aa11ba5afcd3b51ee384cdc5c7a0f5ff5e7a7dbba1ef8ae6b7a9ec5ac40464e9bb81e77681c978a812b2a290ed90772a4ad183d9ee6df3fba7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ne-NP/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ne-NP/firefox-59.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "40f8dab8f69a84722696d97ee23c1fc661f8fccc1daeb1e1110c805893923d9f0fcecf2a438d6a7ef2421962ee66485eeae66c8874c0035666b5a21c2abb9a83"; + sha512 = "e878c6186675d12331832c89e4ad3684a70d19e22d0d860a20b01820b27af97f2fb7849a2301b00a8faa728ba4f7ed36036ce17e6d31d20b4afb7627391c8097"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/nl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/nl/firefox-59.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "40256687f025eb34b65f3d04f9e084f68c76887fb9d3535e183f736941e55c24feefbdb6654dcbbd263ff0944161b9d9bd6e993a85a6a546827f9c5d6e265700"; + sha512 = "c42244c08c1dcb2a7bf861882671509654b0557fc0a7ec5021a794930a9b6b128cc36c5d88b35538c7013d0c2179bf6290d019164fd976ed098c4b2d347e89a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/nn-NO/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/nn-NO/firefox-59.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "0d4ecc0ee915dd73adc758005ce4d9dbe319f47e5e63ab471d9b7e70c5bbe32f4e6a05c33e5ad9e7300b00d167b26a43c4a042bd48261ab7522eb93d8eb6216e"; + sha512 = "883aebaa4243f3be171cb13c6c06b3c8ab0d2f5c88647802832db1dc0059c2e164fbce2f1ab5b0afc8ee7442534c59c56fcec2c2852d580b852d6d329dafffdb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/or/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/or/firefox-59.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "54936a9550e47c5c418a099fade3109118996f0bbdfb6d6b5eb98b239ae7cd89ebd6e03a6a4365157a99b1cb3c7cb67a53e3b2063f748a5afd7bcc72d7981c13"; + sha512 = "3593184349d5eacc7efa6371295807801beb97c3fc9ea79168f455ab96e5a4d931537f3dd415b4572ac0afec036d4a7c004166166a244f37aec48a199a9e08e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/pa-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/pa-IN/firefox-59.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "1c5115efefc64869214a07167a7935e3d9eb62c30fcaa0a1cf762481545c61c6c27d346245cb461658763a7aec734925579af4992263d2c844eadce79835f835"; + sha512 = "e402bd4a598178b44427694528179053229f213d9ec132517f528a041d2e6581086a143f77eae7a30dc9faa6fd9156cefdd65de611ad26b0ed2a0db67958e81e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/pl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/pl/firefox-59.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "c496e713d1f0c67c47cc5adada2bf1cd06f0ffe0d97e67cba934246665d1dac91e5b3de492ef844759233856b4ee8347b680531c421a6e341ae3729bdba0b807"; + sha512 = "bed6e5f2a5230680994400af90c1cc3fe35e3dfff576aa4e8ba3d1363660e23a62ccdf975ea1ecd3a90f476e671380b72dfc777961806739ca6c3b183cb83dd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/pt-BR/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/pt-BR/firefox-59.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "8c85e7df9f4e92ff78abbaefa2f4528d699e6993086f754d7f841613b94c061c8fc4dac5bced24132fc9ac00dea437ecf4d9e169cf94adf4f916a6d6174e5f4b"; + sha512 = "3a70913def8797ade3f312f34ef4debb332539eb0abb2154e54498785c3534ff16beafd6f2ba98dff15c62b43521dfa37d7623ed6d94676fd6d08a3c072c8559"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/pt-PT/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/pt-PT/firefox-59.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "647ab8ba8419aa662aab1a42a3cc016155e727e267513088cf04d0d553048f94f52fe12e2458472adddede896c76acdd9fac33513143f18568b1f11c8b0affdc"; + sha512 = "6561c49ab07c9ba721dfd357876ac38b0cd33ab3f6968400aee91ce4be999d718dee02c43ef21b4440a0356b9ef348c5938beb3ae13e8e0f3ddf813b45839335"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/rm/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/rm/firefox-59.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "fb1a0f849196a3a0f20b1749290b119e949b337af871edee22ef642e889b99b430cbd76297ed11a1262e35785b6c6092d38553e540f74dcdae966f1c155e4ed0"; + sha512 = "b5a878a49086861c6ee60dfbc8bf8cf833287a7aa73674dc0d3d336cc9af1f4f939e2ee45b6e3f69875dbda3d86036f9c6e274a144b339823919aba5800048b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ro/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ro/firefox-59.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "fe45cc59c50e3c94c7d8809416ba668da6cf3a4d91fdf6e1be9e6fb3b6d9e498a35e109f272d98815a129d4bee8cbd67211b2e4864f222f84ea057e2712bea00"; + sha512 = "a9d480f7572e2d02feab9cafb6ac61c1d496292e186436766daf73e7863560a576a3b4104d6354e237513d32e8807ae5a7d226b56ee9b520eb9dadae77bdada1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ru/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ru/firefox-59.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5f2d5d7f285a05721fdf4f6f442d328a2daaa52f37d963060f103b309fe56056cee1917c057cc5dd13c1df881847c2bdb101759011676a8128901266514b26e9"; + sha512 = "f334946512a851e9365ef84bbcc3a7a0aafe5df8f6f2795bcf9283e4085a584ce22e410774d286e9e25cbc946014c5da3fb88129b8942842ab8dd02cb7c32e1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/si/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/si/firefox-59.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "2a8ec448e5a81daeca1d16524189c6686518a0c8ff1fffb33c0e3c63cdc184d668f0cb7d5c30ab175708e5fc32aba38bb0a138b956aaec6cbd3d3b1a0026b571"; + sha512 = "ba91ce5bcdc4bcbe78ad1e9966c94ca540c95e9053bc84c9b37878fed0588fb22fa64c6426e157df082511103c8cc13fd2ee4771047a81cbd388bee3a5124ee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/sk/firefox-59.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "307b3a718526522dc8f0ae7b1ae7ed542f630d2fc3d9e032fa0820d943bcd631e97358a6053fee285cd20638cb65376304b3f0000902fc97e9fceda3344d9217"; + sha512 = "d8666e4f70c35906150985c674bcf01064b6baec74a18b689e8952ac0feb5f7fcad4b83cc0b1fa6cadc6b6959798119494b495ba8194a38f5b3290f937612e7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/sl/firefox-59.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "864967ca09b58861670537405f459d8149b2ff4f77a18f903ef38f925740568e1532adcad7c02e63b760875169bc8f43e779c9f573a889a1808108de5a4c67a1"; + sha512 = "a9e842bc2c33f95fe2df45a83565380ab584e9f59a8ca23d9059c795712da8f274759f204ef36ae8eb85f370027f1992b43f74a79c6cc8c086a3d7d90e518549"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/son/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/son/firefox-59.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "29d149a19ce3b76ae48b50eb5c7d6aa9fbc9532ed0067a5f11092456e91d615d9dae1dc3c1ed62b00bdcf5da6daff8e750dea429bf73d41ce79c564f478411cc"; + sha512 = "f6fd9544276e2e00eb8e0e5305f5267d48157c7f6b872b079f4722a797660dadc81da47cbfad3e2b525960cba6deff206475607b50a1aaec8f180cbc1d64156b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sq/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/sq/firefox-59.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "b5289d1a40452c57807054c7dc946aac0ca452233a950e671ffa65ec02c1ed4198fa47cf6d4f4d7a3dcf0d4bdd9b17e5ae2a8a97ccc19acf0f456c0f7fef123a"; + sha512 = "18700a804519c56dc39bcb7be5b88385391ecbbe4e46e6bd9daa1dc063662dafb823aaa8e11ed68bfe31473c1538c1c34a52c8a38bdc8115867c50e618907833"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/sr/firefox-59.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "7b0676253b085e69931e01166f56004b01e877d7ba178ee356f5dff43562f84a3490881ff6bb7e800c8b2857f4b9fabd64def393f9bbe5e7bb2642663c729c93"; + sha512 = "e29e00bc5ebc4ad7d8cf5dd93bad6345fd40c25bd56e743d0dead040cdabf59a423bb62dddbd00778be81e70a8bf0ad5804bec9ece1631623516331f07afe9e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/sv-SE/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/sv-SE/firefox-59.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "1930438ee12b671e61a1534cb43820a972e574b6e12f1b9b0b44d740e02750e904a4654ec521bc7c6c0821cd92499249ef029e940cbb7a22b9d9b1c94ebcc65d"; + sha512 = "2d0eb3d5e206144b96e3165060aa466fd512a943504256735fa96a17e13ed4717038ec07df4d5886f837276fa3fcdf73286db046879d99313b948a1af3fbf0c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ta/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ta/firefox-59.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "75bffb22482c6968c5c177f3dee2613b75659cc5f701f1df6f7b394ee462a7a4b2283cb8ba6e6333739b12e72957f4ff7f36d9891d424a069a27700ba40804fb"; + sha512 = "e702cb916b2164e67ae75c58a812dd42c142dd0fb71417337a12e14a865e236c406edcdd11621584d43f05005be51916e3479df4eaaa51cdf4d2fec5048c1947"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/te/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/te/firefox-59.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "67b8c2d161577370585d1d308287cc2dec6e17511b5216debae424d97f01d38a19bedcaf131719cc211016812fb85e1f321b374a33bb2b41578f506b6dbdcc99"; + sha512 = "8d4adc92da5875b7cc405bee387d1e5df225dedf4097627167c4bf4cca7893a4b51e8ccbe38bbb2b1af96798f1d34ee6f78eef3b00287eb9835ddac13ef43dfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/th/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/th/firefox-59.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6d5a11f2b4364e99021530e32dcc0443d76efea0597f09d29ab2bdcee6a8e97af81f56a7e09c44e5ee78723e2ca99abdc12965e115e1b32e39441975a1107550"; + sha512 = "7d920c85cd7a9c09fd8c1ca0ff61ed4c458527eb048075dc0d16e26da7977d1fec0d9cf40187a5b1755b30c2d95b45be215b14f8789cb2b37ac72ffd884d80b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/tr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/tr/firefox-59.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c62f3048f3678799d3526660cf5442ba0f39b5acb426d9fcbea7d0310d54682d3bf19fa510f0736c7539ac38434d338191940f621604e9f98e2e99a06bc8705c"; + sha512 = "984652faad2b4ef5e0c4b38e38716efbce0db0c11e44e6c8ee7f33f45116833324f7a8d5dd0b7fb3888ec6c490e84a463ed3ed478e597970e87b5003c3457969"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/uk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/uk/firefox-59.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "c6e2cbc831993decba5316b8f9e096a8c0626eafbd86e67df219923c7169710110cea6de5f8060ed7917c15c407fce0a7bee2d6a46927cf5c8c95ae76f1dd473"; + sha512 = "d416a2c9e006dd832b7d42e4019128129320d2e8861e7657573c0b76c227b22e9fa9b0f69ee97bca326c9951e1a04b9ed2abfb6afad670f1436b68c9e999abcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/ur/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/ur/firefox-59.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "48f86a924fdef01c7ad7950a79a145fe3ab7087ff0f4d2e50feca384f25dad4575f0915d8c7cc41a253d58aa1b9940fe92930a7cc48081f2e363ab7bfe740e21"; + sha512 = "3711a31737a81b4c1462dd6a69a50cbdc274f7a95a54a2f185c47cdae520385d141ac40e7dffcaa8b29d2d4369a7ea707834ea83df60d793d1ceaf3b0bf31aca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/uz/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/uz/firefox-59.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "40180bb0ce42f27f4944ebd397332955cb200446d11218a0cf846c39f03fe71bcf720232c7e52ec237024673024d010e909c57e44a3d26310246067e0022cf41"; + sha512 = "c579af36bafc7205dd1cade982c8e84d02b7e0aeed75c866068b233bb39722a79a43a4356057ccf33426825e0b304fcba2fee1ee19a3f2c8b4aabb95c8c3de2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/vi/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/vi/firefox-59.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0b546168fa1c46544a693b40e8e97c8d01fede814cc0866db6475bcb7ce17a2346833de1b19e4518b21b7498cb1dd5bde109e7491fa320a5a722096f1442bfe6"; + sha512 = "807b95822022917149758edefac1ed2d960b5f016705a99acd52420761e31999903a4ae3932d53c70185062fd0203b5ffc33aa79f35e2fce8303b59702744d0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/xh/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/xh/firefox-59.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "6d431b8dd89250df0ddeb07a3884c0b5d8e13b22c53646d75ee4137d5fc2d3f5592f2d8974640ff0de6e650f0935fec74c9d7b6556f8f8c1456149c4edb34b3e"; + sha512 = "7a4e961f42775a1e878f6a1e478402eac3dc6eb330c7ac22a5febd0b8fd6d7a7866b6d2346c26f0e53389781c73abd67c29d316d85b4f2129e6322b80591a633"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/zh-CN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/zh-CN/firefox-59.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "9e9aeb50a38c3ba753b13ac441baa8126645e07a73bc8a34c633a9d277a6ea6599abf9a3b81ff3da736fbeb7f1d246fe949d8e02db3cf91b686782be0a318595"; + sha512 = "c0511b14e3a6edbaa22534f51b1f98e366ce5499d00a0d56e50adcd9248341afa5f8429b99ef161447cbfd41c4330779ee2d693602cffc7f32217e47af035a99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-x86_64/zh-TW/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-x86_64/zh-TW/firefox-59.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "6c22cd0c1d95a0f365e2cbc0d0e5c21f7af982cd36833ead9a056cd676d7dabb626ac9df9af5429aa1fb92094b33a69acac23689d2ff867124545c110a35672a"; + sha512 = "292fbe1b67cafba2aa8171e36db9b86d3f41822b9ded51bfb85beda880b980d18df6a35e1f425d93ff9f9e76b30a182cea4228a044110473dfeb1e986e846418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ach/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ach/firefox-59.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "dcdbbdf2c61cc5160eb9f961c7380093cbf12aa73ba0066296790e69bf8f60ce3894087a1fde706016b57020c1b8da32a23a9715338b75c97d59183941503d68"; + sha512 = "5195fe8d1d1a31b886d3412a5ff91c01a3f2034ae5c354bbfd02ff5d4de41706ec5ebf85596965e060a5d9895c7741866d41649d750def2cc525eba206d58785"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/af/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/af/firefox-59.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "b46b173df4d904ac974bb6871897f8fafbbf6c590fc190c992701fde8090fbb2e252c568f56268286a43f08f68e82ad393690ac446ff0895aedb1dcf8900cb59"; + sha512 = "ef9a8eb36319f78e6249d8aaff151ea753fd1b0e9148c64adfbe0f653084c88fb70e5782735c805d56b2ab52677facbf5cf1d0ad320eace1bca938d112360d9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/an/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/an/firefox-59.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f4043062501615b69b9a6f7f8c5bfb1898b877ee580910efe627dcb09538b08c3614e15a03b9ff1cd74dadf8af9a4299e22db32244b1741821aa0fdbe72c649a"; + sha512 = "f67be9b0de60ba71b2a9006140a95881771c456d9d67cf845b50d0ba9d40a844327935196f10a315a60a2e1709c7dd0420bbe8515102766a1ea5e0cebd7d9be1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ar/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ar/firefox-59.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "880d129688cabc9732138d7eede17dd53c6259df1f9dbd2fae5510649e8df9c1be7decb1f1c44cd6e9d998a32b0680490b5a9e348af2d1a50df8d521db730989"; + sha512 = "686c8f9c889e325f39dd1d0c3bbf0e41300a7b188a3cf4d1c04dd91881f4b874460657472916ce75334efc61e54026b06e3061e91cc054f1ea09655bf5e984ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/as/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/as/firefox-59.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "044ad5403e1d3af4bbd3a0e2efbfa4c6b05ae80ffaa2397294cfdbe087325c7f17a80a40e44e1817a5f5fcf2b420fd892c0b0b9e56e1945d2ec96d77f39fa3f3"; + sha512 = "13b83b595f2268937f58fae19eb064912a0236714e227ada658b06099243d68ade2dd149d9ed79bb85f4596767595def575962366c32b3b7759220724a1eff2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ast/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ast/firefox-59.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "28efebe8f08d88778854cdd0dde2a66a76e85898afc86f6e136dcbb162c4b3bea9eeadce420efd5660ae22199c7ba0aef29b9c803c1b9689b3be9a0856599d32"; + sha512 = "c70e186937bf74bfa39665ccadb68fa390c573d6d2ed07447e2b78157ed93577fff17185010b2263592463c423597760c63a431876a9879ff0452a9290c83427"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/az/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/az/firefox-59.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "58faa1254fd08c606a58759780f96fbca4172e7551e08bd8c998037b526244f2d44fd618ca1677039d5ba1ca1a244b8a104f3478d43ccf0bb56c3b223d759a34"; + sha512 = "889254b6ba089332a7e228c0dd801214b6b13cbe75000f192d282682fe760c36642634cacf0634229af6e3fc43ecc77ca1c63b68a9afc63cca2eb0e6e50a47bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/be/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/be/firefox-59.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "fe017dc001a47ee3520af5f003d96a6d24d6205676153e2837d7c6972e5a7652a74c352709b61908d97107a040eae5a9416d5ce1613cad3295fb7fb0b1165d03"; + sha512 = "26199077cb868fc5f1a3d60cb019fd8152c615af62709206108dacde5912a522fdc9a601c8222f54f6b6d0103e585cd1eb06dad3b02414bfe3f435214fc54837"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/bg/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/bg/firefox-59.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "674ae504a6ec9ad52c4693b71eb623204027f83a47845365fd55feea4395986b4106991ff977646e6e5a4569e2c00e74ed81c8cd99121b40c229473fc3763697"; + sha512 = "0fbd371902076ca76dde9f2dd5b3602a2c36f3bf3e635da058a5a33876b1b69ace0fbeef69a703ecb8980724ff8a1c00f83e1fcc9dca2beee31299a10fa88970"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/bn-BD/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/bn-BD/firefox-59.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "d4b7a8865e1743ef415e91a9ec316d671cc0e959b6ec5b6206ef82efe783a7b2b7fcd7624a4b2520c12553f363c15320f9e08a5bbbddb0b7e2ba2983e31d6698"; + sha512 = "bee88244e6f502f9d2cfe9c8b44737bc74e7feecfdb622ea346cfefc5245f39c09d0fb9d5838ef75e242b4c6b531d1aac6d5a59678642873f9cafcadcf639f28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/bn-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/bn-IN/firefox-59.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b8b766777510129018ef091b975174ddb90e277d6395fcd93b2cf46eb998deb02338ec7f6e85b9ee2ed8791c81ba131bf614d4d590b0a418292df85b42f3ebf7"; + sha512 = "259ac2a4edc19806800eca1328de3789ebd39e26f51fc9dd5ef4c5b7e162b7420cec2833d038194a6019237f9f570263183aa7d035967d28e0ea2ba52bbd694f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/br/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/br/firefox-59.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "1297040bf1b387ee0818f1f516bb7b1bcc3101e16b9607d1100c965da1be489e50199aa730498220843b8f9a91058168c093ffe64cf89c80cb146a00ebca2c26"; + sha512 = "a1cdb51d3cb0d7a4999eea979ee0db9d0d6baa20f251cb5c1888c9a837fc623f0b856c364aa5c47764fbeab04f9ffc3617a2ae1c4cf54421ebcf434fca5d3158"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/bs/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/bs/firefox-59.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "6a0716c3193eca75edf820b99b71f1b289960d190a6d0ded6f62633ab4ea1375a5760300d99adaf672b72c2d986e7bb8e3d7efcbb136e32d49011efe25af0751"; + sha512 = "13193f327c5964a3368ea56d1f1410dc521f4eabd9635d282d357bf719a2a08cfaaf7196fc87e385c0fe665d0a1b3967cd55f0d83712f1832dbf0ae949b94d83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ca/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ca/firefox-59.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "566ba7e707684477b55732d31535834dcbde9ade01fe5fe4fc14d6065a937e29cf8d2fef05b0e16222c06e41d6b295c131a04b9379dc0a62ca710ba78152dd31"; + sha512 = "19637da51a962c9da27365328e00f0dc1eed931459896f91a863e6f99e1e17b57207f5f51890deb72ee164de1045ef028b14d79b71e181c8fe0fa89842a0c63c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/cak/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/cak/firefox-59.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "6516e8b3fc8bb10144832b0606833b5085c057020f78f974b1196c7d42956c924e45214a9c946b50c0fb9fcc50db24ff912630adc327edd960794b7903a1cb15"; + sha512 = "099af30a6957a67eaf787d64c366dbd5ea16924aed134e6b45c092d9fdaf476f1a9ead05800ebd91fc99c3bc483c14dfc37a6b8eb90e40b9a6f50d114cce7ce5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/cs/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/cs/firefox-59.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d69335fdd9314b7ea51260b6d09d752ca7dbb5b79f99bfe227296fb230b95ed783c253c4f590760d9e5773f59583faccb8008a48bd5a96ac7ab465c8087b9ad9"; + sha512 = "aec6a4ef2c92ee9bfed98ddf6d93879a7fa9e882b0c82c644776a6a700a4e981a21977924a1fb68c79bd82407066be949d1d6f53bd42307d5a5a36cd262a3829"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/cy/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/cy/firefox-59.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4ef538b761e7f25b112d3fdcd879be870f380a20a26da13a3b6b356d15e60470163886ee59aab67166ced1747bc9f48369df3275719fb814e21f81c9060a5515"; + sha512 = "71204535aea799bbe6e133850b253c8c01a7ba1c1f80169f4e842edf977bd0eae54eca8370674d8161a0edb6738bd8b21cb554431f988822e287a15ecea68d93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/da/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/da/firefox-59.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4e62c1f38b53bbe3eacd612d17b63b449f609f8d94beedd96705d3f1b627d1a427165c667c8d0c678f9a47532393925f47915ea72ad3ba1490fe7b7a0d957cff"; + sha512 = "b87282f26280febafa771edd0b3570774987a0694d8c957afba819b396d57cc1bfd93f8d8135bed3eb53b9a1b56bceea3aaaad250261593f9be7fa555c319b22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/de/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/de/firefox-59.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c406ba6aca19d4f517b4e923f1d483573e82c6b590805f0880a5c38a83ed63ace3d9b52969042d0d0734ceb946817a55b730c1d532583024e360dde592d3e99f"; + sha512 = "92b5f7c7f268afc3fdf75ee5f58a74341798f1069276c6ce3f964d99590a988b2f66aa832c90af5518453bccbe1d9833d0712130dfbd013ebe7ba08999812226"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/dsb/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/dsb/firefox-59.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5e7d27a03a29a853e9c128acbe1715846ab49078aeec43fe9e9c461fd8780eea0f4723bca7f84c69b4c2d3dbe57c61c98f49511144d7405821b934cb15fb5e00"; + sha512 = "37244fad6e4d9487091604febc392c2b821d56848f93a83bc566bbd5f9d32cbe90e1e92e93051b0ac7e979b67cb6661c813ce4b945e7de9bd1e30d91813a67ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/el/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/el/firefox-59.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "868a7ef45b4c7f0cb2b3180d5ce070ee619b447497779dad976740f4bb21081dd942302b3478893ded779031ee3c5cdce0bf1aa3d65e1542aed693e3675dbb3d"; + sha512 = "184641eadc76b7d24a8df2e2a1521f590924ca7e81925c1db28f67f8f28871cf2f8ac8e9e875531eb04b09b65cf47ef6c0fbc28657b4b34b07623e063136c991"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/en-GB/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/en-GB/firefox-59.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "dcdf0b70f0c2be1a25c3f7c5a03f7701776fd12e1353ed8028e9a32abd657878bda25ffad1fd3d51291735499f98d88293834dcbde558de5fce26acdaeecec69"; + sha512 = "0f1cba239c8866d622249dba13af14de6a264ed9a30f460d79408f452390f17d6b94f75096d9687c7a7a753652377a25a7d437b0d4f33fbc405428e384dc79da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/en-US/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/en-US/firefox-59.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e06d91d7279a791fde529db3dc82500f2133235f770518ce136b8164e1b4773675bd1fc00b1df7794423aad80cb020544441014c95bcf6d54ffab3812648193b"; + sha512 = "654902f13cfe142a2f6eaf4838106a1825f77d5f1ac55111c8f38c49d8e987a153230a8944d5c009abf028496853a8442d33c6fbb2f23d35005da765009329d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/en-ZA/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/en-ZA/firefox-59.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "baf3a3b4b07aef66072f34d1219f59124a26973fb52f049d9b3e32a625a9ddd0e507792f0f4aab59bf14b61903de7b3788012933040bfbcaf63abd018ca9f6a2"; + sha512 = "f3b17e0509df52dde8c753bd3358635569eea8ea7579243611356a4a47975267ee5702a1894325a549fa1fc9c86416253401fc6dab81adf95c79c09ba3971030"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/eo/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/eo/firefox-59.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "c44203b66d22efde88fc24f9d3c96629d203bdacee0bf9a8ff672424b202a29e8f0272bc2d8d0e348cb8b7f0240e2f1c61825b61bebc44f0da6d7f01aa640f84"; + sha512 = "c0bcc8d00e728c4dc05332b6c90ab86f8d6baa688512271a2b9c9703b821090dcfa45bbfa4db97e803e95d391a07e0f2e3f783a1106890d0c34dbabbf32180a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/es-AR/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/es-AR/firefox-59.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ece746aaa80c6aa27113105325fbdd37eb2c2f8950a47e633a0a5f6c8b20bdcba16676f992c72c262eb95c745a9896242f613e0fc75c190cf9aa799a0162127a"; + sha512 = "1359fbad04c9887e049fb59bd872d81f0a6242a2fc3081ad8d027611375c5b13e082ff519ce5a2db1aa0134726ac4c8a9e8f37126ede43c3e671507d3adb8ef5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/es-CL/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/es-CL/firefox-59.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c36489b825045844687ec11dd95a2c9fc67dd75d3d86b3e8a833abdab9faa0b2f946ac4ae061dffd5fcfba57fc78b20a161ace2b04a36d206cdea3df625fc82f"; + sha512 = "ac0d7b310171d5912911577ea61e2f0eb562a14a1eb3eb050408c7241eb131c0183784291e244881f808aaccea097a74b4e24151d0add0a3fc142878f6a3c5ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/es-ES/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/es-ES/firefox-59.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6ef85e4b571c901879563fc4dd55932151e23135df780fed33730a18565c77733388d7bcc29e0d72f6c7d37969478c3a2affd236609ba2e86a76d46bf358a84d"; + sha512 = "b5eac28001625b4b9bfcdf2e24c9b64ee2ef54e69a533ecd03c3dad2048942ece37824663ee074ba69c2d53b1e2d6ced20d66136443f9072a5381817099a003f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/es-MX/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/es-MX/firefox-59.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "95b8eb509e7206588d5b8546815b9c15dcc99e446ff35585494d17508acbd1b699d7d1b429925a7fe7b38e5e9988470a5304e11ede0907ea81b32bc8eee242ba"; + sha512 = "41a3ed5ada8c1bc24cffc12736065ea27c3e5ede2a6fd2f71596ed6aca5bdaaad90097d1c6554a6268b1f48fcff7346f3436ca176676721d8555b2e112144148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/et/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/et/firefox-59.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1fb01b69c034f005cfc481d8f37860eb4a7c0b8f6a132103a0b13c04531b4218474f17e8a707247c0e55ab084ea4f69697f1b73bae903e3e5a1f1e7142104632"; + sha512 = "aa33f6b425fc4076c2dc6d405e876592501eb0e14d853efd5b7b76703d4ad6ace61d6b8d48eb46ad440b645797873c879a16ad0b092bdf80fb2e6cd5e62342c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/eu/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/eu/firefox-59.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bb9c0250e3901e98c9723b6c56744e0078bb9e7262d19b8a32906d4347dd8aeac7dd05ba6f7f900d84d7cdec33ea42219f6b5d34ebef7b3751a236374c2cfb6f"; + sha512 = "7ce22d301ffee66ee8de97ce4b2e5cac4c7317b5567a6ea5964cf0b134f3d682433fecf83060452167003a7e8458d1311cd9bf1baaeeb8a76d4098718fb92ea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/fa/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/fa/firefox-59.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "ba7390cecc52d00294468aec6992fa647c1cef8bd2676b885a5dc4d43612a3aaccfc5b9973e11ae8f41c067341b554489ca34eadf5996b7904978c00bccb10c9"; + sha512 = "27a95c37988873c0ace99a87f0878f60130ef47bfdec50589bc36b33a7da4de3c875117be03c505e6be7464eabff29285851d972e599c7f9d016d7a515598d7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ff/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ff/firefox-59.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "ab6d7f44295392726bca99d11e6ab9894feaee189d6512b5b7504c046c9fa48829003072e2019ab60c20105cec13c5b113e35cd3628c3ed9a00983349761cbae"; + sha512 = "f467f38f66bc4e2128999cecfef736dc15eb05e0dfe84f2960e1d073d87e641fe15a96b65034bcc1c9cca667f391e1a9f094ca6971678b46e45b62c744e7f391"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/fi/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/fi/firefox-59.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "71f7c6f480a92935cf4a8815b1c213e2a91a2bc96b184df4557289c815103b5767409265ca38ac8fee2d70b20f321a0d758680c1611c7a4ec58005ad4443e99e"; + sha512 = "eba959827e0e8365aab5708116c05169eebbd7238427247503e61545b5f2eb0e8aa9dbc4b2aa7eb2844bfbc1fe0360e3dd166a220190807677ba22a764a30ab0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/fr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/fr/firefox-59.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7ecc1c31c2410b0a6d853507aee740f7f9981cb092332ba41829557fb222463386091f9c54da900d1293e808773aef2b990985615b5541eeafba545ad52b8055"; + sha512 = "33d0c314725e12542748a1d2fff780fa8631ad519c750ab3f1bf604d760c887190e882304a1edc4c745bd41ac2fec3aa6f949251b82d616b53e52e4c85ec466c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/fy-NL/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/fy-NL/firefox-59.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "575cc07983498858ea720246929cb9991e5c4ed9f99679b3266c1d1d290025c30192f8c653ec5336c6d60c59ccf124c1c7d9e42b2e22341d5552cdd9507004ee"; + sha512 = "6fa40ac3de1c1f824b48b3df7ee918e97cb09bc3a3eece4666ba721f55d3b4c100dde860ef46a5fd100913006a90d13e110f76692f00227a786022f9a8adb4f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ga-IE/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ga-IE/firefox-59.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f422262a08d300f25f03160ad58f474cffccc0ce573bfda47e90c0ec5f3b09588f6e527ad99c62174a3c9392c803a37152ed9670e31169cb63494b1d0801dc65"; + sha512 = "72cfe20feed532fb5334afedb45f2174338cdb4c2a709d56f5971a0b6b252276a4e795bc6dcf8b8626be9979183556de520024bc4621178af5254ef2cefbeb69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/gd/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/gd/firefox-59.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "dfc94426a47493438619c275557b669e4e7a6606f968fb166a035a57fe4408388dff820cc5760b9042e6f39671ae5f1416e0b05ddd97c34cc5e45830a2007aef"; + sha512 = "a171dc210ecae76a9f983ee7e679e376487e56de6c15657d71b0490e958e4f03c001108faa1981bc049e31cd93f6e7e8b4efeedd883d6cf246b70340055f888d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/gl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/gl/firefox-59.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0eaf06e0b666b4411a8acb1d26531ffb4200c06dc423b3c26dc65cce0ce52534b6764f9f392c122b2c86c89efc82d205d1075d7f7cebe4a90d6d395ecf4dc51c"; + sha512 = "3406f4aeecf539a6f0ade1e099554e7f7a0efa7ea7494100888d398a797de23dfbf0608b2c1a3662801613aa048817116068adf4dc65816e4579aab13ab7924c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/gn/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/gn/firefox-59.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "201cf482bb592ea45042a76d550345975dd7ffdd65cf7dea906292b18ed22d6587f87999eb75f1f4105a2b9463be042f2219b6bbc024e480f2a8bd54788ee070"; + sha512 = "bcbf9d532169551d96c959904c29afebf3857a8b1db159b6c9bc07d2c83ffd243fd129ae27fe4ff8c17b52492efe21a812af2b56eaf54966ba05268cdf677422"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/gu-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/gu-IN/firefox-59.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "36a1548f6cb8352899767cd04915f46ee9db23ce81474e8ae6b8814014b95569f851462f8ccf4a67c1a90ffd6f0dbec0bf28890d4d59d3952402ebdf8421514b"; + sha512 = "8ea15c3d9529d873087c10769ddc39ebb1ab1ed3ab17619f3d1d2a98b8dc936add5bf93a0e2a28be8946b52abcff150e97953cea19d47a3af584edcf320c1cb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/he/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/he/firefox-59.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "422d309f265d6c4a4c2206f430d1d16d84a886dc3fe85d6e44980bcc09d9114cb426f64a595119a09e47668237d3141ac4cf001cef07e15cec2633fe0ba89188"; + sha512 = "f4cbee306be391ceafa746e85d7105cb2330a722ea4bb298d599e6320a8365be773a2c4c7bd61e511ebf512566db033d76913dad0c2a76da1fb896b183ce29e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hi-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/hi-IN/firefox-59.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "c12da2272508c9b6fc1988debd620f0dff95cce75a289a312f8480a442008917a28948977c96af3c60f2184182409b4811c50b0e231f881eeebb909411a9771f"; + sha512 = "6dfe40757e8486841c1877892a567e0f6f0a99414b527a77cdd49f70fd96b0e14c4b5514d7711d02b8f197a2e9e73f2e89388256714efd651198d26921a36c42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/hr/firefox-59.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "93dedf524596a70c71a471003f98d9144f3414c9fcb1c0f6e843a8f66a5de3432c72c658745beff7b2a061db642c021fd0f8f5fbd47b16c3c49e46fa352a211d"; + sha512 = "9cc07ce0bb996d11238325c658f1cbc0133006e8ccbd2b8669619bc5ea582b8a52dd1d4f5b75d5f141313c01e973bf3f255dc2d53e16b606e38f9dcf8060c969"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hsb/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/hsb/firefox-59.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "dd713a5890d8d909d0d81ae624730d897e216c76e5e5f3b0445cd8c35920a99757e3b32787b0a5de852dc689c9a1a7d7096e8ca8a22f59b98a82512da1e1d3a9"; + sha512 = "28c0749cd90d22f4bb2cb19cea84578608e161da18f0f83f50ac3e4cdccbc86e7f5337aa29ce782b113a31fea37bd0b7fa0f8d9964f3871bf54b448fdd087f17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hu/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/hu/firefox-59.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "15b6175b8b2bb4b9ea3efdd6c9c16a954e8760f2537f7bcc78a0231815395bb0f2ef1212265e498eabedec4d561f6944e5bc851939a7943285dce981b06fed62"; + sha512 = "1abe7994eaee5b053112d294953b0b188fd98f372000f8ca0e95d8d68b60c1cabf45237b1c776bda8928e510ed141c904d1cf7d739e7c58767ee23a0303e35a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/hy-AM/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/hy-AM/firefox-59.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "e5ec9abdc9a9ac38ef5671041db9ed84907e712e998d261a7a5c07a02ccff2142949c9c137563657c28f531c5a3c577ac35b8c3760ab3bc7f0521571d1779033"; + sha512 = "77a87119fbab30b9175d88b629eedb17259caff70927ebfd075b389de3cf4ae59a140f0fa412a47e02ecb8fc06789bb951ac44fc53971f3fa5f1003ba9960c7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ia/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ia/firefox-59.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "4466d36c03523e0680f591218e5788623b5cbbfe1ed25402cbeeab7e53a325cb2abbf66bb5c4596e588b54dd1e7da66b920e4909a11ea86832e891f5d72a6caa"; + sha512 = "610f665e96ca1452a647ff9b5e7efb183ee8981542d29ec7507f1b9c118f5240d171fe5bcaecae1ba7838005261d2db2dbe1089548c30cdeefdf457f1c415576"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/id/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/id/firefox-59.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "f18bf165dff3ba124966a641b469a3d059848e49c5e3dad03ea1c9d1d2403279f9e63d3657f83ff28cb1493ee7d5f3e0fab9ecd0a66cadf23db8fd4e003c0d2a"; + sha512 = "70c23ebf879714eb7ddfc0357e89cca8e7c5fdc57680d23b7daefd25aa8839833393e60dd97e8a4f188032cb9cb1de1782d292c4af92db03e631b4f408f7a2b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/is/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/is/firefox-59.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1b2d2f2116752ce0e0e572e5bab2e60ef60ece8d62e68bb339d65b9ffa4dd79e69525183e1a584a878f6424248255c305ee2b49c946de834517f38c535ec06e5"; + sha512 = "459fc0c5258e5242488b934177efbacc238e335a9ce6c0aa447a0ea5e43a3242d7c54986f3e8f95893ebeefa9a4358f918e6db43a8ac61e6f4b4bd133b034ea4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/it/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/it/firefox-59.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a14fa6699b7f896c94ed48be0b8778485938447a6e0768199c4d679ea2413991e8a36f2512c2752918375169d70a3ca60d1c47ee820bf80f152048ac15efd199"; + sha512 = "daeabddf3dff385ccd2598d62a807e1f9f7f834d50c4a9690bb1d2b0d6905e402993024f05549c11234f1f13e8e3e3addd6851c76c47a386c8f52bbdee3292f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ja/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ja/firefox-59.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "aba0140076f89722e80b4132c39023e37e14f01f616fb4e842597855bda221a84ec005ac96e6eee7186303bc693782517621df82520cf678bd680715f1ef4197"; + sha512 = "634fcf673db6ea1e2cc9ce0232ca38bf39c8fb54c389120baa68ec9709b71da89750c06a9ff44568bf9ee74e2fd857b78a2ff028d29e5d264dc5d0e1855d8e8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ka/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ka/firefox-59.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "014d45c95b3b7c718d969b8b3ab5c48e6faf932b9515faa06bd9d61c98d6e1b2e6ea5747c6ad3b0b715da9b5394a3930cb975e508d28ee2bd2bf7709190329a3"; + sha512 = "94499d573b516b4633330b3ccd1bd0aa962e0fc6b9129c7d2ca24674e03a5974497a6438f582c323d1d40441227009891a8f5c45d3af14c7fdf97176ee5ffd89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/kab/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/kab/firefox-59.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "6bca11465d3733408850b66c5383b4bde5889dda7b0fc586c0769a771831f5f58f4bb3ffe4d1506ec1cebb99f181361af8faf6101b1952fd5d4bb4dc753911f8"; + sha512 = "d043bf49a4fa7ed6e491c8bbb0aebce6acee5edc910e40035afc937965fb17da587bffbba40424b80f32fdbe7106a7741a9d11fc518d298484a4d4d7449ab024"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/kk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/kk/firefox-59.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "cf540be688a915102f95dfc7cc472431d15f724ceb2502e89f78c53340aced1501ac5f9590ae81bc84d0f8b0889b9c0988932c211f31b83b7a3cef0ecc10b638"; + sha512 = "2d8e8f3b2f982e1c5f01710e3a20db36748eddf8089876ac769f3dee2cecc47d2a74b9f250bca7f25cd8066f6968014e74b23c334d2f7624dbcfebda5094af98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/km/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/km/firefox-59.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "47e8cbe0548b2c957eac22fc10dff5bbc58a33b6ae28c9f453071e97213c3ac97708bf3e62080cb1b0eb12478a3e0581e48e363175a5ed51512b379d888d9b2c"; + sha512 = "59a221a0c0656846f190428440ca8a1cb9389ed070147e0d772404bfa70995d2cb718dbf5f638fe4ddd9d4d895ee0155a671e14b9aac8c9879a45ff6dac7dafe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/kn/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/kn/firefox-59.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "72bbcfefba3197b489f32f656c8d8f1d9e86112482ab178606d9291687367549b86bce4c9f332105c55e6556844df5a614247f3f20e15c7367c58b0ee9e4f0d6"; + sha512 = "403607e837d21ad5588344a3d5b00d8a72b7c181082e3094fc4b314ab68334a546fbbba120732180f26d944d55df88e753726e5c4a22f0f57c0001f463da30e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ko/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ko/firefox-59.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "13022a8bbb4458c371d3b640ddae98a2ad41722c05dfac063beff06a354e062e38fdb962ba5dd0ff2ec5386fa3ee2fb9329dac0143bb9b14387c9cf786309e1b"; + sha512 = "71d02bf8510f0d397604473b5a9ebe4a9f70dc3c01012000decc152600feb84d9f7fc89b4314263a4c9e820e2249ad475a9e40a64a53a80be492ffb232ed0970"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/lij/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/lij/firefox-59.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "882b40fcba581b03d36dd3021c5bfbf375fcd2b38676eb592cc9b0777bc5223a2f931e235f333dcbcad2380342c1dfe26a9bb043f7ef5d88f7e92fab3edf5e12"; + sha512 = "5232a40d4099b52e81948bbceeccdf499c15f432e2a4963a8adae55945a435dde6d06fd1b0a7b9026cbf7f255e963e209bd8dddc19b4a200b8fe6620c5b06cb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/lt/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/lt/firefox-59.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c7a3859f644705c5a269bc3c7634aef5551c8cc9730e7666eafd67a8e39bf6ef1943e043649d73f42df3f987e98a71168df5f7303ed25998e6edb471d2a70754"; + sha512 = "3424ec9569d2c27b1b793c84aa9921067843fdccce55e05bd005926e464e71562c4707db2c7b02814eaba2f4945c3b8c80d054f10bd932306a5e9ee970515152"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/lv/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/lv/firefox-59.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f2d3341b4d32b62a2c67ce922bcff689ce08bfd7ccc22306299b4a297dde8a3158cc0c225a4470d2c60762c4acc1b06f4df96c2f2bb9b053d5bdcc1a4c0577f9"; + sha512 = "9b6168d9a5f1f3d6346e2bac71fcb0c372588f4d6fb4248b3fa327fe718dd3b2ae2c3248a610a8187922f31ba8e40031365b8991f1381dee72d97a0544a24ae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/mai/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/mai/firefox-59.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "44347bfed38573998da52f2afa1c92e24cc86a3f78b64947fae4487047baa7db72adb89fa361d2a6bab5c303500b8fe89167e4aa818d23c21c42c81fbdabc15b"; + sha512 = "0add366ae96d63bb5b92d9371c708509ea5d52ac8f11850c046d850fdbd7f2752cc4d878ddf08b6659ff5168f60f996cc4ba9596f6102b284eeb43314246f73d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/mk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/mk/firefox-59.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "d3022203142754e592e3593ee4602156552f9c9c629ca9e2b781ebbb3fde4ffe8360f9e959333869d7535771429b04c96ccd3e06fe9235fcdff1b6d440ff37b4"; + sha512 = "56c0e3b3d95c1215c274d14f814b93c7fa642f42931487685385fed3d21c77f74088b81d6853bcc3e700e8cd7d2893924bc16deba6b813cecd50bd6519adeb44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ml/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ml/firefox-59.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "eb1cad98f1f6bf5d74a9fc65c631547687dfc97f64f950191727c55301882e48a1aca92d9566cab619ea2b1c69f3670d4d7ed82eb0a07578b6d949d109cfa34a"; + sha512 = "5b11955594d6371392407a021003fa1d7a6150cc1f322c3b1b408af5fb536d884c1e1d060b2fe49267affb04f0743a151c159121f520bf60a8dd5f14344a9876"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/mr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/mr/firefox-59.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "2246d555fe20dae8dd4b33981aa248b17a4454b789b831c95922cef04cf82c9daec99deb2ca01adcd36845ac178128255a8e5e1272d0541f70b69a40ed149679"; + sha512 = "a82419e071f3abbf50c0a52f7455563a45f5b1f83fb4ab7ca021908b6998f5c5a13afdec94b00e796ed1fe22519e11ded3b390f38d8a47012f008b67ebbf705b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ms/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ms/firefox-59.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "4190a6c6cd1895eb7f325eb89076e04278fb3d1334dc4e7543826a7fc42bd15b681538366ef2f73ea864f3a3a3f2758393f40b3d60241f9ee82aefc36d1323c1"; + sha512 = "70f9e6311e1c53b9c1683b698ca715fbdd9285d89c31eb56ec29851a415cb818da7cbae8adc13e2a81b3c696cd58e6f5f48d31fa44c91c470ba2b15af96d8b3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/my/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/my/firefox-59.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "295907b17943be4d537af7bf7a1838ab0c870cd8a1890a00d968a2630961716ad8f0b740041cc48529fc55c01856c5dad79b434a16cd5d9d672cdefd6af8c3d7"; + sha512 = "240e7ba622c462f30bba42e8e17efed4d9ad1253b3781f6b780ce41da4d5f57e2dfa595dbf2064fd1a8c8f670b460d1cf38d9a460ab281a108f36007a3d2f69e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/nb-NO/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/nb-NO/firefox-59.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "fa4b2606e7c4a224d26c561c93a3ab4ecd7efd4fd628e485b23724f16f20483bef5098080bc4fcbd23563f097813396c885d5d19a6743cdde9d6e0153323d02e"; + sha512 = "99761169b1379268de6c91e0f5b4b5c21c89b29ee817eac36882162cc6139e51962d06b0800ff6c5dd93ea0ffecf2b062a7ba78f4962bb592e4e81bbabd290d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ne-NP/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ne-NP/firefox-59.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "1c1d5f0a70d960860f5d95cf35b14b6042cacf46510ca8c18d21f9d0c8c3b4bfdb49cb36ee24f631d8f98939b50754e7f94a7b809f1ea373800d4728c0f8e3d1"; + sha512 = "d1c1802aca080cc9c8945512782ee1c365ea3721fe0890dce8e1ffac7f04407de61645f32588c87467e4999cb94a1f673cc560ea344a121f89c5cde1b414cb27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/nl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/nl/firefox-59.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "89aa1bdb8adfd631a22c7214278f8aa16ef8aef2771c1eb2775b8e4c9cf82d646e0c3d945b786b31d865b8ecb161e4d9b7e23544e37527727cfe1fe3ba5fa210"; + sha512 = "d039b8f5fc0b933a6d28d5de1dba52200a04f1eface370284f5cbc45a2f3bd0cdab73ef7b9d8f11a39cec0cd4eb021791b39c88869f97ebd4c651316f63ebe60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/nn-NO/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/nn-NO/firefox-59.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "804393edbaf62246ce34ba2de0e136d191ea5f95297cf12b95963304bc3dfca88dbeca33db077ea12f3318080ca467d6217ae16b9613e7a9740d1b159d7b68a1"; + sha512 = "0e682cdaa44f3a65dd3c86b7a12a35bf990de37018972eda6cc54a6c90b8a944718073497bb627e9b40ef85a09b7c9470c07cde881205580bf05685d3933db1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/or/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/or/firefox-59.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "482af2011d97de19d35a8cd33b9df157b985a5fc99c1aff125d557f1b5584b46fc61554c151a80303d5c298aaaec1c816ef543398ebe88058880a36414bc70ec"; + sha512 = "00766aacf056eb4a3d8d47b9f632fb07756938fddd3357c72694d1bc260809c8477148018e507c2deceb94433dc7d230579e74448e2f40dd13249274f53f39d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/pa-IN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/pa-IN/firefox-59.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "0a678d0e6069f8d7cc16f81021c9316734fd07a06a12f1aae3b5e547eb7b42a19cb9979e1227ee9a88335d5808d61197e067ed829ce808a35a50262b341eba26"; + sha512 = "0b75a641878e2addcb39808c22f2962fe5d85010db6e893567c31a4915d0008395a683e1465027217e74340b3410fef7d9e3ddc7121762253b560e8dca191c88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/pl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/pl/firefox-59.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "2a1ed4dded1746489ec68c9782aa245670feca15b885d5b9d6290e7bdb8efb2c94d441c6fd3c29f0055846d6d826b9c6d174711123eb92247e5960b26fca0a05"; + sha512 = "f35e491fb25a91aed2bfb836e5a90a838e2cc5a34712ac337136def36fd6408a02fa52f0743907e83758b3250b11ab79b80e72e799d8c9b1395eeab0f6a55bb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/pt-BR/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/pt-BR/firefox-59.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "06ff1bd1049edbb0ea6745b07d4441e9053cdeaf034a259fde467b88dd3832ae2cb08ad7852ded6e0afc10f26ad66d15737a820ba7a94fd9281d9fdc6f6da983"; + sha512 = "7a2579d9b871a633c7c957841204f50e56ef82a803eb8259a8770798247efc248f532e107b1a369683ba4e35860d36d7ec2c7d437c4eaf95d7167537bc756fc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/pt-PT/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/pt-PT/firefox-59.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "762788c89c655d20e04d2f4d9231dbd38f8d33237a5e9a2120557bfb1a3fc12c309314d096a395c2d97873cea46ba46f08aa021b6eb57b6e08271103dc010e54"; + sha512 = "eab5c8d91abec67790450ba5022d1cf34c456d330b8bc7158d8754cf9a6010dd48b7020a972f4f5af7a2242bb1948362e0de7478b7f65f401f603fbc35e0bd0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/rm/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/rm/firefox-59.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a81941bc85f5841b0c3bdd3e08a8e03e18b2964b01fd70c6986b42f6ffb144631d55c7b520fc0c4bdf8b4cf7a3d0c7a02e4b689e5e94f21d39ee30fdcd3d0bc9"; + sha512 = "b6e80ea8c6dfd08a8f62465b69f94e4ec680ccba18380ac80803cc1737d0620a6be6d2be7f95cafd7fe1edabed73dbfefa1b9005e976fda53a745b4dda25ab18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ro/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ro/firefox-59.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e17b8dc24a656244a648030cdcaa491ae641c88dd88c05a9d3a110c7aa7aced5f1654f948409dd7b0364172b6eeb57f53ca904d28611064ad5a6198b7bfafa53"; + sha512 = "0954d016989647027403ec6f423d9dbc01362423c0db78c1bf671e294556dd6547ea4bc74cea338811f64a206b70298fb211a7d38129263b429124a3bb4eee59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ru/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ru/firefox-59.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "24ef18457f75befbeb727bcf53a2205e62098f35d4ec40cda2ddcb08dddc711fc96fcfca388e4a006639ffdf646392a27b3f9424327aba05cfbc94a030470fdf"; + sha512 = "06f8dfdd5c275e6c0ea829ddda9f0bc38626f9c9791cb03aa13f257bfaae8f11442c61910f4be83ac19750c98b32ebc5c6f8b0eb921b666443a51604aefabd8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/si/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/si/firefox-59.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ff77087c39f3e7a81c5a359a911403a2ebe58e2425e6fc991788bedd3500e374e357c4199a55a22c9cc77f8369c3c2421990f1ddbe03921d9ba0a76337fff2f3"; + sha512 = "cf32d908bb2620ea458a3d1c691bc92b3ce2d89694de6af201b8e4b8934145d5a99735ed61ad5c474db0160109f1087d63bea86c97a3c7d3b6fddb8294ccface"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/sk/firefox-59.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "75b2f58ac881842689f3ab6e3be33f2ca5b836b5a1ced1584192218fa178785056c699d0c0ba54c0f2f4069aa2b4e4f6b6729c78e55402950453754734e86b6d"; + sha512 = "140dab9dadee516367f32f2b53d908cbfe3322e490e3bd33fcd96be1c979317f31e3701e2984ca2bb7068e487e6878656da556c8f084dce4f2c005a06427c51f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sl/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/sl/firefox-59.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "9f5b6cc50e5122a5963586e2cfc93461436c57e07483985d835667120809362a06b329ca510d2d6a29bef409216e6b528795579fb0424455712ae4b02c88b428"; + sha512 = "d576d3f498fe8fadc1dfc58169e5b584230f6ef3cc280eba59c4902b5a6b7e8f14cb0806c22d52c80e93e7d27378b613a1f5f09a89395d8a9ae68dfa356002dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/son/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/son/firefox-59.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "d76d1cd488def76b853dcfb4993a4336902d3f47b9943a103e5e1443f85f765b87754b9f104e485f07a1740fb9cb981eae650f2b88e82d8ef27fda2dde1a9009"; + sha512 = "3baa12d21bf7ba952cf3fd14328c9b76a882d257c4fc6aa94c677985b171d5e77fa434df916738df79783ff8a738fa97c5082da30431ec47a61636765a7bade6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sq/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/sq/firefox-59.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "17a218368fed020f009286c28618cd7e295666e5f448bfd970f2704a6aa070853f04110cf22c9b47793c6d24051dba2238b7b3e12da599da171d19ecf198363f"; + sha512 = "500998a19530fb51af525adf285fdfe9540bc1463dbebd0f9bfffb9db8d3308aa48a96d1c9b033f234082448e27d8fbe2c8078e2293e7d8c0ff53f103e303dc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/sr/firefox-59.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "791ca9a22256faa907e9d802828205fe92b6eb61eaea35c0ada8e3ea2b8528cfca7768507cb345229989574ea9ec9605b8ddea359a8e7225cc8cd292c2bed648"; + sha512 = "1a10da5b9a92c676d603d0eee038cbc747b160b4f9dcc5a865780aaa39761604ab815ec00c12e40fa9f0b9624250e8bfd9c25b1b00d528104fb4596a6da5ad3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/sv-SE/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/sv-SE/firefox-59.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "63bad970b1fa75d8e994dd7d01bbf67bb31dde8f349bb1655138b74f2c1ae4e190e77c7d4035caebe5d5d32202574273cd53c44d9ca983478b9c085a839a196b"; + sha512 = "37d7706834531ef9f5c1784a7fe4040c81d963f81d7c92bc9730707e9f0e06643fda2021c9df2bc9ab57cb72ec403bbfa68ea24b7ec1350f19fb879c4fe1c271"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ta/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ta/firefox-59.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "e715e5b5d2e5e0dbdbbcdde1f2576dc712e578d4563e0b27bd9be84d74e6b5fc50e619ed09a86f9bcc00a5d7f4b2c7aa5bb710133d3e3d8f83d6282e7dfc236d"; + sha512 = "647319950b8c67c28c2726356b563c0283277a65dd8e2dab3c6012b754b18849bfc7d0fc6efb4700aa4962ed29099b6c6e3c2bc3f33b3584ad74cd10cba3bf21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/te/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/te/firefox-59.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "87b3bfdde89fdca538e57ec4330147cbd2fe473bb8e7a54de09f06cd8e43155b402658bea32ea90f381e0e2b5aa28d6d6fc5ff142a26a51ee4e258e160fd4e37"; + sha512 = "3928e1883fd2fd5f2b355db918a30c300fbcf18cee6e8da8c9f507f30d15dc1654f979aa223c81992ec5879496bfffb0b1daa1d736010c0384e86d1fc133c3bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/th/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/th/firefox-59.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "706f09593039df8f708674b1afcfc84c26d0b26278840cbd833332521f87dd3f2f751162c6a2963322cd617f76172802779d19f62c58050e0d0d3577f9adff8b"; + sha512 = "34b76e7818590f598d1a88c81b3c71f39fcd8cab9ab16045d77181cbba255473045ff435dad6f48b3335c4d7e464fbc3eeebedf56b2c93f85d968204ff8de2c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/tr/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/tr/firefox-59.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "ce38e7ecfa85e602f1fa5db264075022795f87110c9fea80a6f4427b6368c8d76d1bda277b461d594ada3116265f80e5fe3831f96bdc8ffad4375c004659f4be"; + sha512 = "55dbe81812339490b1f82c9861762f0b1e35202c2288961db5920ee15406c8e9202acc914aff10cb6a2c7a24b7e178fe1aa8d1a74d1b3bd89966d871b4162141"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/uk/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/uk/firefox-59.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f548e694f6d835eab2364c2abb85434029f85094f9726c1c1b64d7ba4d0cebe6fe94d275bb24c6b4135de86c3fcf27287aa14ebcbe43aa62a417804d02503859"; + sha512 = "1b0054379bb8ca87c9e4ebd80a1f8e121b291ca5808743707a35eb05809637d9a45ef9838cbf774ebac9c80341f9bbd090e58e3e82001d4ea44ae34d6751f1d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/ur/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/ur/firefox-59.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "0aed7a74c061e5468dcd8cc86c31dcbfd854638a886ef9a0d1648f786bf5d16c3243ff955fffeea93c1212d9a09ad38543ac22f4ad45f3caa9c02c8ceea43778"; + sha512 = "acc80b01fbf848af3c41d94b6e4d8364da17370ed91c68eb1dd58008032e1676fb4490b0feda71431ae94747d5d12b38a35329d24f8dbd7ef4a7aaa24cc1f9df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/uz/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/uz/firefox-59.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "4c09aa4b69c66aed0a6167cd97c9d760c19837f060caaf72abebe9939c64482f91ad2bc00c5307e28801bc020bfb5ec6ee5d253d39240e6877f973e615446bc1"; + sha512 = "8bece9280ef21408576682d7d5d5035c14c5ddb750d9e816873b14264b7ed22fdc6707c5c81460f85383d7d2502a838a96dd30ffff974d2eb4511cc99e48c79b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/vi/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/vi/firefox-59.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2aa55feb7e466bd9c780e128566a4908c5865b5b80323d40cc8e112f28f9b2ded1edf1010c558b8be149dfe5f293da20ff0da6ea17e965958b235a3070ef9370"; + sha512 = "c86896fd46a9fb87299fbb4d72e3c0f804964ad143bde49e6d095bc681c829a0015d37973c5c585c3bb0d6a6fb06c639ccf9355a78dc2e7a73d4ad75693e4b4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/xh/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/xh/firefox-59.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "cd2bf30b10f4542bf70976094efa99d4599d8ac0ab1de6f660b0dd16bf37279adf20e568ede25f4243f43bd51320ab2fbf43cb7ae9a6b5dac60c53440f97f500"; + sha512 = "20a0c3c86b6e5ea8f8b4ba2d73e3ea8b4defcfe6b06439cd2e80b97b3310620848aceb1ac3492141b553ee10fc0336ad81a8ea0f71e1dc8e52b085e5b1eb669e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/zh-CN/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/zh-CN/firefox-59.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c9f2c1c9c68361760d05c1f38440c664f62fe252462cde7e2271b5c014c21dea3801593552c7b0d15ca82c2799682e58148539a9cab6a1f7ffeda9b2119e8f41"; + sha512 = "aa3220d2cb7d94aab31366a8c3e28db96cf3acee1a8bdb999ca7e154c07bd848e805aac2aec3c8e24302c62ddfaffbd61008605c7a545c33e920b223c041e4aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b7/linux-i686/zh-TW/firefox-59.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b8/linux-i686/zh-TW/firefox-59.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "dcb31eb413421336f26219e963e9da1b717d5ef0e6359d20af3b7e6c0c11ebfd345e771d9fd3830695fb6a96ad2a13bdaddd2929b60acfb9b15d988fed6d6d41"; + sha512 = "db50dc9b40647165638bd8319a71f688b65c5d4dcb3fbc9a29b30429cea2026e614b0f5b758bc2a79152b3a02e384ff65766d4f70b178d495108cc6737ca24f9"; } ]; } From bf53dc68c256603f572fdb4a38275d22c68865d4 Mon Sep 17 00:00:00 2001 From: markuskowa Date: Fri, 9 Feb 2018 23:52:03 -0800 Subject: [PATCH 721/797] nixos/rdma-core: add module for soft RoCE and test (#34607) --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/rxe.nix | 63 +++++++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/rxe.nix | 53 +++++++++++++++++++ 4 files changed, 118 insertions(+) create mode 100644 nixos/modules/services/networking/rxe.nix create mode 100644 nixos/tests/rxe.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c0c72f2bdb9..2ef8684d7f9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -531,6 +531,7 @@ ./services/networking/redsocks.nix ./services/networking/resilio.nix ./services/networking/rpcbind.nix + ./services/networking/rxe.nix ./services/networking/sabnzbd.nix ./services/networking/searx.nix ./services/networking/seeks.nix diff --git a/nixos/modules/services/networking/rxe.nix b/nixos/modules/services/networking/rxe.nix new file mode 100644 index 00000000000..a6a069ec50c --- /dev/null +++ b/nixos/modules/services/networking/rxe.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.rxe; + + runRxeCmd = cmd: ifcs: + concatStrings ( map (x: "${pkgs.rdma-core}/bin/rxe_cfg -n ${cmd} ${x};") ifcs); + + startScript = pkgs.writeShellScriptBin "rxe-start" '' + ${pkgs.rdma-core}/bin/rxe_cfg -n start + ${runRxeCmd "add" cfg.interfaces} + ${pkgs.rdma-core}/bin/rxe_cfg + ''; + + stopScript = pkgs.writeShellScriptBin "rxe-stop" '' + ${runRxeCmd "remove" cfg.interfaces } + ${pkgs.rdma-core}/bin/rxe_cfg -n stop + ''; + +in { + ###### interface + + options = { + networking.rxe = { + enable = mkEnableOption "RDMA over converged ethernet"; + interfaces = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "eth0" ]; + description = '' + Enable RDMA on the listed interfaces. The corresponding virtual + RDMA interfaces will be named rxe0 ... rxeN where the ordering + will be as they are named in the list. UDP port 4791 must be + open on the respective ethernet interfaces. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.rxe = { + path = with pkgs; [ kmod rdma-core ]; + description = "RoCE interfaces"; + + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-modules-load.service" "network-online.target" ]; + wants = [ "network-pre.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${startScript}/bin/rxe-start"; + ExecStop = "${stopScript}/bin/rxe-stop"; + }; + }; + }; +} + diff --git a/nixos/release.nix b/nixos/release.nix index 8057e2d50fa..b778258da63 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -336,6 +336,7 @@ in rec { tests.radicale = callTest tests/radicale.nix {}; tests.rspamd = callSubTests tests/rspamd.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; + tests.rxe = callTest tests/rxe.nix {}; tests.samba = callTest tests/samba.nix {}; tests.sddm = callSubTests tests/sddm.nix {}; tests.simple = callTest tests/simple.nix {}; diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix new file mode 100644 index 00000000000..cfe64a75a63 --- /dev/null +++ b/nixos/tests/rxe.nix @@ -0,0 +1,53 @@ +import ./make-test.nix ({ pkgs, ... } : + +let + node = { config, pkgs, lib, ... } : { + networking = { + firewall = { + allowedUDPPorts = [ 4791 ]; # open RoCE port + allowedTCPPorts = [ 4800 ]; # port for test utils + }; + rxe = { + enable = true; + interfaces = [ "eth1" ]; + }; + }; + + environment.systemPackages = with pkgs; [ rdma-core screen ]; + }; + +in { + name = "rxe"; + + nodes = { + server = node; + client = node; + }; + + testScript = '' + # Test if rxe interface comes up + $server->waitForUnit("default.target"); + $server->succeed("systemctl status rxe.service"); + $server->succeed("ibv_devices | grep rxe0"); + + $client->waitForUnit("default.target"); + + # ping pong test + $server->succeed("screen -dmS rc_pingpong ibv_rc_pingpong -p 4800 -g0"); + $client->succeed("sleep 2; ibv_rc_pingpong -p 4800 -g0 server"); + + $server->succeed("screen -dmS uc_pingpong ibv_uc_pingpong -p 4800 -g0"); + $client->succeed("sleep 2; ibv_uc_pingpong -p 4800 -g0 server"); + + $server->succeed("screen -dmS ud_pingpong ibv_ud_pingpong -p 4800 -s 1024 -g0"); + $client->succeed("sleep 2; ibv_ud_pingpong -p 4800 -s 1024 -g0 server"); + + $server->succeed("screen -dmS srq_pingpong ibv_srq_pingpong -p 4800 -g0"); + $client->succeed("sleep 2; ibv_srq_pingpong -p 4800 -g0 server"); + + $server->succeed("screen -dmS rping rping -s -a server -C 10"); + $client->succeed("sleep 2; rping -c -a server -C 10"); + ''; +}) + + From 4422a70922b23a22ff69a968cf844e13952fc4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 9 Feb 2018 16:40:17 +0100 Subject: [PATCH 722/797] arxiv2bib: init at 1.0.8 --- .../python-modules/arxiv2bib/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/arxiv2bib/default.nix diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix new file mode 100644 index 00000000000..1182c36fc0c --- /dev/null +++ b/pkgs/development/python-modules/arxiv2bib/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, python, lib, fetchFromGitHub +, mock +}: + +buildPythonPackage rec { + pname = "arxiv2bib"; + version = "1.0.8"; + + # Missing tests on Pypi + src = fetchFromGitHub { + owner = "nathangrigg"; + repo = "arxiv2bib"; + rev = version; + sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg"; + }; + + # Required for tests only + checkInputs = [ mock ]; + + checkPhase = "${python.interpreter} -m unittest discover -s tests"; + + meta = with lib; { + description = "Get a BibTeX entry from an arXiv id number, using the arxiv.org API"; + homepage = http://nathangrigg.github.io/arxiv2bib/; + license = licenses.bsd3; + maintainers = [ maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca0acaa6905..cc635ec627a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -598,6 +598,8 @@ in { area53 = callPackage ../development/python-modules/area53 { }; + arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; + chai = callPackage ../development/python-modules/chai { }; chainmap = callPackage ../development/python-modules/chainmap { }; From e6a42f82526432e0c515af5ad4982631ac7bdaae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 9 Feb 2018 16:41:24 +0100 Subject: [PATCH 723/797] habanero: init at 0.6.0 --- .../python-modules/habanero/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/habanero/default.nix diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix new file mode 100644 index 00000000000..09d82d74f2b --- /dev/null +++ b/pkgs/development/python-modules/habanero/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, lib, fetchFromGitHub +, requests +, nose, vcrpy +}: + +buildPythonPackage rec { + pname = "habanero"; + version = "0.6.0"; + + # Install from Pypi is failing because of a missing file (Changelog.rst) + src = fetchFromGitHub { + owner = "sckott"; + repo = pname; + rev = "v${version}"; + sha256 = "1l2cgl6iiq8jff2w2pib6w8dwaj8344crhwsni2zzq0p44dwi13d"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ nose vcrpy ]; + checkPhase = "make test"; + + meta = { + description = "Python interface to Library Genesis"; + homepage = http://habanero.readthedocs.io/en/latest/; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc635ec627a..32b61e854f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -241,6 +241,8 @@ in { hdf5 = pkgs.hdf5-mpi; }; + habanero = callPackage ../development/python-modules/habanero { }; + intelhex = callPackage ../development/python-modules/intelhex { }; lmtpd = callPackage ../development/python-modules/lmtpd { }; From 1e5216751e666b30c6892f52310d4db38de818bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 9 Feb 2018 16:42:06 +0100 Subject: [PATCH 724/797] pyparser: init at 1.0 --- .../python-modules/pyparser/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/pyparser/default.nix diff --git a/pkgs/development/python-modules/pyparser/default.nix b/pkgs/development/python-modules/pyparser/default.nix new file mode 100644 index 00000000000..1c00d726ead --- /dev/null +++ b/pkgs/development/python-modules/pyparser/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, lib, fetchFromBitbucket +, parse +}: + +buildPythonPackage rec { + pname = "pyparser"; + version = "1.0"; + + # Missing tests on Pypi + src = fetchFromBitbucket { + owner = "rw_grim"; + repo = pname; + rev = "v${version}"; + sha256 = "0aplb4zdpgbpmaw9qj0vr7qip9q5w7sl1m1lp1nc9jmjfij9i0hf"; + }; + + postPatch = "sed -i 's/parse==/parse>=/' requirements.txt"; + + propagatedBuildInputs = [ parse ]; + + meta = { + description = "Simple library that makes it easier to parse files"; + homepage = https://bitbucket.org/rw_grim/pyparser; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32b61e854f3..e4fd2f6aa06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -330,6 +330,8 @@ in { callPackage = pkgs.callPackage; }; + pyparser = callPackage ../development/python-modules/pyparser { }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { pythonPackages = self; }; From 78ab5169641ef044f2e77701d3f564bb70d84b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 9 Feb 2018 16:42:35 +0100 Subject: [PATCH 725/797] papis-python-rofi: init at 1.0.2 --- .../papis-python-rofi/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/papis-python-rofi/default.nix diff --git a/pkgs/development/python-modules/papis-python-rofi/default.nix b/pkgs/development/python-modules/papis-python-rofi/default.nix new file mode 100644 index 00000000000..1344e1588cd --- /dev/null +++ b/pkgs/development/python-modules/papis-python-rofi/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, lib, fetchPypi }: + +buildPythonPackage rec { + pname = "papis-python-rofi"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "13k6mw2nq923zazs77hpmh2s96v6zv13g7p89510qqkvp6fiml1v"; + }; + + # No tests existing + doCheck = false; + + meta = { + description = "A Python module to make simple GUIs with Rofi"; + homepage = https://github.com/alejandrogallo/python-rofi; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4fd2f6aa06..fe7414784c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5816,6 +5816,8 @@ in { paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; + papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; + pathspec = callPackage ../development/python-modules/pathspec { }; pathtools = buildPythonPackage rec { From c00d76cc2910f6f676d710fb2fcac5d7dffb9174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 9 Feb 2018 16:43:06 +0100 Subject: [PATCH 726/797] pylibgen: init at 1.3.1 --- .../python-modules/pylibgen/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pylibgen/default.nix diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix new file mode 100644 index 00000000000..8db864cc869 --- /dev/null +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, python, lib, fetchPypi +, isPy3k +, requests +}: + +buildPythonPackage rec { + pname = "pylibgen"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rviqi3rf62b43cabdy8c2cdznjv034mp0qrfrzvkih4jlkhyfrh"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ requests ]; + + # It's not using unittest + checkPhase = "${python.interpreter} tests/test_pylibgen.py -c 'test_api_endpoints()'"; + + meta = { + description = "Python interface to Library Genesis"; + homepage = https://pypi.org/project/pylibgen/; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe7414784c7..3c3d3a7925b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14412,6 +14412,8 @@ in { pylibacl = callPackage ../development/python-modules/pylibacl { }; + pylibgen = callPackage ../development/python-modules/pylibgen { }; + pyliblo = buildPythonPackage rec { name = "pyliblo-${version}"; version = "0.9.2"; From 3c3bc83c392da1775eca14a665a9f9965e05a105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 9 Feb 2018 13:16:04 +0100 Subject: [PATCH 727/797] python-magic: move to own file, 0.4.10 -> 0.4.13 move python_magic --- .../python-modules/python-magic/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +----------------- 2 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/python-magic/default.nix diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix new file mode 100644 index 00000000000..56be2e3448a --- /dev/null +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, lib, fetchPypi, file, stdenv }: + +buildPythonPackage rec { + pname = "python-magic"; + version = "0.4.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "128j9y30zih6cyjyjnxhghnvpjm8vw40a1q7pgmrp035yvkaqkk0"; + }; + + postPatch = '' + substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + doCheck = false; + + # TODO: tests are failing + #checkPhase = '' + # ${python}/bin/${python.executable} ./test.py + #''; + + meta = { + description = "A python interface to the libmagic file type identification library"; + homepage = https://github.com/ahupp/python-magic; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c3d3a7925b..2263fb29ecd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9793,32 +9793,7 @@ in { py_scrypt = callPackage ../development/python-modules/py_scrypt/default.nix { }; - python_magic = buildPythonPackage rec { - name = "python-magic-0.4.10"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-magic/${name}.tar.gz"; - sha256 = "1hx2sjd4fdswswj3yydn2azxb59rjmi9b7jzh94lf1wnxijjizbr"; - }; - - propagatedBuildInputs = with self; [ pkgs.file ]; - - patchPhase = '' - substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - - doCheck = false; - - # TODO: tests are failing - #checkPhase = '' - # ${python}/bin/${python.executable} ./test.py - #''; - - meta = { - description = "A python interface to the libmagic file type identification library"; - homepage = https://github.com/ahupp/python-magic; - }; - }; + python_magic = callPackage ../development/python-modules/python-magic { }; magic = buildPythonPackage rec { name = "${pkgs.file.name}"; From dd4144ed62eb7a92059ccfba5c75bef78fe50a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Fri, 9 Feb 2018 13:16:36 +0100 Subject: [PATCH 728/797] papis: init at 0.5.2 --- pkgs/tools/misc/papis/default.nix | 44 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/misc/papis/default.nix diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix new file mode 100644 index 00000000000..de69712eb5e --- /dev/null +++ b/pkgs/tools/misc/papis/default.nix @@ -0,0 +1,44 @@ +{ buildPythonApplication, lib, fetchFromGitHub +, argcomplete, arxiv2bib, beautifulsoup4, bibtexparser +, configparser, habanero, papis-python-rofi, pylibgen +, prompt_toolkit, pyparser, python_magic, pyyaml +, requests, unidecode, urwid, vobject, tkinter +, vim +}: + +buildPythonApplication rec { + pname = "papis"; + version = "0.5.2"; + + # Missing tests on Pypi + src = fetchFromGitHub { + owner = "alejandrogallo"; + repo = pname; + rev = "v${version}"; + sha256 = "0cw6ajdaknijka3j2bkkkn0bcxqifk825kq0a0rdbbmc6661pgxb"; + }; + + postPatch = "sed -i 's/configparser>=3.0.0/# configparser>=3.0.0/' setup.py"; + + propagatedBuildInputs = [ + argcomplete arxiv2bib beautifulsoup4 bibtexparser + configparser habanero papis-python-rofi pylibgen + prompt_toolkit pyparser python_magic pyyaml + requests unidecode urwid vobject tkinter + vim + ]; + + # Papis tries to create the config folder under $HOME during the tests + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + + meta = { + description = "Powerful command-line document and bibliography manager"; + homepage = http://papis.readthedocs.io/en/latest/; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45cf17897bd..f2669d9ad4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13985,6 +13985,8 @@ with pkgs; papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; + papis = python3Packages.callPackage ../tools/misc/papis { }; + pecita = callPackage ../data/fonts/pecita {}; paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {}; From 256ba86fffc079b6035637eed1a85b2ff299d239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 10 Feb 2018 11:29:19 +0100 Subject: [PATCH 729/797] libtasn1: 4.12 -> 4.13 (security) /cc #34787. --- pkgs/development/libraries/libtasn1/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index ccdc3aba611..cc5b19f7a59 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,21 +1,13 @@ { stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.12"; + name = "libtasn1-4.13"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0ls7jdq3y5fnrwg0pzhq11m21r8pshac2705bczz6mqjc8pdllv7"; + sha256 = "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky"; }; - patches = [ - (fetchurl { - name = "CVE-2017-10790.patch"; - url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39"; - sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i"; - }) - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; From 6aee626c3243b1f1e23f5b1cf9b6c0d85345b2d5 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sat, 10 Feb 2018 13:11:07 +0200 Subject: [PATCH 730/797] pythonPackages.txtorcon: fix tests There is a bug in the upstream package that causes one test to fail currently: https://github.com/meejah/txtorcon/issues/250 The test can be safely ignored but should be enabled once it's been fixed upstream. --- pkgs/development/python-modules/txtorcon/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 60947bc769c..cd2d6c9a365 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -26,8 +26,10 @@ buildPythonPackage rec { substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" "" ''; + # Skip a failing test until fixed upstream: + # https://github.com/meejah/txtorcon/issues/250 checkPhase = '' - pytest . + pytest --ignore=test/test_util.py . ''; meta = { From 6fb6616f17c0d4ec17e25ce9a07b7bc2452df87d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 10 Feb 2018 13:43:05 +0100 Subject: [PATCH 731/797] home-assistant: remove dependencies which should be loaded via autoExtraComponents --- pkgs/servers/home-assistant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 057d4a384e4..eed800fa7d3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -63,8 +63,8 @@ in with py.pkgs; buildPythonApplication rec { propagatedBuildInputs = [ # From setup.py requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi - # From the components that are part of the default configuration.yaml - sqlalchemy aiohttp-cors hass-frontend user-agents distro mutagen xmltodict netdisco + # From http, frontend and recorder components + sqlalchemy aiohttp-cors hass-frontend user-agents ] ++ componentBuildInputs ++ extraBuildInputs; checkInputs = [ From 508bf1b318c65def4bd8ced9e11189f2a0732706 Mon Sep 17 00:00:00 2001 From: "pe@pijul.org" Date: Wed, 24 Jan 2018 15:28:36 +0100 Subject: [PATCH 732/797] defaultCrateOverrides: add thrussh-libsodium --- pkgs/build-support/rust/default-crate-overrides.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 658548135aa..a3d30d20318 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,6 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, - openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, ... }: + openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, + libsodium, ... }: let inherit (darwin.apple_sdk.frameworks) CoreFoundation; @@ -36,6 +37,7 @@ in openssl-sys = attrs: { buildInputs = [ pkgconfig openssl ]; }; + dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; }; @@ -60,4 +62,8 @@ in xcb = attrs: { buildInputs = [ python3 ]; }; + + thrussh-libsodium = attrs: { + buildInputs = [ pkgconfig libsodium ]; + }; } From 113591c803f1d7e2885b50ce8b77ad18d810fe2a Mon Sep 17 00:00:00 2001 From: "pe@pijul.org" Date: Thu, 25 Jan 2018 21:53:10 +0100 Subject: [PATCH 733/797] defaultCrateOverrides: add pq-sys fixes #34228 --- pkgs/build-support/rust/default-crate-overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index a3d30d20318..346fd0e7908 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,6 +1,6 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, - libsodium, ... }: + libsodium, postgresql, ... }: let inherit (darwin.apple_sdk.frameworks) CoreFoundation; @@ -66,4 +66,7 @@ in thrussh-libsodium = attrs: { buildInputs = [ pkgconfig libsodium ]; }; + pq-sys = attr: { + buildInputs = [ pkgconfig postgresql ]; + }; } From 713a69d08357ea813175ae1f9f87888ece2d9b36 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 10 Feb 2018 20:26:05 +0700 Subject: [PATCH 734/797] nixos/acpid: pass event parameters to handler (#34190) Previously the parameters were just dropped. Now they can be read from within the handler script. An example to show this is added. Makes use of the new writeShellScript function as suggested in: issue #21557 resolves: #21557 --- nixos/modules/services/hardware/acpid.nix | 32 +++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index bb17c8859d8..f69706ebff3 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -31,7 +31,7 @@ let '' fn=$out/${name} echo "event=${handler.event}" > $fn - echo "action=${pkgs.writeScript "${name}.sh" (concatStringsSep "\n" [ "#! ${pkgs.bash}/bin/sh" handler.action ])}" >> $fn + echo "action=${pkgs.writeShellScriptBin "${name}.sh" handler.action }/bin/${name}.sh '%e'" >> $fn ''; in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // config.services.acpid.handlers)) } @@ -69,11 +69,33 @@ in }; }); - description = "Event handlers."; + description = '' + Event handlers. + + + Handler can be a single command. + + ''; default = {}; - example = { mute = { event = "button/mute.*"; action = "amixer set Master toggle"; }; }; - - + example = { + ac-power = { + event = "ac_adapter/*"; + action = '' + vals=($1) # space separated string to array of multiple values + case ''${vals[3]} in + 00000000) + echo unplugged >> /tmp/acpi.log + ;; + 00000001) + echo plugged in >> /tmp/acpi.log + ;; + *) + echo unknown >> /tmp/acpi.log + ;; + esac + ''; + }; + }; }; powerEventCommands = mkOption { From b8f6510859c7842b36d2f8b776a70a8e16868c74 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 6 Jan 2018 15:56:14 +0800 Subject: [PATCH 735/797] wordgrinder: Fix darwin build --- pkgs/applications/office/wordgrinder/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index da096acc27f..be5ac7a2f2b 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" - "XFT_PACKAGE=--libs=\{-lX11 -lXft\}" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux "XFT_PACKAGE=--libs=\{-lX11 -lXft\}"; dontUseNinjaBuild = true; dontUseNinjaInstall = true; @@ -37,11 +36,12 @@ stdenv.mkDerivation rec { ]; # To be able to find - NIX_CFLAGS_COMPILE = "-I${libXft.dev}/include/X11"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; + '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; ''; @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = https://cowlark.com/wordgrinder; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } From e2859068b194c812235690322e9c144273ad2380 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Sat, 10 Feb 2018 14:15:18 +0100 Subject: [PATCH 736/797] pythonPackages.msgpack: renamed to msgpack-python --- .../networking/instant-messengers/pybitmessage/default.nix | 2 +- pkgs/development/python-modules/locustio/default.nix | 4 ++-- pkgs/servers/matrix-synapse/default.nix | 2 +- pkgs/tools/backup/borg/default.nix | 2 +- pkgs/top-level/python-packages.nix | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 0e052e847cc..654c343caa8 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; }; - propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix index 0e9386f667c..4bc48810e71 100644 --- a/pkgs/development/python-modules/locustio/default.nix +++ b/pkgs/development/python-modules/locustio/default.nix @@ -2,7 +2,7 @@ , fetchPypi , mock , unittest2 -, msgpack +, msgpack-python , requests , flask , gevent @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i s/"pyzmq=="/"pyzmq>="/ setup.py ''; - propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ]; + propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ]; buildInputs = [ mock unittest2 ]; meta = { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index e499dc5de04..7de011e5866 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -42,7 +42,7 @@ in pythonPackages.buildPythonApplication rec { pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 - psutil msgpack lxml matrix-synapse-ldap3 + psutil msgpack-python lxml matrix-synapse-ldap3 phonenumbers jsonschema affinity bcrypt ]; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index eb40dfefb83..4f0d24a27d9 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { lz4 openssl python3Packages.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3Packages; [ - cython msgpack + cython msgpack-python ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ]; preConfigure = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2263fb29ecd..811af95afdf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3642,7 +3642,7 @@ in { buildInputs = with self; [ pytest docutils ]; propagatedBuildInputs = with self; [ - dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado + dask six boto3 s3fs tblib locket msgpack-python click cloudpickle tornado psutil botocore zict lz4 sortedcollections sortedcontainers ] ++ (if !isPy3k then [ singledispatch ] else []); @@ -10551,7 +10551,7 @@ in { }; }; - msgpack = buildPythonPackage rec { + msgpack-python = buildPythonPackage rec { name = "msgpack-python-${version}"; version = "0.4.7"; @@ -20440,7 +20440,7 @@ EOF # which we cannot add because of circular dependency. doCheck = false; - propagatedBuildInputs = with self; [ msgpack ] + propagatedBuildInputs = with self; [ msgpack-python ] ++ optional (!isPyPy) greenlet ++ optional (pythonOlder "3.4") trollius; From b020aef13aaf916cb07020c2efe0b06ef8811562 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Sat, 10 Feb 2018 14:19:13 +0100 Subject: [PATCH 737/797] pythonPackages.msgpack: init at 0.5.4 --- .../python-modules/msgpack/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/msgpack/default.nix diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix new file mode 100644 index 00000000000..2400a76bd6e --- /dev/null +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, fetchPypi +, pytest +, lib +}: + +buildPythonPackage rec { + pname = "msgpack"; + version = "0.5.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "13ckbs2qc4dww7fddnm9cw116j4spgxqab49ijmj6jr178ypwl80"; + }; + + checkPhase = '' + py.test + ''; + + checkInputs = [ pytest ]; + + meta = { + homepage = https://github.com/msgpack/msgpack-python; + description = "MessagePack serializer implementation for Python"; + license = lib.licenses.asl20; + # maintainers = ?? ; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 811af95afdf..b4f5c28667f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10551,6 +10551,8 @@ in { }; }; + msgpack = callPackage ../development/python-modules/msgpack {}; + msgpack-python = buildPythonPackage rec { name = "msgpack-python-${version}"; version = "0.4.7"; From 41937749ce8f7a4320e01c67b03463763973ce03 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Sat, 10 Feb 2018 14:21:29 +0100 Subject: [PATCH 738/797] pythonPackages.msgpack-python: 0.4.7 -> 0.5.4 and refactored to reuse the nix expression of pythonPackages.msgpack --- pkgs/top-level/python-packages.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4f5c28667f..04334a258ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10553,21 +10553,11 @@ in { msgpack = callPackage ../development/python-modules/msgpack {}; - msgpack-python = buildPythonPackage rec { - name = "msgpack-python-${version}"; - version = "0.4.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/msgpack-python/${name}.tar.gz"; - sha256 = "0syd7bs83qs9qmxw540jbgsildbqk4yb57fmrlns1021llli402y"; - }; - - checkPhase = '' - py.test + msgpack-python = self.msgpack.overridePythonAttrs { + pname = "msgpack-python"; + postPatch = '' + substituteInPlace setup.py --replace "TRANSITIONAL = False" "TRANSITIONAL = True" ''; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ ]; }; msrplib = buildPythonPackage rec { From 230b640ea612a44c5d2a5604be7a475745946f49 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Sat, 10 Feb 2018 14:22:13 +0100 Subject: [PATCH 739/797] pythonPackages.neovim: 0.2.0 -> 0.2.1 changed dependency msgpack-python to msgpack to make it build --- .../python-modules/neovim/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +------------- 2 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/neovim/default.nix diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix new file mode 100644 index 00000000000..6fcd82aca9e --- /dev/null +++ b/pkgs/development/python-modules/neovim/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, fetchPypi +, lib +, nose +, msgpack +, greenlet +, trollius +, pythonOlder +, isPyPy +}: + +buildPythonPackage rec { + pname = "neovim"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "16vzxmp7f6dl20n30j5cwwvrjj5h3c2ch8ldbss31anf36nirsdp"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + # Tests require pkgs.neovim, + # which we cannot add because of circular dependency. + doCheck = false; + + propagatedBuildInputs = [ msgpack ] + ++ lib.optional (!isPyPy) greenlet + ++ lib.optional (pythonOlder "3.4") trollius; + + meta = { + description = "Python client for Neovim"; + homepage = "https://github.com/neovim/python-client"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ garbas ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04334a258ce..dae1db07f06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20413,36 +20413,7 @@ EOF trollius = callPackage ../development/python-modules/trollius {}; - neovim = buildPythonPackage rec { - version = "0.2.0"; - name = "neovim-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/neovim/${name}.tar.gz"; - sha256 = "1ywkgbrxd95cwlglihydmffcw2d2aji6562aqncymxs3ld5y02yn"; - }; - - buildInputs = with self; [ nose ]; - - checkPhase = '' - nosetests - ''; - - # Tests require pkgs.neovim, - # which we cannot add because of circular dependency. - doCheck = false; - - propagatedBuildInputs = with self; [ msgpack-python ] - ++ optional (!isPyPy) greenlet - ++ optional (pythonOlder "3.4") trollius; - - meta = { - description = "Python client for Neovim"; - homepage = "https://github.com/neovim/python-client"; - license = licenses.asl20; - maintainers = with maintainers; [ garbas ]; - }; - }; + neovim = callPackage ../development/python-modules/neovim {}; neovim_gui = buildPythonPackage rec { name = "neovim-pygui-${self.neovim.version}"; From a507c4a3c0be573b242c1ed6ffe0505740cf9d1e Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 10 Feb 2018 15:41:16 +0100 Subject: [PATCH 740/797] infamousPlugins: 0.2.03 -> 0.2.04 --- pkgs/applications/audio/infamousPlugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index fd9dee62420..9fe0820e5d6 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "infamousPlugins-v${version}"; - version = "0.2.03"; + version = "0.2.04"; src = fetchFromGitHub { owner = "ssj71"; repo = "infamousPlugins"; rev = "v${version}"; - sha256 = "1pb7vmc703j25rnyx81cqlfzi66v7gm4a49s06dbgy8a66s1i2zl"; + sha256 = "0hmqk80w4qxq09iag7b7srf2g0wigkyhzq0ywxvhz2iz0hq9k0dh"; }; nativeBuildInputs = [ pkgconfig cmake ]; From 29fcbdd4145ead0ec27fe48e860dc45b68b15bdd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 11 Feb 2018 00:25:57 +0800 Subject: [PATCH 741/797] kde-applications: 17.12.1 -> 17.12.2 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1688 ++++++++++++++++---------------- 2 files changed, 845 insertions(+), 845 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 1c1a0102dd0..724f252907c 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.12.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.12.2/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 781a5978675..ff6b1803e13 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1691 +3,1691 @@ { akonadi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-17.12.1.tar.xz"; - sha256 = "0iaw6kmbi68wd728v6m5w90xy9v0nqgd66n026r5dy64pm08hj0x"; - name = "akonadi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-17.12.2.tar.xz"; + sha256 = "03cz5jl5qywc39krjrzby7yxcrx4iaf94pkvzbkagx1c7bfgajkf"; + name = "akonadi-17.12.2.tar.xz"; }; }; akonadi-calendar = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-calendar-17.12.1.tar.xz"; - sha256 = "0j32xxglksya014c2199bn5k540zllmlsyvvr6jcmvbfpcilnl7d"; - name = "akonadi-calendar-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-calendar-17.12.2.tar.xz"; + sha256 = "1j2bs3ybl2lz3yr862kz4jnkiksawbyv96lsjvzgkalmri3y2jv9"; + name = "akonadi-calendar-17.12.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-calendar-tools-17.12.1.tar.xz"; - sha256 = "0yk59hq0fflmv18w7i6jx48436ykhgc1q5agbjckfw9g9qfmaj04"; - name = "akonadi-calendar-tools-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-calendar-tools-17.12.2.tar.xz"; + sha256 = "0fh7zsf4ckmikqqwa3zqdd97i80s53r56bx8q0aj1dyxa5kzrid6"; + name = "akonadi-calendar-tools-17.12.2.tar.xz"; }; }; akonadiconsole = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadiconsole-17.12.1.tar.xz"; - sha256 = "1x1cazikj7a3paf93ms2wl9cbbqhr43jpk7ijb6wjnhzv0jx0yv0"; - name = "akonadiconsole-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadiconsole-17.12.2.tar.xz"; + sha256 = "00w21nxbq9a9h1cs4wl0641hj82i3w63r9ab5hb9kw33gi9ijali"; + name = "akonadiconsole-17.12.2.tar.xz"; }; }; akonadi-contacts = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-contacts-17.12.1.tar.xz"; - sha256 = "12gvzwxhazwz6cn07vz2v21nh31nnxq5ckvm9bw94amhxdcrhji1"; - name = "akonadi-contacts-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-contacts-17.12.2.tar.xz"; + sha256 = "1v8082walg47bl8rj6zcp2br4wr0mhrw82l0aw41gmcwi2vr4pr7"; + name = "akonadi-contacts-17.12.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-import-wizard-17.12.1.tar.xz"; - sha256 = "1v4sqmlbkvhi14bjpg88017slsmsingk3lcvl1hpi9wh5chhybs2"; - name = "akonadi-import-wizard-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-import-wizard-17.12.2.tar.xz"; + sha256 = "1yflksmvvysl3p3s37i0qc712cdzkzi501x74mk3c7sy1pw097g4"; + name = "akonadi-import-wizard-17.12.2.tar.xz"; }; }; akonadi-mime = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-mime-17.12.1.tar.xz"; - sha256 = "0y0s4qaa00240czq1mgm3p63cagdn4kv0njwhlh5va6jknb56rsq"; - name = "akonadi-mime-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-mime-17.12.2.tar.xz"; + sha256 = "0xsm87nph967293ixwnh1450qwrn0ghfcw34444fj8f4ciwbv0iv"; + name = "akonadi-mime-17.12.2.tar.xz"; }; }; akonadi-notes = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-notes-17.12.1.tar.xz"; - sha256 = "1ylbrz5p5y80j7carlqwpxw222faf1ri7lyhnl09j1xsiaw74jz1"; - name = "akonadi-notes-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-notes-17.12.2.tar.xz"; + sha256 = "06ac7b1n3aaad7y1cbby44jaq748xnxfjd51c1jh0p257q22qj85"; + name = "akonadi-notes-17.12.2.tar.xz"; }; }; akonadi-search = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akonadi-search-17.12.1.tar.xz"; - sha256 = "14blwxccz36qdmahwz14vnd7a5j01xpzijc3bbw768l1ifxac5sp"; - name = "akonadi-search-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akonadi-search-17.12.2.tar.xz"; + sha256 = "0g03z7xcbl25ylrflgkycfgyvny5hr8i38flirw9jidwy5zf1pny"; + name = "akonadi-search-17.12.2.tar.xz"; }; }; akregator = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/akregator-17.12.1.tar.xz"; - sha256 = "03292r4l2wpsikrngldmkvjl75ijpy9sfwr14r2kk0rbkqpzn7gn"; - name = "akregator-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/akregator-17.12.2.tar.xz"; + sha256 = "19grppwmspn7x84ygxscch3ydr5i6nanshi1pk4wr5z34g8qcxrc"; + name = "akregator-17.12.2.tar.xz"; }; }; analitza = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/analitza-17.12.1.tar.xz"; - sha256 = "1zp3xki1jppqzpsjxv0mif44hx5amdk9w9a8h1h9wbdwf9zn7038"; - name = "analitza-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/analitza-17.12.2.tar.xz"; + sha256 = "128qcnzizcvrc1mknb5qdzricymxai2mxlrxb5h93cc14jwiivg1"; + name = "analitza-17.12.2.tar.xz"; }; }; ark = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ark-17.12.1.tar.xz"; - sha256 = "0xxahw4qysynim32pi4f3kzvpn8fikii3nxdjk1f58cs7ylk7h9h"; - name = "ark-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ark-17.12.2.tar.xz"; + sha256 = "0xh60mf1ygyhcc06w8g4nnrhqyjf88ji3kf8d5vfpdijq8m6gg8b"; + name = "ark-17.12.2.tar.xz"; }; }; artikulate = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/artikulate-17.12.1.tar.xz"; - sha256 = "1f99gdjlrfxfii605d58566qkzg0vwbdj2sl7gaf2n8974qih26l"; - name = "artikulate-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/artikulate-17.12.2.tar.xz"; + sha256 = "0plc81c7sc47392x183q30x39ksjr1wnjhlwy0ixngj2q9nhi6nn"; + name = "artikulate-17.12.2.tar.xz"; }; }; audiocd-kio = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/audiocd-kio-17.12.1.tar.xz"; - sha256 = "1q5rl3h5vlqa16wsa2zqapqycnbqcsfskkgh47pklsbzi49p2b7w"; - name = "audiocd-kio-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/audiocd-kio-17.12.2.tar.xz"; + sha256 = "1n3n3ylwdm5yjv0hh43rmn3bn0q32xsbrl5wlbwgiijhpqd0ahkw"; + name = "audiocd-kio-17.12.2.tar.xz"; }; }; baloo-widgets = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/baloo-widgets-17.12.1.tar.xz"; - sha256 = "1w681fxjimwnywx6dbk7486ncwgq4izj7r4q5ahism10kxjyvy1i"; - name = "baloo-widgets-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/baloo-widgets-17.12.2.tar.xz"; + sha256 = "0pw153cy606dggkq2njk6fs5yp6a9jlkwpp7vckd9jl5s6pbsqd2"; + name = "baloo-widgets-17.12.2.tar.xz"; }; }; blinken = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/blinken-17.12.1.tar.xz"; - sha256 = "0935gyc499j1br0g1knkpzr73q44mqfr89rjnl5ax6cncs6kkwcd"; - name = "blinken-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/blinken-17.12.2.tar.xz"; + sha256 = "008pmr3g553xd4mcdmby0fqzp8vk651dji3c8zkad94560xysm71"; + name = "blinken-17.12.2.tar.xz"; }; }; bomber = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/bomber-17.12.1.tar.xz"; - sha256 = "1jmkzq07rq19dzci1p3zida12yamn3rsd1l7zy75skwm43q8210r"; - name = "bomber-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/bomber-17.12.2.tar.xz"; + sha256 = "1rdxr7w2p3r1gviqsmshx6n07gzsc3ymz6drhqk3kacqwgnnr72y"; + name = "bomber-17.12.2.tar.xz"; }; }; bovo = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/bovo-17.12.1.tar.xz"; - sha256 = "0fa0cp3w2khvsg5rvnhn9yrx7pg0qvgd3grk7dbzv9frs3nc8k8a"; - name = "bovo-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/bovo-17.12.2.tar.xz"; + sha256 = "0rhj0w7li1rsfjmrivr6g6z9ja408v59pk5rpci4344piaqglrqm"; + name = "bovo-17.12.2.tar.xz"; }; }; calendarsupport = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/calendarsupport-17.12.1.tar.xz"; - sha256 = "02g845mnyyjma9kadi9j1y774nb157qk4s9xfh414j35wa4n4ml0"; - name = "calendarsupport-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/calendarsupport-17.12.2.tar.xz"; + sha256 = "0c6i8gqjdgc9s3mz351qjxwv6fsk3098i7ni6x4bhh5shg863vnr"; + name = "calendarsupport-17.12.2.tar.xz"; }; }; cantor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/cantor-17.12.1.tar.xz"; - sha256 = "1jxjv729js6na70nc8rmr65ah4bvly27qndv1g4grzyv1j5v9pwa"; - name = "cantor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/cantor-17.12.2.tar.xz"; + sha256 = "1b055fcbpqs4fwwyj0pywv5y8pfpg3ha5382d4hhrpvpc8xwjn6c"; + name = "cantor-17.12.2.tar.xz"; }; }; cervisia = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/cervisia-17.12.1.tar.xz"; - sha256 = "1jjc2iarpl6vinav20rly9b2ha3d35ipm45mmn6hdqwrgh08x61a"; - name = "cervisia-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/cervisia-17.12.2.tar.xz"; + sha256 = "1iqkp7d3wkmi0wfxsx2k20qblkmk6m1ndh472bxn6vvfaii2dqmm"; + name = "cervisia-17.12.2.tar.xz"; }; }; dolphin = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/dolphin-17.12.1.tar.xz"; - sha256 = "0pyajijsadkl1yky0p66d0sglxp7ks1bl23x4xy5zhdv3clr5gzc"; - name = "dolphin-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/dolphin-17.12.2.tar.xz"; + sha256 = "1pmfix569996minfc8rrjdbfvybm1a5bnljk0gxybahlainxwjp4"; + name = "dolphin-17.12.2.tar.xz"; }; }; dolphin-plugins = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/dolphin-plugins-17.12.1.tar.xz"; - sha256 = "1igyk2jx2rsgy7rbxi84fkhi831a2v4fg0bc08ad36y43cm849zh"; - name = "dolphin-plugins-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/dolphin-plugins-17.12.2.tar.xz"; + sha256 = "03637pxjf0kjbw831vvdj3lk3msvn6y3gkildsr1490v60cl2f2c"; + name = "dolphin-plugins-17.12.2.tar.xz"; }; }; dragon = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/dragon-17.12.1.tar.xz"; - sha256 = "02apbhw98sq817660ldb1gdzna4jjb2v6379mvrb2d1qgigh1afd"; - name = "dragon-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/dragon-17.12.2.tar.xz"; + sha256 = "03z263agwrkpqf1l3xpfmgxjzqs6icwxv22bp5shzlyiq5dvmq0d"; + name = "dragon-17.12.2.tar.xz"; }; }; eventviews = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/eventviews-17.12.1.tar.xz"; - sha256 = "1cga2i941x1rgp4i8aff8vr7hlk4q312pynr44hfidx4vjig9ia9"; - name = "eventviews-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/eventviews-17.12.2.tar.xz"; + sha256 = "1y1d8flzmi3mm15gc2q2925f1z17lcm5b8difd65z7rji4ra9rg6"; + name = "eventviews-17.12.2.tar.xz"; }; }; ffmpegthumbs = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ffmpegthumbs-17.12.1.tar.xz"; - sha256 = "0lmd8papahnqr5c830wqz8bhkvdsads97b23dnzhnck78dinww2s"; - name = "ffmpegthumbs-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ffmpegthumbs-17.12.2.tar.xz"; + sha256 = "098w62hvjqkq9iixbipg1wl0091d0fnb49jm874k4d68mpvlmmf2"; + name = "ffmpegthumbs-17.12.2.tar.xz"; }; }; filelight = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/filelight-17.12.1.tar.xz"; - sha256 = "0c0fi9dziwf5v7069wsrqnqw95cfpicg4a6xp05hhpc9qqkvdngk"; - name = "filelight-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/filelight-17.12.2.tar.xz"; + sha256 = "1ysh5rb9irgha62iw1yiw5f4fxanym9swgc8sd9cdlmkqm6km27m"; + name = "filelight-17.12.2.tar.xz"; }; }; granatier = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/granatier-17.12.1.tar.xz"; - sha256 = "1ja7v2xr2yyw2qh7zkf2s7ym8qv5gfr1zbii54dk2r5k4a8slvi4"; - name = "granatier-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/granatier-17.12.2.tar.xz"; + sha256 = "1c86vh6jx991ig1n6n591r9va8rs029gd83m6y9appavi43aylkv"; + name = "granatier-17.12.2.tar.xz"; }; }; grantlee-editor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/grantlee-editor-17.12.1.tar.xz"; - sha256 = "19w2f30rsk65xdc8kqr03fmkm0a743mgyj6gm6207nxsm5plr3nv"; - name = "grantlee-editor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/grantlee-editor-17.12.2.tar.xz"; + sha256 = "1x4rn8liz083y8h3in743xrmk3caqcn75ba97f8ymaap0f48nly6"; + name = "grantlee-editor-17.12.2.tar.xz"; }; }; grantleetheme = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/grantleetheme-17.12.1.tar.xz"; - sha256 = "1nga48vvqysbh2g10wka02ibbyny77wrz8a1p336sycr76q1xmcz"; - name = "grantleetheme-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/grantleetheme-17.12.2.tar.xz"; + sha256 = "0cpmd8glpjpg62h2qcngaks6adahfcbf9aikm9y4gwqbsmglqjkx"; + name = "grantleetheme-17.12.2.tar.xz"; }; }; gwenview = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/gwenview-17.12.1.tar.xz"; - sha256 = "1a87b6wh2ga9j8r498zyf2dga77lhky41dl31ndkx94vm8ycdnlv"; - name = "gwenview-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/gwenview-17.12.2.tar.xz"; + sha256 = "0cpv7wlbkm20vch1d4m49kxk02by9zh9lbdcli5p6bgp8mnvpxgr"; + name = "gwenview-17.12.2.tar.xz"; }; }; incidenceeditor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/incidenceeditor-17.12.1.tar.xz"; - sha256 = "0x7c3j8frzqmvgz6zn98h0qiays1fdvnlngdksi7gkm82bsvk7i2"; - name = "incidenceeditor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/incidenceeditor-17.12.2.tar.xz"; + sha256 = "1qlghzfc4lg69p5014f3zj6k0lgy57n0lg063b804nqy0378xra2"; + name = "incidenceeditor-17.12.2.tar.xz"; }; }; juk = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/juk-17.12.1.tar.xz"; - sha256 = "13k7j7h62mggfj79a534m58rl9fd2vzhvv0wj7752n4nbiha6q3q"; - name = "juk-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/juk-17.12.2.tar.xz"; + sha256 = "1wa52sysy3hr7n5r59vb9qqnac73fcy2dc3zl51ba9da8lz8q0lj"; + name = "juk-17.12.2.tar.xz"; }; }; k3b = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/k3b-17.12.1.tar.xz"; - sha256 = "11jsfja3r9x6drs0v1nb4h9w6hl3ab7rxjcxm8czbwmx2897vgyg"; - name = "k3b-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/k3b-17.12.2.tar.xz"; + sha256 = "0ryzchkk37yzihfhra5xh5sj2k46bdlspi9i2zfs63q3n32jyfww"; + name = "k3b-17.12.2.tar.xz"; }; }; kaccounts-integration = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kaccounts-integration-17.12.1.tar.xz"; - sha256 = "1zfq6yknn8kjjnkp3s58gj15r5qd0xpmxl49c2615j08qjbbs5k2"; - name = "kaccounts-integration-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kaccounts-integration-17.12.2.tar.xz"; + sha256 = "14mipln6ppg88yipwvyc6ainj250ss6xynh9smxbji533wyg72c5"; + name = "kaccounts-integration-17.12.2.tar.xz"; }; }; kaccounts-providers = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kaccounts-providers-17.12.1.tar.xz"; - sha256 = "1mzh7brgd42fb4nnnn607nivqpb3hvy982dini32j54k1rls4810"; - name = "kaccounts-providers-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kaccounts-providers-17.12.2.tar.xz"; + sha256 = "1lapgxlgzymrdl8swn2prrlrmz5xgmkhmv7hx8fpxpc3cpfyvfsd"; + name = "kaccounts-providers-17.12.2.tar.xz"; }; }; kaddressbook = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kaddressbook-17.12.1.tar.xz"; - sha256 = "1ls02igrp4q6zbw62gyp3rkzbyv6jm0s46z1q3ifkqyxanm3mpbv"; - name = "kaddressbook-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kaddressbook-17.12.2.tar.xz"; + sha256 = "1b5a5ypmf0jr9si5cx01h52aql26v6cv16wzrrb6vhxqzksmwriw"; + name = "kaddressbook-17.12.2.tar.xz"; }; }; kajongg = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kajongg-17.12.1.tar.xz"; - sha256 = "05vakzhzrr7p8hdrmmvy8q0mj0z5xf7zyzm4lckaj9mpfvg9gnxm"; - name = "kajongg-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kajongg-17.12.2.tar.xz"; + sha256 = "15vnin2rg63c60injxqkx0jp5sy1hjmh5rys3qq40wy0bm41pwai"; + name = "kajongg-17.12.2.tar.xz"; }; }; kalarm = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kalarm-17.12.1.tar.xz"; - sha256 = "11aa89k44jzmkm3xrgi59y4fgk2vb68zhhrkm53r13wxv2k2z9d7"; - name = "kalarm-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kalarm-17.12.2.tar.xz"; + sha256 = "1vvayib91mh73kqc0linzqlwa1l9jlc2wsih80bzzglaaxbi4l7z"; + name = "kalarm-17.12.2.tar.xz"; }; }; kalarmcal = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kalarmcal-17.12.1.tar.xz"; - sha256 = "05ynq5rbcny5h0k43r13b019zkg8mfkpkfx6drnar7nif6ji3qg5"; - name = "kalarmcal-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kalarmcal-17.12.2.tar.xz"; + sha256 = "04js601j477jwa5lhqdxq9gaacd7bf5ladgy3k64dwns5mx1j762"; + name = "kalarmcal-17.12.2.tar.xz"; }; }; kalgebra = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kalgebra-17.12.1.tar.xz"; - sha256 = "10pn3b17ahxp99glza6yyj4fmn6f6mhjggfd1d612gj8jldqr7r4"; - name = "kalgebra-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kalgebra-17.12.2.tar.xz"; + sha256 = "10vfzwmz0l7yvmy8gjwcb3dnpqyfngj47knb5knvkibqzij6p4w4"; + name = "kalgebra-17.12.2.tar.xz"; }; }; kalzium = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kalzium-17.12.1.tar.xz"; - sha256 = "13h4134w97dbsxrg4f6bgq5l14shlzg4djzwyiad4m892hmyrajn"; - name = "kalzium-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kalzium-17.12.2.tar.xz"; + sha256 = "0rdq2cpq5mzl3qrj3ll1d0qixaiygl5x277wlr5fg9cngi51v58x"; + name = "kalzium-17.12.2.tar.xz"; }; }; kamera = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kamera-17.12.1.tar.xz"; - sha256 = "19ps2p6cwhgfw9ll8gjjdq7k88srcixsfmfsqk8jvi9jpfqcw9mn"; - name = "kamera-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kamera-17.12.2.tar.xz"; + sha256 = "070kvaij5chk8nkap9nm1rrilq3sc32q7ysnrld9bssbfi9m73v7"; + name = "kamera-17.12.2.tar.xz"; }; }; kanagram = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kanagram-17.12.1.tar.xz"; - sha256 = "0pq0iwd7qrd5rc5jgm3ll2hgdxrjb6rq1qzz1175lj4b9ackn7ad"; - name = "kanagram-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kanagram-17.12.2.tar.xz"; + sha256 = "1300wg5k6x6s1wgmavywcwyqgv68xv0qv6hkqawvzsd61zfhxcr3"; + name = "kanagram-17.12.2.tar.xz"; }; }; kapman = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kapman-17.12.1.tar.xz"; - sha256 = "1d0a36jj1prp6zsxhzxz081w6wr5p7hb6lx687nfrqhbiqkr9059"; - name = "kapman-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kapman-17.12.2.tar.xz"; + sha256 = "0njf1017dnf4xl801xinfgfmqqpjf3ifnpwchg35zm2qlrlwhmyi"; + name = "kapman-17.12.2.tar.xz"; }; }; kapptemplate = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kapptemplate-17.12.1.tar.xz"; - sha256 = "1gcb8gc4x6f1brxqxdsppq61n8r20p9a0qq0pp8g88q1n5r3irpc"; - name = "kapptemplate-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kapptemplate-17.12.2.tar.xz"; + sha256 = "16p63zil3vaa5q2q01010gshn6a58kbmayks27kdgvsfdavgdh51"; + name = "kapptemplate-17.12.2.tar.xz"; }; }; kate = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kate-17.12.1.tar.xz"; - sha256 = "0rnkp197ranq3hi9scw1k1nmqj05fhnifyk9gjbg4mp8wwn3zgcv"; - name = "kate-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kate-17.12.2.tar.xz"; + sha256 = "1w3pswd3gpjpa55xy98yq39nck775mfv5i9lcvm8y15x1233rr6p"; + name = "kate-17.12.2.tar.xz"; }; }; katomic = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/katomic-17.12.1.tar.xz"; - sha256 = "13xszrnc3bgz2vbzhhz00k1hzlzi7n7jvg61rjqg0frf0n4ccih0"; - name = "katomic-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/katomic-17.12.2.tar.xz"; + sha256 = "0jhmszbq0rslwg8b8aq0vjynjlkg491di661k2b6yrsfqr4vmngw"; + name = "katomic-17.12.2.tar.xz"; }; }; kblackbox = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kblackbox-17.12.1.tar.xz"; - sha256 = "1iish6qs2q7pn9y8k4v07gkyqs0jq6ppdvxc6jfrkzymcnnaq9by"; - name = "kblackbox-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kblackbox-17.12.2.tar.xz"; + sha256 = "07bvmcfm3r4dj41dvsaba4rig2i9yilshrzl3wwprsjajmx4j6rf"; + name = "kblackbox-17.12.2.tar.xz"; }; }; kblocks = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kblocks-17.12.1.tar.xz"; - sha256 = "11kfm99hp6a4dp5q6bapq3axgkjmwcp1cd284plm3nxsd15sv87b"; - name = "kblocks-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kblocks-17.12.2.tar.xz"; + sha256 = "019h8rxv9p1ynby7bshr2yzrcn415magwlzmyrwvh5hzjjp0bmm9"; + name = "kblocks-17.12.2.tar.xz"; }; }; kblog = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kblog-17.12.1.tar.xz"; - sha256 = "1f7ygzb3acgjr1ax768cv94l3li8lbq6230lkgqz6lms3x9plpdc"; - name = "kblog-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kblog-17.12.2.tar.xz"; + sha256 = "1s2py5ll879zxcl6l7y2jryy1z29wljwm8hrgr52f8xr22vspbjc"; + name = "kblog-17.12.2.tar.xz"; }; }; kbounce = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kbounce-17.12.1.tar.xz"; - sha256 = "18w0jxdfjkvrkz1g1k0f37ajjyxc7cazbp3qxg0m2pbrkllgs12v"; - name = "kbounce-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kbounce-17.12.2.tar.xz"; + sha256 = "0rb9p8q0zwwfx70cxfcdbr9h3i8gag0da8nql6nnd37v2wcr4i82"; + name = "kbounce-17.12.2.tar.xz"; }; }; kbreakout = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kbreakout-17.12.1.tar.xz"; - sha256 = "166ck3z0x77p6n065q41fwj3lvxyzsshpgmi7xavbjgjl6cb941r"; - name = "kbreakout-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kbreakout-17.12.2.tar.xz"; + sha256 = "1j9gfzgdjhfd4jz2x3qgbd4jwfix0m1qx5lnlbkbxnff5jkw68sh"; + name = "kbreakout-17.12.2.tar.xz"; }; }; kbruch = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kbruch-17.12.1.tar.xz"; - sha256 = "04ylr7jj1qz3clnavv195gqm4hi017jzrz3vbx0dg7jfqr9jvzxh"; - name = "kbruch-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kbruch-17.12.2.tar.xz"; + sha256 = "0q95i474lgbl6phshbw7f89kik8hk9k8j8vpbzy3cchwn7dmg3p3"; + name = "kbruch-17.12.2.tar.xz"; }; }; kcachegrind = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcachegrind-17.12.1.tar.xz"; - sha256 = "1qiwv7xpcf01s08bm83n77nhwplg19dd0zaqcr6xagjhf9y165xf"; - name = "kcachegrind-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcachegrind-17.12.2.tar.xz"; + sha256 = "02nx8vqvl62vdm311r4akcckzl1w4c47phl3ybswygrakik7vf2a"; + name = "kcachegrind-17.12.2.tar.xz"; }; }; kcalc = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcalc-17.12.1.tar.xz"; - sha256 = "00asfczvfvfmfg0ffd0d2rh3nmqgzqf4f9bdkwq9z8gajfz3cjs1"; - name = "kcalc-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcalc-17.12.2.tar.xz"; + sha256 = "13h4c97qz8g7z4r5kb4js6sjzdgr3s4mabzr16qkwmmg4lwvzcp8"; + name = "kcalc-17.12.2.tar.xz"; }; }; kcalcore = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcalcore-17.12.1.tar.xz"; - sha256 = "0zyf3r3zwivjzqag76pi9wrbvzqzbcnraajbb0xksf9ik53gk3pd"; - name = "kcalcore-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcalcore-17.12.2.tar.xz"; + sha256 = "06z7xd0a8pz75zx1l2hcban39rc6dmxhhwhgidfglkj3l2xzw927"; + name = "kcalcore-17.12.2.tar.xz"; }; }; kcalutils = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcalutils-17.12.1.tar.xz"; - sha256 = "01djf24immjn62hxs2gsi5f27q54vh254wq3sqzgxz0vbfv97bza"; - name = "kcalutils-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcalutils-17.12.2.tar.xz"; + sha256 = "11vp32f53by2gc7zv08zq0z591rw4srmmjmiafds8hvx76ry3dsl"; + name = "kcalutils-17.12.2.tar.xz"; }; }; kcharselect = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcharselect-17.12.1.tar.xz"; - sha256 = "14bh4n4bqi5y7ya6xi7ykl398i2qdkmximp87r5qcimxgvxfczki"; - name = "kcharselect-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcharselect-17.12.2.tar.xz"; + sha256 = "1gbr6gvp2vwgvns83pmg5idhwhixyw9yqyr6nn61qf43f97nkdiy"; + name = "kcharselect-17.12.2.tar.xz"; }; }; kcolorchooser = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcolorchooser-17.12.1.tar.xz"; - sha256 = "1aqzwbw7ajb5nzj2k107m32naj0c6nsdhzmg0w0wrd80fz2qnpx3"; - name = "kcolorchooser-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcolorchooser-17.12.2.tar.xz"; + sha256 = "0jjzpm82jy9f4qf5sf5v24vk50y4qq2sj42zn057v0kwlpwzvrr9"; + name = "kcolorchooser-17.12.2.tar.xz"; }; }; kcontacts = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcontacts-17.12.1.tar.xz"; - sha256 = "152a9bhyya4rigmydfh6x932pp3vi4i1zya5sdlg9vr045ljgzwk"; - name = "kcontacts-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcontacts-17.12.2.tar.xz"; + sha256 = "0hg442jg0rb7fsy67fg44551c02gx3i7znwl6cgr9nzlxj5srhyq"; + name = "kcontacts-17.12.2.tar.xz"; }; }; kcron = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kcron-17.12.1.tar.xz"; - sha256 = "0qzc8427l1hndisq163b4ppph8ividw38lxczirv186gm01xsgqk"; - name = "kcron-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kcron-17.12.2.tar.xz"; + sha256 = "1h1bkicvfbz7s0n36iw5pilqrv2vfzl3rwqx6r0wa10341sx8wc3"; + name = "kcron-17.12.2.tar.xz"; }; }; kdav = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdav-17.12.1.tar.xz"; - sha256 = "09q1d0yzhwr4gr4xfp1zbmqbdhrw827y379blqg1351k8mxvfhzi"; - name = "kdav-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdav-17.12.2.tar.xz"; + sha256 = "1jlw2l6jd2rhf7swl7bwlsphp1xddb0f9xzkpa6dxw4cimfz4r7l"; + name = "kdav-17.12.2.tar.xz"; }; }; kdebugsettings = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdebugsettings-17.12.1.tar.xz"; - sha256 = "0ac8mnjm7mvk9988ds0kvgxnjfkpv8iiwgaccsykiqgpnk8dx7qh"; - name = "kdebugsettings-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdebugsettings-17.12.2.tar.xz"; + sha256 = "1a9yy42x16maj60wh7x19248gp1x4diybj9k2gkmlf7hd8g82m4b"; + name = "kdebugsettings-17.12.2.tar.xz"; }; }; kde-dev-scripts = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kde-dev-scripts-17.12.1.tar.xz"; - sha256 = "1cxfjc4can7ggbrcdz03lsalq221fw5qmcw9y35kqs504wgc0g1w"; - name = "kde-dev-scripts-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kde-dev-scripts-17.12.2.tar.xz"; + sha256 = "181s9cf1kqx35w9cza40svgzbqvhz48f858r0rxvl6klzm7rrqmn"; + name = "kde-dev-scripts-17.12.2.tar.xz"; }; }; kde-dev-utils = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kde-dev-utils-17.12.1.tar.xz"; - sha256 = "0mnk6zzq0xa3fd32c46gyjsqsxji5p7ky5g7bly2myhl7f03hnc0"; - name = "kde-dev-utils-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kde-dev-utils-17.12.2.tar.xz"; + sha256 = "044w9az0jnc7lhlgyiqxsl5lgfzbnrfrdvsr2918idy2niif7cjq"; + name = "kde-dev-utils-17.12.2.tar.xz"; }; }; kdeedu-data = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdeedu-data-17.12.1.tar.xz"; - sha256 = "0i917gys8bpsmswm7rp2idbrwv5470cvp4xa0wxfnnq0y6nxj0w3"; - name = "kdeedu-data-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdeedu-data-17.12.2.tar.xz"; + sha256 = "1sdldx357ifv4sqwa8yrcjxyricb0kk21gvj9472bi28rcgyxqgv"; + name = "kdeedu-data-17.12.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdegraphics-mobipocket-17.12.1.tar.xz"; - sha256 = "09bh0qjzr27zkvz5cyrxpx5pkz9fldr2yxzc1f3hxs2fmqgj7rc6"; - name = "kdegraphics-mobipocket-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdegraphics-mobipocket-17.12.2.tar.xz"; + sha256 = "1jx5ir1q12s939m0nndhxwiarfr6r7ma79dy9fn5bbhdjgjqf7fq"; + name = "kdegraphics-mobipocket-17.12.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdegraphics-thumbnailers-17.12.1.tar.xz"; - sha256 = "0fm8vsbmaxibjlkjkbic7b8x3xrz8nrjn8r8ps4mka4hnsmkk2b9"; - name = "kdegraphics-thumbnailers-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdegraphics-thumbnailers-17.12.2.tar.xz"; + sha256 = "0d6cf2mhblxgnhv432x9rgk5k73fhpa20xajn6nfawxkmpkzngsy"; + name = "kdegraphics-thumbnailers-17.12.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdenetwork-filesharing-17.12.1.tar.xz"; - sha256 = "10d0ayd3krkac0249smnxn8jfyj9rfy1jjx0d2sqs28jhq5z8892"; - name = "kdenetwork-filesharing-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdenetwork-filesharing-17.12.2.tar.xz"; + sha256 = "1ghdskmc0ynjb1a4qid9vjjcl8nmyqvr5x6aryzz9g1rmm6vv8l5"; + name = "kdenetwork-filesharing-17.12.2.tar.xz"; }; }; kdenlive = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdenlive-17.12.1.tar.xz"; - sha256 = "0rv52w6kccsz6796nhn5hw0x5x2jjwx7y8jxmglc7jbdlsf90bj1"; - name = "kdenlive-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdenlive-17.12.2.tar.xz"; + sha256 = "1l2sv78wwfwrya486sm4iszkm1hsj473a5gpkgay66h4qb968w70"; + name = "kdenlive-17.12.2.tar.xz"; }; }; kdepim-addons = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdepim-addons-17.12.1.tar.xz"; - sha256 = "19sn4j4ks5iqmcgnir1p2hgzvgncy2iqdvwq7p4ns7hy35bl59n3"; - name = "kdepim-addons-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdepim-addons-17.12.2.tar.xz"; + sha256 = "185qargpzlmphq5afzvw0pcmas8ska2cnnbv5rpicmg8q01ixnm7"; + name = "kdepim-addons-17.12.2.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdepim-apps-libs-17.12.1.tar.xz"; - sha256 = "1xy7wcz4wk9qcgmss3xfbkhyhvfp31c13n1wj7a4ar724s35sja9"; - name = "kdepim-apps-libs-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdepim-apps-libs-17.12.2.tar.xz"; + sha256 = "0zn620bv551lgl6sx9g4f8ncpv5hs231jbrzkiwqw6y74xw5qq7g"; + name = "kdepim-apps-libs-17.12.2.tar.xz"; }; }; kdepim-runtime = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdepim-runtime-17.12.1.tar.xz"; - sha256 = "0k2b52smz68b9ijcdawimnh471zzadqnfxhvkvprkah952p23z32"; - name = "kdepim-runtime-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdepim-runtime-17.12.2.tar.xz"; + sha256 = "1z11ac0l4n80nybsnfk716c88ah2l7g1fsz5xmzvv6pcmhm2q94j"; + name = "kdepim-runtime-17.12.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdesdk-kioslaves-17.12.1.tar.xz"; - sha256 = "07zv4xkgqpirc0jzidbv0nc5bgqn5sywz9lvgs2v73v1pz1gy13m"; - name = "kdesdk-kioslaves-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdesdk-kioslaves-17.12.2.tar.xz"; + sha256 = "09r7iqqvil2sjfzdnq64075gmm7wxd705j00qxfch99ja3nf4961"; + name = "kdesdk-kioslaves-17.12.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdesdk-thumbnailers-17.12.1.tar.xz"; - sha256 = "0r2dpin3cf19qii0sfl4s8pj99n0fsxgc1l1lh3bnm94z7myld2c"; - name = "kdesdk-thumbnailers-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdesdk-thumbnailers-17.12.2.tar.xz"; + sha256 = "1j8gqwcs65cfpaqvny29yqzsgjbjmxrafnf4ggc1bjaz2p63blni"; + name = "kdesdk-thumbnailers-17.12.2.tar.xz"; }; }; kdf = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdf-17.12.1.tar.xz"; - sha256 = "0jk9i94mc0jb08z4vnnr3m6mlih6y877hll42p0iywliwsbnyz21"; - name = "kdf-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdf-17.12.2.tar.xz"; + sha256 = "07379lagrl7hhh05dixd4ldqiy9pwmw0yai8sgcbfi3kgcns9c6a"; + name = "kdf-17.12.2.tar.xz"; }; }; kdialog = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdialog-17.12.1.tar.xz"; - sha256 = "075xhg3bzyxaanixlzr740km2z84csx4jbq37gijdz6rllnxjxwl"; - name = "kdialog-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdialog-17.12.2.tar.xz"; + sha256 = "1pwicn5jsg3jwqqkrjhaxbcd9762k9fj4w51ahglby04c4cca38a"; + name = "kdialog-17.12.2.tar.xz"; }; }; kdiamond = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kdiamond-17.12.1.tar.xz"; - sha256 = "08qw7gry0zdrslq5dpzm45blcr951xnrgfs75jpw3f7g9xy042kx"; - name = "kdiamond-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kdiamond-17.12.2.tar.xz"; + sha256 = "03m91x6rgh3wd8mim41d08x1c06ndg9vkciyl6nkj4iyflwwy0rp"; + name = "kdiamond-17.12.2.tar.xz"; }; }; keditbookmarks = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/keditbookmarks-17.12.1.tar.xz"; - sha256 = "1ml3bl6f24c6cs4hfa87rvyax36wcjxkh94iy5xwlhfd176qcjnn"; - name = "keditbookmarks-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/keditbookmarks-17.12.2.tar.xz"; + sha256 = "1aqqd2lvdbqhnzz28axv9j84s7i7cxrs39zyaia7cwzbbgymkal1"; + name = "keditbookmarks-17.12.2.tar.xz"; }; }; kfind = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kfind-17.12.1.tar.xz"; - sha256 = "0z97w4p86ylkndq12dphpfa0r10ld2b5fvcj1xdfa9cic14lgfxk"; - name = "kfind-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kfind-17.12.2.tar.xz"; + sha256 = "0zxm5fjf6xzl871gjbs5nzp6h5j4qm47ygfq644jqbi9f3z2in74"; + name = "kfind-17.12.2.tar.xz"; }; }; kfloppy = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kfloppy-17.12.1.tar.xz"; - sha256 = "11gc0v1nkwg6f334ydsh289s5bgxr7ccdybbw3zq16q0vih9px3a"; - name = "kfloppy-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kfloppy-17.12.2.tar.xz"; + sha256 = "0s25jbngh6zipxm16kffvwyd1ircnf0xjsh20lm08i9kh4jcicgq"; + name = "kfloppy-17.12.2.tar.xz"; }; }; kfourinline = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kfourinline-17.12.1.tar.xz"; - sha256 = "0rb6z0siw8yhf4w3m9hrkv6csm4vdr8qj7754c41fqkrnlfa8w96"; - name = "kfourinline-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kfourinline-17.12.2.tar.xz"; + sha256 = "0cqlqab9sazhvvsdyvwzdzrjccvlbxwq2p1n6ki8g8i6707mx3hc"; + name = "kfourinline-17.12.2.tar.xz"; }; }; kgeography = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kgeography-17.12.1.tar.xz"; - sha256 = "1v6xyqv8d4faj0ix7jwq8ralr8s8vi8ryn6hy1i4lj3a06mvgk5z"; - name = "kgeography-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kgeography-17.12.2.tar.xz"; + sha256 = "1mf5zr4cwnnrvsad4mq0mr6p3v38payajagc2whfl1lmcg82f2wl"; + name = "kgeography-17.12.2.tar.xz"; }; }; kget = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kget-17.12.1.tar.xz"; - sha256 = "1n6z92fcbvnvzk3wwpfrf8ycx3kv8vnybpay6hmr63vnbgn7bssw"; - name = "kget-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kget-17.12.2.tar.xz"; + sha256 = "1fm5yzxxg7lihzgnl7207gfn9gz33ydk1axf8lmdhwwld14q25f9"; + name = "kget-17.12.2.tar.xz"; }; }; kgoldrunner = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kgoldrunner-17.12.1.tar.xz"; - sha256 = "01c2439a7vic3nxhnzhjph3qnfp6qm7yv6qcanxaf2jy7idbm5zq"; - name = "kgoldrunner-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kgoldrunner-17.12.2.tar.xz"; + sha256 = "0dddzimh41xm6fvz1spl58gwff9vlx12h52kbfxdb2wz60zkg8wb"; + name = "kgoldrunner-17.12.2.tar.xz"; }; }; kgpg = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kgpg-17.12.1.tar.xz"; - sha256 = "1h82gx0y7vm3n7idhqdawns47fmjv6szz3qivds4jj0wx9z2gc9f"; - name = "kgpg-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kgpg-17.12.2.tar.xz"; + sha256 = "0r604acqm255xqjqg4islk30g62f8p9mj6haqp0iyw82239hbkp0"; + name = "kgpg-17.12.2.tar.xz"; }; }; khangman = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/khangman-17.12.1.tar.xz"; - sha256 = "1a5ifxm2flkbxy1lqvkaz48ff57yvhqm49j3l637q60i7v2gd75q"; - name = "khangman-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/khangman-17.12.2.tar.xz"; + sha256 = "1wk0k4lbskgxrbv91032yg6n64ghir25128pphsy61m4v00jysg3"; + name = "khangman-17.12.2.tar.xz"; }; }; khelpcenter = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/khelpcenter-17.12.1.tar.xz"; - sha256 = "0y7axdqfmbd2sas5c6ncsi6bpbh95mgymsbpvp2gv7r7d3p11irj"; - name = "khelpcenter-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/khelpcenter-17.12.2.tar.xz"; + sha256 = "0871xxril7dllks46f4a31dkiwmgjc8ajm2jpn5hfm3g2cbawlsd"; + name = "khelpcenter-17.12.2.tar.xz"; }; }; kholidays = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kholidays-17.12.1.tar.xz"; - sha256 = "0595d7wbnz8kyq1bnivdrp20lwdp8ykvdll1fmb0fgm4q24z0cl8"; - name = "kholidays-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kholidays-17.12.2.tar.xz"; + sha256 = "0mn2bmjiy5k99g4yv0n61jklyp1105kmnvkf4ay28ha55zy95bbk"; + name = "kholidays-17.12.2.tar.xz"; }; }; kidentitymanagement = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kidentitymanagement-17.12.1.tar.xz"; - sha256 = "1hz1zawc3zmbj0ylhxc4p1qgffpjbpvzhj5mi4b5zvi0nblqsnk6"; - name = "kidentitymanagement-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kidentitymanagement-17.12.2.tar.xz"; + sha256 = "1s5xjgbp7vdww8k59s8h2mypi1d94n4kkphkgiybdq2gxpfq73pb"; + name = "kidentitymanagement-17.12.2.tar.xz"; }; }; kig = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kig-17.12.1.tar.xz"; - sha256 = "0nvsz4q51bjr380w8gfzfahigpxyap7bf54lnllhfbad673b897d"; - name = "kig-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kig-17.12.2.tar.xz"; + sha256 = "1cphrji1l3c32j8wdr88y40fzkr9s20q79hlk4c4rhzkym7jgzhp"; + name = "kig-17.12.2.tar.xz"; }; }; kigo = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kigo-17.12.1.tar.xz"; - sha256 = "01f0l6fs12v5m88hc9g788mq4k61irgdnf47h7hln4k62rn7yfp9"; - name = "kigo-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kigo-17.12.2.tar.xz"; + sha256 = "0xz8nmhgx8iadwmqkm6469vw8vn9n74mk2fhmciqn8xn66r11g9d"; + name = "kigo-17.12.2.tar.xz"; }; }; killbots = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/killbots-17.12.1.tar.xz"; - sha256 = "16x72i36vy8a2r7bsg5qmg7bs91cxk3r1yhk8ch8666jl8jvxlnx"; - name = "killbots-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/killbots-17.12.2.tar.xz"; + sha256 = "140v8mwbkhv9fkqi0781mrk51fk00q5p1ad3p1rqgmhy0pzfvkg4"; + name = "killbots-17.12.2.tar.xz"; }; }; kimagemapeditor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kimagemapeditor-17.12.1.tar.xz"; - sha256 = "0zhrfr17596swxp7g53y74kh3pndgpjk8lrxfhpvxn45628wzb62"; - name = "kimagemapeditor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kimagemapeditor-17.12.2.tar.xz"; + sha256 = "16wyb80al1vp3macr2lrkh0f1l42jzm126mv2l5gbhd5qiwj6yag"; + name = "kimagemapeditor-17.12.2.tar.xz"; }; }; kimap = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kimap-17.12.1.tar.xz"; - sha256 = "1isga4zz98qcgfhvvjmkm0fv8fm27japzc69il814bypd49bkvmb"; - name = "kimap-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kimap-17.12.2.tar.xz"; + sha256 = "15nbnjckmqa4kka012lvaziimgnr6vs5k361sjhdykvrvk4fhz13"; + name = "kimap-17.12.2.tar.xz"; }; }; kio-extras = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kio-extras-17.12.1.tar.xz"; - sha256 = "0vqzvd9linv6y6pfqdi9az79d9294wadz96pr03zwhbak0z5bw65"; - name = "kio-extras-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kio-extras-17.12.2.tar.xz"; + sha256 = "0vc8wwx9cqs48hn1hf49fmz99xa4c8vhcqq58wmpq3bg62vfipyp"; + name = "kio-extras-17.12.2.tar.xz"; }; }; kiriki = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kiriki-17.12.1.tar.xz"; - sha256 = "08xhsdxz0w0qw155zasyq49r1hfqqrbk916lxilmqgkxqww53wgw"; - name = "kiriki-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kiriki-17.12.2.tar.xz"; + sha256 = "1a427gja7y2s37a29jl1n4bx1xa2piqm7wwv7g7agaxm5j15qvx8"; + name = "kiriki-17.12.2.tar.xz"; }; }; kiten = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kiten-17.12.1.tar.xz"; - sha256 = "1mrlj80m1g7r9wwmyrz7iq0lz5lmx56h8fzwcg4nkpim571cn6ch"; - name = "kiten-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kiten-17.12.2.tar.xz"; + sha256 = "0bcb65pcs3xv5pmr78zlxcbicxknvbf30h83i4f4qjxrq6iw8sf4"; + name = "kiten-17.12.2.tar.xz"; }; }; kjumpingcube = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kjumpingcube-17.12.1.tar.xz"; - sha256 = "04bzxq4r7jr776g7hyf2wm08y7j9y5wy0c2war7mn2nc8an2rnna"; - name = "kjumpingcube-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kjumpingcube-17.12.2.tar.xz"; + sha256 = "0d2gdvjd0fxxdnpxfplw9gp69b1qx35w165srd79qcx17c2r7cdv"; + name = "kjumpingcube-17.12.2.tar.xz"; }; }; kldap = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kldap-17.12.1.tar.xz"; - sha256 = "0gn84blvrfspvw4gaqisrsdxp2051j5xva00cw3lv9n0vyrq8vqf"; - name = "kldap-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kldap-17.12.2.tar.xz"; + sha256 = "177xg8ng4636gnppf4jf0m2amadlrz0n9bdmc7f6xnijchmda2p4"; + name = "kldap-17.12.2.tar.xz"; }; }; kleopatra = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kleopatra-17.12.1.tar.xz"; - sha256 = "1rzil9m982iilwpz8qi6j8brrwvzcdrmzldrwaqdpa1v56sjq5f0"; - name = "kleopatra-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kleopatra-17.12.2.tar.xz"; + sha256 = "04c1w1la826dwjam19m12jg8l5c8641l7ad6injrbig1kja819v4"; + name = "kleopatra-17.12.2.tar.xz"; }; }; klettres = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/klettres-17.12.1.tar.xz"; - sha256 = "1ibrkwy9bb60cilmnv46zhw0zl4lv8sn9wddjg53havh38rwjgwc"; - name = "klettres-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/klettres-17.12.2.tar.xz"; + sha256 = "16pi5r4s67j6pq5jjbyap7jrxxx5wrg7dr77391yk06s955rcfr1"; + name = "klettres-17.12.2.tar.xz"; }; }; klickety = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/klickety-17.12.1.tar.xz"; - sha256 = "09d8mkca0p5fp93i5w30zbvz746j7cvz11wrscjbg2n6vi36pcbd"; - name = "klickety-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/klickety-17.12.2.tar.xz"; + sha256 = "0rwmswrmwjizv9vw3bivh75wisy09icbykvwsi43zsapar9hs89l"; + name = "klickety-17.12.2.tar.xz"; }; }; klines = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/klines-17.12.1.tar.xz"; - sha256 = "0b9srbianz3c5knbm9cwn9f5i88pg5v5gc1fnz1vgir2izlyx5pg"; - name = "klines-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/klines-17.12.2.tar.xz"; + sha256 = "0nl5w65m7c46hjh0hvd76x7zf5c9qlqxqn8b96dzgrab6s9f96wf"; + name = "klines-17.12.2.tar.xz"; }; }; kmag = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmag-17.12.1.tar.xz"; - sha256 = "04z02kyaf5xfb8j4fxq1i5b08hvl2j9dbik2liiykzdhv5kn8di8"; - name = "kmag-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmag-17.12.2.tar.xz"; + sha256 = "0yxh4y5l6l528j2nz4wl0w8zmydayrgh1aracy1lymv65ww8qax2"; + name = "kmag-17.12.2.tar.xz"; }; }; kmahjongg = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmahjongg-17.12.1.tar.xz"; - sha256 = "1d46d8dpx969sih2dlc6qf3kiqj9ry7w8jgqczsjnm1irh6l7gqd"; - name = "kmahjongg-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmahjongg-17.12.2.tar.xz"; + sha256 = "06skr41bs29q19dm6j79h0x1l2szbr6gz9kn6s47s23wmyjkqdqr"; + name = "kmahjongg-17.12.2.tar.xz"; }; }; kmail = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmail-17.12.1.tar.xz"; - sha256 = "0dfzgf0mpjanq43fwlv4165ggxi1iqv8dfxpgdf8vg1l8ckb86p0"; - name = "kmail-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmail-17.12.2.tar.xz"; + sha256 = "0kanmbb09x6cyswq7ws6cw7j117lqwqp3hvs9hipx7nyr38mhrlc"; + name = "kmail-17.12.2.tar.xz"; }; }; kmail-account-wizard = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmail-account-wizard-17.12.1.tar.xz"; - sha256 = "0swilpfry4fqkjpd4hwqxycxy2655znphppp67h5fjrnjbvpkyfv"; - name = "kmail-account-wizard-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmail-account-wizard-17.12.2.tar.xz"; + sha256 = "1l7szmbhxrqj93cqvpaywgyql319n1wmw8acnca1aym9l79pns0s"; + name = "kmail-account-wizard-17.12.2.tar.xz"; }; }; kmailtransport = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmailtransport-17.12.1.tar.xz"; - sha256 = "1yxxj93lxfb068z5f5dhz85jy3f0a76zifvxgh8ph05n2kr23rq3"; - name = "kmailtransport-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmailtransport-17.12.2.tar.xz"; + sha256 = "1prrw61vz52wp8yb587xz1kd5rm6s6dry8i9zcs66aha5g7r0wj8"; + name = "kmailtransport-17.12.2.tar.xz"; }; }; kmbox = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmbox-17.12.1.tar.xz"; - sha256 = "12ds7kzrjb885ip73drd9q40gb59d8yhr3y8pdkmz048z7495dh9"; - name = "kmbox-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmbox-17.12.2.tar.xz"; + sha256 = "0q6217br3cpdwns6hiw5klnvkwwx7sd8gbl003clf4wkfnxpgqsb"; + name = "kmbox-17.12.2.tar.xz"; }; }; kmime = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmime-17.12.1.tar.xz"; - sha256 = "1659ri4fxmfnkfa6nqbhkvpj349ynhcl254hwp43pngf1zmk280x"; - name = "kmime-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmime-17.12.2.tar.xz"; + sha256 = "097xzsd7lld01iz1nziy8b9vv97xaz6vsl52d5809h0kxfpixw99"; + name = "kmime-17.12.2.tar.xz"; }; }; kmines = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmines-17.12.1.tar.xz"; - sha256 = "0dhwda6gkjix0lmb3wcz6ds8fglzw7i8wg85a2ij6amc6am9014j"; - name = "kmines-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmines-17.12.2.tar.xz"; + sha256 = "00apcafaxh18rxk8d3r333mzjd0b6f7946kp6ffr1ps9c93mm3ab"; + name = "kmines-17.12.2.tar.xz"; }; }; kmix = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmix-17.12.1.tar.xz"; - sha256 = "1xf46qjn6ax5w8z7l78wcw4k4j59c40vncmrpqdb62kmr4zi0m7q"; - name = "kmix-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmix-17.12.2.tar.xz"; + sha256 = "096dbmywdhgcjzvm473sm0vjrmgfmb19cjx82066ws8pvn9fybdj"; + name = "kmix-17.12.2.tar.xz"; }; }; kmousetool = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmousetool-17.12.1.tar.xz"; - sha256 = "1qbxq4b892i4ssjbky0i5jk96q8zs4lr859y3190kz538g5jakh0"; - name = "kmousetool-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmousetool-17.12.2.tar.xz"; + sha256 = "08kv4j6r18wrl7n4j7apffyj52w77l8rkksvmdzlfg2nk87vaafj"; + name = "kmousetool-17.12.2.tar.xz"; }; }; kmouth = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmouth-17.12.1.tar.xz"; - sha256 = "1yn510zhcw9kw0qcy21k85ryhki56lvgzgzq2hjqbjq0ymzpmlmp"; - name = "kmouth-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmouth-17.12.2.tar.xz"; + sha256 = "12kdrwz3mxwz9y4srq5jjrrn0wg3905qhg1qbj8p583gk1n03g20"; + name = "kmouth-17.12.2.tar.xz"; }; }; kmplot = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kmplot-17.12.1.tar.xz"; - sha256 = "06ybsjl9m9awjb70inm7i2hg92p34gqmb4vc5sn8jm2ckm5qsgc6"; - name = "kmplot-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kmplot-17.12.2.tar.xz"; + sha256 = "1pws8lajpjm4nfichd0949lmsn975ivxh2b001gsif3vvadmp48l"; + name = "kmplot-17.12.2.tar.xz"; }; }; knavalbattle = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/knavalbattle-17.12.1.tar.xz"; - sha256 = "1yzf70lnjvyk63bv88ycjcwxnbwp0wh2lifqq7m34n3c51ifhd5g"; - name = "knavalbattle-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/knavalbattle-17.12.2.tar.xz"; + sha256 = "0iil9kw7xhjq8ll93hcvcm9apigrys89nj7j2bpvs00208dcyv9c"; + name = "knavalbattle-17.12.2.tar.xz"; }; }; knetwalk = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/knetwalk-17.12.1.tar.xz"; - sha256 = "078gzqyq33val8kvsfw63r0jhnh8q2lwv7p11a8z2qy44cp0bg25"; - name = "knetwalk-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/knetwalk-17.12.2.tar.xz"; + sha256 = "0l98h7grhgddawbn9apm0zifxpdssdkp29cdrcyv025h72dhj5ih"; + name = "knetwalk-17.12.2.tar.xz"; }; }; knotes = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/knotes-17.12.1.tar.xz"; - sha256 = "16bjbxc5l3nxcw6k7csq0phr2hamk4ps1b367s8j6x5w81y3gypw"; - name = "knotes-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/knotes-17.12.2.tar.xz"; + sha256 = "009mia832fxll0a5kl5n16zsy54jvvm9gr2zp4qy5xmimci48llj"; + name = "knotes-17.12.2.tar.xz"; }; }; kolf = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kolf-17.12.1.tar.xz"; - sha256 = "0sgn5702rf3kmflrb0dxlgvx0lb7ajfyq6izzqh147kkp9s8h44i"; - name = "kolf-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kolf-17.12.2.tar.xz"; + sha256 = "12zxqa88jsg4zf68ndw32gw7l6sjjzq6pkkj0a55wcwsdph59666"; + name = "kolf-17.12.2.tar.xz"; }; }; kollision = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kollision-17.12.1.tar.xz"; - sha256 = "08px3m7jl78cg4mbsfwp4xa0fm7kp0p12zb973iy2ipqnhp1wkqp"; - name = "kollision-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kollision-17.12.2.tar.xz"; + sha256 = "1lzc0gih4lcw5dbrkkz0411al1xsjnqi1xzdwa2cijlka1py028g"; + name = "kollision-17.12.2.tar.xz"; }; }; kolourpaint = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kolourpaint-17.12.1.tar.xz"; - sha256 = "1cdz7dhjmg757y70lzsxzsn1k2ih2q89vdcy8vgwggx9b47xgbar"; - name = "kolourpaint-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kolourpaint-17.12.2.tar.xz"; + sha256 = "0jd2r9jv0g1wrqvx7dwniv8an4miv3wjl3ym4rkczpdsjh3smc7c"; + name = "kolourpaint-17.12.2.tar.xz"; }; }; kompare = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kompare-17.12.1.tar.xz"; - sha256 = "09w9g20hkgnvdv7g27pmw3kb82f52ia30fbg9dswbv5snjr82db3"; - name = "kompare-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kompare-17.12.2.tar.xz"; + sha256 = "0cww2zhvf97zya2wpmc9hyk1vp3za8r8xvxc0l4whcm33w0fwgc9"; + name = "kompare-17.12.2.tar.xz"; }; }; konqueror = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/konqueror-17.12.1.tar.xz"; - sha256 = "0nfsfzyzd27m9sxrs2yx2rywkj31ip0qkna5frflsh4fa13jbnjw"; - name = "konqueror-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/konqueror-17.12.2.tar.xz"; + sha256 = "08yyxkrc4rx8y166p8r871rs3b6gxq6fkrnfbg9j4n3387rpg64f"; + name = "konqueror-17.12.2.tar.xz"; }; }; konquest = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/konquest-17.12.1.tar.xz"; - sha256 = "1yph9hp40v1z9kfz7n72hi7y17fbrsgfn7jqdyk0dc7j3ldhji5y"; - name = "konquest-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/konquest-17.12.2.tar.xz"; + sha256 = "18c30b1z0jalkwcgdg6w5y4nl1j2iapp7588qk1zip3nfvgbdpky"; + name = "konquest-17.12.2.tar.xz"; }; }; konsole = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/konsole-17.12.1.tar.xz"; - sha256 = "0k8d5am4qb5p1w02fbn164ffwlg1mg5hjxh5848dvrip8gxhhq40"; - name = "konsole-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/konsole-17.12.2.tar.xz"; + sha256 = "1dbsmfqw0d1f0nhmhz61rhy6spcfvv54j7v05axjhh870wyfmrpc"; + name = "konsole-17.12.2.tar.xz"; }; }; kontact = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kontact-17.12.1.tar.xz"; - sha256 = "1ml71112422sggpi7y3lyn0gs374k99hpy9g4991vsyx53z5yn53"; - name = "kontact-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kontact-17.12.2.tar.xz"; + sha256 = "0qn1iha7g6i85va7bvcagxjx3qk0g9lpaqikn2fvlz22sgv45a2q"; + name = "kontact-17.12.2.tar.xz"; }; }; kontactinterface = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kontactinterface-17.12.1.tar.xz"; - sha256 = "13a898b60mfbi6ara411ns0b7r57vfsq3wbdkq2c6fag5jsafaxl"; - name = "kontactinterface-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kontactinterface-17.12.2.tar.xz"; + sha256 = "044dys074cgahspx9h3bz8a807r5975b25pwjxwimr9vg4ln37d3"; + name = "kontactinterface-17.12.2.tar.xz"; }; }; korganizer = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/korganizer-17.12.1.tar.xz"; - sha256 = "0qrqmiv86f17w8ycfxk8dj3r5ajzyp667kd8cq9yz9xzzf76xhlh"; - name = "korganizer-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/korganizer-17.12.2.tar.xz"; + sha256 = "0ijw3dq0c21c11a4bhdpgd1ailamrhknim4bs4ix1fgriycwpz31"; + name = "korganizer-17.12.2.tar.xz"; }; }; kpat = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kpat-17.12.1.tar.xz"; - sha256 = "1f12jad1439zbrmya1hwbfsz6mxgjncchy94a1ynic5p8ixmja32"; - name = "kpat-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kpat-17.12.2.tar.xz"; + sha256 = "1yy81rv29wfym74709hrz67ms6af408ni5dbnpwjniz86fx2jnxs"; + name = "kpat-17.12.2.tar.xz"; }; }; kpimtextedit = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kpimtextedit-17.12.1.tar.xz"; - sha256 = "08qcrd6ii0hp8afjwk2g64lvxyndy36lnzklc8hszls82h5qablp"; - name = "kpimtextedit-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kpimtextedit-17.12.2.tar.xz"; + sha256 = "1bj3ccvccwg1x5px080w7c3adkjsl1z886bxdimdf84pdxj2fm65"; + name = "kpimtextedit-17.12.2.tar.xz"; }; }; kqtquickcharts = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kqtquickcharts-17.12.1.tar.xz"; - sha256 = "09ppnv95dxrl1wr4h9kmxjhrj8q3h40jjjz68k3d9nzhzb1lz7vi"; - name = "kqtquickcharts-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kqtquickcharts-17.12.2.tar.xz"; + sha256 = "05xsvc4ppncpjj0w5j7m5075ydxjnln8kjfd002c1m2a755brv5j"; + name = "kqtquickcharts-17.12.2.tar.xz"; }; }; krdc = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/krdc-17.12.1.tar.xz"; - sha256 = "1hs7f55s8r6f9h1f5g357zvdzn1dgw5y9pih9n3yxa2522bh0j7r"; - name = "krdc-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/krdc-17.12.2.tar.xz"; + sha256 = "0m9ij015cs8qb1sbiysy27jrz070x9dkrbkrsqy3a2n9dkv7jjz0"; + name = "krdc-17.12.2.tar.xz"; }; }; kreversi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kreversi-17.12.1.tar.xz"; - sha256 = "0vgxwv0cpnpr4q2fdgc1nsrxrac59db558gwbw706a2yh3bn69dk"; - name = "kreversi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kreversi-17.12.2.tar.xz"; + sha256 = "1qx0lv85pn98wbaskk0ihg3zywwfj9p0l30jjq67my254qlbaqpk"; + name = "kreversi-17.12.2.tar.xz"; }; }; krfb = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/krfb-17.12.1.tar.xz"; - sha256 = "101h35f8vk3fgbjpw3f32cs6nc184z43qd3q345cq564cmh6h7z3"; - name = "krfb-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/krfb-17.12.2.tar.xz"; + sha256 = "1ggi0rmb0jx9pkqcvml5q6gxzzng5mdpyj8m9knknhmdx0y19k1b"; + name = "krfb-17.12.2.tar.xz"; }; }; kross-interpreters = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kross-interpreters-17.12.1.tar.xz"; - sha256 = "1n9y7ynnkg8h61kyv894bwja3i2z1a5h2542flriny9788xfwwp0"; - name = "kross-interpreters-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kross-interpreters-17.12.2.tar.xz"; + sha256 = "05fd5cbgh81qmffbkmn3zanlrdjdqcgyafcw4jxsfvqb556wdvzv"; + name = "kross-interpreters-17.12.2.tar.xz"; }; }; kruler = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kruler-17.12.1.tar.xz"; - sha256 = "0yxyqrz901fimdqap20rdarikdlcd9rlxmsl7dbfgrgjygxdhwlf"; - name = "kruler-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kruler-17.12.2.tar.xz"; + sha256 = "1j39vrd98p3bxa5kggmg3ccx4wrn8hvd100p0njkd54wagm9r2m7"; + name = "kruler-17.12.2.tar.xz"; }; }; kshisen = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kshisen-17.12.1.tar.xz"; - sha256 = "1sx1dcjg1pbww3xx3r8ackswp61nmlawi5nf38ppgnpmcgz3b7md"; - name = "kshisen-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kshisen-17.12.2.tar.xz"; + sha256 = "02ihwa8zhaig97z14l3jx6c7swsm8aq5107n41h0z0lzf7sir47g"; + name = "kshisen-17.12.2.tar.xz"; }; }; ksirk = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksirk-17.12.1.tar.xz"; - sha256 = "112m9liq8xfjqnz0fbb7qpi54vys4mcp3i0zvph8i7aidqch6jbk"; - name = "ksirk-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksirk-17.12.2.tar.xz"; + sha256 = "049za390509m4gsmjybhidbq3p2qss47whwfmzcj6lpcxf0fsrja"; + name = "ksirk-17.12.2.tar.xz"; }; }; ksmtp = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksmtp-17.12.1.tar.xz"; - sha256 = "11y0pwfy2pzjj678b53x222x0vzbxsng8j936s4afy1dbpx66ms2"; - name = "ksmtp-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksmtp-17.12.2.tar.xz"; + sha256 = "0g6sjn5vkkwcdqjhpws86l5dhwilxrqqif50dndc2fyiak6x796n"; + name = "ksmtp-17.12.2.tar.xz"; }; }; ksnakeduel = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksnakeduel-17.12.1.tar.xz"; - sha256 = "1py4zcn311kh4kjzmwrviy91i9gj94fivdqyvfhzkbis59hwvnf4"; - name = "ksnakeduel-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksnakeduel-17.12.2.tar.xz"; + sha256 = "1gqgw47im2sifxskhbgmg5rr6clvswcz81sinqffmjmpwgrabif7"; + name = "ksnakeduel-17.12.2.tar.xz"; }; }; kspaceduel = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kspaceduel-17.12.1.tar.xz"; - sha256 = "16flrinzg2pysgab2mygijc9pb96ps28pk4ybnxc5bswzhkbhqyz"; - name = "kspaceduel-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kspaceduel-17.12.2.tar.xz"; + sha256 = "13636n466yna04wga7f206gw1scnjr3w3x59hwi4mdr0sghz9a7i"; + name = "kspaceduel-17.12.2.tar.xz"; }; }; ksquares = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksquares-17.12.1.tar.xz"; - sha256 = "0ma162lsh0vgis1qgsbav6w3v628s29mj4hgs05hlhl576f7h1zw"; - name = "ksquares-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksquares-17.12.2.tar.xz"; + sha256 = "1csw9kns4b258k1hwcshw01bxbzfa1kclbd4w5fail1qp5xs7x7d"; + name = "ksquares-17.12.2.tar.xz"; }; }; ksudoku = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksudoku-17.12.1.tar.xz"; - sha256 = "16d2r0vwy1yzwlkvwq98by35zpg6w35j2npfzacjzmy5xxq2k63m"; - name = "ksudoku-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksudoku-17.12.2.tar.xz"; + sha256 = "0rwgzg0i8s4b7af2dhzccaklbg3rj0khyjsiawijw66p9gs9cczy"; + name = "ksudoku-17.12.2.tar.xz"; }; }; ksystemlog = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ksystemlog-17.12.1.tar.xz"; - sha256 = "03f0pjxc8zbkn47csm45dqswl9sc37cfyawlmnl7pwjbsqmimpi6"; - name = "ksystemlog-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ksystemlog-17.12.2.tar.xz"; + sha256 = "1aw1m1kv3si3qqzhs5mdynmf2b8s2dpsjnb7h0c1l39kq7mbgc9i"; + name = "ksystemlog-17.12.2.tar.xz"; }; }; kteatime = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kteatime-17.12.1.tar.xz"; - sha256 = "0zvr3qkasnf26m6x2lg0pa7m3f2va4favz2sdav0g2ix9jdglqz6"; - name = "kteatime-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kteatime-17.12.2.tar.xz"; + sha256 = "13p1v7ic64rfff7md7f33xv9pl89sgjig35q78q31h5q42k6qzv9"; + name = "kteatime-17.12.2.tar.xz"; }; }; ktimer = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktimer-17.12.1.tar.xz"; - sha256 = "00v8za6dhs7lb2aynlsrfjdq1zzbrxcxk7hr6x5vrxw7q6wp730c"; - name = "ktimer-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktimer-17.12.2.tar.xz"; + sha256 = "1263bsqz23064v7qnrz51nbbckld3d2vz80cm6z43vcis236bvh2"; + name = "ktimer-17.12.2.tar.xz"; }; }; ktnef = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktnef-17.12.1.tar.xz"; - sha256 = "0b6axld4h9dr1a4cr650ibgm2avp1yynwvfyz1s8jaz58lpw8l1b"; - name = "ktnef-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktnef-17.12.2.tar.xz"; + sha256 = "05cj5lghqj8js0bd14w6kbpl29wslyh36yn57sdf5dfbgpnn9a7v"; + name = "ktnef-17.12.2.tar.xz"; }; }; ktouch = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktouch-17.12.1.tar.xz"; - sha256 = "006ng7ajz4x37k2zy2gk7i1wpw2f2yqwvx6lc7vny3s8hz61a8zr"; - name = "ktouch-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktouch-17.12.2.tar.xz"; + sha256 = "1jqc0i6n70vjy6ipgv4swnd8xp404d8frax6nfd4rv3gmn68l5q4"; + name = "ktouch-17.12.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-accounts-kcm-17.12.1.tar.xz"; - sha256 = "003v1228nk2x8h9r8698fij1q461ibs76ycybgk2611r547jqwxm"; - name = "ktp-accounts-kcm-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-accounts-kcm-17.12.2.tar.xz"; + sha256 = "1qfq2sg2pzv2gkr87yb3r5j0xy0f1j56cxys8c1zijpglfy6a41z"; + name = "ktp-accounts-kcm-17.12.2.tar.xz"; }; }; ktp-approver = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-approver-17.12.1.tar.xz"; - sha256 = "0f3cqq005c2363b23c393qcml84g3h23906rsnc6id0b2zcdfkp3"; - name = "ktp-approver-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-approver-17.12.2.tar.xz"; + sha256 = "0jhzazj42qigdbzjidpnkqlsndv3ias80ik033hzks6m22c20bz6"; + name = "ktp-approver-17.12.2.tar.xz"; }; }; ktp-auth-handler = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-auth-handler-17.12.1.tar.xz"; - sha256 = "0z6c1p7v8zkj54knpxvcnk1xk88ncm751nd6j2lrzg3fxnk4kdyj"; - name = "ktp-auth-handler-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-auth-handler-17.12.2.tar.xz"; + sha256 = "0h81j79285k872wfyflabk6j4s3y7fi0nv41c9n6rnsdv91yvwpk"; + name = "ktp-auth-handler-17.12.2.tar.xz"; }; }; ktp-call-ui = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-call-ui-17.12.1.tar.xz"; - sha256 = "07x0n8b21sfrc01rvya51rg0shvbi265i2pzc0c3kv0d6di74bs1"; - name = "ktp-call-ui-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-call-ui-17.12.2.tar.xz"; + sha256 = "1nh6a7gf3qp3vgw32rbh196ik5pzgad4z6lgrn59x36ssvcpmmd2"; + name = "ktp-call-ui-17.12.2.tar.xz"; }; }; ktp-common-internals = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-common-internals-17.12.1.tar.xz"; - sha256 = "0h6vd98168rs1rcxpj43c7i57yd4lch95qxihy32l8nbyjxn0cc2"; - name = "ktp-common-internals-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-common-internals-17.12.2.tar.xz"; + sha256 = "18i311hnyd7lwvv6c08dk674w77q1sk3bggj5mp94r987507kns4"; + name = "ktp-common-internals-17.12.2.tar.xz"; }; }; ktp-contact-list = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-contact-list-17.12.1.tar.xz"; - sha256 = "1b8x9mxd00f9zvlni95q6arvv912srsshgdfrig6jl8l94aknhfz"; - name = "ktp-contact-list-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-contact-list-17.12.2.tar.xz"; + sha256 = "1fzw7mqk65ry16bpbrh9zp7rpcbdgjabcsw23xdz08dzl86gji24"; + name = "ktp-contact-list-17.12.2.tar.xz"; }; }; ktp-contact-runner = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-contact-runner-17.12.1.tar.xz"; - sha256 = "03bxpcgxazp4g44iidbc2y8a4i147bxvm9hqkglv5bdy86lvg0y3"; - name = "ktp-contact-runner-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-contact-runner-17.12.2.tar.xz"; + sha256 = "0qmwajxqhd2m2p9jnyqq5c8i1a02r8mc20limrikvg2m25cg8ii9"; + name = "ktp-contact-runner-17.12.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-desktop-applets-17.12.1.tar.xz"; - sha256 = "1qb54wpyh5pz4d0nan02gkf2n16cvq2cfj61vpi2xml6cb1yqypf"; - name = "ktp-desktop-applets-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-desktop-applets-17.12.2.tar.xz"; + sha256 = "02s5b2lgcsslr2zavijp457kngmdall03li9wlgg31kxyqwrycwc"; + name = "ktp-desktop-applets-17.12.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-filetransfer-handler-17.12.1.tar.xz"; - sha256 = "1976sjks028faahm6gha2kd0if0czbiyplj2vq9x1jnwh9fcbvcx"; - name = "ktp-filetransfer-handler-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-filetransfer-handler-17.12.2.tar.xz"; + sha256 = "1vc8w0aq16rfcwf48s3178y2qmz6r03bsdrgn2mkxscj8z4rv8j5"; + name = "ktp-filetransfer-handler-17.12.2.tar.xz"; }; }; ktp-kded-module = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-kded-module-17.12.1.tar.xz"; - sha256 = "1l8jkixyc41irmf8ak358nfkn6m7nab5a2hxzfhgzi4grr2cassc"; - name = "ktp-kded-module-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-kded-module-17.12.2.tar.xz"; + sha256 = "1is5l0ammvqqp4cz9hk9ra63rv5kphy58b1b1qh1vwdhbc74cdx6"; + name = "ktp-kded-module-17.12.2.tar.xz"; }; }; ktp-send-file = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-send-file-17.12.1.tar.xz"; - sha256 = "0fhqf15dl0rq1dlgb42na64dj5sr53hqdgk4fghjpma4lvr8qd4p"; - name = "ktp-send-file-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-send-file-17.12.2.tar.xz"; + sha256 = "13xq1slbr6qhjq135kxcxmv9lk5w68i6zkc47ffj76x40hdryh34"; + name = "ktp-send-file-17.12.2.tar.xz"; }; }; ktp-text-ui = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktp-text-ui-17.12.1.tar.xz"; - sha256 = "0zjvxncvr1cbis2amd0s5x3kxgd2dw4mcjbfnqgf30mjbg13bn5m"; - name = "ktp-text-ui-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktp-text-ui-17.12.2.tar.xz"; + sha256 = "166ya2nggpljf591rvscd2gqbi8fbr2zq06v512clraawfzgbrqa"; + name = "ktp-text-ui-17.12.2.tar.xz"; }; }; ktuberling = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/ktuberling-17.12.1.tar.xz"; - sha256 = "0b1wfmkd8lxh0cdalcniwz53wkv3iqlgfcb5wkp40xk4yzgm1i2g"; - name = "ktuberling-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/ktuberling-17.12.2.tar.xz"; + sha256 = "05h47my9f167gi811nzpdn6sdn0k7bdbr582rrm6j1gpjgay2d16"; + name = "ktuberling-17.12.2.tar.xz"; }; }; kturtle = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kturtle-17.12.1.tar.xz"; - sha256 = "1f1gij16s5501p41h6m9z5qf8ldix4avw7cgxcib0s273fds8wxl"; - name = "kturtle-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kturtle-17.12.2.tar.xz"; + sha256 = "0xk3dpnld7f58b9p1hgcv6afvay1yhcm285jq22qa29wi2ckhk6m"; + name = "kturtle-17.12.2.tar.xz"; }; }; kubrick = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kubrick-17.12.1.tar.xz"; - sha256 = "15vy1srmfsbxcjrm2jp0yqqn0x984jlblapma6jvgpcygxf2cxjg"; - name = "kubrick-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kubrick-17.12.2.tar.xz"; + sha256 = "0f5b3z91w4g8kl11wv43xn7n92dcfpmga51nw20wk4vsfmrwgpc9"; + name = "kubrick-17.12.2.tar.xz"; }; }; kwalletmanager = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kwalletmanager-17.12.1.tar.xz"; - sha256 = "00x122kr7vbf6wans95spq0qxlavnjnp25h1pqzxg4y4sqdgy88p"; - name = "kwalletmanager-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kwalletmanager-17.12.2.tar.xz"; + sha256 = "0aqdlm87hxw8d28jr9hhvpjcjs939595vxhg8p5bw5dzanj48zkv"; + name = "kwalletmanager-17.12.2.tar.xz"; }; }; kwave = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kwave-17.12.1.tar.xz"; - sha256 = "0ry9hgmkhs6sx9plqzyds5qn0b7qvq9g2hhxrycahsaj2q9kwk8a"; - name = "kwave-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kwave-17.12.2.tar.xz"; + sha256 = "1l5mdy1qdzw3lmrmvylcjj4wc9xg6brcd7qd20fsanzfv7w8if6k"; + name = "kwave-17.12.2.tar.xz"; }; }; kwordquiz = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/kwordquiz-17.12.1.tar.xz"; - sha256 = "1a427jy3vyqc3jadrlwfvq8gh8zx6mfwrnwwaf4skixlwgnpwcp4"; - name = "kwordquiz-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/kwordquiz-17.12.2.tar.xz"; + sha256 = "175cf0qvw7qiifbqbgsg036n125gqpbpw7v1qq81hfg8nl0zpy2h"; + name = "kwordquiz-17.12.2.tar.xz"; }; }; libgravatar = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libgravatar-17.12.1.tar.xz"; - sha256 = "0v0xnmfv272hppv7ccdj3ccq6g344v1n883pcp0fbsppkhrfwbwq"; - name = "libgravatar-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libgravatar-17.12.2.tar.xz"; + sha256 = "1vps67mbjh31y7q19wr1km0n35drimc7gi4xyhfx17l8k87nrx7a"; + name = "libgravatar-17.12.2.tar.xz"; }; }; libkcddb = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkcddb-17.12.1.tar.xz"; - sha256 = "03iz1cf69pzk0vfgjkdfwlp3iq2zj3ybzqp8mds9m7725qad35bq"; - name = "libkcddb-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkcddb-17.12.2.tar.xz"; + sha256 = "1hqrpnfy5gzknvvcfmbp2axx4qbk0qkl47rmhr8gmpdvlkh33cny"; + name = "libkcddb-17.12.2.tar.xz"; }; }; libkcompactdisc = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkcompactdisc-17.12.1.tar.xz"; - sha256 = "19ifymhr3wbf3bcsdhdbjqwnnbqrdhkxc6bq35av2n40b7395avc"; - name = "libkcompactdisc-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkcompactdisc-17.12.2.tar.xz"; + sha256 = "12dcyxjr6b6i8zfk3i17ah0kc3x0d9ixy65wj3zw1gf4mmdzgpbk"; + name = "libkcompactdisc-17.12.2.tar.xz"; }; }; libkdcraw = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkdcraw-17.12.1.tar.xz"; - sha256 = "05ji1s7p5sdcvrzmivp7dw98kxl6zm8vsfb6wc41x1syp18xvbxj"; - name = "libkdcraw-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkdcraw-17.12.2.tar.xz"; + sha256 = "1qfzyy4952b2lc3619bbzqffvrphqsq16z89bxb4pn1ad796zn62"; + name = "libkdcraw-17.12.2.tar.xz"; }; }; libkdegames = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkdegames-17.12.1.tar.xz"; - sha256 = "0sqiq3xsfigd77czw3mrgrdn4bhz6f08ibv0yy4vfvgzx5ldysbp"; - name = "libkdegames-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkdegames-17.12.2.tar.xz"; + sha256 = "1v3a9240crfpjdwpbz0bdwv06572s99h80l53vf3zwmqw5yk05z4"; + name = "libkdegames-17.12.2.tar.xz"; }; }; libkdepim = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkdepim-17.12.1.tar.xz"; - sha256 = "1h6gcn1lsk9zd2q4m4w4gwgx2nawf7iqzxq4liyrx9s0j980v9vy"; - name = "libkdepim-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkdepim-17.12.2.tar.xz"; + sha256 = "069x28ia6d95rm1g3mr339v7rdvlmiz20y4kddp2acja53b0sagg"; + name = "libkdepim-17.12.2.tar.xz"; }; }; libkeduvocdocument = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkeduvocdocument-17.12.1.tar.xz"; - sha256 = "0qfhfhy18w5fa8989hjqrk9910sb3j99xpp55zkwvfssxjnrwwxj"; - name = "libkeduvocdocument-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkeduvocdocument-17.12.2.tar.xz"; + sha256 = "1g4zldr9ys7ddxqfkkhlyqgq623q303011ifaraid5zpiql092qd"; + name = "libkeduvocdocument-17.12.2.tar.xz"; }; }; libkexiv2 = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkexiv2-17.12.1.tar.xz"; - sha256 = "18has05apcfw2qvyzkk4ywi0vbx46k0abvk6ai2rpag9kqw877i9"; - name = "libkexiv2-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkexiv2-17.12.2.tar.xz"; + sha256 = "0jr9wpnl80xala60yz4zd5j9nd1bv56y688fldr5dxx25ljavn24"; + name = "libkexiv2-17.12.2.tar.xz"; }; }; libkgapi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkgapi-17.12.1.tar.xz"; - sha256 = "177m12jfswilb1qfi7zyhymscxrz52wplm8nzlrmwv7pr3brnmnl"; - name = "libkgapi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkgapi-17.12.2.tar.xz"; + sha256 = "1vki4sxb7dzg202waqqyvjwsx8yhx8cfp2wk4b6p81hfaq8a1syd"; + name = "libkgapi-17.12.2.tar.xz"; }; }; libkgeomap = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkgeomap-17.12.1.tar.xz"; - sha256 = "0zixbp0vkmf8nrlzhwkbsgn0bxpwx6xcgslhjrl5q8w1bvp2hfjp"; - name = "libkgeomap-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkgeomap-17.12.2.tar.xz"; + sha256 = "1spq6g56ih6wlc2qasf3fkpkn7m4gsbn14p6ja60cr1gvf4p9j79"; + name = "libkgeomap-17.12.2.tar.xz"; }; }; libkipi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkipi-17.12.1.tar.xz"; - sha256 = "11438klx8lj16py2vvyahs1pf0as0dx1523bsrxy8hmyx5gsivas"; - name = "libkipi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkipi-17.12.2.tar.xz"; + sha256 = "180yg24iqh02nkcv7jbvm10lr7z7qagapjh8zarpmh6r2s3c0nh5"; + name = "libkipi-17.12.2.tar.xz"; }; }; libkleo = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkleo-17.12.1.tar.xz"; - sha256 = "1mbiljd4xpzlmf7xmf21pr2ka0cz5sg4f38z0m9if61903ag2bcc"; - name = "libkleo-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkleo-17.12.2.tar.xz"; + sha256 = "00nlspwnh9nvxarm34y9hdis3af2zkjf2flla4qwks5nhl7fgi8g"; + name = "libkleo-17.12.2.tar.xz"; }; }; libkmahjongg = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkmahjongg-17.12.1.tar.xz"; - sha256 = "1x8zbldp66my0pn4p44pg2wxybh7hq221bda91p2andaqa72nswq"; - name = "libkmahjongg-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkmahjongg-17.12.2.tar.xz"; + sha256 = "0l8krpiyzlsn9awp8za10n9qhbac8nf98jiz7dxzn4qpniv45px5"; + name = "libkmahjongg-17.12.2.tar.xz"; }; }; libkomparediff2 = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libkomparediff2-17.12.1.tar.xz"; - sha256 = "0jd700pjw51vyan5d22k6j60jgb95pfn2nvwz2nfs2f4xlsly1hz"; - name = "libkomparediff2-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libkomparediff2-17.12.2.tar.xz"; + sha256 = "07is7vn9wrivxpyd4s19371ffylj2x3s5zi14y8zr778nq68wrzq"; + name = "libkomparediff2-17.12.2.tar.xz"; }; }; libksane = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libksane-17.12.1.tar.xz"; - sha256 = "1jglv4b5zqgs3qysadcrizfwlzwv39w369hhj4180xjjc07kxjw0"; - name = "libksane-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libksane-17.12.2.tar.xz"; + sha256 = "01d182hnrj6n8qmh85pkwmjdyhfy0n946zp40r9r6avh9ajrx5nd"; + name = "libksane-17.12.2.tar.xz"; }; }; libksieve = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/libksieve-17.12.1.tar.xz"; - sha256 = "1w3cqhig1nwy5q98503f0s6i0vibsrq35js8y9vqqa22hyksy8xb"; - name = "libksieve-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/libksieve-17.12.2.tar.xz"; + sha256 = "1nfy96ykaxdm5h67bhykgdcmlidsjgvbsf52qs5f7j7iyl3w4nhr"; + name = "libksieve-17.12.2.tar.xz"; }; }; lokalize = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/lokalize-17.12.1.tar.xz"; - sha256 = "0ygsz8mbind93sc148rd3asdpzlki1ps7xkc6y2zgf069ikrp504"; - name = "lokalize-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/lokalize-17.12.2.tar.xz"; + sha256 = "18nama2dafhp5v1lvxibm92cxwdldkxs778s948qnb7xh65mxvsb"; + name = "lokalize-17.12.2.tar.xz"; }; }; lskat = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/lskat-17.12.1.tar.xz"; - sha256 = "036lhwx0d49cb2ml514rawbcngrrxhly4cjrrhf21yw8apxfwa92"; - name = "lskat-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/lskat-17.12.2.tar.xz"; + sha256 = "0a4gch1krd7xpvxkscy7prsfb72dcg78alk4vz2z70nfn11zrzv3"; + name = "lskat-17.12.2.tar.xz"; }; }; mailcommon = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/mailcommon-17.12.1.tar.xz"; - sha256 = "0m9ng8mj0hwj5zg9da5cqy8paa80q2v92qn6a6b1wm34ylbdfhsm"; - name = "mailcommon-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/mailcommon-17.12.2.tar.xz"; + sha256 = "0ikmbg91f4p7d4qb7nx05n5mlbmmcdwzgw0xvdsib7vkj5cfrxp2"; + name = "mailcommon-17.12.2.tar.xz"; }; }; mailimporter = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/mailimporter-17.12.1.tar.xz"; - sha256 = "1rd55alsa502v1vrp2fbmfxyf29h248n78d9wcw93grwg50sabdn"; - name = "mailimporter-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/mailimporter-17.12.2.tar.xz"; + sha256 = "1p4dc7xwk6wx1j6xk3h5w5cnzm665pzrmc70v8l5898025i94ml5"; + name = "mailimporter-17.12.2.tar.xz"; }; }; marble = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/marble-17.12.1.tar.xz"; - sha256 = "0g4vr27ggc3xdr274apcmv8ys9584lzxxc78ssr16snb1rkrb9my"; - name = "marble-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/marble-17.12.2.tar.xz"; + sha256 = "1y6wbh571g2d8gzg9pwdbsc4a4bl67fmvnkf65acs182zfc2x7jy"; + name = "marble-17.12.2.tar.xz"; }; }; mbox-importer = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/mbox-importer-17.12.1.tar.xz"; - sha256 = "1vm0f2yb5adrnsdl6dy34bb7zggrh6xd89n0cvz1grq5fsrb3ilk"; - name = "mbox-importer-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/mbox-importer-17.12.2.tar.xz"; + sha256 = "0f1zvp31m6i20jd7xi9hxks8759mvbsj57r2nciwhc47r3m9wi3l"; + name = "mbox-importer-17.12.2.tar.xz"; }; }; messagelib = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/messagelib-17.12.1.tar.xz"; - sha256 = "1nc6vh68fy26kcisqbr4lvhwxx3dzmjdawgzhy7jnbhdx36siw3b"; - name = "messagelib-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/messagelib-17.12.2.tar.xz"; + sha256 = "17fayacl3m7p0w0rf724fhdm287dz8n03pyliapsxybldgp2rlaz"; + name = "messagelib-17.12.2.tar.xz"; }; }; minuet = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/minuet-17.12.1.tar.xz"; - sha256 = "1y7l1qh3vwhhkv9mp165kyhf3ps4xzclnmbml3kpczhgxs0hzw47"; - name = "minuet-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/minuet-17.12.2.tar.xz"; + sha256 = "17gwnh0bd2a7fvxbjhwadh0gvb0zly71lwv8znkb18dwsyd38v3r"; + name = "minuet-17.12.2.tar.xz"; }; }; okteta = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/okteta-17.12.1.tar.xz"; - sha256 = "1ryaqbccqlir910v628wcv7gwp85w82d6f1lwwg92dh55zmlx6a4"; - name = "okteta-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/okteta-17.12.2.tar.xz"; + sha256 = "1k4b2m5pvrv1zxvm6pwmkl0ahh0ynkssa8z1v51a3hxlvw593b4d"; + name = "okteta-17.12.2.tar.xz"; }; }; okular = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/okular-17.12.1.tar.xz"; - sha256 = "0rai5m7alks6lri2fwg07s842azd6q9xizwsk0ib4pnw07hj2fqj"; - name = "okular-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/okular-17.12.2.tar.xz"; + sha256 = "10rkrwp3rwccvqsw7njcmggw3jkj84fb90vkvqp8k2lmhnrz1ypx"; + name = "okular-17.12.2.tar.xz"; }; }; palapeli = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/palapeli-17.12.1.tar.xz"; - sha256 = "0xbcfsrzlj41wr2fx0awgmvdxdd6y890sigf42nzi8mizvd70b5v"; - name = "palapeli-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/palapeli-17.12.2.tar.xz"; + sha256 = "0j9b4a6x3bp9bki2p79ksn86l16niixa2x8xx24vdnd9y71lp2yb"; + name = "palapeli-17.12.2.tar.xz"; }; }; parley = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/parley-17.12.1.tar.xz"; - sha256 = "199qkhsrgcviyi3hfaazr8acd1xji1rraqvwlrb8b1bsrdnknbfs"; - name = "parley-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/parley-17.12.2.tar.xz"; + sha256 = "0kqvj1gwsv9kdac0zsv6cda34h8qx8xr43mgwk343c8pcwm1r2r5"; + name = "parley-17.12.2.tar.xz"; }; }; picmi = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/picmi-17.12.1.tar.xz"; - sha256 = "024bia05vczjaz2df0lg4jqkjn8l7x36cjr6jkr0c77p37vm3w6k"; - name = "picmi-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/picmi-17.12.2.tar.xz"; + sha256 = "0ry4vvspa2mdvxrxvbqihkdh7qvsxhl9v7i07ycx3qs7sybf1rx4"; + name = "picmi-17.12.2.tar.xz"; }; }; pimcommon = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/pimcommon-17.12.1.tar.xz"; - sha256 = "0wmlzx43730zgdvgnw1ljplspbg19r5i88s0nvz53s0fa70nbga2"; - name = "pimcommon-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/pimcommon-17.12.2.tar.xz"; + sha256 = "0frgn2shd2qzf4rbix9k4psy81b2yzsyy0sisy0ngc68gk5mdj8a"; + name = "pimcommon-17.12.2.tar.xz"; }; }; pim-data-exporter = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/pim-data-exporter-17.12.1.tar.xz"; - sha256 = "0ryw03lb5lhj5k6g7rqnmmqfgrd6004im7p3wwf9v3ynmjbkx0v7"; - name = "pim-data-exporter-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/pim-data-exporter-17.12.2.tar.xz"; + sha256 = "1fbpz4sw4gn01yc7vzlj9v15wp3b6acbcd6xs9nsp3bfpb9mqd16"; + name = "pim-data-exporter-17.12.2.tar.xz"; }; }; pim-sieve-editor = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/pim-sieve-editor-17.12.1.tar.xz"; - sha256 = "1adz9whyvqz0fw2ggkr7g8xd67m779vyymqbyx3h05kwmdy6kims"; - name = "pim-sieve-editor-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/pim-sieve-editor-17.12.2.tar.xz"; + sha256 = "1jwjgywqp23c17g08c18ajbl2dzq3h9vm94bmbjcan64isd03jr4"; + name = "pim-sieve-editor-17.12.2.tar.xz"; }; }; poxml = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/poxml-17.12.1.tar.xz"; - sha256 = "1ynycpwvsx2514rar3ycvmyv6fj2ac1adxx2gcip9vkb4chija6b"; - name = "poxml-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/poxml-17.12.2.tar.xz"; + sha256 = "0amb095qjv8d22ny86rs6wj280b2ag2zpk7bzs5834m75wlmpg6w"; + name = "poxml-17.12.2.tar.xz"; }; }; print-manager = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/print-manager-17.12.1.tar.xz"; - sha256 = "024hzc2ja1cb6wvag0w040q3ifrpzlb6s23d75hvkpyqqgi1qq5d"; - name = "print-manager-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/print-manager-17.12.2.tar.xz"; + sha256 = "0sz7xqcjc5ddxkc7gbl1h673ywp3ffhmx985jzpd296n6sjppc2v"; + name = "print-manager-17.12.2.tar.xz"; }; }; rocs = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/rocs-17.12.1.tar.xz"; - sha256 = "04v3khfyz7gg7krn3v3j5885ivmf0avmgl5xwyqh8vy7zwxajvq7"; - name = "rocs-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/rocs-17.12.2.tar.xz"; + sha256 = "08flyrla2kqkdc94hd8w2inzmnmzvczcgwl9hzqxxzf3fsjnnfdl"; + name = "rocs-17.12.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/signon-kwallet-extension-17.12.1.tar.xz"; - sha256 = "05w8hpxc2fmm5w1fj8df8dqj8hag62f154mpyiq5zy04a0j69mbl"; - name = "signon-kwallet-extension-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/signon-kwallet-extension-17.12.2.tar.xz"; + sha256 = "06l1mynl7wp1r3gmy5919dm0p19p23harsh6qwdvbi9lffy7ascp"; + name = "signon-kwallet-extension-17.12.2.tar.xz"; }; }; spectacle = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/spectacle-17.12.1.tar.xz"; - sha256 = "0zl2wr9n5lb6ry5xp33wv73r5xkadm4zm1bnric85q383qzwzhvd"; - name = "spectacle-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/spectacle-17.12.2.tar.xz"; + sha256 = "0qhhnpdk4rqzpg3npj183nl7k1n4mvhcb97hydwaq51yh51r4gvj"; + name = "spectacle-17.12.2.tar.xz"; }; }; step = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/step-17.12.1.tar.xz"; - sha256 = "027czrw3dkvcbw74jrh8qwi577zxb7hzbzmnpd7b01qal486qj0f"; - name = "step-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/step-17.12.2.tar.xz"; + sha256 = "1n9gd2sq2lvfmgvjdb8yn5g25j58jcb24qh8l41k1y0hgcbaxly7"; + name = "step-17.12.2.tar.xz"; }; }; svgpart = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/svgpart-17.12.1.tar.xz"; - sha256 = "13g89s83y7wwwkx06zxcghcv9rdpziyq5f2lc81y583qsqg6j6lh"; - name = "svgpart-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/svgpart-17.12.2.tar.xz"; + sha256 = "1d7yrpnxc3sm3381fd9m3fiipi664vl8cz2li8dlw2y4pbgpx28g"; + name = "svgpart-17.12.2.tar.xz"; }; }; sweeper = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/sweeper-17.12.1.tar.xz"; - sha256 = "0rhn2ia3sxjlig9vp15jdvi7ij5xgyn4bz8cbh5g93an79z4mi59"; - name = "sweeper-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/sweeper-17.12.2.tar.xz"; + sha256 = "1qi4kfd4p8xnykv3zn3sqkx4b605mwbnr6m9l6cr0v26c01yjq3k"; + name = "sweeper-17.12.2.tar.xz"; }; }; syndication = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/syndication-17.12.1.tar.xz"; - sha256 = "1y8nsrbdc69cyh0rhjfvi99qx2fgvpvfsixpqjsyis1xhkxc3901"; - name = "syndication-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/syndication-17.12.2.tar.xz"; + sha256 = "1hcdk0apdrppfrjyfjm4cn0iyb1yrf7zq2wb2ipmxzca1hfgw4c0"; + name = "syndication-17.12.2.tar.xz"; }; }; umbrello = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/umbrello-17.12.1.tar.xz"; - sha256 = "13krbjzg840rhr74zwday4p5min0zwrpxri6k1sdz7mhqm4lbj19"; - name = "umbrello-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/umbrello-17.12.2.tar.xz"; + sha256 = "1sm0drfsyyslls5n66mvjy2knbwykws34g74c6rn1mmmdpyp7b94"; + name = "umbrello-17.12.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.12.1"; + version = "17.12.2"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.1/src/zeroconf-ioslave-17.12.1.tar.xz"; - sha256 = "10n0zyr2by91d0985r8cq6d8p0h3pxxq3kckrz2pmafr0q7l1zqx"; - name = "zeroconf-ioslave-17.12.1.tar.xz"; + url = "${mirror}/stable/applications/17.12.2/src/zeroconf-ioslave-17.12.2.tar.xz"; + sha256 = "09p55dmrsi8jyvs793ya2xzfbhm6f6gwg8ldri15v9n3if7crpzx"; + name = "zeroconf-ioslave-17.12.2.tar.xz"; }; }; } From b2f1422f5532847a14842a3202f22741f197828a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sat, 10 Feb 2018 17:54:55 +0100 Subject: [PATCH 742/797] teamspeak_client: 3.1.7 -> 3.1.8 --- .../networking/instant-messengers/teamspeak/client.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index b7dfdb3e341..5ab2923e992 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { name = "teamspeak-client-${version}"; - version = "3.1.7"; + version = "3.1.8"; src = fetchurl { urls = [ @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" ]; sha256 = if stdenv.is64bit - then "1ww20805b7iphkh1ra3py6f7l7s321cg70sfl9iw69n05l3313fn" - else "0yvhmbhliraakn9k4bij6rnai7hn50g4z6mfjsyliizf6437x4nr"; + then "0yav71sfklqg2k3ayd0bllsixd486l0587s5ygjlc9gnchw3zg6z" + else "1agf6jf5hkyxazxqcnvcjfb263p5532ahi7h4rkifnnvqay36v5i"; }; # grab the plugin sdk for the desktop icon From 52628a27e7aa160075e5da6a17b627f72bac619b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Feb 2018 12:34:10 +0100 Subject: [PATCH 743/797] hackage2nix: disable broken builds --- .../configuration-hackage2nix.yaml | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b8839184c31..4ab9669094a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2979,6 +2979,7 @@ dont-distribute-packages: aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-tiled: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] affection: [ i686-linux, x86_64-linux, x86_64-darwin ] affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3042,6 +3043,7 @@ dont-distribute-packages: angle: [ i686-linux, x86_64-linux, x86_64-darwin ] Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] animate-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + animate: [ i686-linux, x86_64-linux, x86_64-darwin ] annah: [ i686-linux, x86_64-linux, x86_64-darwin ] anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] anonymous-sums: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3138,6 +3140,7 @@ dont-distribute-packages: atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] atp-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ats-format: [ i686-linux, x86_64-linux, x86_64-darwin ] + ats-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] attic-schedule: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3784,6 +3787,7 @@ dont-distribute-packages: conductive-base: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-song: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-find: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3947,6 +3951,7 @@ dont-distribute-packages: d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ] + damnpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ] Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4550,6 +4555,7 @@ dont-distribute-packages: fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixer: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] fixie: [ i686-linux, x86_64-linux, x86_64-darwin ] fizzbuzz-as-a-service: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4713,6 +4719,7 @@ dont-distribute-packages: general-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] GeneralTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] generators: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-accessors: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4772,6 +4779,7 @@ dont-distribute-packages: ghc-exactprint: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-justdoit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-mod: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4981,6 +4989,7 @@ dont-distribute-packages: gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gssapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + gstorable: [ i686-linux, x86_64-linux, x86_64-darwin ] gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5141,6 +5150,7 @@ dont-distribute-packages: happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] + HappyTree: [ i686-linux, x86_64-linux, x86_64-darwin ] hapstone: [ i686-linux, x86_64-linux, x86_64-darwin ] HaPy: [ i686-linux, x86_64-linux, x86_64-darwin ] haquery: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5577,6 +5587,7 @@ dont-distribute-packages: hocker: [ i686-linux, x86_64-linux, x86_64-darwin ] hodatime: [ i686-linux, x86_64-linux, x86_64-darwin ] HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] hofix-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] hog: [ i686-linux, x86_64-linux, x86_64-darwin ] hogg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5624,6 +5635,7 @@ dont-distribute-packages: hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] hpack-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpack-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco: [ i686-linux, x86_64-linux, x86_64-darwin ] hpage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5688,6 +5700,7 @@ dont-distribute-packages: hs-twitterarchiver: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-watchman: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs2ats: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5747,6 +5760,7 @@ dont-distribute-packages: HSlippyMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsluv-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5817,6 +5831,7 @@ dont-distribute-packages: htestu: [ i686-linux, x86_64-linux, x86_64-darwin ] HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] htlset: [ i686-linux, x86_64-linux, x86_64-darwin ] + html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] html-tokenizer: [ i686-linux, x86_64-linux, x86_64-darwin ] hts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6141,6 +6156,7 @@ dont-distribute-packages: jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] + judge: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6918,6 +6934,7 @@ dont-distribute-packages: netease-fm: [ i686-linux, x86_64-linux, x86_64-darwin ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] netrc: [ i686-linux, x86_64-linux, x86_64-darwin ] + netrium: [ i686-linux, x86_64-linux, x86_64-darwin ] NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] netstring-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6999,6 +7016,7 @@ dont-distribute-packages: noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + not-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7221,6 +7239,7 @@ dont-distribute-packages: peg: [ i686-linux, x86_64-linux, x86_64-darwin ] peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] pell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pencil: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] penny: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7247,6 +7266,7 @@ dont-distribute-packages: persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-test: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] persona-idp: [ i686-linux, x86_64-linux, x86_64-darwin ] persona: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7327,6 +7347,7 @@ dont-distribute-packages: plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-light: [ i686-linux, x86_64-linux, x86_64-darwin ] ploton: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7404,6 +7425,7 @@ dont-distribute-packages: potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + powerqueue-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7622,6 +7644,7 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] + rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7972,6 +7995,7 @@ dont-distribute-packages: semiring-num: [ i686-linux, x86_64-linux, x86_64-darwin ] semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] + sendgrid-v3: [ i686-linux, x86_64-linux, x86_64-darwin ] sensei: [ i686-linux, x86_64-linux, x86_64-darwin ] sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] sentence-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8015,6 +8039,7 @@ dont-distribute-packages: servant-pushbullet-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-ruby: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8050,6 +8075,7 @@ dont-distribute-packages: shadowsocks: [ i686-linux, x86_64-linux, x86_64-darwin ] shady-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] shady-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-ats: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8111,6 +8137,7 @@ dont-distribute-packages: simple-sql-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-tar: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleargs: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleGL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8276,6 +8303,7 @@ dont-distribute-packages: sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] spata: [ i686-linux, x86_64-linux, x86_64-darwin ] + spatial-math: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8409,6 +8437,7 @@ dont-distribute-packages: strelka: [ i686-linux, x86_64-linux, x86_64-darwin ] StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] strictly: [ i686-linux, x86_64-linux, x86_64-darwin ] + string-isos: [ i686-linux, x86_64-linux, x86_64-darwin ] string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] stringprep: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8798,6 +8827,7 @@ dont-distribute-packages: twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + twilio: [ i686-linux, x86_64-linux, x86_64-darwin ] twill: [ i686-linux, x86_64-linux, x86_64-darwin ] twiml: [ i686-linux, x86_64-linux, x86_64-darwin ] twine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9148,6 +9178,7 @@ dont-distribute-packages: ws: [ i686-linux, x86_64-linux, x86_64-darwin ] wsdl: [ i686-linux, x86_64-linux, x86_64-darwin ] wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] + wsjtx-udp: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] From c8bc6163c017ca066f264653073950d43c61a738 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Feb 2018 02:31:39 +0100 Subject: [PATCH 744/797] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.8-24-g7642d25 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ddb881454bc4f70d0d9cb6cb2e003136af3b5e8a. --- .../haskell-modules/hackage-packages.nix | 2367 +++++++++++++---- 1 file changed, 1890 insertions(+), 477 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 796cc5262dc..f330561b145 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -543,9 +543,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ANum"; - version = "0.1.1.0"; - sha256 = "0ilgz1akz66cwwvxd8dkz2fq9gyplc4m206jpmp380ys5n37b4q9"; + version = "0.2.0.1"; + sha256 = "01ixrqas444vd0dynx6lkfgvjrd3fnj1lwdz7pcwaiclww5nyxba"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; homepage = "https://github.com/DanBurton/ANum#readme"; description = "Num instance for Applicatives provided via the ANum newtype"; license = stdenv.lib.licenses.bsd3; @@ -753,8 +754,8 @@ self: { pname = "Agda"; version = "2.5.3"; sha256 = "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a"; - revision = "3"; - editedCabalFile = "1hd1viy4wj7fyskjmmf5hqziyvk5qxjr0zcnbp5zdyacng0yyafi"; + revision = "5"; + editedCabalFile = "0cly9p549phqv86dlqacxrs2w50y5jmsw21657gpn84ryz3cmjbs"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -1869,8 +1870,8 @@ self: { }: mkDerivation { pname = "Blogdown"; - version = "0.2.3"; - sha256 = "0xdlcx82nfm74n88fghbg5f6fnjvrajpsz52hrc4bl5afxx63bpx"; + version = "0.2.4"; + sha256 = "04ll74z2yqb99jydz9bw4p602hvpmk03sgix8rzwg0qb38lwvjvm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -9180,6 +9181,7 @@ self: { homepage = "https://github.com/MarisaKirisame/HappyTree#readme"; description = "Type Safe and End to End Decision Tree"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HarmTrace" = callPackage @@ -9763,6 +9765,7 @@ self: { homepage = "https://github.com/MaartenFaddegon/Hoed"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Hoed_0_5_0" = callPackage @@ -10864,6 +10867,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels-extra_0_3_0" = callPackage + ({ mkDerivation, base, criterion, hspec, JuicyPixels }: + mkDerivation { + pname = "JuicyPixels-extra"; + version = "0.3.0"; + sha256 = "08hf3dklz3zaczbffq11z1yjk3hqf53rnz3g9n989ndw8ybkm865"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base hspec JuicyPixels ]; + benchmarkHaskellDepends = [ base criterion JuicyPixels ]; + homepage = "https://github.com/mrkkrp/JuicyPixels-extra"; + description = "Efficiently scale, crop, flip images with JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-repa" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { @@ -11537,8 +11556,10 @@ self: { ({ mkDerivation, base, hmatrix, vector }: mkDerivation { pname = "Learning"; - version = "0.0.0"; - sha256 = "18fh7gbpb4pm3cfsz3sxynippg6khf9cj4ijbk6q0xa107czy9w6"; + version = "0.0.1"; + sha256 = "10sdnhi3pr3x3fjj90nwz1lij64wjxss805xcskqqad2j4lygwxz"; + revision = "1"; + editedCabalFile = "1z5ka7gjkv0ir6f011rigzndsjrh05i9zryn4m7855dsk3bxysab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hmatrix vector ]; @@ -13073,6 +13094,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Naperian" = callPackage + ({ mkDerivation, base, containers, ghc-prim, vector }: + mkDerivation { + pname = "Naperian"; + version = "0.1.0.1"; + sha256 = "0h8kijw9y0p7bpy6qr1334xzbkcici3jrnk16w0cm4mxykrqjhwc"; + libraryHaskellDepends = [ base containers ghc-prim vector ]; + homepage = "https://github.com/idontgetoutmuch/Naperian"; + description = "Naperian Functors for APL-like programming"; + license = "unknown"; + }) {}; + "NaturalLanguageAlphabets" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, cereal , containers, criterion, deepseq, file-embed, hashtables @@ -14669,6 +14702,7 @@ self: { executableHaskellDepends = [ base containers generic-accessors ]; description = "Real-time line plotter for generic data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PlslTools" = callPackage @@ -19600,22 +19634,24 @@ self: { }) {}; "XSaiga" = callPackage - ({ mkDerivation, base, cgi, containers, hsparql, network, pretty - , rdf4h, text + ({ mkDerivation, base, bifunctors, bytestring, cgi, containers + , hsparql, mtl, network, pretty, rdf4h, text }: mkDerivation { pname = "XSaiga"; - version = "1.5.0.0"; - sha256 = "0v4f1z8xhwyiq5y2p8dxdxmdg4y2ik02zmamjff5mb7d22bqwpir"; + version = "1.6.0.0"; + sha256 = "1kc48pdqhxiqmmp7fhlidx5lqzr57b34d6sln1hxpvkl862sfmr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hsparql network pretty rdf4h text + base bifunctors bytestring cgi containers hsparql mtl network + pretty rdf4h text ]; executableHaskellDepends = [ - base cgi containers hsparql network pretty rdf4h text + base bifunctors bytestring cgi containers hsparql mtl network + pretty rdf4h text ]; - homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html"; + homepage = "http://speechweb2.cs.uwindsor.ca/solarman4/demo_sparql.html"; description = "An implementation of a polynomial-time top-down parser suitable for NLP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -22203,8 +22239,8 @@ self: { ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }: mkDerivation { pname = "aeson-picker"; - version = "0.1.0.0"; - sha256 = "1976cf67y0077gd1s13vrfws5w5mcak94dc6ygnl1pir6ysanaf7"; + version = "0.1.0.1"; + sha256 = "080grn544k035kbinrimar2d2vx6h59dqjhl7irll708dvpfphcv"; libraryHaskellDepends = [ aeson base lens lens-aeson text ]; testHaskellDepends = [ base hspec text ]; homepage = "https://github.com/ozzzzz/aeson-picker#readme"; @@ -22472,6 +22508,7 @@ self: { homepage = "https://github.com/codedownio/aeson-typescript#readme"; description = "Generate TypeScript definition files from your ADTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-utils" = callPackage @@ -24489,8 +24526,8 @@ self: { pname = "amazonka-core"; version = "1.5.0"; sha256 = "173mdmk3p9jqnskjf5g9r1kr568plrmshb6p17cq11n1wnngkxnk"; - revision = "1"; - editedCabalFile = "0w04b2cpshrv1r8nkw70y0n70wshzmnl0lp1khpj8qzzj1zxl1i2"; + revision = "2"; + editedCabalFile = "1y1ian4wimsbng4c3ix8jd3pn3b0xhydzwv87blck4sgl41w83vl"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -26380,8 +26417,8 @@ self: { }: mkDerivation { pname = "animate"; - version = "0.4.0"; - sha256 = "1mzjvnr1q8lj380ijhqpnqpbqfz34bcv4frg1phsr478j55x17v4"; + version = "0.6.0"; + sha256 = "14fbxn3v4l5z6krqsycpg9ylx91y1xwzwqcxpqy5ihjba2g2r23a"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; @@ -26389,6 +26426,7 @@ self: { homepage = "https://github.com/jxv/animate#readme"; description = "Animation for sprites"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "animate-example" = callPackage @@ -26397,8 +26435,8 @@ self: { }: mkDerivation { pname = "animate-example"; - version = "0.0.0"; - sha256 = "14i5jav4p7hwj8d7z611mzhdwqmxsikrs56kn10lxww6m9i4fvf5"; + version = "0.2.0"; + sha256 = "07jqlqjdza4jxjc4hic2v0gh1n3jcvz1dnsm54m6y68k1ww68vrz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28975,6 +29013,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async_2_2_1" = callPackage + ({ mkDerivation, base, hashable, HUnit, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.2.1"; + sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hashable stm ]; + executableHaskellDepends = [ base stm ]; + testHaskellDepends = [ + base HUnit stm test-framework test-framework-hunit + ]; + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-ajax" = callPackage ({ mkDerivation, async, base, ghcjs-ajax, text }: mkDerivation { @@ -29533,71 +29592,85 @@ self: { }) {}; "ats-format" = callPackage - ({ mkDerivation, alex, ansi-wl-pprint, base, Cabal, cli-setup - , directory, file-embed, happy, htoml-megaparsec, language-ats - , optparse-applicative, process, text, unordered-containers + ({ mkDerivation, ansi-wl-pprint, base, Cabal, cli-setup, directory + , file-embed, htoml-megaparsec, language-ats, optparse-applicative + , process, text, unordered-containers }: mkDerivation { pname = "ats-format"; - version = "0.2.0.9"; - sha256 = "07vbqwdlhnbqman07yh53s3fsdvpvphbj6s5cr9cr7pb6l3s3m13"; - isLibrary = true; + version = "0.2.0.17"; + sha256 = "13bxd28pyxyna8vv3vg8d29wmyi6iv296jqbcjh0p12jicxgf4i8"; + isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cli-setup ]; - libraryHaskellDepends = [ + executableHaskellDepends = [ ansi-wl-pprint base directory file-embed htoml-megaparsec language-ats optparse-applicative process text unordered-containers ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; description = "A source-code formatter for ATS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ats-pkg" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Cabal - , cli-setup, composition-prelude, dhall, directory, filemanip - , http-client, http-client-tls, lens, optparse-applicative - , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary - , text, unix, zlib + ({ mkDerivation, ansi-wl-pprint, ats-setup, base, binary + , bytestring, Cabal, cli-setup, composition-prelude, dependency + , dhall, directory, http-client, http-client-tls, lens + , optparse-applicative, parallel-io, process, shake, shake-ats + , shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.1.0.8"; - sha256 = "05ipwj3ihds2q8amvxxj02jzqpbmyjvd55a69z7bmx9vmz8j3pal"; + version = "2.2.1.1"; + sha256 = "1gbin3wsnhk34pqr7qi0dld91n7m600bbn5pnbhg0z59d43wl5iq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-wl-pprint base binary bytestring composition-prelude dhall - directory filemanip http-client http-client-tls lens + ansi-wl-pprint ats-setup base binary bytestring composition-prelude + dependency dhall directory http-client http-client-tls lens optparse-applicative parallel-io process shake shake-ats shake-ext - tar temporary text unix zlib + tar temporary text unix zip-archive zlib ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/atspkg#readme"; - description = "Package manager for ATS"; + description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ats-setup" = callPackage - ({ mkDerivation, base, Cabal, directory, http-client - , http-client-tls, parallel-io, tar, zlib + ({ mkDerivation, base, bytestring, Cabal, dependency, directory + , filemanip, http-client, http-client-tls, parallel-io, process + , tar, unix, zlib }: mkDerivation { pname = "ats-setup"; - version = "0.2.0.0"; - sha256 = "1jkavd5dvsk6nbkik9xcdnlp3ry6jcmvkdk0lhm94f53cwz23xi5"; + version = "0.3.0.2"; + sha256 = "1fxk1602kh4i2dgfdjalnwfp37w8r775vd21431pkwf5xcf9ax0g"; libraryHaskellDepends = [ - base Cabal directory http-client http-client-tls parallel-io tar - zlib + base bytestring Cabal dependency directory filemanip http-client + http-client-tls parallel-io process tar unix zlib ]; description = "ATS scripts for Cabal builds"; license = stdenv.lib.licenses.bsd3; }) {}; + "ats-storable" = callPackage + ({ mkDerivation, base, bytestring, composition-prelude, text }: + mkDerivation { + pname = "ats-storable"; + version = "0.2.0.1"; + sha256 = "0cybcdsq8gj2wzhfa5jbw5ihlbhrsgx9dyyi157yxj7dbbhz3abs"; + libraryHaskellDepends = [ + base bytestring composition-prelude text + ]; + homepage = "https://github.com//ats-generic#readme"; + description = "Marshal ATS types into Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attempt" = callPackage ({ mkDerivation, base, failure }: mkDerivation { @@ -30564,14 +30637,14 @@ self: { "avro" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, data-binary-ieee754, entropy, extra, fail - , hashable, hspec, mtl, pure-zlib, QuickCheck, scientific - , semigroups, tagged, template-haskell, text, unordered-containers - , vector + , hashable, hspec, lens, lens-aeson, mtl, pure-zlib, QuickCheck + , scientific, semigroups, tagged, template-haskell, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "avro"; - version = "0.2.0.0"; - sha256 = "1bs2fpka2pz58hj1x8pv27vm2sdap7rp83fasali228iigvlp9cc"; + version = "0.2.1.0"; + sha256 = "07gqi33aadb9c94b19z1166ayyi0s95ykda77l53vc2al43sa3bl"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -30579,9 +30652,9 @@ self: { ]; testHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers - entropy extra fail hashable hspec mtl pure-zlib QuickCheck - scientific semigroups tagged template-haskell text - unordered-containers vector + entropy extra fail hashable hspec lens lens-aeson mtl pure-zlib + QuickCheck scientific semigroups tagged template-haskell text + transformers unordered-containers vector ]; homepage = "https://github.com/haskell-works/hw-haskell-avro.git"; description = "Avro serialization support for Haskell"; @@ -31485,6 +31558,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "backprop_0_1_2_0" = callPackage + ({ mkDerivation, base, bifunctors, criterion, deepseq, directory + , hmatrix, lens, microlens, mnist-idx, mwc-random, primitive + , reflection, time, transformers, type-combinators, vector + }: + mkDerivation { + pname = "backprop"; + version = "0.1.2.0"; + sha256 = "1f4q1mj0q9721i85fccl8wpi1mkcr8m1r8q67wsg2s7490zdnjvv"; + libraryHaskellDepends = [ + base deepseq microlens primitive reflection transformers + type-combinators vector + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory hmatrix lens mnist-idx + mwc-random time transformers vector + ]; + homepage = "https://github.com/mstksg/backprop#readme"; + description = "Heterogeneous automatic differentation (backpropagation)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -32548,17 +32644,17 @@ self: { , codec-rpm, cond, conduit, conduit-combinators, conduit-extra , containers, content-store, cpio-conduit, cryptonite, directory , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree - , gitrev, hspec, http-conduit, HUnit, memory, monad-control - , monad-logger, monad-loops, mtl, network-uri, ostree, parsec - , parsec-numbers, persistent, persistent-sqlite + , gitrev, hspec, http-conduit, HUnit, listsafe, memory + , monad-control, monad-logger, monad-loops, mtl, network-uri + , ostree, parsec, parsec-numbers, persistent, persistent-sqlite , persistent-template, process, regex-pcre, resourcet, split, tar , tar-conduit, temporary, text, time, unix, unordered-containers , xml-conduit }: mkDerivation { pname = "bdcs"; - version = "0.1.1"; - sha256 = "1sxksvn852glnq181cj8y2pw2gkfg7afvhxx4rshvkxb7y58v8w9"; + version = "0.2.0"; + sha256 = "1a7cnxfvgrwi966kfccd29s45246dspqnd1fn953xfid4zfqy5s1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32567,7 +32663,7 @@ self: { aeson base bytestring codec-rpm cond conduit conduit-combinators conduit-extra containers content-store cpio-conduit cryptonite directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree - gitrev http-conduit memory monad-control monad-logger mtl + gitrev http-conduit listsafe memory monad-control monad-logger mtl network-uri parsec parsec-numbers persistent persistent-sqlite persistent-template process regex-pcre resourcet split tar tar-conduit temporary text time unix unordered-containers @@ -32582,8 +32678,8 @@ self: { testHaskellDepends = [ aeson base bytestring codec-rpm cond conduit conduit-combinators containers directory esqueleto filepath gi-gio gi-glib hspec HUnit - monad-logger mtl parsec parsec-numbers persistent persistent-sqlite - persistent-template resourcet text time unix + listsafe monad-logger mtl parsec parsec-numbers persistent + persistent-sqlite persistent-template resourcet text time unix ]; homepage = "https://github.com/weldr/bdcs"; description = "Tools for managing a content store of software packages"; @@ -33313,6 +33409,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bifunctors_5_5_2" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, semigroups, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.2"; + sha256 = "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark"; + libraryHaskellDepends = [ + base base-orphans comonad containers semigroups tagged + template-haskell th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/ekmett/bifunctors/"; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -37941,7 +38061,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_33" = callPackage + "brick_0_34" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, stm, template-haskell, text, text-zipper @@ -37949,8 +38069,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.33"; - sha256 = "0052hdwvqrprf5911axikxpigbc1iv3h4kq3zhrnvpy038wjbis1"; + version = "0.34"; + sha256 = "1n835ma8a73zcb4q0r066d9ql4071qf1d30cpv2xhwqc5p4c2i41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38312,8 +38432,8 @@ self: { }: mkDerivation { pname = "buchhaltung"; - version = "0.0.5"; - sha256 = "0sbmabig0b5z71c8v71p0fb5wagm0a8vb40c829w6q337q23m9iq"; + version = "0.0.7"; + sha256 = "1hkiiah2h64gkb9y6bagg5q182rylysdqwqlkn5lvmym4akp8zlb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39391,6 +39511,8 @@ self: { pname = "bzlib-conduit"; version = "0.2.1.5"; sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an"; + revision = "1"; + editedCabalFile = "1pz462dij6rizmbi7dw6qz50f9xgnzzw2z08cjlvbqzn05cpgdv6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring conduit conduit-extra data-default mtl @@ -39407,6 +39529,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; + "bzlib-conduit_0_3_0" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit + , data-default, hspec, mtl, random, resourcet + }: + mkDerivation { + pname = "bzlib-conduit"; + version = "0.3.0"; + sha256 = "11nz2lkrv39rb7ayhnqlpjrxsprnv92ygwwvgmp3i32l9fakwhpw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bindings-DSL bytestring conduit data-default mtl resourcet + ]; + librarySystemDepends = [ bzip2 ]; + testHaskellDepends = [ + base bindings-DSL bytestring conduit data-default hspec mtl random + resourcet + ]; + benchmarkHaskellDepends = [ + base bindings-DSL bytestring conduit data-default mtl resourcet + ]; + homepage = "https://github.com/snoyberg/bzlib-conduit#readme"; + description = "Streaming compression/decompression via conduits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) bzip2;}; + "c-dsl" = callPackage ({ mkDerivation, base, language-c }: mkDerivation { @@ -39918,8 +40066,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.8.0.0"; - sha256 = "050g5y74ldpv8haj8grqpk2cw72l3gm0hypza72f556dl9j5hz2m"; + version = "0.8.0.2"; + sha256 = "0yhsyq2z660qj5vp38lak2cz90r5jy69ifvz6dfipj6miyh2vmm6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -40411,6 +40559,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-toolkit_0_0_5" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, containers, ghc + , template-haskell + }: + mkDerivation { + pname = "cabal-toolkit"; + version = "0.0.5"; + sha256 = "1w3c75avp12ig1bmakgjsp10rb8bnnibxi1sbg96y6gx4g3krbcq"; + libraryHaskellDepends = [ + base binary bytestring Cabal containers ghc template-haskell + ]; + homepage = "https://github.com/TerrorJack/cabal-toolkit#readme"; + description = "Helper functions for writing custom Setup.hs scripts."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-uninstall" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process }: mkDerivation { @@ -41396,8 +41561,8 @@ self: { }: mkDerivation { pname = "capataz"; - version = "0.1.0.0"; - sha256 = "1bz9yazxwdasbdbr9hrfpvjaqd4lax8kqinlj4rxyiq1517rsqrk"; + version = "0.1.0.1"; + sha256 = "0ldxnm5mib9gg7qhf29psifkcfzfcrbnfzk93hvnb08lfrdc8d1d"; libraryHaskellDepends = [ async base bytestring data-default microlens protolude safe-exceptions stm teardown text time unordered-containers uuid @@ -42831,6 +42996,8 @@ self: { pname = "cereal-conduit"; version = "0.8.0"; sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r"; + revision = "1"; + editedCabalFile = "1imyl3g2bni8bc6kajr857xh94fscphksj3286pxfpa8yp9vqqpc"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet transformers ]; @@ -45445,8 +45612,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.10"; - sha256 = "0ijwfl4wj0pjv6hfac6fbrvcg3all9p2wx2w1lirjvn5kgwjj5r2"; + version = "0.4.3.11"; + sha256 = "1xqlpdg511m5wif9cz01v0fgam1lsvl50sqigxrcjc9n6fivn61x"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -47910,6 +48077,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_3" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , contravariant, distributive, doctest, semigroups, tagged + , transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.3"; + sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers contravariant distributive semigroups tagged + transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/comonad/"; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -48714,6 +48902,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concise_0_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, lens, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "concise"; + version = "0.1.0.1"; + sha256 = "09crgc6gjfidlad6263253xx1di6wfhc9awhira21s0z7rddy9sw"; + libraryHaskellDepends = [ base bytestring lens text ]; + testHaskellDepends = [ + base bytestring lens QuickCheck quickcheck-instances tasty + tasty-quickcheck text + ]; + homepage = "https://github.com/frasertweedale/hs-concise"; + description = "Utilities for Control.Lens.Cons"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concorde" = callPackage ({ mkDerivation, base, containers, process, safe, temporary }: mkDerivation { @@ -49016,8 +49223,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.3.1.1"; - sha256 = "109c202sqhsx6fr8m0zkwgzsy7pnnaps2nhyykp7cd6rw0ak6i28"; + version = "0.3.1.2"; + sha256 = "1qvd452najs0i3a2k2m493zs1jclsiisr1wv318kvkh0k42sb2m6"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -49047,6 +49254,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_3" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.3"; + sha256 = "0sp5mc7pxw48k0hv17l553bcjr7s5dp9vznm2n6400nyhgmxdha8"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -49331,6 +49555,7 @@ self: { homepage = "https://github.com/luispedro/conduit-algorithms#readme"; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-audio" = callPackage @@ -49463,6 +49688,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conduit-connection_0_1_0_4" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, HUnit + , network, resourcet, test-framework, test-framework-hunit + , transformers + }: + mkDerivation { + pname = "conduit-connection"; + version = "0.1.0.4"; + sha256 = "1z11r3rf6hmz5b00w4xymp6x0s00acyvbyw6n99wd3b9ycbl2y2y"; + libraryHaskellDepends = [ + base bytestring conduit connection resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit connection HUnit network resourcet + test-framework test-framework-hunit transformers + ]; + homepage = "https://github.com/sdroege/conduit-connection"; + description = "Conduit source and sink for Network.Connection."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-extra" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, criterion, directory, exceptions @@ -49581,6 +49828,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conduit-iconv_0_1_1_3" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, mtl + , QuickCheck, test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "conduit-iconv"; + version = "0.1.1.3"; + sha256 = "1dmcsdx0nz0b9sans2fr8lmrii2n0fsjh41jhwlrlng4h93k0w8w"; + libraryHaskellDepends = [ base bytestring conduit ]; + testHaskellDepends = [ + base bytestring conduit mtl QuickCheck test-framework + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion mtl text + ]; + homepage = "https://github.com/sdroege/conduit-iconv"; + description = "Conduit for character encoding conversion"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-merge" = callPackage ({ mkDerivation, base, conduit, mtl }: mkDerivation { @@ -51068,8 +51337,8 @@ self: { }: mkDerivation { pname = "convert-annotation"; - version = "0.5.0.1"; - sha256 = "198zkisa1j01wi23z168wkw9xk2xm7z45akj2yxjiz82iy6yp8hi"; + version = "0.5.1.0"; + sha256 = "1m6b5b7drgxb6cc4qqhi9s5k93rpsny7yf83a9m5q0a585nwmk0q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52386,20 +52655,21 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, mtl - , network-info, QuickCheck, quickcheck-instances, safe, stm, tasty - , tasty-discover, tasty-quickcheck, time + ({ mkDerivation, base, binary, bytestring, containers, Diff, mtl + , network-info, QuickCheck, QuickCheck-GenT, quickcheck-instances + , safe, stm, tasty, tasty-discover, tasty-quickcheck, time, vector }: mkDerivation { pname = "crdt"; - version = "6.2"; - sha256 = "0d88s8wj3679v4hjgh2jzhsp3iscbh8ph8vkc2rv528abkxfrqfv"; + version = "7.0"; + sha256 = "17wpc1qn2kid2rw7icx1apaca6znzx1gy0h8j9qap3f2p852z1zk"; libraryHaskellDepends = [ - base binary bytestring containers mtl network-info safe stm time + base binary bytestring containers Diff mtl network-info safe stm + time vector ]; testHaskellDepends = [ - base containers QuickCheck quickcheck-instances tasty - tasty-discover tasty-quickcheck + base containers mtl QuickCheck QuickCheck-GenT quickcheck-instances + tasty tasty-discover tasty-quickcheck vector ]; homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; @@ -53561,6 +53831,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_25" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.25"; + sha256 = "131wbbdr5yavs5k1ah9sz6fqx1ffyvaxf66pwjzsfc47mwc1mgl9"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + homepage = "https://github.com/haskell-crypto/cryptonite"; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -53837,6 +54131,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "css-text_0_1_3_0" = callPackage + ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: + mkDerivation { + pname = "css-text"; + version = "0.1.3.0"; + sha256 = "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; + homepage = "https://github.com/yesodweb/css-text.git#readme"; + description = "CSS parser and renderer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "csv" = callPackage ({ mkDerivation, base, filepath, parsec }: mkDerivation { @@ -54724,6 +55032,7 @@ self: { testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; description = "Parsing dAmn messages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "danibot" = callPackage @@ -56128,6 +56437,8 @@ self: { pname = "data-interval"; version = "1.3.0"; sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9"; + revision = "1"; + editedCabalFile = "09n6gklg64lgn4x1f48ga9ynssyl4fm8x376blls1mx1xg6kgbz6"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -57115,8 +57426,8 @@ self: { ({ mkDerivation, base, dates, hspec, QuickCheck, time }: mkDerivation { pname = "date-conversions"; - version = "0.2.0.0"; - sha256 = "1bx8r66wfghrfbmcyddsi6z5b66kc9skrq0hnk2mvz4gx2cl0gdq"; + version = "0.3.0.0"; + sha256 = "086vmgq58n2gcmz93idngh2hq1zfz8d231qazjzv19p08np5j3zm"; libraryHaskellDepends = [ base dates time ]; testHaskellDepends = [ base dates hspec QuickCheck time ]; homepage = "https://github.com/thoughtbot/date-conversions#readme"; @@ -58780,6 +59091,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dependency" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, containers + , criterion, deepseq, hspec, microlens, recursion-schemes + }: + mkDerivation { + pname = "dependency"; + version = "0.1.0.1"; + sha256 = "0kl8dsflw1g8a5k0x6v0fjc94gxdz6cxn4kj5jydbv63b044m71a"; + libraryHaskellDepends = [ + ansi-wl-pprint base binary containers deepseq microlens + recursion-schemes + ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Dependency resolution for package management"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dependent-map" = callPackage ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { @@ -59103,16 +59432,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "deriving-compat_0_4" = callPackage + "deriving-compat_0_4_1" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, QuickCheck, tagged + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers , transformers-compat }: mkDerivation { pname = "deriving-compat"; - version = "0.4"; - sha256 = "1jza92p1x3dbm4gx891miaihq3ly30mlz20ddwdsz0xyk7c1wk15"; + version = "0.4.1"; + sha256 = "0lzcbnvzcnrrvr61mrqdx4i8fylknf4jwrpncxr9lhpxgp4fqqk4"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -59121,6 +59450,7 @@ self: { base base-compat base-orphans hspec QuickCheck tagged template-haskell transformers transformers-compat ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/haskell-compat/deriving-compat"; description = "Backports of GHC deriving extensions"; license = stdenv.lib.licenses.bsd3; @@ -59808,6 +60138,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-contrib_1_4_2_1" = callPackage + ({ mkDerivation, base, circle-packing, colour, containers + , cubicbezier, data-default, data-default-class, diagrams-core + , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens + , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat + , parsec, QuickCheck, random, semigroups, split, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "diagrams-contrib"; + version = "1.4.2.1"; + sha256 = "1l7xz360chrqj9by6l5v0vwpvy81lniif600r3b6vf9ckyj747yz"; + libraryHaskellDepends = [ + base circle-packing colour containers cubicbezier data-default + data-default-class diagrams-core diagrams-lib diagrams-solve + force-layout hashable lens linear mfsolve MonadRandom monoid-extras + mtl mtl-compat parsec random semigroups split text + ]; + testHaskellDepends = [ + base containers diagrams-lib HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Collection of user contributions to diagrams EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-core" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors @@ -61494,12 +61852,12 @@ self: { }) {}; "display" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "display"; - version = "0.0.0"; - sha256 = "1z5spl8l4n2x17szlyra2m1973ppgd9xqw851zgnmrvlp79gr0ls"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.0.1"; + sha256 = "0hn1zdis621h87r4mr35vic9473iwqcdjnmmfgs1j5dfsh62kd6b"; + libraryHaskellDepends = [ base bytestring text ]; homepage = "https://github.com/chrisdone/display#readme"; description = "Display things for humans to read"; license = stdenv.lib.licenses.bsd3; @@ -61588,14 +61946,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "distributed-closure_0_3_5" = callPackage + "distributed-closure_0_4_0" = callPackage ({ mkDerivation, base, binary, bytestring, constraints, hspec , QuickCheck, syb, template-haskell }: mkDerivation { pname = "distributed-closure"; - version = "0.3.5"; - sha256 = "0mm3w8l63n9lbifrj32kv5xbb79fiwd4swi2kv2lbnc67b6ig43h"; + version = "0.4.0"; + sha256 = "1r2ymmnm0misz92x4iz58yqyb4maf3kq8blsvxmclc0d77hblsnm"; libraryHaskellDepends = [ base binary bytestring constraints syb template-haskell ]; @@ -67058,8 +67416,8 @@ self: { }: mkDerivation { pname = "engine-io-wai"; - version = "1.0.7"; - sha256 = "13aa7x94z32c2gfzwjxh9808alcwqhxmxgn42r4jyqfylis2p73a"; + version = "1.0.8"; + sha256 = "0mph6pg3j81kwwl73dn5hdbw3mndfxi2wqdgwb727znh058xh7zb"; libraryHaskellDepends = [ attoparsec base bytestring either engine-io http-types mtl text transformers transformers-compat unordered-containers wai @@ -70005,8 +70363,8 @@ self: { pname = "extended-reals"; version = "0.2.2.0"; sha256 = "14wskq0m3sclb2c1m3aqsaj26rijbzyy021qkvxjdpzskz13higj"; - revision = "2"; - editedCabalFile = "1vsh115lals5sqp2rkj7gp9b1jc0rg92x5fb51p8jckqr4f43pma"; + revision = "3"; + editedCabalFile = "14jmdqapr01l0gb0g10296shz01nfvv14l5bpbzsc8zwh5zb4cvx"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck test-framework test-framework-hunit @@ -70560,17 +70918,14 @@ self: { "fast-arithmetic" = callPackage ({ mkDerivation, arithmoi, ats-setup, base, Cabal, combinat - , composition-prelude, criterion, hspec, QuickCheck - , recursion-schemes + , composition-prelude, criterion, gmpint, hspec, QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.2.4"; - sha256 = "0dvrwlcpfsrrw8la5brvhjc78k48s2kaz08cg6xqx82vkrzipm63"; + version = "0.3.2.5"; + sha256 = "0sln2am6xrm73y3731gy1wabc8cdvnrksgzvrl0qwlinshc4pd74"; setupHaskellDepends = [ ats-setup base Cabal ]; - libraryHaskellDepends = [ - base composition-prelude recursion-schemes - ]; + libraryHaskellDepends = [ base composition-prelude gmpint ]; testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; homepage = "https://github.com/vmchale/fast-arithmetic#readme"; @@ -70657,6 +71012,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-logger_2_4_11" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring, directory + , easy-file, filepath, hspec, text, unix, unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "2.4.11"; + sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath text + unix unix-time + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A fast logging system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-math" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -73124,6 +73498,7 @@ self: { homepage = "https://github.com/NorfairKing/fixer#readme"; description = "A Haskell client for http://fixer.io/"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixfile" = callPackage @@ -77154,14 +77529,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fuzzyset_0_1_0_5" = callPackage + "fuzzyset_0_1_0_6" = callPackage ({ mkDerivation, base, base-unicode-symbols, data-default, hspec , ieee754, lens, text, text-metrics, unordered-containers, vector }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.5"; - sha256 = "12cl135ph7qjnfm0x36yw3mvjilsw4pm509yvh7i5whsafs3kakq"; + version = "0.1.0.6"; + sha256 = "18v1zsmdgy5if7l23vciip6dbbhbpgvn0dy0ray0pqwdcw9yh6kk"; libraryHaskellDepends = [ base base-unicode-symbols data-default lens text text-metrics unordered-containers vector @@ -77748,18 +78123,18 @@ self: { }) {}; "gedcom" = callPackage - ({ mkDerivation, array, base, bytestring, containers, megaparsec - , monad-loops, mtl, text-all, time + ({ mkDerivation, array, base, bytestring, containers, hspec + , megaparsec, monad-loops, mtl, text-all, time }: mkDerivation { pname = "gedcom"; - version = "0.1.0.0"; - sha256 = "099y6vgw81v31aijyl81hdijs5vry77jg4qy2gl8w7scn2zp2p58"; + version = "0.2.0.0"; + sha256 = "1hwjrljmwr7ywi213lxvfp6c98ydlxngr7hrhcx7ylngw165al7y"; libraryHaskellDepends = [ array base bytestring containers megaparsec monad-loops mtl text-all time ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec megaparsec text-all ]; homepage = "https://github.com/CLowcay/hs-gedcom"; description = "Parser for the GEDCOM genealogy file format"; license = stdenv.lib.licenses.bsd3; @@ -78133,6 +78508,7 @@ self: { ]; description = "stringly-named getters for generic data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-aeson" = callPackage @@ -78693,6 +79069,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "geniplate-mirror_0_7_6" = callPackage + ({ mkDerivation, base, mtl, template-haskell }: + mkDerivation { + pname = "geniplate-mirror"; + version = "0.7.6"; + sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb"; + libraryHaskellDepends = [ base mtl template-haskell ]; + homepage = "https://github.com/danr/geniplate"; + description = "Use Template Haskell to generate Uniplate-like functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "geniserver" = callPackage ({ mkDerivation, base, bytestring, cmdargs, GenI, http-types, json , snap-core, snap-server, text, transformers, utf8-string @@ -79281,10 +79670,10 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.1.0.0"; - sha256 = "02r9c063kkqalyadfqwhhwfb42kky7nkfp5k968l1qidyx6aha5j"; + version = "0.1.0.1"; + sha256 = "1syxxd8qg2d3l045lw0i5mchvbx3k5vhad5bxlg9pyp8isvb7wvi"; libraryHaskellDepends = [ - base bytestring cassava mtl transformers vector + base bytestring mtl transformers vector ]; librarySystemDepends = [ geos_c ]; testHaskellDepends = [ base bytestring cassava hspec mtl vector ]; @@ -79848,6 +80237,7 @@ self: { homepage = "https://github.com/nomeata/ghc-justdoit"; description = "A magic typeclass that just does it"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-make" = callPackage @@ -80093,6 +80483,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-prof_1_4_1" = callPackage + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , process, scientific, tasty, tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "ghc-prof"; + version = "1.4.1"; + sha256 = "1jpf2pn37vgwqcnsm799g9s9d7qbxk9d305b6i2k12573cv1x8r4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers scientific text time + ]; + executableHaskellDepends = [ base containers scientific text ]; + testHaskellDepends = [ + attoparsec base containers directory filepath process tasty + tasty-hunit temporary text + ]; + homepage = "https://github.com/maoe/ghc-prof"; + description = "Library for parsing GHC time and allocation profiling reports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-prof-flamegraph" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -80490,6 +80904,8 @@ self: { pname = "ghcid"; version = "0.6.9"; sha256 = "0bkhbzjjp4n97dsf8q4ggphsfh0rxwgdn4kmg8l87zbrih41gdpc"; + revision = "1"; + editedCabalFile = "0salqw860vc070q04n2cqd5aca4gcysxlcys8znhx6cpgyz6bn91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80508,6 +80924,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_6_10" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.6.10"; + sha256 = "1qqd619pwdlcxvkgfawsqq19a5kl1584ra35ib8769874i6y9awj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + homepage = "https://github.com/ndmitchell/ghcid#readme"; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -83251,6 +83695,8 @@ self: { pname = "glirc"; version = "2.25"; sha256 = "1hh6zqkk1cm50n7d17i2490q2xh7hzy63krpj58rwhgpmn3ps5sb"; + revision = "1"; + editedCabalFile = "13bf4rcwik6lq4rv1ci9i01hpmvvbqd1xs7fixrk10qsjm31cakw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -83782,6 +84228,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gmpint" = callPackage + ({ mkDerivation, base, recursion-schemes }: + mkDerivation { + pname = "gmpint"; + version = "0.1.0.4"; + sha256 = "023acr1a69b9r380zlk8bsgfjw0l4h381pk7bwar7mbv3zzsnmxn"; + libraryHaskellDepends = [ base recursion-schemes ]; + homepage = "https://github.com/vmchale/gmpint#readme"; + description = "GMP integer conversions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gnome-desktop" = callPackage ({ mkDerivation, base, directory, gconf, glib, gtk, random }: mkDerivation { @@ -86768,8 +87226,8 @@ self: { }: mkDerivation { pname = "graphql-api"; - version = "0.2.0"; - sha256 = "08hsrqh4v7fmkmilwnmxpii8iqkhc0affcv3mmjmp3my0qi79xrl"; + version = "0.3.0"; + sha256 = "1rn47xxyz3wkflz2ji0d496r8w0jcf1a0al14gclflbyd4bzkpwy"; libraryHaskellDepends = [ aeson attoparsec base containers exceptions ghc-prim protolude QuickCheck scientific text transformers @@ -86781,8 +87239,8 @@ self: { benchmarkHaskellDepends = [ attoparsec base criterion exceptions protolude transformers ]; - homepage = "https://github.com/jml/graphql-api#readme"; - description = "Sketch of GraphQL stuff"; + homepage = "https://github.com/haskell-graphql/graphql-api#readme"; + description = "GraphQL API"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -87665,6 +88123,7 @@ self: { ]; description = "Generic implementation of Storable"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gstreamer" = callPackage @@ -90166,8 +90625,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.3.0"; - sha256 = "13z78q36x28h7yn282k03568hj0lvava678d7hhhp5hrbk6ni8xv"; + version = "1.4.0"; + sha256 = "006mg9i15ldksydkr6c9wd7p7a3j0ia1bcxi96y9l66wp31hg36w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91617,6 +92076,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_5_2" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.5.2"; + sha256 = "0qabrvx93l8wmir4a0rg2iddsal455fx34vvdxj1ngbya25fspw4"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath formatting gitrev mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -92356,6 +92843,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "happy_1_19_9" = callPackage + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, mtl, process + }: + mkDerivation { + pname = "happy"; + version = "1.19.9"; + sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"; + revision = "1"; + editedCabalFile = "1lm706nv64cvfi3ccg7hc3217642sg0z9f9xz2ivbpzvzwwn8gj6"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + homepage = "https://www.haskell.org/happy/"; + description = "Happy is a parser generator for Haskell"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happy-meta" = callPackage ({ mkDerivation, array, base, containers, happy, haskell-src-meta , mtl, template-haskell @@ -93054,6 +93562,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hashids_1_0_2_4" = callPackage + ({ mkDerivation, base, bytestring, containers, split }: + mkDerivation { + pname = "hashids"; + version = "1.0.2.4"; + sha256 = "1kzkyni9hfwpvyq9rdv62iziwiax5avzd05ghsh7dgnylv41z697"; + libraryHaskellDepends = [ base bytestring containers split ]; + testHaskellDepends = [ base bytestring containers split ]; + homepage = "http://hashids.org/"; + description = "Hashids generates short, unique, non-sequential ids from numbers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashing" = callPackage ({ mkDerivation, array, base, bytestring, cryptonite, mtl , QuickCheck, template-haskell @@ -96370,6 +96892,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskyapi" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, containers + , directory, http-conduit, markdown, mtl, network, parsec + , persistent, persistent-sqlite, persistent-template, split + , tagsoup, text, time, utf8-string + }: + mkDerivation { + pname = "haskyapi"; + version = "0.0.0.2"; + sha256 = "1s5krzzmrl8p97xg8p1dimijqmyjbrdfm4i0dpp7jiipj2hzvqyq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html bytestring containers directory http-conduit + markdown mtl network parsec persistent persistent-sqlite + persistent-template split tagsoup text time utf8-string + ]; + executableHaskellDepends = [ + aeson base blaze-html bytestring containers directory http-conduit + markdown mtl network parsec persistent persistent-sqlite + persistent-template split tagsoup text time utf8-string + ]; + testHaskellDepends = [ + aeson base blaze-html bytestring containers directory http-conduit + markdown mtl network parsec persistent persistent-sqlite + persistent-template split tagsoup text time utf8-string + ]; + homepage = "https://github.com/okue/haskyapi#readme"; + description = "HTTP server"; + license = stdenv.lib.licenses.mit; + }) {}; + "haslo" = callPackage ({ mkDerivation, base, mtl, old-time, QuickCheck, time, wtk }: mkDerivation { @@ -96510,23 +97064,22 @@ self: { }) {}; "hasql-class" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , data-default-class, doctest, generics-eot, Glob, hasql, hspec - , process, QuickCheck, quickcheck-instances, string-qq, text, time - , vector, yaml + ({ mkDerivation, base, bytestring, contravariant + , data-default-class, generics-eot, hasql, hspec, process + , QuickCheck, quickcheck-instances, string-qq, text, time, vector }: mkDerivation { pname = "hasql-class"; - version = "0.0.1.0"; - sha256 = "10d61avgsma6104d1bh3sfs1i4hrbpr0rhb7ihgi43xshg6wjvgl"; + version = "0.1.0.0"; + sha256 = "00va6klddkkr60zl9i9mx7lmryn71qbc4qfhw4q8fcwbw69bzc0f"; libraryHaskellDepends = [ base bytestring contravariant data-default-class generics-eot hasql text time vector ]; testHaskellDepends = [ - base bytestring containers contravariant data-default-class doctest - generics-eot Glob hasql hspec process QuickCheck - quickcheck-instances string-qq text time vector yaml + base bytestring contravariant data-default-class generics-eot hasql + hspec process QuickCheck quickcheck-instances string-qq text time + vector ]; homepage = "http://github.com/turingjump/hasql-class#readme"; description = "Encodable and Decodable classes for hasql"; @@ -96774,6 +97327,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasql-transaction_0_6" = callPackage + ({ mkDerivation, async, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , hasql, mtl, rebase, transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "0.6"; + sha256 = "00dxm78wscj88zb6wbyg48ps4a5cc41jbbknjrmxlgp0iw4hr06b"; + libraryHaskellDepends = [ + base base-prelude bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async hasql rebase ]; + homepage = "https://github.com/nikita-volkov/hasql-transaction"; + description = "A composable abstraction over the retryable transactions for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hastache" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, process, syb, text @@ -98495,6 +99068,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_0_5_2" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, directory, exceptions + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, semigroups, stm, template-haskell, text + , th-lift, time, transformers, transformers-base, unix + , wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "0.5.2"; + sha256 = "1nl6q4hlsqbwqjk3ywpd6hdyi3qyz34agrp9533lmkx7120jfblh"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + directory exceptions lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet semigroups stm + template-haskell text th-lift time transformers transformers-base + unix wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers pretty-show semigroups text transformers + ]; + homepage = "https://hedgehog.qa"; + description = "Hedgehog will eat all your bugs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -102186,8 +102787,8 @@ self: { pname = "hledger-iadd"; version = "1.3.1"; sha256 = "0z7f9bm7xkq8a9kbhf3bd6fxhfaab08ddgghpbg5z460l4lhcczv"; - revision = "1"; - editedCabalFile = "1kwncys0n2xbvbq6a5rgfxg955726xk8av6v9221qx8zpndf2di4"; + revision = "2"; + editedCabalFile = "03cc91bzxmk3hffkmda3w87rgwarpdjbs1kwafix65avhw03g7ga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102454,8 +103055,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.0.15"; - sha256 = "0k9y9dj9sq8rwkjnca4s6wv0ncba536lmcpq10vpyvy47x5dzs2d"; + version = "2.1"; + sha256 = "13chm0dhh1fn2iy3flnh7ahc3yzh8q0v10qxwd1739sywhykayg9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103350,15 +103951,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_6_2" = callPackage + "hoauth2_1_6_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , http-conduit, http-types, microlens, text, unordered-containers , uri-bytestring, uri-bytestring-aeson, wai, warp }: mkDerivation { pname = "hoauth2"; - version = "1.6.2"; - sha256 = "185yia9mdjhmhian83rrd0hm3wjpja7hawnyvzq25rnhh2g4l2ay"; + version = "1.6.3"; + sha256 = "165xaw7k8ii9g8ig0ifvs8c76q2s760n8g0hxyhhprz1gj586913"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104828,6 +105429,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hourglass_0_2_11" = callPackage + ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale + , tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "hourglass"; + version = "0.2.11"; + sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge mtl old-locale time + ]; + homepage = "https://github.com/vincenthz/hs-hourglass"; + description = "simple performant time related library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hourglass-fuzzy-parsing" = callPackage ({ mkDerivation, base, hourglass, parsec }: mkDerivation { @@ -105018,7 +105640,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hpack_0_24_0" = callPackage + "hpack_0_25_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , http-client, http-client-tls, http-types, HUnit, interpolate @@ -105027,8 +105649,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.24.0"; - sha256 = "074pzminhv59br5w2xy3d8mhi2cwj5m10lwlqkq990w0gfcfhy46"; + version = "0.25.0"; + sha256 = "0nz8hrfw59pcd685qqkhikwwzrg5aaiynlxlsga8gqfzx0gsjwip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105097,8 +105719,8 @@ self: { pname = "hpack-dhall"; version = "0.1.0"; sha256 = "1yz1ypq88lmxdz9728w8q0ag1whwzlkwcdvx8dhyav5k3ifgp2x0"; - revision = "1"; - editedCabalFile = "1432yrvrd0dlnn4lzyb4s5akvb85mx0anbxd1j9b4l1zl37d2bmn"; + revision = "2"; + editedCabalFile = "15h2891c34qhxqj9rv90662fq8r7dsp4skmmxpk88gcqvs9fl084"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105111,6 +105733,7 @@ self: { homepage = "https://github.com/sol/hpack-dhall#readme"; description = "Dhall support for Hpack"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpaco" = callPackage @@ -105395,7 +106018,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hpio_0_9_0_4" = callPackage + "hpio_0_9_0_5" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , doctest, exceptions, filepath, hspec, monad-control, monad-logger , mtl, optparse-applicative, protolude, QuickCheck, text @@ -105403,8 +106026,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.9.0.4"; - sha256 = "18j60xiwh18s01bbapi95h8g6ixr9brqh375qlhg600cgf0yzirx"; + version = "0.9.0.5"; + sha256 = "0k1n2la7c5ld13nr0j2hc1ia2i9gy4aacs2cna4rkmcnyamgg38i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106563,8 +107186,8 @@ self: { }: mkDerivation { pname = "hs2ats"; - version = "0.2.0.4"; - sha256 = "0yji8np53qgwfhmamfkmc4bbvkivwhrkjrwr9aqly9gyadbsw89m"; + version = "0.2.1.3"; + sha256 = "1np1sd6s6dxq0kd87w5bf98xkffjaj354s9g7ah1fjmr36shvwib"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106579,6 +107202,7 @@ self: { homepage = "https://github.com/vmchale/hs2ats#readme"; description = "Create ATS types from Haskell types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs2bf" = callPackage @@ -107440,8 +108064,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.1.1"; - sha256 = "1bj9zhkikspf73xha8vcx3ads5fp33f1ail0fns9iyra5zl0g612"; + version = "0.3.1.2"; + sha256 = "1abwv4987xznfv6sx8sfhk04f4s7dpjvgzwzjzi8rwxibm8az09p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108098,6 +108722,7 @@ self: { testHaskellDepends = [ aeson base bytestring colour containers ]; description = "HSLuv conversion utility"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsmagick" = callPackage @@ -110314,6 +110939,7 @@ self: { homepage = "https://github.com/nikita-volkov/html-entities"; description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html-entity-map" = callPackage @@ -110403,8 +111029,8 @@ self: { }: mkDerivation { pname = "html-tokenizer"; - version = "0.6.3"; - sha256 = "0vwjqv2fqz63ip6q2j62f54phcyrdwghsbs4c4ziz7dh35nh4ahx"; + version = "0.6.4"; + sha256 = "1ws1y05qxyz5zx3y7lwj10giiviqzlka9h2bqj4y3wpzjdbrd4rk"; libraryHaskellDepends = [ attoparsec base base-prelude html-entities semigroups text text-builder vector vector-builder @@ -110947,7 +111573,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client-tls_0_3_5_2" = callPackage + "http-client-tls_0_3_5_3" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection , containers, cryptonite, data-default-class, exceptions, gauge , hspec, http-client, http-types, memory, network, network-uri @@ -110955,8 +111581,8 @@ self: { }: mkDerivation { pname = "http-client-tls"; - version = "0.3.5.2"; - sha256 = "1ynkwm77sb7djfflnz7v6gfli8zh1sdw4yjqpnb74slrh112ngh9"; + version = "0.3.5.3"; + sha256 = "0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7"; libraryHaskellDepends = [ base bytestring case-insensitive connection containers cryptonite data-default-class exceptions http-client http-types memory network @@ -111296,6 +111922,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-media_0_7_1_2" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , QuickCheck, test-framework, test-framework-quickcheck2 + , utf8-string + }: + mkDerivation { + pname = "http-media"; + version = "0.7.1.2"; + sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers utf8-string + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers QuickCheck + test-framework test-framework-quickcheck2 utf8-string + ]; + homepage = "https://github.com/zmthy/http-media"; + description = "Processing HTTP Content-Type and Accept headers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-monad" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception , HTTP, lazyio, network, network-uri, parsec, transformers @@ -112754,13 +113402,13 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, rdkafka, regex-posix, temporary - , transformers, unix + , either, hspec, monad-loops, rdkafka, temporary, transformers + , unix }: mkDerivation { pname = "hw-kafka-client"; - version = "2.3.1"; - sha256 = "0sjr3xqpx47lwzm6kk1rjinc9k39i9zjm74160ly9i68gnjgx69i"; + version = "2.3.3"; + sha256 = "14g0mqwj6fr8sdq62sljzih0a9km1hxqm1zqmr9jv58znmj9f2x1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112773,7 +113421,6 @@ self: { ]; testHaskellDepends = [ base bifunctors bytestring containers either hspec monad-loops - regex-posix ]; homepage = "https://github.com/haskell-works/hw-kafka-client"; description = "Kafka bindings for Haskell"; @@ -115279,6 +115926,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "ihs_0_1_0_2" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "ihs"; + version = "0.1.0.2"; + sha256 = "0cprv8g7kz07s5954020ac9yfggf3d2wmwp4xa61q4sz5rs7wiwq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base process ]; + homepage = "https://github.com/minad/ihs"; + description = "Interpolated Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihttp" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , contstuff, enumerator, netlines, network @@ -118367,15 +119029,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-conduit_0_3_0_0" = callPackage + "irc-conduit_0_3_0_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text , time, tls, transformers, x509-validation }: mkDerivation { pname = "irc-conduit"; - version = "0.3.0.0"; - sha256 = "166p6a3kxrr2cgkdw39pdkc9myzn60411bpg2v23bs01np0336j4"; + version = "0.3.0.1"; + sha256 = "0lividbrrc2yydqp55xqji8q6wigb49skrzw9vki6iivxcszka5h"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -118395,6 +119057,8 @@ self: { pname = "irc-core"; version = "2.3.0"; sha256 = "08nbdnszdakbam1x0fps3n3ziqv21d8ndhmrc7za69pm97wkicjf"; + revision = "1"; + editedCabalFile = "1cqc9as84bckjh6yjcfh3pkj11sw35bkj848wzcv6qwjcn8kvcv9"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -118427,8 +119091,8 @@ self: { pname = "irc-dcc"; version = "2.0.1"; sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234"; - revision = "5"; - editedCabalFile = "1m0p5pyaghwjz9rwh4jmm02hrax2yz4z0nlgjij8673hjr8ggdzz"; + revision = "6"; + editedCabalFile = "0fcgif6mcmp97plvvf1daiizwg2h9bniya50ldfd6ya932yh8b3c"; libraryHaskellDepends = [ attoparsec base binary bytestring io-streams iproute irc-ctcp mtl network path safe-exceptions transformers utf8-string @@ -119917,16 +120581,17 @@ self: { "jbi" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, Cabal, directory - , filepath, optparse-applicative, process, tagged, text + , filepath, monad-parallel, optparse-applicative, process, tagged + , text }: mkDerivation { pname = "jbi"; - version = "0.1.0.0"; - sha256 = "13jswxfka5v8n2sdxg0p75ykhgvb351cih2zlid8x05lpiqlw87c"; + version = "0.2.0.0"; + sha256 = "0h08p1lra76yx0grxr08z2q83al1yn4a8rbpcahpz47cxxydwry4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base Cabal directory filepath process tagged + aeson base Cabal directory filepath monad-parallel process tagged ]; executableHaskellDepends = [ aeson-pretty base optparse-applicative text @@ -121521,6 +122186,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "judge" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , bytestring, containers, directory, filepath, mtl + , optparse-applicative, pointedlist, terminal-size, texmath, text + , transformers, unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "judge"; + version = "0.1.2.0"; + sha256 = "14lrqrzw70cjzz0skihh9w9kfgah6rb7023dbgmcqbx0m8xjiiaw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base bytestring containers mtl + pointedlist terminal-size texmath text transformers + unordered-containers utf8-string vector yaml + ]; + executableHaskellDepends = [ + ansi-wl-pprint attoparsec base directory filepath + optparse-applicative text unordered-containers yaml + ]; + homepage = "https://github.com/slakkenhuis/judge#readme"; + description = "Tableau-based theorem prover"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "judy" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, Judy , QuickCheck @@ -121565,8 +122258,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.3.1"; - sha256 = "0dg54vbn9cxcskyc92grz39zp863ki6da8kwdz0nfkfm5xzsxlrs"; + version = "0.3.2"; + sha256 = "098vli26hrgkjxw3y1sfc7fi3wj72ka1dqy1k49z22rigisffbwj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122977,8 +123670,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "key-state"; - version = "0.0.0"; - sha256 = "182j5kmaxwvnhaa98bkiwb62ga8ylrdyyjs9vkvh2rvm4vjildrp"; + version = "0.1.0"; + sha256 = "0q5pfayi02xhka2xdn2nwng1cms0lyh6pbysvpxsmbiwzq80p4kp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/jxv/key-state#readme"; @@ -124734,8 +125427,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "0.1.1.18"; - sha256 = "0ahby04g56wgz73r8k51v8afrvwn898crdbx9scbklh0by5cjfpj"; + version = "0.2.0.5"; + sha256 = "12dnyx6z644f1i5f3mybqisa3x8kfsvbqvd0ab0lyg4mv1b9c6lh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base composition-prelude deepseq @@ -125596,6 +126289,54 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; + "language-puppet_1_3_14" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, exceptions, filecache, filepath + , formatting, Glob, hashable, hruby, hslogger, hspec + , hspec-megaparsec, http-api-data, http-client, HUnit, lens + , lens-aeson, megaparsec, memory, mtl, neat-interpolation + , operational, optparse-applicative, parallel-io, parsec + , pcre-utils, process, protolude, random, regex-pcre-builtin + , scientific, servant, servant-client, split, stm + , strict-base-types, temporary, text, time, transformers, unix + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.3.14"; + sha256 = "1vf80dfdi2w5kwkbpqjqd9iahi7fg8qw5h243x8j286hzg3hx59d"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory exceptions + filecache filepath formatting hashable hruby hslogger hspec + http-api-data http-client lens lens-aeson megaparsec memory mtl + operational parsec pcre-utils process protolude random + regex-pcre-builtin scientific servant servant-client split stm + strict-base-types text time transformers unix unordered-containers + vector yaml + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint base bytestring containers Glob hslogger + http-client lens megaparsec mtl optparse-applicative parallel-io + regex-pcre-builtin strict-base-types text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens + megaparsec mtl neat-interpolation protolude scientific + strict-base-types temporary text transformers unix + unordered-containers vector + ]; + homepage = "http://lpuppet.banquise.net/"; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -126416,6 +127157,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lca_0_3_1" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: + mkDerivation { + pname = "lca"; + version = "0.3.1"; + sha256 = "0kj3zsmzckczp51w70x1aqayk2fay4vcqwz8j6sdv0hdw1d093ca"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/lca/"; + description = "O(log n) persistent online lowest common ancestor search without preprocessing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lcs" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -128513,6 +129269,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_0" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit + , tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.0"; + sha256 = "0w6xgyw2d3mcv8n7wnnma5dx2slz2ngis5k45x68dh7nv1azzs37"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty tasty-hunit + tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + homepage = "https://github.com/maoe/lifted-async"; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -131287,7 +132066,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "logging-effect_1_2_2" = callPackage + "logging-effect_1_2_3" = callPackage ({ mkDerivation, async, base, bytestring, criterion, exceptions , fast-logger, free, lifted-async, monad-control, monad-logger, mtl , semigroups, stm, stm-delay, text, time, transformers @@ -131295,8 +132074,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.2.2"; - sha256 = "1p0czcwph777dncidsrn0nbrmhhv7f8c5ic86mnrkxj7hzym0dfw"; + version = "1.2.3"; + sha256 = "0822ifll474q3aqh5jjavhryrlz331p2zc5hh4zi47wviyfm8brk"; libraryHaskellDepends = [ async base exceptions free monad-control mtl semigroups stm stm-delay text time transformers transformers-base wl-pprint-text @@ -135109,28 +135888,30 @@ self: { "matterhorn" = callPackage ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat - , brick, bytestring, cheapskate, checkers, config-ini, connection - , containers, directory, filepath, gitrev, hashable, Hclip - , mattermost-api, mattermost-api-qc, microlens-platform, mtl - , process, quickcheck-text, semigroups, skylighting, stm, stm-delay - , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-zipper, time, timezone-olson - , timezone-series, transformers, Unique, unix, unordered-containers - , utf8-string, vector, vty, word-wrap, xdg-basedir + , brick, brick-skylighting, bytestring, cheapskate, checkers + , config-ini, connection, containers, directory, filepath, gitrev + , hashable, Hclip, mattermost-api, mattermost-api-qc + , microlens-platform, mtl, process, quickcheck-text, semigroups + , skylighting, stm, stm-delay, strict, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time + , timezone-olson, timezone-series, transformers, Unique, unix + , unordered-containers, utf8-string, vector, vty, word-wrap + , xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "40600.0.0"; - sha256 = "0niha43l1p00af3qjkz5j43ksdl0a0sgagra584c8j34cl1f9akv"; + version = "40600.1.0"; + sha256 = "1cxbvs6w2iv4n2ig3hfy79gwcc76mv48q16r8w4jag0dswv5ry92"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson aspell-pipe async base base-compat brick bytestring - cheapskate config-ini connection containers directory filepath - gitrev hashable Hclip mattermost-api microlens-platform mtl process - semigroups skylighting stm stm-delay strict temporary text - text-zipper time timezone-olson timezone-series transformers unix - unordered-containers utf8-string vector vty word-wrap xdg-basedir + aeson aspell-pipe async base base-compat brick brick-skylighting + bytestring cheapskate config-ini connection containers directory + filepath gitrev hashable Hclip mattermost-api microlens-platform + mtl process semigroups skylighting stm stm-delay strict temporary + text text-zipper time timezone-olson timezone-series transformers + unix unordered-containers utf8-string vector vty word-wrap + xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -135155,8 +135936,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40600.0.0"; - sha256 = "0s27n9a7s6bgbara2rzh689234ykl3vfpm84yg1nvc61wsrxbkql"; + version = "40600.1.0"; + sha256 = "00c2vbf73gg14cpjdbnly0h8dszys31n5ymmf0c43zgrv3z5wb4i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135182,8 +135963,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40600.0.0"; - sha256 = "0pfmf4ja4a7vc9bnr4kc604j0b8dmcm1ggddg4m64jf355mw6nxm"; + version = "40600.1.0"; + sha256 = "1n2gfq4f0lmb3hbnja49j70ryrgmwkr0h69zwls3zcd7mdx5v1fr"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -136019,17 +136800,19 @@ self: { }) {}; "mellon-core" = callPackage - ({ mkDerivation, async, base, doctest, hlint, hspec, mtl + ({ mkDerivation, async, base, doctest, hspec, mtl, protolude , QuickCheck, quickcheck-instances, time, transformers }: mkDerivation { pname = "mellon-core"; - version = "0.8.0.4"; - sha256 = "03gh3ks6k3y11sga15bnknqw7j29kfhgw8zvfz87vgw5xlsva3j2"; - libraryHaskellDepends = [ async base mtl time transformers ]; + version = "0.8.0.6"; + sha256 = "07dhbqw0x7vbwzkhf1wh083h4b8xrw8sv75db2s72zgjrh8igpfm"; + libraryHaskellDepends = [ + async base mtl protolude time transformers + ]; testHaskellDepends = [ - async base doctest hlint hspec mtl QuickCheck quickcheck-instances - time transformers + async base doctest hspec mtl protolude QuickCheck + quickcheck-instances time transformers ]; homepage = "https://github.com/quixoftic/mellon#readme"; description = "Control physical access devices"; @@ -136038,13 +136821,12 @@ self: { }) {}; "mellon-gpio" = callPackage - ({ mkDerivation, base, hlint, hpio, mellon-core }: + ({ mkDerivation, base, hpio, mellon-core, protolude }: mkDerivation { pname = "mellon-gpio"; - version = "0.8.0.4"; - sha256 = "0b12wvv11ny3rdrd8wg236zn8yy3szm85n7qjdyiiznx2jf33rm7"; - libraryHaskellDepends = [ base hpio mellon-core ]; - testHaskellDepends = [ base hlint ]; + version = "0.8.0.6"; + sha256 = "08mr37wmg1paigbhs1wv7rpdxkhy2jiba8nd22rg1lhscc04k7g1"; + libraryHaskellDepends = [ base hpio mellon-core protolude ]; homepage = "https://github.com/quixoftic/mellon#readme"; description = "GPIO support for mellon"; license = stdenv.lib.licenses.bsd3; @@ -136053,35 +136835,35 @@ self: { "mellon-web" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, doctest - , exceptions, hlint, hpio, hspec, hspec-wai, http-client - , http-client-tls, http-types, lens, lucid, mellon-core - , mellon-gpio, mtl, network, optparse-applicative, QuickCheck - , quickcheck-instances, servant, servant-client, servant-docs - , servant-lucid, servant-server, servant-swagger - , servant-swagger-ui, swagger2, text, time, transformers, wai - , wai-extra, warp + , exceptions, hpio, hspec, hspec-wai, http-client, http-client-tls + , http-types, lens, lucid, mellon-core, mellon-gpio, mtl, network + , optparse-applicative, protolude, QuickCheck, quickcheck-instances + , servant, servant-client, servant-docs, servant-lucid + , servant-server, servant-swagger, servant-swagger-ui, swagger2 + , text, time, transformers, wai, wai-extra, warp }: mkDerivation { pname = "mellon-web"; - version = "0.8.0.4"; - sha256 = "1fyd8vkdym9rm54dbcnn9821jdmbvdyl942339m6prnc2188hkcc"; + version = "0.8.0.6"; + sha256 = "0hfb2gkfn9kdg8a5n6l8c7jky8d4545qqlpdzl2qv63500nr4wz3"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring http-client http-types lens - lucid mellon-core servant servant-client servant-docs servant-lucid - servant-server servant-swagger servant-swagger-ui swagger2 text - time transformers wai warp + lucid mellon-core protolude servant servant-client servant-docs + servant-lucid servant-server servant-swagger servant-swagger-ui + swagger2 text time transformers wai warp ]; executableHaskellDepends = [ base bytestring exceptions hpio http-client http-client-tls http-types mellon-core mellon-gpio mtl network optparse-applicative - servant-client time transformers warp + protolude servant-client time transformers warp ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring doctest hlint hspec hspec-wai - http-client http-types lens lucid mellon-core network QuickCheck - quickcheck-instances servant servant-client servant-docs + aeson aeson-pretty base bytestring doctest hspec hspec-wai + http-client http-types lens lucid mellon-core network protolude + QuickCheck quickcheck-instances servant servant-client servant-docs servant-lucid servant-server servant-swagger servant-swagger-ui swagger2 text time transformers wai wai-extra warp ]; @@ -138790,6 +139572,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "moesocks_1_0_0_44" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens + , lens-aeson, mtl, network, optparse-applicative, random, stm + , strict, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "moesocks"; + version = "1.0.0.44"; + sha256 = "1j7181sjj5p6r419z9j8b8ikshhcgm2zwfbl4f1brbpyvwvs4ddz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base binary bytestring containers cryptohash + hslogger HsOpenSSL iproute lens lens-aeson mtl network + optparse-applicative random stm strict text time transformers + unordered-containers + ]; + homepage = "https://github.com/nfjinjing/moesocks"; + description = "A functional firewall killer"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, filepath, html, HTTP, network @@ -139337,6 +140143,27 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "monad-logger-prefix_0_1_7" = callPackage + ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec + , monad-control, monad-logger, mtl, QuickCheck, resourcet, text + , transformers, transformers-base + }: + mkDerivation { + pname = "monad-logger-prefix"; + version = "0.1.7"; + sha256 = "0k8npx31vqck3zz1kirv36ljp6i9sy7banj0xkcpw8z7siqx64vd"; + libraryHaskellDepends = [ + base exceptions monad-control monad-logger mtl resourcet text + transformers transformers-base + ]; + testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion monad-logger ]; + homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme"; + description = "Add prefixes to your monad-logger output"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-syslog" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers @@ -143536,6 +144363,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "named" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "named"; + version = "0.1.0.0"; + sha256 = "0n26085hhqcqazwb02j5ippicl04caln935dbsq8sgkaj1imryp7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Named parameters (keyword arguments) for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "named-formlet" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, mtl , text, transformers @@ -143941,6 +144780,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nats_1_1_2" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "nats"; + version = "1.1.2"; + sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr"; + doHaddock = false; + homepage = "http://github.com/ekmett/nats/"; + description = "Natural numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nats-queue" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , dequeue, hspec, network, network-uri, random, text @@ -144761,6 +145613,7 @@ self: { ]; description = "Contract normaliser and simulator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netspec" = callPackage @@ -147124,8 +147977,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "nonfree"; - version = "0.1.0.2"; - sha256 = "1wmh8bp06rxzakcri25sg5vpmjqci8nz6dg158c5vbs6vizj1hz0"; + version = "0.1.0.3"; + sha256 = "1qdrzc0r37sw2knfgr9yqp7j8bcp1fayprjjg9xwkgxsjfsqp30b"; libraryHaskellDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; @@ -147152,6 +148005,8 @@ self: { pname = "nonlinear-optimization-ad"; version = "0.2.2"; sha256 = "07a80ggl8wxjllam1cqlamwmh61lkxag1410gj8n53hdd55slqxj"; + revision = "1"; + editedCabalFile = "038242cdiddjck2m995622862wd8ykla1asl9c8njbr1k0iacgbf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147245,6 +148100,7 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -148453,17 +149309,16 @@ self: { }) {}; "ocaml-export" = callPackage - ({ mkDerivation, aeson, base, bytestring, constraints, containers - , directory, file-embed, filepath, formatting, hspec - , hspec-golden-aeson, mtl, process, QuickCheck - , quickcheck-arbitrary-adt, servant, servant-server, split - , template-haskell, text, time, typelits-witnesses, wai, wai-extra - , warp, wl-pprint-text + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, filepath, formatting, hspec, hspec-golden-aeson, mtl + , process, QuickCheck, quickcheck-arbitrary-adt, servant + , servant-server, split, template-haskell, text, time + , typelits-witnesses, wai, wai-extra, warp, wl-pprint-text }: mkDerivation { pname = "ocaml-export"; - version = "0.5.0.0"; - sha256 = "0xp4aiqn5p1c3frl83axjchbs5dwh4ibqqyiixvi0i1wpbi9fqka"; + version = "0.6.0.0"; + sha256 = "197d1sqnq7085jpynhbck0923hm1ci9sca59gklxbzk45siml58m"; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath formatting hspec-golden-aeson mtl QuickCheck @@ -148471,10 +149326,10 @@ self: { template-haskell text time typelits-witnesses wl-pprint-text ]; testHaskellDepends = [ - aeson base bytestring constraints containers directory filepath - hspec hspec-golden-aeson process QuickCheck - quickcheck-arbitrary-adt servant servant-server template-haskell - text time typelits-witnesses wai wai-extra warp + aeson base bytestring containers directory filepath hspec + hspec-golden-aeson process QuickCheck quickcheck-arbitrary-adt + servant servant-server template-haskell text time + typelits-witnesses wai wai-extra warp ]; homepage = "https://github.com/plow-technologies/ocaml-export#readme"; description = "Convert Haskell types in OCaml types"; @@ -149043,8 +149898,8 @@ self: { ({ mkDerivation, base, one-liner }: mkDerivation { pname = "one-liner-instances"; - version = "0.1.0.0"; - sha256 = "1v5a4szk3497razn7r2d3664w7bxbdcw9bacsc4y7vj3kim4nhca"; + version = "0.1.1.0"; + sha256 = "0yb5rdy735lalwrxvmvvjnpyikdqs2y2fjldjcbjj0r3d912azxn"; libraryHaskellDepends = [ base one-liner ]; homepage = "https://github.com/mstksg/one-liner-instances#readme"; description = "Generics-based implementations for common typeclasses"; @@ -151850,20 +152705,24 @@ self: { }) {}; "pandoc-include-code" = callPackage - ({ mkDerivation, base, filepath, mtl, pandoc-types, process, tasty - , tasty-hunit, text, unordered-containers + ({ mkDerivation, base, filepath, hspec, hspec-expectations, mtl + , pandoc-types, process, tasty, tasty-hspec, tasty-hunit, text + , unordered-containers }: mkDerivation { pname = "pandoc-include-code"; - version = "1.2.0.2"; - sha256 = "0mnk6ld2d1bka2wmz9718k8rfdbzhp4ym3axn4js4m0ka51w50h9"; + version = "1.3.0.0"; + sha256 = "1klmshyakhli0g9prqnllyrh9hsj67lps5b1cxh3jjlb6mxg5ic4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath mtl pandoc-types process text unordered-containers ]; executableHaskellDepends = [ base pandoc-types ]; - testHaskellDepends = [ base pandoc-types tasty tasty-hunit ]; + testHaskellDepends = [ + base hspec hspec-expectations pandoc-types tasty tasty-hspec + tasty-hunit + ]; homepage = "https://github.com/owickstrom/pandoc-include-code"; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; @@ -152983,19 +153842,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "parsec_3_1_12_0" = callPackage + "parsec_3_1_13_0" = callPackage ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework , test-framework-hunit, text }: mkDerivation { pname = "parsec"; - version = "3.1.12.0"; - sha256 = "0jav9a1hb156qd29n3sclxrb7bk477n89jshqpmlym2z2h880bc2"; + version = "3.1.13.0"; + sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit ]; - homepage = "https://github.com/haskell/parsec"; + homepage = "https://github.com/hvr/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -154719,8 +155578,8 @@ self: { }: mkDerivation { pname = "pencil"; - version = "0.1.1"; - sha256 = "0k1lcmllfcqnlyidla6icvzx41q0wsykwc7ak68m9lbri1d7g5ry"; + version = "0.1.2"; + sha256 = "0wgs79vsz52cnmbcfzbb3avn98ciadnispgr98h6kwhgj5pmaxbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154733,6 +155592,7 @@ self: { homepage = "https://github.com/elben/pencil"; description = "Static site generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "penn-treebank" = callPackage @@ -155180,7 +156040,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_8_0" = callPackage + "persistent_2_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , fast-logger, haskell-src-meta, hspec, http-api-data @@ -155191,8 +156051,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.8.0"; - sha256 = "07x73s1icxj3wbw197f7qbj1pk9gg30vk4f7yz1hxs27lzximjfh"; + version = "2.8.1"; + sha256 = "1mfk6mxicg12vnvc9049k55dgvcx4ss4z2219qr8wy89m2z72l1k"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers fast-logger haskell-src-meta @@ -155411,15 +156271,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql_2_8_0" = callPackage + "persistent-mysql_2_8_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-logger, mysql, mysql-simple, persistent , resource-pool, resourcet, text, transformers, unliftio-core }: mkDerivation { pname = "persistent-mysql"; - version = "2.8.0"; - sha256 = "0sy9gl2604f3qargvgkqnhdfbnwrq81y2hrhmx4fsknpfkkypya4"; + version = "2.8.1"; + sha256 = "0m76hsrgv118bg6sawna6xwg30q8vl84zqa8qc9kll4hzbw2kk40"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -155457,6 +156317,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell_0_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-logger, mysql-haskell, network, persistent + , persistent-template, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.4.0"; + sha256 = "1gcvfvyg0xf4m6qm78czdkqabqnx07wqkr6b6myfwy2g1frdhb0d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -155512,7 +156398,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-postgresql_2_8_0" = callPackage + "persistent-postgresql_2_8_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-logger, persistent, postgresql-libpq , postgresql-simple, resource-pool, resourcet, text, time @@ -155520,8 +156406,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.8.0"; - sha256 = "0dqdgw4sayq76hdib7sf27nzwcg1lbgr4l50kdyq8xlvi8yb5mk8"; + version = "2.8.1"; + sha256 = "01mpmr51f0r4a00gbxyd0ih66czq1dlnr7h49x3wnlqdnwbsv334"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger persistent postgresql-libpq postgresql-simple resource-pool @@ -155655,7 +156541,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-sqlite_2_8_0" = callPackage + "persistent-sqlite_2_8_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-logger, old-locale, persistent , persistent-template, resource-pool, resourcet, temporary, text @@ -155663,8 +156549,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.8.0"; - sha256 = "1vdsb271d17b0ip7z6mkbcw4iggafpaaimz6zzknjc4l409yswnb"; + version = "2.8.1"; + sha256 = "19iqpa99r4s14r2qmimqpv3b8qz3wm9arbkniccrj8bxlw1c8a4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155770,6 +156656,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Tests for Persistent"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-vector" = callPackage @@ -156823,6 +157710,45 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "pinpon" = callPackage + ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core + , amazonka-sns, base, bytestring, containers, doctest, exceptions + , hpio, hspec, http-client, http-client-tls, http-types, lens + , lucid, mtl, network, optparse-applicative, optparse-text + , protolude, QuickCheck, quickcheck-instances, resourcet, servant + , servant-client, servant-docs, servant-lucid, servant-server + , servant-swagger, servant-swagger-ui, swagger2, text, time + , transformers, transformers-base, wai, warp + }: + mkDerivation { + pname = "pinpon"; + version = "0.2.0.1"; + sha256 = "0l21lh66iwqk5bq2zxpjxp04gypcpy74xj4xnxmgbj7qzcxp9xha"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty amazonka amazonka-core amazonka-sns base + bytestring containers exceptions http-client http-types lens lucid + mtl protolude resourcet servant servant-client servant-docs + servant-lucid servant-server servant-swagger servant-swagger-ui + swagger2 text time transformers transformers-base wai warp + ]; + executableHaskellDepends = [ + amazonka amazonka-sns base bytestring containers exceptions hpio + http-client http-client-tls http-types lens mtl network + optparse-applicative optparse-text protolude servant-client text + time transformers warp + ]; + testHaskellDepends = [ + aeson base bytestring doctest exceptions hspec protolude QuickCheck + quickcheck-instances servant-swagger + ]; + homepage = "https://github.com/quixoftic/pinpon#readme"; + description = "A gateway for various cloud notification services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipe-enumerator" = callPackage ({ mkDerivation, base, enumerator, pipes, transformers }: mkDerivation { @@ -157175,6 +158101,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-concurrency_2_0_9" = callPackage + ({ mkDerivation, async, base, contravariant, pipes, stm, void }: + mkDerivation { + pname = "pipes-concurrency"; + version = "2.0.9"; + sha256 = "1br0cssp4rdfh6lhvjql9ppjvcn0v6kpg1h1f1hi8vqb0c87nvb4"; + libraryHaskellDepends = [ + async base contravariant pipes stm void + ]; + testHaskellDepends = [ async base pipes stm ]; + description = "Concurrency for the pipes ecosystem"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-conduit" = callPackage ({ mkDerivation, base, conduit, mtl, pipes-core }: mkDerivation { @@ -160635,19 +161576,18 @@ self: { }) {}; "potoki" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + ({ mkDerivation, attoparsec, base, base-prelude, bytestring , directory, foldl, hashable, potoki-core, profunctors, QuickCheck , quickcheck-instances, random, rerebase, tasty, tasty-hunit , tasty-quickcheck, text, unagi-chan, unordered-containers, vector }: mkDerivation { pname = "potoki"; - version = "0.6.4"; - sha256 = "1w05m47cl9x7riy27jzaxkwpaigs09bfikpqaqa6ghvx20mgx4vl"; + version = "0.7"; + sha256 = "009f36bc3l7xilih5y7hzibvdyxa36s8y9r255y74jgkfy583w4c"; libraryHaskellDepends = [ - attoparsec base base-prelude bug bytestring directory foldl - hashable potoki-core profunctors text unagi-chan - unordered-containers vector + attoparsec base base-prelude bytestring directory foldl hashable + potoki-core profunctors text unagi-chan unordered-containers vector ]; testHaskellDepends = [ attoparsec QuickCheck quickcheck-instances random rerebase tasty @@ -160665,8 +161605,8 @@ self: { }: mkDerivation { pname = "potoki-cereal"; - version = "0.1"; - sha256 = "04qfs8j2kgvavacpz7x9zdza0yfl4yw56g0bca28wh7q837y073y"; + version = "0.1.3"; + sha256 = "1r7plcki29gr9jx61qjx752zc9zh9yy47kznrs36q7jgjhnj6mqx"; libraryHaskellDepends = [ base base-prelude bytestring cereal potoki potoki-core text ]; @@ -160683,8 +161623,8 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "1.2"; - sha256 = "06d9hs15r6gr5yj9rcpw4klj3lxfjdd09nc0zwvmg1h3klqrqfxy"; + version = "1.3"; + sha256 = "0z6ld13kmkvamn8y39zqw0z4mkg5wi9mmh7kdav31wy46im03b9l"; libraryHaskellDepends = [ base deque profunctors stm ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -160785,6 +161725,7 @@ self: { homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A distributed worker backend for powerqueu"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "powerqueue-levelmem" = callPackage @@ -163162,8 +164103,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.3.0"; - sha256 = "09qkh6d2jbn8f5miaqh5mlxh36146wpfm61k4xdz3kdxmg78s140"; + version = "5.3.1"; + sha256 = "1mcs593ynn5x4i5qcdkbkqx3cyqmza0jz6vl8q5a3x8fydmq6n98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163590,6 +164531,8 @@ self: { pname = "protolude"; version = "0.2.1"; sha256 = "1r2baxx6q4z75sswirlqsnyynk4i7amfmpzajggh31fbz13hxgxx"; + revision = "1"; + editedCabalFile = "03kaarc0k64zrkqkh9q38919pcaya7ngzjhb3pbapbjm7np2ynpd"; libraryHaskellDepends = [ array async base bytestring containers deepseq ghc-prim hashable mtl mtl-compat safe stm text transformers transformers-compat @@ -164652,7 +165595,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pusher-http-haskell_1_5_1_1" = callPackage + "pusher-http-haskell_1_5_1_2" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-types, memory , QuickCheck, scientific, text, time, transformers @@ -164660,8 +165603,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.1"; - sha256 = "0j8gsarczvdidri63s162flzdkb6w0sysawairlxmmgcdbybfci5"; + version = "1.5.1.2"; + sha256 = "1jrb0ni157a9wa5mbqz1dmd1i7nkjh1nhjyvx52mbk530hslcnnn"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -165133,6 +166076,24 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "qm-interpolated-string_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-meta, hspec + , template-haskell, text + }: + mkDerivation { + pname = "qm-interpolated-string"; + version = "0.3.0.0"; + sha256 = "1brbs4qwvb16bkmcg51spjjrzc83hwgi1fbsix25vrri2myk6sz8"; + libraryHaskellDepends = [ + base bytestring haskell-src-meta template-haskell text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/unclechu/haskell-qm-interpolated-string"; + description = "Implementation of interpolated multiline strings"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qq-literals" = callPackage ({ mkDerivation, base, network-uri, template-haskell }: mkDerivation { @@ -165749,6 +166710,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quickcheck-arbitrary-template" = callPackage + ({ mkDerivation, base, QuickCheck, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "quickcheck-arbitrary-template"; + version = "0.2.0.0"; + sha256 = "1bn0g3gg7cpjwap1vgvahw91yjn0v8sy1hiy60w54gdg5rrll5j9"; + libraryHaskellDepends = [ base QuickCheck safe template-haskell ]; + testHaskellDepends = [ + base QuickCheck safe tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme"; + description = "Generate QuickCheck Gen for Sum Types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-assertions" = callPackage ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }: mkDerivation { @@ -167854,6 +168833,7 @@ self: { homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rattletrap_4_0_5" = callPackage @@ -168110,10 +169090,8 @@ self: { }: mkDerivation { pname = "rcu"; - version = "0.2.1"; - sha256 = "114w0nhlcg6wd9v6xg0ax74y5xbwb408b37hdkra863xr7dibdp0"; - revision = "1"; - editedCabalFile = "138vbjy6z2lh4x4icdssh0xz0rcwiw4lczcb3w375cnyjjn3b6ly"; + version = "0.2.2"; + sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -171884,6 +172862,8 @@ self: { pname = "req"; version = "1.0.0"; sha256 = "1s2yd61pw316llxyap7qwi18vrqxl6hhsmbgr79chjv5g119c087"; + revision = "1"; + editedCabalFile = "18bs1mcr454dgczzv8ahxps5lhba8wgls34cccg5aqdfhglprphk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -172705,6 +173685,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "retry_0_7_6_0" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, ghc-prim + , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog + , tasty-hunit, time, transformers + }: + mkDerivation { + pname = "retry"; + version = "0.7.6.0"; + sha256 = "1p6x6djd6cvsf03pxd9ky7rpzrzs0jcapmyap8z55aziasr3xk7n"; + libraryHaskellDepends = [ + base data-default-class exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base data-default-class exceptions ghc-prim hedgehog HUnit mtl + random stm tasty tasty-hedgehog tasty-hunit time transformers + ]; + homepage = "http://github.com/Soostone/retry"; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -172870,27 +173872,27 @@ self: { "rfc" = callPackage ({ mkDerivation, aeson, aeson-diff, async, base, bifunctors, binary , blaze-html, classy-prelude, containers, data-default, exceptions - , hedis, http-api-data, http-client-tls, http-types, lens - , lifted-async, markdown, monad-control, postgresql-simple - , resource-pool, servant, servant-blaze, servant-client - , servant-docs, servant-server, servant-swagger, simple-logger - , string-conversions, swagger2, temporary, text, time-units - , unordered-containers, url, uuid-types, vector, wai, wai-cors - , wai-extra, wreq + , hedis, http-api-data, http-client, http-client-tls, http-types + , lens, lifted-async, lifted-base, markdown, monad-control + , postgresql-simple, resource-pool, servant, servant-blaze + , servant-client, servant-docs, servant-server, servant-swagger + , simple-logger, string-conversions, swagger2, temporary, text + , time-units, unordered-containers, url, uuid-types, vector, wai + , wai-cors, wai-extra, wreq }: mkDerivation { pname = "rfc"; - version = "0.0.0.17"; - sha256 = "0aqw2b2ivk16h156baj21jg5x5via9dn645500zl53zn05py6bng"; + version = "0.0.0.20"; + sha256 = "0b54v1mw76w3ljs64jrvz5z24008z4dkmg31i1spfrakypx7fxn5"; libraryHaskellDepends = [ aeson aeson-diff async base bifunctors binary blaze-html classy-prelude containers data-default exceptions hedis - http-api-data http-client-tls http-types lens lifted-async markdown - monad-control postgresql-simple resource-pool servant servant-blaze - servant-client servant-docs servant-server servant-swagger - simple-logger string-conversions swagger2 temporary text time-units - unordered-containers url uuid-types vector wai wai-cors wai-extra - wreq + http-api-data http-client http-client-tls http-types lens + lifted-async lifted-base markdown monad-control postgresql-simple + resource-pool servant servant-blaze servant-client servant-docs + servant-server servant-swagger simple-logger string-conversions + swagger2 temporary text time-units unordered-containers url + uuid-types vector wai wai-cors wai-extra wreq ]; homepage = "https://github.com/RobertFischer/rfc#README.md"; description = "Robert Fischer's Common library"; @@ -173212,17 +174214,23 @@ self: { "rio" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, hashable, microlens, mtl, text, time - , typed-process, unix, unliftio, unordered-containers, vector + , exceptions, filepath, hashable, hspec, microlens, mtl, primitive + , text, time, typed-process, unix, unliftio, unordered-containers + , vector }: mkDerivation { pname = "rio"; - version = "0.0.1.0"; - sha256 = "006avzlv6ghwang3dhllxj7absa32sxw2qss2wdf3hxqbij6fy0b"; + version = "0.0.2.0"; + sha256 = "0iyfbqrgj0kcs72ibd5wm4gr51agvmqr5jg0vhay5srg86wc248l"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl text time typed-process unix unliftio - unordered-containers vector + hashable microlens mtl primitive text time typed-process unix + unliftio unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens mtl primitive text time typed-process unix + unliftio unordered-containers vector ]; homepage = "https://github.com/commercialhaskell/rio#readme"; description = "A standard library for Haskell"; @@ -175718,6 +176726,8 @@ self: { pname = "sandi"; version = "0.4.1"; sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j"; + revision = "1"; + editedCabalFile = "1gk6vwydqdgz1s5glv4jlkaph7g19aqdf7yxbyq0m1afaj1rvjq9"; libraryHaskellDepends = [ base bytestring conduit exceptions stringsearch ]; @@ -178357,6 +179367,7 @@ self: { homepage = "https://github.com/marcelbuesing/sendgrid-v3"; description = "Sendgrid v3 API library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sensei" = callPackage @@ -178968,30 +179979,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_12_1" = callPackage + "servant_0_13" = callPackage ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat - , bytestring, Cabal, cabal-doctest, case-insensitive, directory - , doctest, filemanip, filepath, hspec, hspec-discover - , http-api-data, http-media, http-types, mmorph, mtl - , natural-transformation, network-uri, QuickCheck - , quickcheck-instances, string-conversions, tagged, text, url - , vault + , bytestring, Cabal, cabal-doctest, case-insensitive, doctest + , hspec, hspec-discover, http-api-data, http-media, http-types + , mmorph, mtl, natural-transformation, network-uri, QuickCheck + , quickcheck-instances, singleton-bool, string-conversions, tagged + , text, vault }: mkDerivation { pname = "servant"; - version = "0.12.1"; - sha256 = "1aknvflz1zlvnmg9ik8zbnbckcy3ai89h7an2rbfm7ygqhmnh0rh"; + version = "0.13"; + sha256 = "0fmwcrkjlq1rnlbzdn918z54pqbwrjpgwy2isxmfykb31m2pn230"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive http-api-data http-media http-types mmorph mtl - natural-transformation network-uri string-conversions tagged text - vault + natural-transformation network-uri singleton-bool + string-conversions tagged text vault ]; testHaskellDepends = [ - aeson aeson-compat attoparsec base base-compat bytestring directory - doctest filemanip filepath hspec QuickCheck quickcheck-instances - string-conversions text url + aeson aeson-compat attoparsec base base-compat bytestring doctest + hspec QuickCheck quickcheck-instances string-conversions text ]; testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; @@ -179271,8 +180280,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.5.1.0"; - sha256 = "113pjs52nvi94bfx1ys4lanyvzkrlmb1p2y8sxhhb4bal917xki1"; + version = "0.5.2.0"; + sha256 = "1rgv88yh91v7b6kq28agijqx7ds9ghwla0npdi5i194p6w7c2mla"; libraryHaskellDepends = [ aeson-injector base bytestring containers http-api-data mtl pwstore-fast servant servant-auth-token-api servant-server text @@ -179293,8 +180302,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.5.1.0"; - sha256 = "1kxmgdj7bz2bbs6n9kfp28y9a9cvc2xk8345jnd4ks0iw43xjwr3"; + version = "0.5.2.0"; + sha256 = "1gv054fvjnx52c5l6bljf1dk3cgi9283nkqxwmg6s968y73z8pxf"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -179334,8 +180343,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-leveldb"; - version = "0.5.1.0"; - sha256 = "0bkprvi9zwc599ynkabjsk1m9wpbvfpmhzjx6rqj92m1nki62264"; + version = "0.5.2.0"; + sha256 = "1xzrrmpvwvba9xwgvvrbwxkhiqg6cs2vp9fbk1as1zfas1sk2kiy"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens leveldb-haskell monad-control mtl resourcet safe @@ -179357,8 +180366,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-persistent"; - version = "0.6.1.0"; - sha256 = "1ni74vk121ncfkdjksf15g6686c2acbg22dn1srzwyngx5iwjcnc"; + version = "0.6.2.0"; + sha256 = "08z15sfpn6rsws80rdnh7yifkyq994gx6a9l2yhb1pqxl6g2vf2c"; libraryHaskellDepends = [ aeson-injector base bytestring containers monad-control mtl persistent persistent-template servant-auth-token @@ -179380,8 +180389,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-rocksdb"; - version = "0.5.1.0"; - sha256 = "1xbnqv3b64r1xnzra2pdysjg5r9kxwxaya5rfrcgl8fz1b4n4hbb"; + version = "0.5.2.0"; + sha256 = "13fcjqbw30rcf123d47hjy8xinrqnii0yyj9zdnfn14yi9gk2lr1"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens monad-control mtl resourcet rocksdb-haskell safe @@ -179409,6 +180418,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-blaze_0_8" = callPackage + ({ mkDerivation, base, blaze-html, http-media, servant + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-blaze"; + version = "0.8"; + sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6"; + libraryHaskellDepends = [ base blaze-html http-media servant ]; + testHaskellDepends = [ base blaze-html servant-server wai warp ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Blaze-html support for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-cassava" = callPackage ({ mkDerivation, base, base-compat, bytestring, cassava, http-media , servant, servant-server, vector, wai, warp @@ -179417,6 +180442,8 @@ self: { pname = "servant-cassava"; version = "0.10"; sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; + revision = "1"; + editedCabalFile = "165q0rvbk09z4k5zwhpx6380gakqbbz2xwvw40ahpjf46p0k9159"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -179495,25 +180522,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_12_0_1" = callPackage + "servant-client_0_13" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , containers, deepseq, exceptions, generics-sop, hspec , hspec-discover, http-api-data, http-client, http-client-tls , http-media, http-types, HUnit, monad-control, mtl, network , QuickCheck, semigroupoids, servant, servant-client-core - , servant-server, text, transformers, transformers-base + , servant-server, stm, text, time, transformers, transformers-base , transformers-compat, wai, warp }: mkDerivation { pname = "servant-client"; - version = "0.12.0.1"; - sha256 = "12apsxsxqxc9xxcpn6l4y69x3q22407gni3ixxa7c0afcr5jnani"; - revision = "1"; - editedCabalFile = "1gwzjxlml8fyhn0acs6pyy1sp34dv2zxsm7pcp8kxck6h1n9x9yq"; + version = "0.13"; + sha256 = "0bfrc3j2b6mbsvbv66l7mh3klkrrfdjvaq5s834jiivaavc6zf93"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions http-client http-client-tls http-media http-types monad-control mtl - semigroupoids servant-client-core text transformers + semigroupoids servant-client-core stm text time transformers transformers-base transformers-compat ]; testHaskellDepends = [ @@ -179537,10 +180562,8 @@ self: { }: mkDerivation { pname = "servant-client-core"; - version = "0.12"; - sha256 = "0wb36sgirhyfqa32zjs6gz3fwzcim6qvhb6w6a3anpi2nlfaq355"; - revision = "1"; - editedCabalFile = "0sfj0sj66f4wi2r4g9hr6p0010jc8l2h05mi23r0217ncwh8y3xm"; + version = "0.13"; + sha256 = "1n7s47cqvahzfyyb4cwnq72a0qyrk8ybx4yj3g4lw9va2zlj78vp"; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions generics-sop http-api-data http-media http-types mtl network-uri @@ -179646,7 +180669,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-docs_0_11_1" = callPackage + "servant-docs_0_11_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, control-monad-omega, hashable, hspec , hspec-discover, http-media, http-types, lens, servant @@ -179654,8 +180677,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.1"; - sha256 = "1i2680jzgrlcajxmakcg1hvddkbx6fbz4vvrbz0ca660hil2vlb2"; + version = "0.11.2"; + sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179807,15 +180830,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-foreign_0_10_2" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, http-types, lens - , servant, text + "servant-foreign_0_11" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.10.2"; - sha256 = "16r42df628jsw9khv5kjwb702ajwmxg4kya19acm10660c0gxygs"; - libraryHaskellDepends = [ base http-types lens servant text ]; + version = "0.11"; + sha256 = "1n8cjlk16m24wdxicyp0js1lsshqf27bk5a6qykc2f8kiriw5jcf"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; testHaskellDepends = [ base hspec servant ]; testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; @@ -179987,6 +181012,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-js_0_9_3_2" = callPackage + ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec + , hspec-discover, hspec-expectations, language-ecmascript, lens + , QuickCheck, servant, servant-foreign, servant-server, stm, text + , transformers, warp + }: + mkDerivation { + pname = "servant-js"; + version = "0.9.3.2"; + sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat charset lens servant servant-foreign text + ]; + executableHaskellDepends = [ + aeson base filepath lens servant servant-server stm transformers + warp + ]; + testHaskellDepends = [ + base base-compat hspec hspec-expectations language-ecmascript lens + QuickCheck servant text + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Automatically derive javascript functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-kotlin" = callPackage ({ mkDerivation, aeson, base, containers, directory, formatting , hspec, http-api-data, lens, servant, servant-foreign, shelly @@ -180027,6 +181082,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-lucid_0_8" = callPackage + ({ mkDerivation, base, http-media, lucid, servant, servant-server + , wai, warp + }: + mkDerivation { + pname = "servant-lucid"; + version = "0.8"; + sha256 = "0vkhh6n51672l3cvd64xdddnzr351j9hd80j7raqkq6k1wrygfi5"; + libraryHaskellDepends = [ base http-media lucid servant ]; + testHaskellDepends = [ base lucid servant-server wai warp ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Servant support for lucid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-match" = callPackage ({ mkDerivation, base, bytestring, hspec, http-types, network-uri , servant, text, utf8-string @@ -180097,6 +181168,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-mock_0_8_4" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , bytestring-conversion, hspec, hspec-discover, hspec-wai + , http-types, QuickCheck, servant, servant-server, transformers + , wai, warp + }: + mkDerivation { + pname = "servant-mock"; + version = "0.8.4"; + sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat bytestring http-types QuickCheck servant + servant-server transformers wai + ]; + executableHaskellDepends = [ + aeson base QuickCheck servant-server warp + ]; + testHaskellDepends = [ + aeson base bytestring-conversion hspec hspec-wai QuickCheck servant + servant-server wai + ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Derive a mock server for free from your servant API types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-multipart" = callPackage ({ mkDerivation, base, bytestring, directory, http-client , http-media, lens, network, resourcet, servant, servant-docs @@ -180104,8 +181205,8 @@ self: { }: mkDerivation { pname = "servant-multipart"; - version = "0.11"; - sha256 = "1m3mzqsg09mcdkr88rba2fq4j19kqrgmrq9nd70dwivfqbh5nvpj"; + version = "0.11.1"; + sha256 = "06wnmazi4f2lgk2ziyh0wjnjl5gs88rsb0f6bpphxkv7wy3agv4q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180156,6 +181257,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-pagination" = callPackage + ({ mkDerivation, aeson, base, safe, servant, servant-server, text + , warp + }: + mkDerivation { + pname = "servant-pagination"; + version = "1.0.0"; + sha256 = "1cxd9sqryk619ss7x55w8xh4y3dkxl0gcdr3kawryzcm64qlgyja"; + revision = "1"; + editedCabalFile = "0y9mg8jaag07f89krsk2n3y635rjgmcym1kx130s7hb3h3ly7713"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base safe servant servant-server text ]; + executableHaskellDepends = [ + aeson base servant servant-server warp + ]; + homepage = "https://github.com/chordify/haskell-servant-pagination"; + description = "Type-safe pagination for Servant APIs"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, http-media , lens, pandoc-types, servant-docs, string-conversions, text @@ -180331,8 +181453,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.5.0"; - sha256 = "1867dcdm87gzq9gzz02rc9h6vcwpi24lxcxyij0aazgvfgsya6m6"; + version = "0.0.6.0"; + sha256 = "1llhxqnbrydikrxdd10cfk4shgbfpxvlsym0lvvvbva4vci1k8wj"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -180342,7 +181464,7 @@ self: { testHaskellDepends = [ aeson base base-compat blaze-html bytestring hspec hspec-core http-client QuickCheck quickcheck-io servant servant-blaze - servant-client servant-server transformers warp + servant-client servant-server text transformers warp ]; testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; @@ -180430,6 +181552,7 @@ self: { homepage = "https://github.com/joneshf/servant-ruby#readme"; description = "Generate a Ruby client from a Servant API with Net::HTTP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-scotty" = callPackage @@ -180491,29 +181614,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_12" = callPackage + "servant-server_0_13" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, Cabal, cabal-doctest, containers - , directory, doctest, exceptions, filemanip, filepath, hspec - , hspec-discover, hspec-wai, http-api-data, http-types - , monad-control, mtl, network, network-uri, parsec, QuickCheck - , resourcet, safe, servant, should-not-typecheck, split - , string-conversions, system-filepath, tagged, temporary, text - , transformers, transformers-base, transformers-compat, wai - , wai-app-static, wai-extra, warp, word8 + , directory, doctest, exceptions, filepath, hspec, hspec-discover + , hspec-wai, http-api-data, http-media, http-types, monad-control + , mtl, network, network-uri, parsec, QuickCheck, resourcet, safe + , servant, should-not-typecheck, split, string-conversions + , system-filepath, tagged, temporary, text, transformers + , transformers-base, transformers-compat, wai, wai-app-static + , wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; - version = "0.12"; - sha256 = "1iiwk4d945z4xkxm3hn4d9ybi04n1ig4niip7vk3xp0wzikk7wk5"; - revision = "1"; - editedCabalFile = "1b0vqzbaaz3bqzdh640rss5xsyl0s5q42xccfdmzmpn559w3p81r"; + version = "0.13"; + sha256 = "09hqihij87h031qcr4swsn82fsv8v1qklqc2hl0is8rd8bzi2cjy"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring - containers exceptions filepath http-api-data http-types + containers exceptions filepath http-api-data http-media http-types monad-control mtl network network-uri resourcet safe servant split string-conversions system-filepath tagged text transformers transformers-base transformers-compat wai wai-app-static warp word8 @@ -180521,10 +181642,10 @@ self: { executableHaskellDepends = [ aeson base servant text wai warp ]; testHaskellDepends = [ aeson base base-compat base64-bytestring bytestring directory - doctest exceptions filemanip filepath hspec hspec-wai http-types - mtl network parsec QuickCheck resourcet safe servant - should-not-typecheck string-conversions temporary text transformers - transformers-compat wai wai-extra warp + doctest exceptions hspec hspec-wai http-types mtl network parsec + QuickCheck resourcet safe servant should-not-typecheck + string-conversions temporary text transformers transformers-compat + wai wai-extra warp ]; testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; @@ -180675,6 +181796,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger_1_1_5" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal + , cabal-doctest, directory, doctest, filepath, hspec + , hspec-discover, http-media, insert-ordered-containers, lens + , QuickCheck, servant, singleton-bool, swagger2, text, time + , unordered-containers + }: + mkDerivation { + pname = "servant-swagger"; + version = "1.1.5"; + sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base bytestring hspec http-media insert-ordered-containers + lens QuickCheck servant singleton-bool swagger2 text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base directory doctest filepath hspec lens + QuickCheck servant swagger2 text time + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/haskell-servant/servant-swagger"; + description = "Generate Swagger specification for your servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-swagger-ui" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring , directory, file-embed, filepath, http-media, lens, servant @@ -180758,8 +181907,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; - revision = "17"; - editedCabalFile = "1525b9dm2g8r2xrisciypi0ihm3rmbs3g3f9nvg01qwa3q1sxf70"; + revision = "18"; + editedCabalFile = "038paj9z77rx6jc06vg5f4f9gvwaq73ggw7ppgrw6vwhsl4nd84q"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -181779,19 +182928,21 @@ self: { }) {}; "shake-ats" = callPackage - ({ mkDerivation, base, binary, directory, hs2ats, language-ats - , shake, shake-ext, text + ({ mkDerivation, base, binary, dependency, directory, hs2ats + , language-ats, shake, shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.1.0.2"; - sha256 = "0k15mpd72mmlnshgm2df042kqwzgk49ylf5rb99sdb9sjn0yrdbm"; + version = "1.3.0.7"; + sha256 = "1syvc551f6dj9xf0n8yhadvw0chnzbn7j62hi2nd3wxibi3w0hdv"; libraryHaskellDepends = [ - base binary directory hs2ats language-ats shake shake-ext text + base binary dependency directory hs2ats language-ats shake + shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; description = "Utilities for building ATS projects with shake"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-cabal-build" = callPackage @@ -181813,15 +182964,15 @@ self: { "shake-ext" = callPackage ({ mkDerivation, base, Cabal, composition-prelude, directory - , language-ats, mtl, shake, text + , language-ats, mtl, shake, template-haskell, text }: mkDerivation { pname = "shake-ext"; - version = "2.1.0.2"; - sha256 = "0ii1l76ms3b2c6pgclrgpfgpjsmxw5ax9gi7g60jyby9s5cgbgmc"; + version = "2.3.0.1"; + sha256 = "0g8hadbq4db6kx611hlhcpnna9rwdwwsch83vl3vv1417f84gjl5"; libraryHaskellDepends = [ base Cabal composition-prelude directory language-ats mtl shake - text + template-haskell text ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; @@ -182000,6 +183151,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_15" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.15"; + sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -182376,6 +183554,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shellout" = callPackage + ({ mkDerivation, async, base, stm, text, typed-process }: + mkDerivation { + pname = "shellout"; + version = "0.1.0.0"; + sha256 = "0cinrxwr4jclx37c3h9r1swkj6l78z7fmja6242z53ai1kjqj9kp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ async base stm text typed-process ]; + executableHaskellDepends = [ async base stm text typed-process ]; + homepage = "https://github.com/loganmac/shellout#readme"; + description = "A threaded manager for Haskell that can run and stream external process output/err/exits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shelltestrunner" = callPackage ({ mkDerivation, base, cmdargs, Diff, directory, filemanip , filepath, HUnit, parsec, pretty-show, process, regex-tdfa, safe @@ -182954,6 +184147,8 @@ self: { pname = "sign"; version = "0.4.3"; sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp"; + revision = "1"; + editedCabalFile = "112xj46k2fzhxiqsnh2fs7fmfrhs6k4q65jxw8mkn58mwl9sr86f"; libraryHaskellDepends = [ base containers deepseq hashable lattices universe-base ]; @@ -183819,6 +185014,7 @@ self: { homepage = "https://github.com/dzhus/simple-vec3#readme"; description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-zipper" = callPackage @@ -184107,6 +185303,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-bool_0_1_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singleton-bool"; + version = "0.1.3"; + sha256 = "1i29dl0f45rk280qfrcjcfbkshb7h3y0s2ndw2d7drwlcbl4p2if"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/phadej/singleton-bool#readme"; + description = "Type level booleans"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-dict" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { @@ -185553,6 +186762,8 @@ self: { pname = "snap"; version = "1.1.0.0"; sha256 = "166ilpc4dd4020mmqn2lrfs3j5dl4a2mvqag1sz4mx7jcndrjbc8"; + revision = "1"; + editedCabalFile = "1a51516zn0315f9y9wyzbj2fka2c7krrrd04nhzrqbfaa8smim71"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -185701,18 +186912,14 @@ self: { }) {}; "snap-cors" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, case-insensitive - , hashable, network, network-uri, snap, text, unordered-containers - }: + ({ mkDerivation, snap-core }: mkDerivation { pname = "snap-cors"; - version = "1.2.11"; - sha256 = "0d5gmii970z9nr4fp911xar6b6798dmjhnxhvids420why5k3gc1"; - libraryHaskellDepends = [ - attoparsec base bytestring case-insensitive hashable network - network-uri snap text unordered-containers - ]; - homepage = "http://github.com/ocharles/snap-cors"; + version = "1.3.0"; + sha256 = "182l2wfkjanxa5n2g5ypsvdgvigfnk5f4n0am37c26lgk3n6zi9a"; + libraryHaskellDepends = [ snap-core ]; + doHaddock = false; + homepage = "https://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -185740,8 +186947,8 @@ self: { }: mkDerivation { pname = "snap-error-collector"; - version = "1.1.4"; - sha256 = "0k9nddbqdd6c12vrl5pqsl02pv38bhcxk5j02sq8lx7pk05w0mam"; + version = "1.1.5"; + sha256 = "0xpz24f2h1rzqs9j15skz1cmk18mh472zsix620shp3qjlma3da4"; libraryHaskellDepends = [ async base containers lifted-base monad-loops snap stm time transformers @@ -187908,21 +189115,21 @@ self: { "sparkle" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, choice - , distributed-closure, filepath, inline-java, jni, jvm + , constraints, distributed-closure, filepath, inline-java, jni, jvm , jvm-streaming, process, regex-tdfa, singletons, streaming, text , vector, zip-archive }: mkDerivation { pname = "sparkle"; - version = "0.7.2.1"; - sha256 = "1bfgj1a43aj4nwzq1471l2sb9il7sh0czc22fhmd8mhpbz6wlnsp"; + version = "0.7.3"; + sha256 = "1wxp0wdmcvkypnayv128f2bgcdh7ka1b6ap7w5743v1gpxzkqb8b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal inline-java ]; libraryHaskellDepends = [ - base binary bytestring choice distributed-closure inline-java jni - jvm jvm-streaming singletons streaming text vector + base binary bytestring choice constraints distributed-closure + inline-java jni jvm jvm-streaming singletons streaming text vector ]; executableHaskellDepends = [ base bytestring filepath process regex-tdfa text zip-archive @@ -188093,6 +189300,7 @@ self: { ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spawn" = callPackage @@ -190228,8 +191436,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.5.0"; - sha256 = "0nqn2sbzig6n3jdzzi8p8kpfmd8npawn448aw9x7zixxav10xz9x"; + version = "0.6.0"; + sha256 = "0v39d39ijc15n6k96g9ii02xlgyw8dvlfghkavlqcsny3jqfa49d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192134,8 +193342,8 @@ self: { }: mkDerivation { pname = "streaming-conduit"; - version = "0.1.2.0"; - sha256 = "1vzw0lfj8l4ic1fcw0iqiwygg4zrfxw9xdjbl7qpkfsjsbjqyg2q"; + version = "0.1.2.1"; + sha256 = "053p9xzd48y47mx22r4v468lbjrbi5gzqwzarfpzf0j5gis3bm38"; libraryHaskellDepends = [ base bytestring conduit streaming streaming-bytestring transformers ]; @@ -192291,8 +193499,8 @@ self: { }: mkDerivation { pname = "streaming-with"; - version = "0.2.0.0"; - sha256 = "02cdjmq7dxqfpqs73v7c63iwavbwb56fdd3pk4qs91vm6d0lfbrp"; + version = "0.2.1.0"; + sha256 = "04i4k7n37qblf9yxdj0bl1qr0arpkv2l06kx7f8aqf1xa7vvxz9i"; libraryHaskellDepends = [ base exceptions managed streaming-bytestring temporary transformers ]; @@ -192699,6 +193907,7 @@ self: { ]; description = "Tools for working with isomorphisms of strings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-qq" = callPackage @@ -192819,6 +194028,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stringbuilder_0_5_1" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "stringbuilder"; + version = "0.5.1"; + sha256 = "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A writer monad for multi-line string literals"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stringlike" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-instances , test-framework, test-framework-quickcheck2, text @@ -195489,8 +196711,8 @@ self: { ({ mkDerivation, attoparsec, base, process, text }: mkDerivation { pname = "system-info"; - version = "0.1.0.13"; - sha256 = "0ym1j9bjjv7aa3v1zqklljfyq19agv3imghglfii0qk7mrlyya9d"; + version = "0.3.0.0"; + sha256 = "05zp1kddydl9fqbhfpkjvxqfi6l9i1qhif5sziz3d0mymnyrzvpp"; libraryHaskellDepends = [ attoparsec base process text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -196742,21 +197964,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tar-conduit_0_2_1" = callPackage + "tar-conduit_0_2_3" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , containers, criterion, deepseq, directory, filepath, hspec, unix - , weigh + , containers, criterion, deepseq, directory, filepath, hspec + , QuickCheck, safe-exceptions, text, unix, weigh }: mkDerivation { pname = "tar-conduit"; - version = "0.2.1"; - sha256 = "09mpkr05f6vwhrk3r8fafs8rsgc10dkkgws356ciy3rz9y8xfjw2"; + version = "0.2.3"; + sha256 = "1is2q5662zrrxgb2dm2n1qa1aqdrwf4g7il5jdpxhri28m7pp7jp"; libraryHaskellDepends = [ - base bytestring conduit-combinators directory filepath unix + base bytestring conduit conduit-combinators directory filepath + safe-exceptions text unix ]; testHaskellDepends = [ base bytestring conduit conduit-combinators containers deepseq - directory filepath hspec weigh + directory filepath hspec QuickCheck weigh ]; benchmarkHaskellDepends = [ base bytestring conduit conduit-combinators containers criterion @@ -199247,20 +200470,20 @@ self: { "testbench" = callPackage ({ mkDerivation, base, bytestring, cassava, containers, criterion - , deepseq, dlist, HUnit, optparse-applicative, process, resourcet - , statistics, streaming, streaming-bytestring, streaming-cassava - , temporary, transformers, weigh + , deepseq, dlist, HUnit, optparse-applicative, process, statistics + , streaming, streaming-cassava, streaming-with, temporary + , transformers, weigh }: mkDerivation { pname = "testbench"; - version = "0.2.1.0"; - sha256 = "0pka1vmzh4x0pzwlrxzzsjaxjd7py43m5ph3barwfrbjkqbyjzj6"; + version = "0.2.1.1"; + sha256 = "0ps4q86258j41iv3xisxw3154xgxg0dmk3khc4ibr1k0dbvkr8r6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cassava criterion deepseq dlist HUnit - optparse-applicative process resourcet statistics streaming - streaming-bytestring streaming-cassava temporary transformers weigh + optparse-applicative process statistics streaming streaming-cassava + streaming-with temporary transformers weigh ]; executableHaskellDepends = [ base bytestring containers criterion HUnit @@ -200883,20 +202106,23 @@ self: { }) {}; "th-printf" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec, HUnit - , QuickCheck, template-haskell, text, transformers + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bytestring + , charset, containers, criterion, hspec, HUnit, QuickCheck + , template-haskell, text, transformers, trifecta, utf8-string }: mkDerivation { pname = "th-printf"; - version = "0.3.1"; - sha256 = "089grlpavvqv90graa9rdwg9x1ph484g5bj7sfjklqy8mgwwqg7a"; + version = "0.5.0"; + sha256 = "1fn1l503x3y5dgv8wsgyxhm66dyvdvfalzmwmsqf86sy643qjpw6"; libraryHaskellDepends = [ - attoparsec base bytestring template-haskell text transformers + ansi-wl-pprint attoparsec base charset containers template-haskell + text transformers trifecta utf8-string ]; testHaskellDepends = [ base bytestring hspec HUnit QuickCheck template-haskell text ]; - homepage = "https://github.com/joelteon/th-printf"; + benchmarkHaskellDepends = [ base criterion text ]; + homepage = "https://github.com/pikajude/th-printf"; description = "Compile-time printf"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -205410,23 +206636,23 @@ self: { }) {}; "tttool" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , directory, executable-path, filepath, hashable, haskeline, HPDF - , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec - , process, random, split, spool, template-haskell, time, vector - , yaml, zlib + ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-svg + , bytestring, containers, directory, executable-path, filepath + , hashable, haskeline, HPDF, JuicyPixels, mtl, natural-sort + , optparse-applicative, parsec, process, random, split, spool + , template-haskell, text, time, vector, yaml, zlib }: mkDerivation { pname = "tttool"; - version = "1.7.0.3"; - sha256 = "0r8ha8wgzlf2ymyxylj16hfshf8w5dl13cwmdkl6ih2niwkzk9ch"; + version = "1.8"; + sha256 = "0j4lgkjg28i7wlz5rnlrii6mzx2bqsagrg3wiiw1z2ncik6qm472"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base binary bytestring containers directory executable-path - filepath hashable haskeline HPDF JuicyPixels mtl natural-sort - optparse-applicative parsec process random split spool - template-haskell time vector yaml zlib + aeson base base64-bytestring binary blaze-svg bytestring containers + directory executable-path filepath hashable haskeline HPDF + JuicyPixels mtl natural-sort optparse-applicative parsec process + random split spool template-haskell text time vector yaml zlib ]; homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; @@ -205721,7 +206947,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "turtle_1_5_1" = callPackage + "turtle_1_5_2" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, foldl , hostname, managed, optional-args, optparse-applicative, process @@ -205730,8 +206956,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.1"; - sha256 = "06yya57w3i598b6h3gkhv8zs0a3f1az12x8viy16sgdbgwph8scm"; + version = "1.5.2"; + sha256 = "1h44b1r7kcfbsziq0c2ldc35mgsyaxa4pkzqs529ibd5pridm8vd"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -205790,20 +207016,16 @@ self: { }) {}; "twee" = callPackage - ({ mkDerivation, base, containers, dlist, ghc-prim, jukebox, pretty - , primitive, split, transformers + ({ mkDerivation, base, containers, jukebox, pretty, split, twee-lib }: mkDerivation { pname = "twee"; - version = "2.0"; - sha256 = "18raccm4glf0gysj625wiwkk2b295863g0hgypc9335cxb65n8k0"; - isLibrary = true; + version = "2.1"; + sha256 = "0g73siwd6hrqsfnvhy51d3q20whad130ai356qv9kv8myi2z8ii4"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - base containers dlist ghc-prim pretty primitive transformers - ]; executableHaskellDepends = [ - base containers jukebox pretty split + base containers jukebox pretty split twee-lib ]; homepage = "http://github.com/nick8325/twee"; description = "An equational theorem prover"; @@ -205811,6 +207033,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "twee-lib" = callPackage + ({ mkDerivation, base, containers, dlist, ghc-prim, pretty + , primitive, transformers, vector + }: + mkDerivation { + pname = "twee-lib"; + version = "2.1"; + sha256 = "0h1wb1jiqd9xcyjg0mdp7kb45bsk3q3mksz4jv8kiqpxi3gjk2fl"; + libraryHaskellDepends = [ + base containers dlist ghc-prim pretty primitive transformers vector + ]; + homepage = "http://github.com/nick8325/twee"; + description = "An equational theorem prover"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion @@ -206098,6 +207336,7 @@ self: { homepage = "https://github.com/markandrus/twilio-haskell"; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twill" = callPackage @@ -206694,8 +207933,8 @@ self: { ({ mkDerivation, base, data-default, nats, numericpeano, text }: mkDerivation { pname = "type-iso"; - version = "0.1.0.0"; - sha256 = "03qs8frsj0a2jxpk1rrmhaivf68hg8dhjn4s3q85h4zrsxwfskjx"; + version = "1.0.0.0"; + sha256 = "11xcadzvvp9y7gm54k0nfsnx0hfr3g5bd8g8f8mlfqy24p0mq1m1"; libraryHaskellDepends = [ base data-default nats numericpeano text ]; @@ -206897,6 +208136,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-of-html_1_3_3_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, criterion + , double-conversion, ghc-prim, hspec, QuickCheck, text + }: + mkDerivation { + pname = "type-of-html"; + version = "1.3.3.0"; + sha256 = "0q3r2imr63nv7l08w6q850xqak4gwzvk43qv1vq8x9qwdaf1nisv"; + libraryHaskellDepends = [ + base bytestring double-conversion ghc-prim text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion QuickCheck text + ]; + homepage = "https://github.com/knupfer/type-of-html"; + description = "High performance type driven html generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-operators" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -209263,6 +210523,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_9_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.9.0"; + sha256 = "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq deepseq-generics + hashable hashmap mtl random + ]; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -212948,6 +214233,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_20" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , deepseq, directory, filepath, hashable, HUnit, microlens + , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck + , quickcheck-assertions, random, smallcheck, stm, string-qq + , terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.20"; + sha256 = "0l9xlk4z8xlkd7qzhzkj4l0qb2gwl27mabr2hhkpz3yfv7z6j0a3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq directory filepath + hashable microlens microlens-mtl microlens-th mtl parallel parsec + stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers deepseq HUnit + microlens microlens-mtl mtl QuickCheck quickcheck-assertions random + smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + homepage = "https://github.com/jtdaugherty/vty"; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -213157,8 +214478,8 @@ self: { }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.1.3"; - sha256 = "0fxgan4r10rvq2mwh7d66shxmxmyqs7z824f3s0yzyl4gysivkkg"; + version = "3.1.4"; + sha256 = "1gcrfcvll4lpd8qrpcai00cn2zs8ql46z1chlqkbi7jk31r14qy0"; libraryHaskellDepends = [ array attoparsec attoparsec-conduit base blaze-builder blaze-html bytestring case-insensitive conduit conduit-extra containers @@ -215036,6 +216357,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "warped" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, http-types + , lifted-async, monad-control, preamble, shakers, uuid, wai + , wai-conduit, wai-cors, warp + }: + mkDerivation { + pname = "warped"; + version = "0.0.1"; + sha256 = "1p90qkvryj5ah8knxrng4wfzzy73bailgj001g3s48qf7b6a46qm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder conduit http-types lifted-async monad-control + preamble uuid wai wai-conduit wai-cors warp + ]; + executableHaskellDepends = [ base shakers ]; + homepage = "https://github.com/swift-nav/warped"; + description = "Warp and Wai Library"; + license = stdenv.lib.licenses.mit; + }) {}; + "watchdog" = callPackage ({ mkDerivation, base, mtl, time }: mkDerivation { @@ -216664,14 +218006,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wild-bind-x11_0_2_0_0" = callPackage + "wild-bind-x11_0_2_0_1" = callPackage ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl , semigroups, stm, text, time, transformers, wild-bind, X11 }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.0"; - sha256 = "0x7zy76x9zmh6pjv6yhkb53l6pkn4wh76x34adx538fyf6a8mk6b"; + version = "0.2.0.1"; + sha256 = "0g02kv710yr8qzh48dcwzyn1aak9hz3ny2pq7v24g40kc7c6pd4d"; libraryHaskellDepends = [ base containers fold-debounce mtl semigroups stm text transformers wild-bind X11 @@ -218081,6 +219423,7 @@ self: { homepage = "https://github.com/MarcFontaine/wsjtx-udp"; description = "WSJT-X UDP protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wtk" = callPackage @@ -219104,6 +220447,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xls_0_1_1" = callPackage + ({ mkDerivation, base, conduit, filepath, getopt-generics + , resourcet, transformers + }: + mkDerivation { + pname = "xls"; + version = "0.1.1"; + sha256 = "0a09zw90xiaklr68w932md38s95jzwid914lw7frnf3qd8j12xq9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base conduit filepath resourcet transformers + ]; + executableHaskellDepends = [ + base conduit getopt-generics resourcet transformers + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/harendra-kumar/xls"; + description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsior" = callPackage ({ mkDerivation, attoparsec, base, blaze-markup, bytestring , conduit, conduit-extra, data-default, exceptions, mtl, resourcet @@ -222257,7 +223623,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-core_1_6_0" = callPackage + "yesod-core_1_6_1" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -222271,8 +223637,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.0"; - sha256 = "0xhg4kjskjpwffnfykhszqyhg9d785r5pnziklswdi6g0qy0zv4z"; + version = "1.6.1"; + sha256 = "1dymck6s9a1cfpp6ib2smxhb4axklj4r08m10z4zqc05s63ch81r"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -222578,7 +223944,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-form_1_6_0" = callPackage + "yesod-form_1_6_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -222587,8 +223953,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.6.0"; - sha256 = "0vvj56pjfaqn7lys8gbb8p7bgnbi67l9a5786gqc3jc1q0b50x8n"; + version = "1.6.1"; + sha256 = "05pnsgnhcsq74w91r74p8psh567yxbmyhddj04mnrfzlzzm19zxq"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -222665,6 +224031,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-gitrepo_0_3_0" = callPackage + ({ mkDerivation, base, directory, http-types, process, temporary + , text, unliftio, wai, yesod-core + }: + mkDerivation { + pname = "yesod-gitrepo"; + version = "0.3.0"; + sha256 = "07lqhih9jcb5rdjdkjsrg7s9l5f3y9lrsxa1rc1c8gxw0v2nfg5h"; + libraryHaskellDepends = [ + base directory http-types process temporary text unliftio wai + yesod-core + ]; + homepage = "https://github.com/snoyberg/yesod-gitrepo#readme"; + description = "Host content provided by a Git repo"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-gitrev" = callPackage ({ mkDerivation, aeson, base, gitrev, template-haskell, yesod-core }: @@ -223575,23 +224959,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-test_1_6_0" = callPackage + "yesod-test_1_6_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, conduit, containers , cookie, hspec, hspec-core, html-conduit, http-types, HUnit - , network, persistent, pretty-show, text, time, transformers - , unliftio, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form + , network, persistent, pretty-show, semigroups, text, time + , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form }: mkDerivation { pname = "yesod-test"; - version = "1.6.0"; - sha256 = "0xdl20qm0h6dx6cbzp0d9n0qmpfz3wrn5lwwy2zrpx7bgb967fq6"; + version = "1.6.1"; + sha256 = "1lwckkbm5i0fj8ixa396v7h683kdvbmxdrwc62y3qbi7hlz2iars"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit network persistent pretty-show text time - transformers wai wai-extra xml-conduit xml-types yesod-core + http-types HUnit network persistent pretty-show semigroups text + time transformers wai wai-extra xml-conduit xml-types yesod-core ]; testHaskellDepends = [ base bytestring containers hspec html-conduit http-types HUnit text @@ -225150,6 +226534,8 @@ self: { pname = "zip"; version = "0.2.0"; sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr"; + revision = "1"; + editedCabalFile = "1lq4v58kq4mwqczbdly4xnhg0pwsn4a5jmsdm38l2svri3by1hbb"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath monad-control @@ -225165,6 +226551,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, directory + , dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "1.0.0"; + sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest directory dlist exceptions filepath + monad-control mtl resourcet text time transformers + transformers-base + ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist exceptions + filepath hspec QuickCheck temporary text time transformers + ]; + homepage = "https://github.com/mrkkrp/zip"; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty From 1d4529c7e25669136c08a3020ab8b8e733408803 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Feb 2018 10:03:40 +0100 Subject: [PATCH 745/797] cabal2nix: compile with hpack 0.25.0 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 712edec6889..0af868765f1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -607,7 +607,7 @@ self: super: { }; # Need newer versions of their dependencies than the ones we have in LTS-10.x. - cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_24_0; }; + cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_25_0; }; hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; }); # https://github.com/bos/configurator/issues/22 From 36a095e27e58665e98dcbe91b052b770b9c6183c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Feb 2018 13:07:09 +0100 Subject: [PATCH 746/797] haskell-contravariant: fix build on GHC 7.10.x --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index fc41fc0b3d3..56f61fddb33 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -186,6 +186,7 @@ self: super: { attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); bytes = addBuildDepend super.bytes self.doctest; case-insensitive = addBuildDepend super.case-insensitive self.semigroups; + contravariant = addBuildDepend super.contravariant self.semigroups; dependent-map = addBuildDepend super.dependent-map self.semigroups; distributive = addBuildDepend (dontCheck super.distributive) self.semigroups; Glob = addBuildDepends super.Glob (with self; [semigroups]); From 69b0bc1bdf6d4fae9669d246532e5c37e5fb8b29 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 7 Feb 2018 15:02:34 -0500 Subject: [PATCH 747/797] ghc 8.{2,4}: Add patches for deterministic profiling symbols. These are taken from https://phabricator.haskell.org/D4388 (which is against HEAD) and fix an inconsistency when building profiling libraries on multiple machines that leads to linking failure. --- pkgs/development/compilers/ghc/8.2.2.nix | 4 ++++ pkgs/development/compilers/ghc/8.4.1.nix | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 8b62bbffcc8..646d4a87387 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -85,6 +85,10 @@ stdenv.mkDerivation rec { url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; }) + (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism + url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; + sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg"; + }) ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index 1bade6e2060..ee40a145cf8 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -3,7 +3,7 @@ # build-tools , bootPkgs, alex, happy -, autoconf, automake, coreutils, fetchgit, perl, python3 +, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 , libffi, libiconv ? null, ncurses @@ -81,6 +81,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; + patches = [ + (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism + url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; + sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; + }) + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. From 9dfbb5242349fd5397e85b2d438fe0d2b39942c3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 8 Feb 2018 22:17:02 -0500 Subject: [PATCH 748/797] liquidhaskell: Patch for compat with our deterministic profiling GHC patch --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0af868765f1..126023a6313 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1000,4 +1000,15 @@ self: super: { ''; }); + # Fix for our backport of D4388 to GHC 8.2. This is in + # configuration-common because we will need the same patch if/when + # liquidhaskell is bumped to support GHC 8.4 + # https://github.com/ucsd-progsys/liquidhaskell/pull/1233 + liquidhaskell = + let patch = pkgs.fetchpatch + { url = https://github.com/ucsd-progsys/liquidhaskell/commit/635338e6ef0aec01d4f6a21058cabd24a521e63f.patch; + sha256 = "0lg40qn2w3kn6zk5r38mp6hndpnswzrqhk38059h0ljhw9md72s8"; + }; + in appendPatch super.liquidhaskell patch; + } From 7ac6c77323dc5faf12427b310a417fb06915d936 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 9 Feb 2018 07:50:49 -0500 Subject: [PATCH 749/797] ghc: Make deterministic profiling patches opt-in. The patch changes some pieces of the exposed API, so we can't have our default GHC changed in this way. --- pkgs/development/compilers/ghc/8.2.2.nix | 8 ++++++-- pkgs/development/compilers/ghc/8.4.1.nix | 9 ++++++--- .../haskell-modules/configuration-common.nix | 11 ++++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 646d4a87387..f4aa2de3241 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -26,6 +26,10 @@ !(targetPlatform.isDarwin # On iOS, dynamic linking is not supported && (targetPlatform.isAarch64 || targetPlatform.isArm)) +, # Whether to backport https://phabricator.haskell.org/D4388 for + # deterministic profiling symbol names, at the cost of a slightly + # non-standard GHC API + deterministicProfiling ? false }: assert !enableIntegerSimple -> gmp != null; @@ -85,11 +89,11 @@ stdenv.mkDerivation rec { url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; }) + ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg"; - }) - ]; + }); postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index ee40a145cf8..e7ec9be16b6 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -25,6 +25,10 @@ enableShared ? true , version ? "8.4.0.20180204" +, # Whether to backport https://phabricator.haskell.org/D4388 for + # deterministic profiling symbol names, at the cost of a slightly + # non-standard GHC API + deterministicProfiling ? false }: assert !enableIntegerSimple -> gmp != null; @@ -81,12 +85,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - patches = [ + patches = stdenv.lib.optional deterministicProfiling (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; - }) - ]; + }); postPatch = "patchShebangs ."; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 126023a6313..3eebd3cbe4e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1000,14 +1000,15 @@ self: super: { ''; }); - # Fix for our backport of D4388 to GHC 8.2. This is in - # configuration-common because we will need the same patch if/when - # liquidhaskell is bumped to support GHC 8.4 + # Add a flag to enable building against GHC with D4388 applied (the + # deterministic profiling symbols patch). The flag is disabled by + # default, so we can apply this patch globally. + # # https://github.com/ucsd-progsys/liquidhaskell/pull/1233 liquidhaskell = let patch = pkgs.fetchpatch - { url = https://github.com/ucsd-progsys/liquidhaskell/commit/635338e6ef0aec01d4f6a21058cabd24a521e63f.patch; - sha256 = "0lg40qn2w3kn6zk5r38mp6hndpnswzrqhk38059h0ljhw9md72s8"; + { url = https://github.com/ucsd-progsys/liquidhaskell/commit/1aeef1871760b2be46cc1cabd51311997d1d0bc0.patch; + sha256 = "0i55n6p3x9as648as0lvxy2alqb1n7c10xv9gp15cvq7zx6c8ydg"; }; in appendPatch super.liquidhaskell patch; From 15344506cc200083b9e4ce275f96bcd55c22328d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 8 Feb 2018 22:28:41 -0500 Subject: [PATCH 750/797] haskell-funcmp: Fix build on GHC 8.4 --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index ae51b82d394..488ca838b9b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -900,4 +900,7 @@ self: super: { ## error: build of ‘/nix/store/iy6ccxh4dvp6plalx4ww81qrnhxm7jgr-wavefront-0.7.1.1.drv’ failed jailbreak = true; }); + + # Needed for (<>) in prelude + funcmp = super.funcmp_1_9; } From d2b666502412e15aad424a57e9db6c4146ee9f8b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 8 Feb 2018 22:37:10 -0500 Subject: [PATCH 751/797] haskell-twee-lib: disable broken haddocks --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3eebd3cbe4e..4946ac0ae5f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1012,4 +1012,6 @@ self: super: { }; in appendPatch super.liquidhaskell patch; + # https://github.com/nick8325/twee/pull/1 + twee-lib = dontHaddock super.twee-lib; } From 74bde7e20a0d4a2dd775da9601713d66a5c444df Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 8 Feb 2018 22:42:53 -0500 Subject: [PATCH 752/797] haskell-deepseq-generics: fix build on ghc 8.4 --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 488ca838b9b..4781ff6d3ae 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -903,4 +903,7 @@ self: super: { # Needed for (<>) in prelude funcmp = super.funcmp_1_9; + + # https://github.com/haskell-hvr/deepseq-generics/pull/4 + deepseq-generics = doJailbreak super.deepseq-generics; } From b0270dfcec088c15e7537fdd20ff1e0d42e95587 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 8 Feb 2018 22:51:25 -0500 Subject: [PATCH 753/797] haskell-securemem: fix build with GHC 8.4 --- .../haskell-modules/configuration-ghc-8.4.x.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 4781ff6d3ae..ab487eb6edf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -906,4 +906,13 @@ self: super: { # https://github.com/haskell-hvr/deepseq-generics/pull/4 deepseq-generics = doJailbreak super.deepseq-generics; + + # SMP compat + # https://github.com/vincenthz/hs-securemem/pull/12 + securemem = + let patch = pkgs.fetchpatch + { url = https://github.com/vincenthz/hs-securemem/commit/6168d90b00bfc6a559d3b9160732343644ef60fb.patch; + sha256 = "0pfjmq57kcvxq7mhljd40whg2g77vdlvjyycdqmxxzz1crb6pipf"; + }; + in appendPatch super.securemem patch; } From 32085eafa1233d67875e49a079ccf83c9adfb712 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 8 Feb 2018 22:57:16 -0500 Subject: [PATCH 754/797] haskell-hpio: disable test suite to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4946ac0ae5f..c242f65b2b1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1014,4 +1014,7 @@ self: super: { # https://github.com/nick8325/twee/pull/1 twee-lib = dontHaddock super.twee-lib; + + # Needs older hlint + hpio = dontCheck super.hpio; } From 03eef817274cb7b49f563277b05950e5ee5c91ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 10 Feb 2018 19:20:44 +0100 Subject: [PATCH 755/797] darwin bootstrap tools: fix after #34339 (http2 in curl) --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 6fb37f24914..6fc9d7f0c10 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -15,8 +15,8 @@ in rec { # Avoid debugging larger changes for now. bzip2_ = bzip2.override (args: { linkStatic = true; }); - # Avoid messing with libkrb5. - curl_ = curl.override (args: { gssSupport = false; }); + # Avoid messing with libkrb5 and libnghttp2. + curl_ = curl.override (args: { gssSupport = false; http2Support = false; }); build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; From 6e24dc7898025a6d6fc55cee9e52a066c49ab1ba Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 10 Feb 2018 20:03:55 +0100 Subject: [PATCH 756/797] syncthing012: removed ancient version Removal as announced by Peter Hoege on the ML [1] [1] https://groups.google.com/forum/#!msg/nix-devel/CR1eldka5SU/eO-xyV4UAgAJ --- .../networking/syncthing012/default.nix | 35 ----- .../networking/syncthing012/deps.nix | 128 ------------------ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 165 deletions(-) delete mode 100644 pkgs/applications/networking/syncthing012/default.nix delete mode 100644 pkgs/applications/networking/syncthing012/deps.nix diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix deleted file mode 100644 index cd6fcc28a50..00000000000 --- a/pkgs/applications/networking/syncthing012/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "syncthing-${version}"; - version = "0.12.15"; - rev = "v${version}"; - - goPackagePath = "github.com/syncthing/syncthing"; - - src = fetchFromGitHub { - inherit rev; - owner = "syncthing"; - repo = "syncthing"; - sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1"; - }; - - goDeps = ./deps.nix; - - postPatch = '' - # Mostly a cosmetic change - sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go - ''; - - preBuild = '' - export buildFlagsArray+=("-tags" "noupgrade release") - ''; - - meta = { - knownVulnerabilities = [ "CVE-2017-1000420" ]; - homepage = https://www.syncthing.net/; - description = "Open Source Continuous File Synchronization"; - license = stdenv.lib.licenses.mpl20; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; - }; -} diff --git a/pkgs/applications/networking/syncthing012/deps.nix b/pkgs/applications/networking/syncthing012/deps.nix deleted file mode 100644 index 44e18c2f606..00000000000 --- a/pkgs/applications/networking/syncthing012/deps.nix +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; - sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; - sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; - }; - } - { - goPackagePath = "github.com/bkaradzic/go-lz4"; - fetch = { - type = "git"; - url = "https://github.com/bkaradzic/go-lz4"; - rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; - sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; - }; - } - { - goPackagePath = "github.com/calmh/luhn"; - fetch = { - type = "git"; - url = "https://github.com/calmh/luhn"; - rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632"; - sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; - sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; - }; - } - { - goPackagePath = "github.com/vitrun/qart"; - fetch = { - type = "git"; - url = "https://github.com/vitrun/qart"; - rev = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0"; - sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"; - }; - } - { - goPackagePath = "github.com/calmh/du"; - fetch = { - type = "git"; - url = "https://github.com/calmh/du"; - rev = "3c0690cca16228b97741327b1b6781397afbdb24"; - sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"; - }; - } - { - goPackagePath = "github.com/calmh/xdr"; - fetch = { - type = "git"; - url = "https://github.com/calmh/xdr"; - rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e"; - sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0"; - sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"; - }; - } - { - goPackagePath = "github.com/thejerf/suture"; - fetch = { - type = "git"; - url = "https://github.com/thejerf/suture"; - rev = "99c1f2d613756768fc4299acd9dc621e11ed3fd7"; - sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; - sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0"; - sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dffab832a9d..d098fce3cf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17327,8 +17327,6 @@ with pkgs; syncthing = callPackage ../applications/networking/syncthing { }; - syncthing012 = callPackage ../applications/networking/syncthing012 { }; - syncthing013 = callPackage ../applications/networking/syncthing013 { }; syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { }; From 2564e75a341db90ac1ac3fcef9f1a170b4864812 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 10 Feb 2018 20:06:24 +0100 Subject: [PATCH 757/797] syncthing013: removed ancient version Removal as announced by Peter Hoege on the ML [1] [1] https://groups.google.com/forum/#!msg/nix-devel/CR1eldka5SU/eO-xyV4UAgAJ --- .../networking/syncthing013/default.nix | 39 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 41 deletions(-) delete mode 100644 pkgs/applications/networking/syncthing013/default.nix diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix deleted file mode 100644 index e1a0dc38c11..00000000000 --- a/pkgs/applications/networking/syncthing013/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchgit, go }: - -stdenv.mkDerivation rec { - version = "0.13.10"; - name = "syncthing-${version}"; - - src = fetchgit { - url = https://github.com/syncthing/syncthing; - rev = "refs/tags/v${version}"; - sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7"; - }; - - buildInputs = [ go ]; - - buildPhase = '' - mkdir -p src/github.com/syncthing - ln -s $(pwd) src/github.com/syncthing/syncthing - export GOPATH=$(pwd) - - # Syncthing's build.go script expects this working directory - cd src/github.com/syncthing/syncthing - - go run build.go -no-upgrade -version v${version} install all - ''; - - installPhase = '' - mkdir -p $out/bin - cp bin/* $out/bin - ''; - - meta = { - knownVulnerabilities = [ "CVE-2017-1000420" ]; - homepage = https://www.syncthing.net/; - description = "Open Source Continuous File Synchronization"; - license = stdenv.lib.licenses.mpl20; - maintainers = with stdenv.lib.maintainers; [pshendry]; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d098fce3cf8..b39bd7de7b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17327,8 +17327,6 @@ with pkgs; syncthing = callPackage ../applications/networking/syncthing { }; - syncthing013 = callPackage ../applications/networking/syncthing013 { }; - syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { }; syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { }; From 274de25f5f1f075963be7e38399a6c6312ecdf72 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 10 Feb 2018 20:27:28 +0100 Subject: [PATCH 758/797] exim: 4.90 -> 4.90.1 Fixes CVE-2018-6789. https://lists.exim.org/lurker/message/20180210.180351.bc65dc61.en.html --- pkgs/servers/mail/exim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 818e6ee8638..b386fadabd4 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "exim-4.90"; + name = "exim-4.90.1"; src = fetchurl { url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "101syariyvv2xxhjyx1zfdvad6303ihp67800s8n4083km98nm4k"; + sha256 = "09ppq8l7cah6dcqwdvpa6r12i6fdcd9lvxlfp18mggj3438xz62w"; }; nativeBuildInputs = [ pkgconfig ]; From 0905e5e23affddfe1857a41266e336926bfec546 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 10 Feb 2018 01:04:56 +0100 Subject: [PATCH 759/797] qt59-qtbase: fix darwin build --- .../libraries/qt-5/5.9/default.nix | 2 +- .../libraries/qt-5/5.9/qtbase-darwin.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 9afa818c36e..e0dab342162 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -37,7 +37,7 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ]; + qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch new file mode 100644 index 00000000000..875fba12e2f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch @@ -0,0 +1,35 @@ +diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm +index 341d3bc..3368234 100644 +--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm ++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm +@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() + QMacAutoReleasePool pool; + userProfiles.clear(); + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + + CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; +@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() + + QMacAutoReleasePool pool; + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + scanThread->interfaceName = QString::fromNSString(ifName); + scanThread->start(); +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index 5cd4beb..84919e6 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -320,7 +320,7 @@ static void qt_closePopups() + + (void)applicationActivationChanged:(NSNotification*)notification + { + const id sender = self; +- NSEnumerator *windowEnumerator = nullptr; ++ NSEnumerator *windowEnumerator = nullptr; + NSApplication *application = [NSApplication sharedApplication]; + + #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) From cac2a6596cbade2cb4b12d4b8f337dfa8d73f48f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 11 Feb 2018 00:47:50 +0800 Subject: [PATCH 760/797] go_1_9: 1.9.3 -> 1.9.4 --- pkgs/development/compilers/go/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index b226cd7a7eb..56091791d71 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "0ivb6z30d6qrrkwjm9fdz9jfs567q4b6dljwwxc9shmdr2l9chah"; + sha256 = "15d9lfiy1cjfz6nqnig5884ykqckx58cynd1bva1xna7bwcwwp2r"; }; # perl is used for testing go vet From d424160b33e958a5598dbd14788aca20d3de25e3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 11 Feb 2018 00:37:33 +0800 Subject: [PATCH 761/797] go_1_8: 1.8.5 -> 1.8.7 --- pkgs/development/compilers/go/1.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index ee71d2aabad..e23d742b0c3 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.8.5"; + version = "1.8.7"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "1ab021l3v29ciaxp738cjpbkh1chlsl6928672q3i82anmdzn5m5"; + sha256 = "06v83fb75079dy2dc1927sr9bwvcpkkzl9d4wcw10scj70vj4a0x"; }; # perl is used for testing go vet From e05a05e0a7a6777ea16790a7aedb40b96189a692 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Feb 2018 04:25:37 +0100 Subject: [PATCH 762/797] altcoins.sumokoin: init at 0.2.0.0 --- pkgs/applications/altcoins/default.nix | 2 ++ pkgs/applications/altcoins/sumokoin.nix | 35 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/altcoins/sumokoin.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 757c6e276fd..fd5c6e4f654 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -59,6 +59,8 @@ rec { stellar-core = callPackage ./stellar-core.nix { }; + sumokoin = callPackage ./sumokoin.nix { }; + zcash = callPackage ./zcash { withGui = false; openssl = openssl_1_1_0; diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/altcoins/sumokoin.nix new file mode 100644 index 00000000000..026008b2761 --- /dev/null +++ b/pkgs/applications/altcoins/sumokoin.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake, unbound, openssl, boost +, libunwind, lmdb, miniupnpc }: + +stdenv.mkDerivation rec { + name = "sumokoin-${version}"; + version = "0.2.0.0"; + + src = fetchFromGitHub { + owner = "sumoprojects"; + repo = "sumokoin"; + rev = "v${version}"; + sha256 = "0ndgcawhxh3qb3llrrilrwzhs36qpxv7f53rxgcansbff9b3za6n"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ unbound openssl boost libunwind lmdb miniupnpc ]; + + postPatch = '' + substituteInPlace src/blockchain_db/lmdb/db_lmdb.cpp --replace mdb_size_t size_t + ''; + + cmakeFlags = [ + "-DLMDB_INCLUDE=${lmdb}/include" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Sumokoin is a fork of Monero and a truely fungible cryptocurrency"; + homepage = "https://www.sumokoin.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} From 41b3a76711bfac7c49abcb2c246eff36a5d40866 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 10 Feb 2018 20:40:57 +0100 Subject: [PATCH 763/797] altcoins.dero: init at 0.11.3 --- pkgs/applications/altcoins/default.nix | 2 ++ pkgs/applications/altcoins/dero.nix | 27 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/altcoins/dero.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index fd5c6e4f654..37df75ae110 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -26,6 +26,8 @@ rec { dashpay = callPackage ./dashpay.nix { }; + dero = callPackage ./dero.nix { }; + dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoind = callPackage ./dogecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix new file mode 100644 index 00000000000..f3e24b6c015 --- /dev/null +++ b/pkgs/applications/altcoins/dero.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost +, libunwind, lmdb, miniupnpc, readline }: + +stdenv.mkDerivation rec { + name = "dero-${version}"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "deroproject"; + repo = "dero"; + rev = "v${version}"; + sha256 = "0cv4yg2lkmkdhlc3753gnbg1nzldk2kxwdyizwhvanq3ycqban4b"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Secure, private blockchain with smart contracts based on Monero"; + homepage = "https://dero.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux; + }; +} From 90c7ce023f9d51dcff6f6455771c79e8a4eb0ead Mon Sep 17 00:00:00 2001 From: dywedir Date: Sat, 10 Feb 2018 21:55:03 +0200 Subject: [PATCH 764/797] fd: 6.2.0 -> 6.3.0 --- pkgs/tools/misc/fd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 2681d14665c..a18c7838271 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "6.2.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1l1p7jlrryd54jwwrwgvs4njr3r59m8xsh31z7db0bzpw3dk7n5k"; + sha256 = "1q666k7rssjd2cbkm8bm2gsn5shlkh756qpam53kibi5ahrwa7dc"; }; cargoSha256 = "1dikix9d46f0ydi81ray2vdvsy6y326w8ql6c89zx0p9cjm8m83r"; @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/sharkdp/fd"; license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; } From df689d142b04f5bf8958ba585ff850ee44a0f8eb Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 10 Feb 2018 14:03:48 -0600 Subject: [PATCH 765/797] chez-scheme: 9.5-20171109 -> 9.5.1 - Add a new postInstall hook that installs Chez's kernel.o file into the library directory. This library /should/ be installed by Chez, but isn't, and it's the only way to properly embed Chez in your applications or write your own shell/bootfile harness directly. - Fixes the version number for Nix to properly reflect the one Chez shows the user. - Loose odds and ends (fix homepage URL, tidy up comments) Signed-off-by: Austin Seipp --- pkgs/development/compilers/chez/default.nix | 45 +++++++++++++++++---- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index f238e5f8fb5..3ffd024305d 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -2,8 +2,7 @@ stdenv.mkDerivation rec { name = "chez-scheme-${version}"; - version = "9.5-${dver}"; - dver = "20171109"; + version = "9.5.1"; src = fetchgit { url = "https://github.com/cisco/chezscheme.git"; @@ -13,10 +12,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools; - buildInputs = [ ncurses libiconv libX11 ]; - /* We patch out a very annoying 'feature' in ./configure, which + enableParallelBuilding = true; + + /* + ** We patch out a very annoying 'feature' in ./configure, which ** tries to use 'git' to update submodules. ** ** We have to also fix a few occurrences to tools with absolute @@ -38,19 +39,47 @@ stdenv.mkDerivation rec { --replace "/usr/bin/libtool" libtool ''; - /* Don't use configureFlags, since that just implicitly appends + /* + ** Don't use configureFlags, since that just implicitly appends ** everything onto a --prefix flag, which ./configure gets very angry ** about. + ** + ** Also, carefully set a manual workarea argument, so that we + ** can later easily find the machine type that we built Chez + ** for. */ configurePhase = '' - ./configure --threads --installprefix=$out --installman=$out/share/man + ./configure --threads \ + --installprefix=$out --installman=$out/share/man \ + --workarea=work ''; - enableParallelBuilding = true; + /* + ** Install the kernel.o file, so we can compile C applications that + ** link directly to the Chez runtime (for booting their own files, or + ** embedding.) + ** + ** Ideally in the future this would be less of a hack and could be + ** done by Chez itself. Alternatively, there could just be a big + ** case statement matching to the different stdenv.platform values... + */ + postInstall = '' + m="$(ls ./work/boot)" + if [ "x''${m[1]}" != "x" ]; then + >&2 echo "ERROR: more than one bootfile build found; this is a nixpkgs error" + exit 1 + fi + + kernel=./work/boot/$m/kernel.o + kerneldest=$out/lib/csv${version}/$m/ + + echo installing $kernel to $kerneldest + cp $kernel $kerneldest/kernel.o + ''; meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; - homepage = "http://www.scheme.com"; + homepage = https://cisco.github.io/ChezScheme/; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; From b85f2eb36775f20b54ac6d27eec64f088bbddd60 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 10 Feb 2018 21:31:00 +0100 Subject: [PATCH 766/797] android-studio-preview: 3.1.0.9 -> 3.1.0.10 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4cd0553e4d2..725841e47b4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio { pname = "android-studio-preview"; - version = "3.1.0.9"; # "Android Studio 3.1 Beta 1" - build = "173.4567466"; - sha256Hash = "01c6a46pk5zbhwk2w038nm68fkx86nafiw1v2i5rdr93mxvx9cag"; + version = "3.1.0.10"; # "Android Studio 3.1 Beta 2" + build = "173.4580418"; + sha256Hash = "0s56vbyq6b1q75ss6pqvhzwqzb6xbp6841f3y5cwhrch2xalxjkc"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; From 0db25ddac50a3942f9a22e57edbda94e8bff98dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 10 Feb 2018 22:07:08 +0100 Subject: [PATCH 767/797] qmediathekview: set platforms to linux See #34821. --- pkgs/applications/video/qmediathekview/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 9d34ab72f0c..13f93800f6e 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "An alternative Qt-based front-end for the database maintained by the MediathekView project"; inherit (src.meta) homepage; license = licenses.gpl3Plus; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; }; } From 0577bc4832d67e77a9f224c8b04aef1d80c9ed8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2018 01:17:10 +0100 Subject: [PATCH 768/797] pythonPackages.astral: 1.4 -> 1.5 --- pkgs/development/python-modules/astral/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 76dba87f964..c6a3ac47aa7 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -2,12 +2,11 @@ buildPythonPackage rec { pname = "astral"; - version = "1.4"; + version = "1.5"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "1zm1ypc6w279gh7lbgsfbzfxk2x4gihlq3rfh59hj70hmhjwiwp7"; + sha256 = "527628fbfe90c1596c3950ff84ebd07ecc10c8fb1044c903a0519b5057700cb6"; }; propagatedBuildInputs = [ pytz ]; From 6d8c1fe01cd69c9607c62bef76cc895cedf44c39 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 10 Feb 2018 23:37:52 +0200 Subject: [PATCH 769/797] linux: Use concatStringsSep --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d0d90adb8b6..9a9c0e7c1ac 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -236,7 +236,7 @@ let "The Linux kernel" + (if kernelPatches == [] then "" else " (with patches: " - + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches)) + + stdenv.lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"); license = stdenv.lib.licenses.gpl2; homepage = https://www.kernel.org/; From 0ed5ba8a64337e5a0ae09317dd8522a759407a73 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 10 Feb 2018 23:41:02 +0200 Subject: [PATCH 770/797] buildMavenPackage: Use concatStringsSep --- pkgs/development/java-modules/build-maven-package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix index b3c3e1732e0..499b2c65b77 100644 --- a/pkgs/development/java-modules/build-maven-package.nix +++ b/pkgs/development/java-modules/build-maven-package.nix @@ -13,8 +13,8 @@ in stdenv.mkDerivation rec { propagatedBuildInput = [ maven ] ++ flatDeps; - find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; - copy = ''cp -rsfu ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2''; + find = ''find ${concatStringsSep " " (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}''; + copy = ''cp -rsfu ${concatStringsSep " " (map (x: x + "/m2/*") flatDeps)} $out/m2''; phases = [ "unpackPhase" "buildPhase" ]; From a6fd03876efad098006392ae0adebb11077d35aa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 10 Feb 2018 23:47:05 +0200 Subject: [PATCH 771/797] check-meta: Use concatStrings --- pkgs/stdenv/generic/check-meta.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 745ad14bc08..dc5e79fcd4f 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -96,8 +96,7 @@ let '' Known issues: - - '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + '' + '' + (lib.concatStrings (map (issue: " - ${issue}\n") attrs.meta.knownVulnerabilities)) + '' You can install it anyway by whitelisting this package, using the following methods: From b1603e951effe2dd1149d8ade015b757a7fb4c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 10 Feb 2018 23:18:41 +0100 Subject: [PATCH 772/797] home-assistant: make parse-requirements.py detect more packages --- pkgs/servers/home-assistant/parse-requirements.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index aa293921e87..5af794e75fa 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -52,10 +52,16 @@ packages = json.loads(output) def name_to_attr_path(req): attr_paths = [] - pattern = re.compile('python3\\.6-{}-\\d'.format(req), re.I) - for attr_path, package in packages.items(): - if pattern.match(package['name']): - attr_paths.append(attr_path) + names = [req] + # E.g. python-mpd2 is actually called python3.6-mpd2 + # instead of python-3.6-python-mpd2 inside Nixpkgs + if req.startswith('python-'): + names.append(req[len('python-'):]) + for name in names: + pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I) + for attr_path, package in packages.items(): + if pattern.match(package['name']): + attr_paths.append(attr_path) # Let's hope there's only one derivation with a matching name assert(len(attr_paths) <= 1) if attr_paths: @@ -64,6 +70,7 @@ def name_to_attr_path(req): return None version = get_version() +print('Generating component-packages.nix for version {}'.format(version)) requirements = fetch_reqs(version=version) build_inputs = {} for component, reqs in requirements.items(): From 7b616b624096d06e6702e106dcbf926b8bdaf2ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 10 Feb 2018 23:19:19 +0100 Subject: [PATCH 773/797] home-assistant: 0.62.1 -> 0.63 --- .../home-assistant/component-packages.nix | 17 ++++++++++++----- pkgs/servers/home-assistant/default.nix | 18 +++++++++--------- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 679ca2afd43..4903c4db092 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.62.1"; + version = "0.63"; components = { "nuimo_controller" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; @@ -23,7 +23,7 @@ "sensor.dnsip" = ps: with ps; [ aiodns ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "http" = ps: with ps; [ aiohttp-cors ]; - "sensor.imap" = ps: with ps; [ ]; + "sensor.imap" = ps: with ps; [ aioimaplib ]; "light.lifx" = ps: with ps; [ ]; "scene.hunterdouglas_powerview" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; @@ -160,10 +160,11 @@ "media_player.liveboxplaytv" = ps: with ps; [ ]; "lametric" = ps: with ps; [ ]; "notify.lametric" = ps: with ps; [ ]; - "sensor.luftdaten" = ps: with ps; [ ]; + "sensor.luftdaten" = ps: with ps; [ luftdaten ]; "sensor.lyft" = ps: with ps; [ ]; "notify.matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; + "mercedesme" = ps: with ps; [ ]; "notify.message_bird" = ps: with ps; [ ]; "sensor.mfi" = ps: with ps; [ ]; "switch.mfi" = ps: with ps; [ ]; @@ -216,6 +217,7 @@ "light.rpi_gpio_pwm" = ps: with ps; [ ]; "canary" = ps: with ps; [ ]; "sensor.cpuspeed" = ps: with ps; [ ]; + "melissa" = ps: with ps; [ ]; "camera.synology" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; "light.tplink" = ps: with ps; [ ]; @@ -271,6 +273,7 @@ "lutron_caseta" = ps: with ps; [ ]; "lutron" = ps: with ps; [ ]; "notify.mailgun" = ps: with ps; [ ]; + "media_player.mediaroom" = ps: with ps; [ ]; "mochad" = ps: with ps; [ ]; "modbus" = ps: with ps; [ ]; "media_player.monoprice" = ps: with ps; [ ]; @@ -288,12 +291,14 @@ "sensor.otp" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ ]; "weather.openweathermap" = ps: with ps; [ ]; + "sensor.pollen" = ps: with ps; [ ]; "qwikswitch" = ps: with ps; [ ]; "rainbird" = ps: with ps; [ ]; "climate.sensibo" = ps: with ps; [ ]; "sensor.serial" = ps: with ps; [ ]; "switch.acer_projector" = ps: with ps; [ pyserial ]; "lock.sesame" = ps: with ps; [ ]; + "goalfeed" = ps: with ps; [ ]; "sensor.sma" = ps: with ps; [ ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ]; "sensor.snmp" = ps: with ps; [ pysnmp ]; @@ -316,9 +321,10 @@ "lirc" = ps: with ps; [ ]; "fan.xiaomi_miio" = ps: with ps; [ ]; "light.xiaomi_miio" = ps: with ps; [ ]; + "remote.xiaomi_miio" = ps: with ps; [ ]; "switch.xiaomi_miio" = ps: with ps; [ ]; "vacuum.xiaomi_miio" = ps: with ps; [ ]; - "media_player.mpd" = ps: with ps; [ ]; + "media_player.mpd" = ps: with ps; [ mpd2 ]; "light.mystrom" = ps: with ps; [ ]; "switch.mystrom" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; @@ -329,7 +335,7 @@ "sensor.sochain" = ps: with ps; [ ]; "sensor.synologydsm" = ps: with ps; [ ]; "tado" = ps: with ps; [ ]; - "telegram_bot" = ps: with ps; [ ]; + "telegram_bot" = ps: with ps; [ python-telegram-bot ]; "sensor.twitch" = ps: with ps; [ ]; "velbus" = ps: with ps; [ ]; "media_player.vlc" = ps: with ps; [ ]; @@ -380,6 +386,7 @@ "media_player.snapcast" = ps: with ps; [ ]; "sensor.speedtest" = ps: with ps; [ ]; "recorder" = ps: with ps; [ sqlalchemy ]; + "sensor.sql" = ps: with ps; [ sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "sensor.steam_online" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index eed800fa7d3..cafb84e333a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 +{ lib, fetchFromGitHub, python3 , extraComponents ? [] , extraPackages ? ps: [] , skipPip ? true }: @@ -8,17 +8,17 @@ let py = python3.override { packageOverrides = self: super: { yarl = super.yarl.overridePythonAttrs (oldAttrs: rec { - version = "0.18.0"; + version = "1.1.0"; src = oldAttrs.src.override { inherit version; - sha256 = "11j8symkxh0ngvpddqpj85qmk6p70p20jca3alxc181gk3vx785s"; + sha256 = "162630v7f98l27h11msk9416lqwm2mpgxh4s636594nlbfs9by3a"; }; }); aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "2.3.7"; + version = "2.3.10"; src = oldAttrs.src.override { inherit version; - sha256 = "0fzfpx5ny7559xrxaawnylq20dvrkjiag0ypcd13frwwivrlsagy"; + sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; }; }); pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { @@ -44,7 +44,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.62.1"; + hassVersion = "0.63"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -57,7 +57,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0151prwk2ci6bih0mdmc3r328nrvazn9jwk0w26wmd4cpvnb5h26"; + sha256 = "0gfdhjydl619jpnflnig5hzglib9385hdk5vw5pris0ksqk27mfk"; }; propagatedBuildInputs = [ @@ -80,9 +80,9 @@ in with py.pkgs; buildPythonApplication rec { tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py ''; - makeWrapperArgs = [] ++ stdenv.lib.optional skipPip [ "--add-flags --skip-pip" ]; + makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://home-assistant.io/; description = "Open-source home automation platform running on Python 3"; license = licenses.asl20; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 6e1a789012f..018405f578d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180130.0"; + version = "20180209.0"; src = fetchPypi { inherit pname version; - sha256 = "0b9klisl7hh30rml8qlrp9gpz33z9b825pd1vxbck48k0s98z1zi"; + sha256 = "b85f0e833871408a95619ae38d5344701a6466e8f7b5530e718ccc260b68d3ed"; }; } From 97ee203a2264f798a36c6d52710e02f62c6b5e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 10 Feb 2018 23:28:30 +0100 Subject: [PATCH 774/797] eudev: 3.2.4 -> 3.2.5 --- pkgs/os-specific/linux/eudev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 67ce39ddbd3..0ca85c7e50b 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.4"; + version = "3.2.5"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "1vbg2k5mngyxdcdw4jkkzxbwdgrcr643hkby1whz7x91kg4g9p6x"; + sha256 = "1bwh72brp4dvr2dm6ng0lflic6abl87h8zk209im5lna0m0x1hj9"; }; nativeBuildInputs = [ pkgconfig ]; From 97982f264af99367030152d5fc6bb2b1a8b15905 Mon Sep 17 00:00:00 2001 From: Valentin Heidelberger Date: Sun, 11 Feb 2018 00:01:48 +0100 Subject: [PATCH 775/797] pythonPackages.pynacl: 0.3.0 -> 1.2.1 --- lib/maintainers.nix | 1 + .../python-modules/pynacl/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------- 3 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pynacl/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ba5ee757a7c..39e0d544623 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -702,6 +702,7 @@ utdemir = "Utku Demir "; #urkud = "Yury G. Kudryashov "; inactive since 2012 uwap = "uwap "; + va1entin = "Valentin Heidelberger "; vaibhavsagar = "Vaibhav Sagar "; valeriangalliat = "Valérian Galliat "; vandenoever = "Jos van den Oever "; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix new file mode 100644 index 00000000000..249945b0358 --- /dev/null +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}: + +buildPythonPackage rec { + pname = "pynacl"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "pyca"; + repo = pname; + rev = version; + sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f"; + }; + + #remove deadline from tests, see https://github.com/pyca/pynacl/issues/370 + prePatch = '' + sed -i 's/deadline=1500, //' tests/test_pwhash.py + sed -i 's/deadline=1500, //' tests/test_aead.py + ''; + + checkInputs = [ pytest coverage hypothesis ]; + propagatedBuildInputs = [ libsodium cffi six ]; + + checkPhase = '' + coverage run --source nacl --branch -m pytest + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ va1entin ]; + description = "Python binding to the Networking and Cryptography (NaCl) library"; + homepage = https://github.com/pyca/pynacl/; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9b0a61d884..0eda59ceac2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20342,23 +20342,7 @@ EOF propagatedBuildInputs = with self; [ pynacl six ]; }; - pynacl = buildPythonPackage rec { - name = "pynacl-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyNaCl/PyNaCl-0.3.0.tar.gz"; - sha256 = "1hknxlp3a3f8njn19w92p8nhzl9jkfwzhv5fmxhmyq2m8hqrfj8j"; - }; - - buildInputs = with self; [ pytest coverage ]; - propagatedBuildInputs = with self; [pkgs.libsodium six cffi pycparser]; - - checkPhase = '' - coverage run --source nacl --branch -m pytest - ''; - - }; + pynacl = callPackage ../development/python-modules/pynacl { }; service-identity = callPackage ../development/python-modules/service_identity { }; From 389a130e6df3ef4e918e1fea7e4026c2584c1290 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 10 Feb 2018 22:34:36 -0800 Subject: [PATCH 776/797] mpi4py: disable test_spawn.py test_spawn.py fails when build with openmpi-3.0.0 in a sandboxed environment. --- pkgs/development/python-modules/mpi4py/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 9329d386099..d4750f252ad 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -14,6 +14,12 @@ buildPythonPackage rec { inherit mpi; }; + postPatch = '' + substituteInPlace test/test_spawn.py --replace \ + "unittest.skipMPI('openmpi(<3.0.0)')" \ + "unittest.skipMPI('openmpi')" + ''; + configurePhase = ""; installPhase = '' From 45b9cf26592f84a33a4b0995913d9a9ffaf363c8 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 9 Jan 2018 11:34:35 +0100 Subject: [PATCH 777/797] =?UTF-8?q?pythonPackages.celery:=204.0.2=C2=A0->?= =?UTF-8?q?=204.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/celery/default.nix | 30 ++++++++++++++++ ...ix_endless_python3.6_loop_logger_isa.patch | 18 ---------- pkgs/top-level/python-packages.nix | 34 +------------------ 3 files changed, 31 insertions(+), 51 deletions(-) create mode 100644 pkgs/development/python-modules/celery/default.nix delete mode 100644 pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix new file mode 100644 index 00000000000..44613dd4e5b --- /dev/null +++ b/pkgs/development/python-modules/celery/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect, + pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet +}: +buildPythonPackage rec { + pname = "celery"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dcb0s6kdcd3vc9pwvazngppkdbhwpmpjmghq6rifsld34q3gzvp"; + }; + + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox + preCheck = '' + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ + LD_PRELOAD=${libredirect}/lib/libredirect.so + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + + buildInputs = [ pytest case ]; + propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; + + meta = with stdenv.lib; { + homepage = https://github.com/celery/celery/; + description = "Distributed task queue"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch deleted file mode 100644 index 27caa80dd4c..00000000000 --- a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix endless loop in logger_isa (Python 3.6) -Author: George Psarakis -Origin: upstream, https://github.com/celery/celery/commit/9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad -Forwarded: not-needed -Reviewed-By: Nishanth Aravamudan -Last-Update: 2017-06-12 - ---- celery-4.0.2.orig/celery/utils/log.py -+++ celery-4.0.2/celery/utils/log.py -@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000): - else: - if this in seen: - raise RuntimeError( -- 'Logger {0!r} parents recursive'.format(l), -+ 'Logger {0!r} parents recursive'.format(l.name), - ) - seen.add(this) - this = this.parent diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50b964af6ef..cad5b6146cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2231,39 +2231,7 @@ in { ''; }; - celery = buildPythonPackage rec { - name = "celery-${version}"; - version = "4.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/celery/${name}.tar.gz"; - sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3"; - }; - - # Fixes testsuite for python-3.6 - # From ubuntu packaging: https://launchpad.net/ubuntu/+archive/primary/+files/celery_4.0.2-0ubuntu1.debian.tar.xz - # (linked from https://launchpad.net/ubuntu/+source/celery) - # https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream - patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ]; - - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox - preCheck = '' - export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ - LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so - ''; - postCheck = '' - unset NIX_REDIRECTS LD_PRELOAD - ''; - - buildInputs = with self; [ pytest case ]; - propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; - - meta = { - homepage = https://github.com/celery/celery/; - description = "Distributed task queue"; - license = licenses.bsd3; - }; - }; + celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; }; cerberus = buildPythonPackage rec { name = "Cerberus-${version}"; From 89467cf1443e06fa8df452be32d41d46acca63ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 11 Feb 2018 09:06:31 +0100 Subject: [PATCH 778/797] python.pkgs.pytest_32: init at 3.2.5 Bring it back as it is needed. --- pkgs/top-level/python-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cad5b6146cd..5c8ac62770b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3136,6 +3136,15 @@ in { }; }; + # Needed for celery + pytest_32 = self.pytest_34.overrideAttrs( oldAttrs: rec { + version = "3.2.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + }; + }); + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; From ad7ab4344865b2fb3cd00aea2b949f543c1dd7f6 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 2 Sep 2017 19:00:14 +0100 Subject: [PATCH 779/797] pythonPackages.weboob: 1.1 -> 1.3 --- .../python-modules/weboob/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +--------- 2 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/weboob/default.nix diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix new file mode 100644 index 00000000000..b71e4d3a4ff --- /dev/null +++ b/pkgs/development/python-modules/weboob/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage, fetchurl, stdenv, isPy27 +, nose, pillow, prettytable, pyyaml, dateutil, gdata +, requests, mechanize, feedparser, lxml, gnupg, pyqt5 +, libyaml, simplejson, cssselect, futures, pdfminer +, termcolor, google_api_python_client, html2text +, unidecode +}: + +buildPythonPackage rec { + pname = "weboob"; + version = "1.3"; + disabled = ! isPy27; + + src = fetchurl { + url = "https://symlink.me/attachments/download/356/${pname}-${version}.tar.gz"; + sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9"; + }; + + setupPyBuildFlags = ["--qt" "--xdg"]; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ pillow prettytable pyyaml dateutil + gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml + simplejson cssselect futures pdfminer termcolor google_api_python_client + html2text unidecode ]; + + checkPhase = '' + nosetests + ''; + + meta = { + homepage = http://weboob.org; + description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; + license = stdenv.lib.licenses.agpl3; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c8ac62770b..66ccc6b3b34 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20097,26 +20097,7 @@ EOF }; }; - weboob = buildPythonPackage rec { - name = "weboob-1.1"; - disabled = ! isPy27; - - src = pkgs.fetchurl { - url = "https://symlink.me/attachments/download/324/${name}.tar.gz"; - sha256 = "0736c5wsck2abxlwvx8i4496kafk9xchkkzhg4dcfbj0isldih6b"; - }; - - setupPyBuildFlags = ["--qt" "--xdg"]; - - propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures pdfminer termcolor ]; - - meta = { - homepage = http://weboob.org; - description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; - license = licenses.agpl3; - maintainers = with maintainers; [ ]; - }; - }; + weboob = callPackage ../development/python-modules/weboob { }; datadiff = buildPythonPackage rec { name = "datadiff-1.1.6"; From 4da3c294f64b07e257c57921032ab05c1b20b096 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Tue, 9 Jan 2018 12:59:33 -0600 Subject: [PATCH 780/797] platformio-fhs: minor changes --- .../arduino/platformio/chrootenv.nix | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index a3720619241..69182c3aa0d 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -1,26 +1,21 @@ -{ lib, buildFHSUserEnv, platformio, stdenv }: - +{ stdenv, lib, buildFHSUserEnv +}: +let + pio-pkgs = pkgs: (with pkgs; + [ + python27Packages.python + python27Packages.setuptools + python27Packages.pip + python27Packages.bottle + python27Packages.platformio + zlib + ]); +in buildFHSUserEnv { name = "platformio"; - targetPkgs = pkgs: (with pkgs; - [ - python27Packages.python - python27Packages.setuptools - python27Packages.pip - python27Packages.bottle - python27Packages.platformio - zlib - ]); - multiPkgs = pkgs: (with pkgs; - [ - python27Packages.python - python27Packages.setuptools - python27Packages.pip - python27Packages.bottle - python27Packages.platformio - zlib - ]); + targetPkgs = pio-pkgs; + multiPkgs = pio-pkgs; meta = with stdenv.lib; { description = "An open source ecosystem for IoT development"; From 677aa175a79c9e7cd07a9444e0a3740c7c16d30b Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Tue, 9 Jan 2018 17:27:40 -0600 Subject: [PATCH 781/797] platformio-python: add git --- pkgs/development/python-modules/platformio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/platformio/default.nix b/pkgs/development/python-modules/platformio/default.nix index 6ac9b7eacfc..01d47b45860 100644 --- a/pkgs/development/python-modules/platformio/default.nix +++ b/pkgs/development/python-modules/platformio/default.nix @@ -3,6 +3,7 @@ , lockfile, pyserial, requests , semantic-version , isPy3k, isPyPy +, git }: buildPythonPackage rec { disabled = isPy3k || isPyPy; @@ -17,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - bottle click_5 colorama lockfile + bottle click_5 colorama git lockfile pyserial requests semantic-version ]; From 0e2ec65b0a78df49aef3db08d209340e32d8e757 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 11 Feb 2018 10:30:32 +0100 Subject: [PATCH 782/797] perl-Cpanel-JSON-XS: 4.00 -> 4.01 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e078cb09b29..cbb730363ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2544,10 +2544,10 @@ let self = _self // overrides; _self = with self; { }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.00"; + name = "Cpanel-JSON-XS-4.01"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "4dedf770cab3009b08bca108266b941097ae1c55c674c500e3145e2f23a628ac"; + sha256 = "c8cfd32a8a9508ab7f280452428582c3e46d0bed4ea863c3ec27c34f6920de60"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; From 2e7e318ffd1b223ce2543fde345b03bbf2fbd7a6 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Feb 2018 12:00:21 +0100 Subject: [PATCH 783/797] unibilium: 1.2.1 -> 2.0.0 --- pkgs/development/libraries/unibilium/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 53207f85541..7c92e7224f9 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl }: stdenv.mkDerivation rec { name = "unibilium-${version}"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mauke"; repo = "unibilium"; rev = "v${version}"; - sha256 = "11mbfijdrvbmdlmxs8j4vij78ki0vna89yg3r9n9g1i6j45hiq2r"; + sha256 = "1wa9a32wzqnxqh1jh554afj13dzjr6mw2wzqzw8d08nza9pg2ra2"; }; makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ libtool ]; meta = with lib; { From 2d6d52b60c3cddfbe2b8fac1ceb221ff53f8ef4f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Feb 2018 12:02:27 +0100 Subject: [PATCH 784/797] icmake: 9.02.04 -> 9.02.06 --- pkgs/development/tools/build-managers/icmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 2744dac2500..5b455f267d8 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.02.04"; + version = "9.02.06"; src = fetchFromGitHub { - sha256 = "0dkqdm7nc3l9kgwkkf545hfbxj7ibkxl7n49wz9m1rcq9pvpmrw3"; + sha256 = "1hs7fhqpkhlrjvjhfarf5bmxl8dw3r0immzdib27gwh3sfzgpx0b"; rev = version; repo = "icmake"; owner = "fbb-git"; From 63c97b946eeae6b33c3c238a1ccc4aea1cc54293 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Feb 2018 13:21:48 +0100 Subject: [PATCH 785/797] udunits: 2.2.24 -> 2.2.26 --- pkgs/development/libraries/udunits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index b8ffc16f905..b02ac885237 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "udunits-2.2.24"; + name = "udunits-2.2.26"; src = fetchurl { url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; - sha256 = "15bz2wv46wiwdzai8770gzy05prgj120x6j2hmihavv5y89cbfi0"; + sha256 = "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn"; }; nativeBuildInputs = [ bison flex file ]; From b0047a527c7fe700cc3a9710fe4da1c50c74ca6f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 11 Feb 2018 13:29:43 +0100 Subject: [PATCH 786/797] fswatch: 1.9.3 -> 1.11.2 --- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index cdddad5155f..2b26383ed31 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "fswatch-${version}"; - version = "1.9.3"; + version = "1.11.2"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "1g329aapdvbzhr39wyh295shpfq5f0nlzsqkjnr8l6zzak7f4yrg"; + sha256 = "05vgpd1fx9fy3vnnmq5gz236avgva82axix127xy98gaxrac52vq"; }; nativeBuildInputs = [ autoreconfHook ]; From 026719f5c243500e44cb183ccef37e9a26db2f89 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 11 Feb 2018 14:25:34 +0100 Subject: [PATCH 787/797] teamspeak_client: restrict platforms to i686 & x86_64 linux --- .../networking/instant-messengers/teamspeak/client.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 5ab2923e992..ea2030e964b 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { free = false; }; maintainers = [ stdenv.lib.maintainers.lhvwb ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } From eb3611a8f33a39e14b40a63c031ea0bc3e70f8d3 Mon Sep 17 00:00:00 2001 From: Ivan Solyankin Date: Sun, 11 Feb 2018 13:15:28 +0300 Subject: [PATCH 788/797] pythonPackages.i3ipc: init at 1.4.0 closes #34828 --- .../python-modules/i3ipc/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/i3ipc/default.nix diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix new file mode 100644 index 00000000000..492c4da6fcc --- /dev/null +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, enum-compat +, xorgserver, pytest, i3, python +}: + +buildPythonPackage rec { + pname = "i3ipc"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "acrisci"; + repo = "i3ipc-python"; + rev = "v${version}"; + sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh"; + }; + + propagatedBuildInputs = [ enum-compat ]; + + checkInputs = [ xorgserver pytest i3 ]; + + checkPhase = ''${python.interpreter} run-tests.py''; + + meta = with stdenv.lib; { + description = "An improved Python library to control i3wm"; + homepage = https://github.com/acrisci/i3ipc-python; + license = licenses.bsd3; + maintainers = with maintainers; [ vanzef ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 515759d3e47..f4660ec89f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -243,6 +243,8 @@ in { habanero = callPackage ../development/python-modules/habanero { }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; + intelhex = callPackage ../development/python-modules/intelhex { }; lmtpd = callPackage ../development/python-modules/lmtpd { }; From 8ea7a302bd8c35c60ddc4cfe62c25503dc316762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 7 Feb 2018 18:59:10 +0100 Subject: [PATCH 789/797] make-fonts-cache: remove CACHEDIR.TAG file from Nix store A CACHEDIR.TAG file indicates that the contents can be automatically re-generated. This is not really true for Nix store paths. (Well _Nix_ can recreate them, but that's different.) I noticed this issue as I was restoring full system backup that "for some reason" always missed /nix/store/*-fc-cache (found by `nix-store --verify --repair`). Turns out I was excluding caches from my backup... --- pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 9aa1a905ec9..8b534edd249 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -24,4 +24,8 @@ runCommand "fc-cache" mkdir -p $out fc-cache -sv + + # This is not a cache dir in the normal sense -- it won't be automatically + # recreated. + rm "$out/CACHEDIR.TAG" '' From 92d68b0656043957dc131962a78d0d515788758b Mon Sep 17 00:00:00 2001 From: Valentin Heidelberger Date: Sun, 11 Feb 2018 16:10:37 +0100 Subject: [PATCH 790/797] pythonPackages.pynacl: fix tests --- pkgs/development/python-modules/pynacl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 249945b0358..c23a90c095b 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; #remove deadline from tests, see https://github.com/pyca/pynacl/issues/370 - prePatch = '' + preCheck = '' sed -i 's/deadline=1500, //' tests/test_pwhash.py sed -i 's/deadline=1500, //' tests/test_aead.py ''; From 559047c67f2b7c0c135cc14197a71fa8e35d6839 Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sun, 11 Feb 2018 16:14:54 +0100 Subject: [PATCH 791/797] Adds Jesper as maintainer :) --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9ff2d53b466..f41b4560b5b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -757,6 +757,7 @@ y0no = "Yoann Ono "; yarr = "Dmitry V. "; yegortimoshenko = "Yegor Timoshenko "; + yesbox = "Jesper Geertsen Jonsson "; ylwghst = "Burim Augustin Berisa "; yochai = "Yochai "; yorickvp = "Yorick van Pelt "; From 4cb393cf12e53a0a1a9a6b5693616a0e9c30d81f Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sun, 11 Feb 2018 16:16:00 +0100 Subject: [PATCH 792/797] Adds license "BSD Zero Clause License" --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 0086bd63ebd..70f4571423e 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -79,6 +79,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = ''Beerware License''; }; + bsd0 = spdx { + spdxId = "0BSD"; + fullName = "BSD Zero Clause License"; + }; + bsd2 = spdx { spdxId = "BSD-2-Clause"; fullName = ''BSD 2-clause "Simplified" License''; From 0312fe48825019669c69251f004426cfd3defdce Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sun, 11 Feb 2018 16:16:46 +0100 Subject: [PATCH 793/797] bfs: init at 1.2.1 --- pkgs/tools/system/bfs/default.nix | 38 +++++++++++++++++++++++++++++++ pkgs/tools/system/bfs/tests.patch | 10 ++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/tools/system/bfs/default.nix create mode 100644 pkgs/tools/system/bfs/tests.patch diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix new file mode 100644 index 00000000000..2e4133124c1 --- /dev/null +++ b/pkgs/tools/system/bfs/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, bash }: + +stdenv.mkDerivation rec { + name = "bfs-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + repo = "bfs"; + owner = "tavianator"; + rev = version; + sha256 = "1dgc31l5d20i0v78c51xga4lr78b5x8dz6yzsvbhlgs0abi0nynx"; + }; + + # Disable fstype test, tries to read /etc/mtab + patches = [ ./tests.patch ]; + postPatch = '' + # Patch tests (both shebangs and usage in scripts) + for f in $(find -type f -name '*.sh'); do + substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" + done + ''; + doCheck = true; + + makeFlags = [ "PREFIX=$(out)" ]; + buildFlags = [ "release" ]; # "release" enables compiler optimizations + + meta = with stdenv.lib; { + description = "A breadth-first version of the UNIX find command"; + longDescription = '' + bfs is a variant of the UNIX find command that operates breadth-first rather than + depth-first. It is otherwise intended to be compatible with many versions of find. + ''; + homepage = https://github.com/tavianator/bfs; + license = licenses.bsd0; + platforms = platforms.linux; + maintainers = with maintainers; [ yesbox ]; + }; +} diff --git a/pkgs/tools/system/bfs/tests.patch b/pkgs/tools/system/bfs/tests.patch new file mode 100644 index 00000000000..a30291d7095 --- /dev/null +++ b/pkgs/tools/system/bfs/tests.patch @@ -0,0 +1,10 @@ +--- a/tests.sh ++++ b/tests.sh +@@ -369,7 +369,6 @@ + test_printf_nul + test_quit_after_print + test_quit_before_print +- test_fstype + test_not + test_and + test_or diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92f81ee2861..82f7450af3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1390,6 +1390,8 @@ with pkgs; bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; + bfs = callPackage ../tools/system/bfs { }; + bgs = callPackage ../tools/X11/bgs { }; biber = callPackage ../tools/typesetting/biber { From 600d0afc4f4a5f1558a46d14718864bf38f79a03 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sun, 11 Feb 2018 16:42:43 +0000 Subject: [PATCH 794/797] pythonPackages.aioconsole: init at 0.1.7 --- .../python-modules/aioconsole/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/aioconsole/default.nix diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix new file mode 100644 index 00000000000..b865b565496 --- /dev/null +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi }: + +# This package provides a binary "apython" which sometimes invokes +# [sys.executable, '-m', 'aioconsole'] as a subprocess. If apython is +# run directly out of this derivation, it won't work, because +# sys.executable will point to a Python binary that is not wrapped to +# be able to find aioconsole. +# However, apython will work fine when using python##.withPackages, +# because with python##.withPackages the sys.executable is already +# wrapped to be able to find aioconsole and any other packages. +buildPythonPackage rec { + pname = "aioconsole"; + version = "0.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "17bnfcp0gacnmpdam6byb7rwhqibw57f736bbgk45w4cy2lglj3y"; + }; + + # hardcodes a test dependency on an old version of pytest-asyncio + doCheck = false; + + meta = { + description = "Asynchronous console and interfaces for asyncio"; + homepage = https://github.com/vxgmichel/aioconsole; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.catern ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4660ec89f4..8673be1a7a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -418,6 +418,8 @@ in { adal = callPackage ../development/python-modules/adal { }; + aioconsole = callPackage ../development/python-modules/aioconsole { }; + aiodns = callPackage ../development/python-modules/aiodns { }; aiofiles = callPackage ../development/python-modules/aiofiles { }; From 63a4cbfb4308e54f316846ef7a7725522516850a Mon Sep 17 00:00:00 2001 From: Olivier Bourdoux Date: Sun, 11 Feb 2018 18:34:40 +0100 Subject: [PATCH 795/797] postman: init at 5.5.2 --- lib/licenses.nix | 6 ++ pkgs/development/web/postman/default.nix | 89 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 97 insertions(+) create mode 100644 pkgs/development/web/postman/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index 0086bd63ebd..2b84d7d7462 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -482,6 +482,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "PostgreSQL License"; }; + postman = { + fullName = "Postman EULA"; + url = https://www.getpostman.com/licenses/postman_base_app; + free = false; + }; + psfl = spdx { spdxId = "Python-2.0"; fullName = "Python Software Foundation License version 2"; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix new file mode 100644 index 00000000000..605e5de0311 --- /dev/null +++ b/pkgs/development/web/postman/default.nix @@ -0,0 +1,89 @@ +{ stdenv, lib, gnome2, fetchurl, pkgs, xlibs, udev, makeWrapper, makeDesktopItem }: + +stdenv.mkDerivation rec { + name = "postman-${version}"; + version = "5.5.2"; + + src = fetchurl { + url = "https://dl.pstmn.io/download/version/${version}/linux64"; + sha1 = "68886197A8375E860AB880547838FEFC9E12FC64"; + name = "${name}.tar.gz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontPatchELF = true; + + buildPhase = ":"; # nothing to build + + desktopItem = makeDesktopItem { + name = "postman"; + exec = "postman"; + icon = "$out/share/postman/resources/app/assets/icon.png"; + comment = "API Development Environment"; + desktopName = "Postman"; + genericName = "Postman"; + categories = "Application;Development;"; + }; + + installPhase = '' + mkdir -p $out/share/postman + mkdir -p $out/share/applications + cp -R * $out/share/postman + mkdir -p $out/bin + ln -s $out/share/postman/Postman $out/bin/postman + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + ''; + + preFixup = let + libPath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + gnome2.pango + gnome2.GConf + pkgs.atk + pkgs.alsaLib + pkgs.cairo + pkgs.cups + pkgs.dbus_daemon.lib + pkgs.expat + pkgs.gdk_pixbuf + pkgs.glib + pkgs.gtk2-x11 + pkgs.freetype + pkgs.fontconfig + pkgs.nss + pkgs.nspr + pkgs.udev.lib + xlibs.libX11 + xlibs.libxcb + xlibs.libXi + xlibs.libXcursor + xlibs.libXdamage + xlibs.libXrandr + xlibs.libXcomposite + xlibs.libXext + xlibs.libXfixes + xlibs.libXrender + xlibs.libX11 + xlibs.libXtst + xlibs.libXScrnSaver + ]; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:$out/share/postman" \ + $out/share/postman/Postman + patchelf --set-rpath "${libPath}" $out/share/postman/libnode.so + patchelf --set-rpath "${libPath}" $out/share/postman/libffmpeg.so + + wrapProgram $out/share/postman/Postman --prefix LD_LIBRARY_PATH : ${libPath} + ''; + + meta = with stdenv.lib; { + homepage = https://www.getpostman.com; + description = "API Development Environment"; + license = stdenv.lib.licenses.postman; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04242396408..aa95093f2f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7835,6 +7835,8 @@ with pkgs; postiats-utilities = callPackage ../development/tools/postiats-utilities {}; + postman = callPackage ../development/web/postman {}; + pprof = callPackage ../development/tools/profiling/pprof { }; pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; From ae040525d8aa01e81ffd1d1c97c908a6e63c819f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 11 Feb 2018 18:38:06 +0100 Subject: [PATCH 796/797] linux-*: build with gcc7, but allow overriding it I expect we will revert this after general upgrade to gcc7. See https://github.com/NixOS/nixpkgs/issues/34383 --- pkgs/os-specific/linux/kernel/generic.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index ebd889d1a99..0bed93d76ed 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -4,10 +4,15 @@ , utillinux , writeTextFile, ubootTools , callPackage +, overrideCC, gcc7 }: { stdenv, buildPackages, perl, buildLinux +, # Allow really overriding even our gcc7 default. + # We want gcc >= 7.3 to enable the "retpoline" mitigation of security problems. + stdenvNoOverride ? overrideCC stdenv gcc7 + , # The kernel source tarball. src @@ -32,12 +37,14 @@ # optionally be compressed with gzip or bzip2. kernelPatches ? [] , ignoreConfigErrors ? hostPlatform.platform.name != "pc" || - hostPlatform != stdenv.buildPlatform + hostPlatform != stdenvNoOverride.buildPlatform , extraMeta ? {} , hostPlatform , ... } @ args: +let stdenv = stdenvNoOverride; in # finish the rename + assert stdenv.isLinux; let From 169216fe143ffa408ff0bc024d9171be25e379f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 11 Feb 2018 11:58:08 +0100 Subject: [PATCH 797/797] linuxPackages: build by kernel's stdenv --- pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 9a9c0e7c1ac..6210f5f79f3 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -82,7 +82,8 @@ let (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = { - inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies; + inherit version modDirVersion config kernelPatches configfile + moduleBuildDependencies stdenv; }; inherit src; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c68991e0d06..1fcd58add10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13052,6 +13052,7 @@ with pkgs; callPackage = newScope self; inherit kernel; + inherit (kernel) stdenv; # in particular, use the same compiler by default acpi_call = callPackage ../os-specific/linux/acpi-call {};