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 001/373] 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 002/373] 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 003/373] 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 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 004/373] 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 31eedb3084fa1f73fb2262222edfd8a6e157a33e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 11 Jan 2018 11:17:18 +0100 Subject: [PATCH 005/373] 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 438452f07a6df2b93e0e186cea51f059a54dd5cc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jan 2018 09:15:47 -0500 Subject: [PATCH 006/373] docker-edge: 17.12.0 -> 18.01.0 --- pkgs/applications/virtualization/docker/default.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c4c0adbb9bf..ed7741b5522 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -215,4 +215,16 @@ rec { tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; 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"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 910afc8ac69..f2e565032e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14523,10 +14523,11 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_12; + docker_17_12 + docker_18_01; docker = docker_17_12; - docker-edge = docker_17_12; + docker-edge = docker_18_01; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; From 8c0558dbb2469b7799515abd108d2fa4adbc4636 Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sun, 14 Jan 2018 18:15:46 +0100 Subject: [PATCH 007/373] 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 c946c101d6dad31897c13a6ba3d6ff75ade1c81d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 15 Jan 2018 12:10:23 +0100 Subject: [PATCH 008/373] 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 009/373] 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 010/373] 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 011/373] 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 012/373] 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 e44038bccab0cae96a93fa517a9acaab9c81a6d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jan 2018 15:08:27 +0100 Subject: [PATCH 013/373] 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 11:01:47 +0100 Subject: [PATCH 014/373] 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 015/373] 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 016/373] 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 017/373] 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 018/373] 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 019/373] 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 020/373] 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 9d82bf2e0ecf9b40d1920d988740f9b3f775bf51 Mon Sep 17 00:00:00 2001 From: Keith Amidon Date: Sun, 21 Jan 2018 17:38:12 -0800 Subject: [PATCH 021/373] 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 022/373] 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 023/373] 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 024/373] 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 025/373] 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 026/373] 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 027/373] 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 028/373] 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 029/373] 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 030/373] 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 031/373] 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 032/373] 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 033/373] 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 034/373] 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 035/373] 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 036/373] 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 037/373] 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 038/373] 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 039/373] 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 040/373] 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 041/373] 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 042/373] 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 043/373] 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 044/373] 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 045/373] 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 046/373] 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 047/373] 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 048/373] 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 049/373] 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 050/373] 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 051/373] 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 052/373] 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 053/373] 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 a6bb22853afad5b7168332a2f2b54989044a2d74 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jan 2018 14:00:02 +0100 Subject: [PATCH 054/373] 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 055/373] 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 056/373] 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 057/373] 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 058/373] 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 059/373] 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 060/373] 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 061/373] 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 062/373] 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 063/373] 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 064/373] 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 065/373] 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 066/373] 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 067/373] 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 068/373] 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 069/373] 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 070/373] 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 071/373] 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 ba12a867f7d57e60466a9715be402fb56e861749 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Thu, 25 Jan 2018 16:46:12 +0100 Subject: [PATCH 072/373] 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 9abc4a550f105db6fdf1ddfc6928eba3f5f2171c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 25 Jan 2018 14:28:56 +0100 Subject: [PATCH 073/373] hplip: Fixes runtime errors The following errors are fixed: - pyqt4 not found - hpasio for sane not found --- pkgs/misc/drivers/hplip/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 9897345b88a..f8f8d16d142 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -78,12 +78,12 @@ pythonPackages.buildPythonApplication { prePatch = '' # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ - -e s,/etc/hp,$out/etc/hp, \ - -e s,/etc/sane.d,$out/etc/sane.d, \ - -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0, \ - -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \ - -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ - -e s,/var/lib/hp,$out/var/lib/hp, \ + -e s,/etc/hp,$out/etc/hp,g \ + -e s,/etc/sane.d,$out/etc/sane.d,g \ + -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0,g \ + -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor,g \ + -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \ + -e s,/var/lib/hp,$out/var/lib/hp,g \ {} + ''; @@ -96,6 +96,8 @@ pythonPackages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit + --disable-qt4 + ${stdenv.lib.optionals withQt5 "--enable-qt5"} " export makeFlags=" @@ -140,9 +142,6 @@ pythonPackages.buildPythonApplication { mkdir -p $out/var/lib/hp cp ${hplipState} $out/var/lib/hp/hplip.state - mkdir -p $out/etc/sane.d/dll.d - mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf - rm $out/etc/udev/rules.d/56-hpmud.rules ''; From 9d196ef641b9d5c83972021eca90b05d57ef395e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Jan 2018 03:33:19 +0100 Subject: [PATCH 074/373] pythonPackages.colorlog: 2.6.1 -> 3.1.2 --- .../python-modules/colorlog/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/colorlog/default.nix diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix new file mode 100644 index 00000000000..e737b884897 --- /dev/null +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "colorlog"; + version = "3.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i21sd6pggr2gqza41vyq2rqyb552wf5iwl4bc16i7kqislbd53z"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test -p no:logging + ''; + + meta = with stdenv.lib; { + description = "Log formatting with colors"; + homepage = https://github.com/borntyping/python-colorlog; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e45418fba46..e6d825030cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1397,24 +1397,7 @@ in { }; }; - colorlog = buildPythonPackage rec { - name = "colorlog-${version}"; - version = "2.6.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/colorlog/${name}.tar.gz"; - sha256 = "0djv6ky1yk28s1l093w8plg19kp88q4nyrm1vfxyq0s9j4pix29l"; - }; - - # No tests included - doCheck = false; - - meta = { - description = "Log formatting with colors"; - homepage = https://github.com/borntyping/python-colorlog; - license = licenses.free; # BSD-like - }; - }; + colorlog = callPackage ../development/python-modules/colorlog { }; colour = buildPythonPackage rec { name = "${pname}-${version}"; From d2e83e6357995966f014d45b2b2539a5a48c3bbb Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 16 Dec 2017 22:57:13 -0500 Subject: [PATCH 075/373] 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 076/373] 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 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 077/373] 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 2474e6e212accb9901e8d08bd90681a18183eff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 27 Jan 2018 09:33:18 +0100 Subject: [PATCH 078/373] pythonPackages.transitions: init at 0.6.4 --- .../python-modules/transitions/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/transitions/default.nix diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix new file mode 100644 index 00000000000..edf13782b07 --- /dev/null +++ b/pkgs/development/python-modules/transitions/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, six, nose, mock, dill, pycodestyle }: + +buildPythonPackage rec { + pname = "transitions"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ikxsjg7vil0yhiwhiimnjzcb1ig6g6g79sdhs9v8rnrszk1mi2n"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "dill<0.2.7" dill + ''; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ nose mock dill pycodestyle ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pytransitions/transitions; + description = "A lightweight, object-oriented finite state machine implementation in Python"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9b0a61d884..88ca182e192 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17533,6 +17533,8 @@ in { traitlets = callPackage ../development/python-modules/traitlets { }; + transitions = callPackage ../development/python-modules/transitions { }; + python_mimeparse = buildPythonPackage rec { name = "python-mimeparse-${version}"; version = "0.1.4"; From f2a5b2fd65ddc75d979522f281889291bc08b45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 27 Jan 2018 09:45:34 +0100 Subject: [PATCH 079/373] pythonPackages.hbmqtt: init at 0.9.1 --- .../python-modules/hbmqtt/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/hbmqtt/default.nix diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix new file mode 100644 index 00000000000..379aa1c3cf4 --- /dev/null +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, transitions, websockets, passlib, docopt, pyyaml, nose }: + +buildPythonPackage rec { + pname = "hbmqtt"; + version = "0.9.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "04lqqcy84f9gcwqhrlvzp689r3mkdd8ipsnfzw8gryfny4lh8wrx"; + }; + + propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -e test_connect_tcp + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/beerfactory/hbmqtt; + description = "MQTT client/broker using Python asynchronous I/O"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88ca182e192..f80d941da91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5090,6 +5090,8 @@ in { then callPackage ../development/python-modules/gurobipy/linux.nix {} else throw "gurobipy not yet supported on ${stdenv.system}"; + hbmqtt = callPackage ../development/python-modules/hbmqtt { }; + helper = buildPythonPackage rec { pname = "helper"; version = "2.4.1"; From 85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Sat, 27 Jan 2018 12:39:02 -0500 Subject: [PATCH 080/373] 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 081/373] 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 800e74486902fb9d8f98c484ab9c568f36814612 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 27 Jan 2018 20:09:20 +0800 Subject: [PATCH 082/373] 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 9d8d6df50cedf30c2014d122e346d4083e8c5031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 28 Jan 2018 14:08:30 +0100 Subject: [PATCH 083/373] python3Packages.multidict: 4.0.0 -> 4.1.0 --- .../python-modules/multidict/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 5ce6969da75..7eaa0962b44 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -6,15 +6,13 @@ , isPy3k }: -let - -in buildPythonPackage rec { +buildPythonPackage rec { pname = "multidict"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0y0pg3r9hlknny0zwg906wz81h8in6lgvnpbmzvl911bmnrqc95p"; + sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v"; }; buildInputs = [ cython ]; @@ -22,9 +20,10 @@ in buildPythonPackage rec { disabled = !isPy3k; - meta = { + meta = with lib; { description = "Multidict implementation"; homepage = https://github.com/aio-libs/multidict/; - license = lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; }; } 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 084/373] 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 bce1355a5f6d434031966bbc4743f15c53244470 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sun, 28 Jan 2018 16:56:30 +0000 Subject: [PATCH 085/373] pythonPackages.supervise_api: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/supervise_api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 99c6dfaf939..f1631013152 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "supervise_api"; - version = "0.2.0"; + version = "0.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b"; + sha256 = "13gy2m14zh6lbdm45b40ffjnw8y3dapz9hvzpwk8vyvbxj4f1vaf"; }; propagatedBuildInputs = [ From 413d1844acfa2e72aa54ef181d17a23bdabd72e2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 28 Jan 2018 16:16:27 +0100 Subject: [PATCH 086/373] 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 087/373] 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 088/373] 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 089/373] 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 090/373] 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 091/373] 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 092/373] 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 093/373] 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 094/373] 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 bf3b8a45bdebd91c97ef6b2573193c7eba0adc87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 29 Jan 2018 02:46:26 +0100 Subject: [PATCH 095/373] postfix: 3.2.4 -> 3.2.5 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index bf1a1e782a5..bf1c16acfeb 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1xn782bvzbrdwkz04smkq8ns89wbnqz11vnmz0m7jr545amfnmgc"; + sha256 = "0xpky04a5xnzbcizqj4y1gyxqjrzvpjlvk1g757wdrs678fq82vx"; }; nativeBuildInputs = [ makeWrapper ]; From 147f3d4d819762fdba3b1e136b1d658294085493 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 29 Jan 2018 11:00:12 +0800 Subject: [PATCH 096/373] qutebrowser: 1.1.0 -> 1.1.1 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index b7d34379096..9142ecde859 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,13 +29,13 @@ let in python3Packages.buildPythonApplication rec { name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; - version = "1.1.0"; + version = "1.1.1"; versionPostfix = ""; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1w02z5akr1v2517rbqrnv65vfsqvgw310g2nhanbwdg606crzr94"; + sha256 = "09fa77rg1yrl8cksavxmgm9z2246s4d8wjbkl5jm1gsam345f7mz"; }; # Needs tox From 82ebace595bd3de93b697681180fa13e4fd6b491 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 28 Jan 2018 22:17:04 -0500 Subject: [PATCH 097/373] 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 098/373] 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 e58adb9238ef9a768c3f63e5b02255b7f0daf42b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 13 Jan 2018 14:59:49 -0800 Subject: [PATCH 099/373] myEnvFun: fix sed script edit --- pkgs/misc/my-env/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 2d210ca0098..d0b7458bf57 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -79,7 +79,7 @@ mkDerivation { mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin" s="$out/nix-support/setup-new-modified" # shut some warning up.., do not use set -e - sed -e 's@set -e@@' \ + sed -e 's@set -eu@@' \ -e 's@assertEnvExists\s\+NIX_STORE@:@' \ -e 's@trap.*@@' \ -e '1i initialPath="${toString initialPath}"' \ From c945f64454492065727408d42c53eac8088013ee Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 29 Jan 2018 09:15:23 +0100 Subject: [PATCH 100/373] urlwatch: 2.7 -> 2.8 --- pkgs/tools/networking/urlwatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 6a322f649ac..0c37043de9b 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "0fx964z73yv08b1lpymmjsigf6929zx9ax5bp34rcf2c5gk11l5m"; + sha256 = "1nja7n6pc45azd3l1xyvav89855lvcgwabrvf34rps81dbl8cnl4"; }; propagatedBuildInputs = with python3Packages; [ From f8c4ccd89b710522b72069868f80e078f101ca67 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 29 Jan 2018 10:22:50 +0100 Subject: [PATCH 101/373] ws: Init at 0.2.1 --- pkgs/development/tools/ws/default.nix | 26 ++++++++++++++++++++++++++ pkgs/development/tools/ws/deps.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/ws/default.nix create mode 100644 pkgs/development/tools/ws/deps.nix diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix new file mode 100644 index 00000000000..b99780d4138 --- /dev/null +++ b/pkgs/development/tools/ws/default.nix @@ -0,0 +1,26 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "ws-${version}"; + version = "0.2.1"; + rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; + + goPackagePath = "github.com/hashrocket/ws"; + + src = fetchgit { + inherit rev; + url = "https://github.com/hashrocket/ws"; + sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "websocket command line tool"; + homepage = https://github.com/hashrocket/ws; + license = licenses.mit; + maintainers = [ maintainers.the-kenny ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/ws/deps.nix b/pkgs/development/tools/ws/deps.nix new file mode 100644 index 00000000000..82988437145 --- /dev/null +++ b/pkgs/development/tools/ws/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5df930a27be2502f99b292b7cc09ebad4d0891f4"; + sha256 = "1xqwvpn5jkp1xqvv9hx4h7cxrsnamryhy2pszcqpbm28dpd3airb"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2790304c0f..d89405433a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11674,6 +11674,8 @@ with pkgs; leaps = callPackage ../development/tools/leaps { }; + ws = callPackage ../development/tools/ws { }; + ### DEVELOPMENT / JAVA MODULES javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { }); From eaaca14c30ff539f02354b7524da8d0df491d728 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 10:54:20 +0100 Subject: [PATCH 102/373] p7zip: add patch to fix CVE-2017-17969 --- pkgs/tools/archivers/p7zip/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3550b7d7de3..886ed817909 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d"; sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m"; }) + (fetchpatch rec { + name = "CVE-2017-17969.patch"; + url = "https://anonscm.debian.org/cgit/users/robert/p7zip.git/plain/debian/patches/13-${name}?h=debian/16.02%2bdfsg-5"; + sha256 = "16lbf6rgyl7xwxfjgg1243jvi39yb3i5pgqfnxswyc0jzhxv81d7"; + }) ]; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional From 329ebdf0d0a99fdfb40954543fdf3ee6867dcfe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 29 Jan 2018 10:40:19 +0000 Subject: [PATCH 103/373] firefox-beta-bin: 59.0b3 -> 59.0b5 --- .../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 cea631345d4..f359cfbf79b 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.0b3"; + version = "59.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ach/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "386221d445cc70cbe108c9d40bc4354d5a902f8fb9861936f251a45513704a8e26517a3daf630d654db46ff41907e98cd6b4c9823afbca5d44183fdfd177423e"; + sha512 = "8378bf22714f1e687a52dd12637a566cf5239f8413cb7508259b58d557e7d8babfbf3c4251a82d3554d812c74791a4b99290a14497ebf69d91db9d8d3c5e0043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/af/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ec2f8daae66eda23344723a6936933a97927067dd28c8577e56f6b5d5fe8b2c557dd309cecd3cac085b91a5cff3a7dbc80fc572760dc82b0f2964ee8eeb26d05"; + sha512 = "6df91af8a37c092c36decf7b8278674ce32d6840ef92cf658ca2803fb3744e38dc246115028af86e5e36b7ec17aba4a9b0b9d219a540b328ac9cb7753bb58262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/an/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "929b4d6a26ee8103d1128c07f661f4cd1a8aab086d5031bbb6bed8f776b2bc7be1a7d23bdec6779754d13df73fe535aebd78b61a3bb0d29bf0fecf5cc7ddfe31"; + sha512 = "09e53bfcd586eac946b372673d4c37641aae81473386d52e1b0060023760c09e5fa22c3b69484be66c6cfe51a99585c957f088eb7c04f7330622ba2f1a5e51d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ar/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "31075ff8c7962c4a87dfb39d959538f2f362dc0a3bd50ed1e81acd898bfb25612fb34f63ef01210474ee9ba8e65964037485b6f2d581cfca166cb5cb55dde871"; + sha512 = "96d84c9139bfc4518e452045cf94e4e61ebca6e7a43085d18d9475dc163c8955a7995935d430d0da386ac268979b6765bccdfd1493a15606225055e7622990fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/as/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a7e2e7f37a22a6a36b9659c803a01a38e7048ba6e3be0eaf7c5a93ea1c799725d4a6646af35ef31493798d5fe082a75d85b02ded48daf45639a2b92e9327d953"; + sha512 = "13daffa3b652455957aed912c9e5f86121d99c25daef470d4b2fe1140fc04b0085a3e8f317f9b36f8c26f207ae412a8dd71f2ef7cf233c15c0552682eadf14cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ast/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b55e4344d6b05ffddfd5cee2d63d28e3f6b0f7c231625af76e83898a042bf7ff1a9b9614666659cd648d86c549d18894dae92278dfcbbb4354a7fb77c4684fd3"; + sha512 = "b9d9e21fc2bdc3054a86c993be82c1e04c086db9ce8c64b40bafff75b967a7c30817aaf924fdd5464c64e05aff7004efd8607a123699ae58e163fbc3c1c3530a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/az/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "10c48fb227944a639cf2143b56c2ab6a61ac31b7903a13a233815c5a8d552d3ebad7ff7e9bbb1807045409f9491613db5163c5c1692e921d7792f15da0b0ee6e"; + sha512 = "5f0bb5796e4ee6ba8f08b18a19254b51b04b60aad93cccac21eec0e10ef1e280ebb0d4a66d053b7f3f875b4cce34b90f58cadfa7705f89f26f96e5b94316cf11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/be/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "38fe9cc7d0337e1bf28df71aec7061475cc2abeceecd9bd1a40469c3d26dce3e4ff0772862dc1aaddb5914185ba36e223e7ba7d58c37baa58ea01c41569d79ab"; + sha512 = "736e5e0c81969107b6bc83d9212a30f027f84d646c896eaa61374c0464942bb74b3e22f94d8254cd17e0c5e9f6431a5b9b910f2b9bb6132f10f336d7e952af09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/bg/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a1eb32c13c0825f5df6b319b17c960743b3853fa60dfa3c8864351e6babfbc78b10673a7cdfe70d1a1976300cefd81bd05234cf2ab77661b1c0488c845aaa42b"; + sha512 = "b2dc4f280897b5806077e4ae527cffe8961910c114456244153edee182db969507722d1c30e5abee9f9b9034c58e22a2b54bbfb00b3e8198569892b87e84df50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/bn-BD/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a103237c49c7d6ecf9545b32b3541a9c2daa7ecebccf2bbc8bb5fe444bd0a1d376062ed8b3ffefe18f28dfe6c243039d05728b21ce9ab2087676c83fcf74e6c0"; + sha512 = "0546005b584f504378799f359eecb11347f16a9d364deaf72a8f1094b2c6030749dbf4eb5bba1224d91965617b2d919b873fbdf4c5c3ca9996286d281af51df4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/bn-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "aa3eb81a794d995cd14424d39e9b13fe8e396e6ed2815d3b9a0e15f450d4658c31a6b34a7676e07438dc5f7d91a9273bf6391b3eb3568ffc00fc37bd251e6bed"; + sha512 = "cece516f3c46b1f98dd837d17533a7607401452d95b3e7611d4352f88699008bc38a95e6abea5c2c69d145e934a34116fe00bdee2b9ad404c26a20e35c5b16d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/br/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "368211a73669f3e341338904c69ebbb69babfe50b777b14a89b964bdba3470631487837ab35b8a92ba263da17fe9d7f2fb31b5d722e20dfd3e297c5c09f6e23d"; + sha512 = "5aaa92650ff188d457fa9d8b7e33198b847e41b9ddb068d1bcf7015792352757e02e5b1deb36e0c20ad1ef214f523003ebdbb70273d153f4194f50514c876aa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/bs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "77973d2a5d193f88ddf54bdf3bfd60f43d818ab637cd0992033ed89efbb57d48b2057f79ea8fa2431d2dde1b4345554ce32893ea5c46e13a8a904503d76a50d9"; + sha512 = "1ccf76aaac7d2ff4e4a8c09e7431ef8f0d5a55cfb5bd9aed032e147e87b6d86391a927d76251b6ca1b3c21a57832f050ee818b43a5513c49d75652e62e5eaa6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ca/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d55f8594b1e157779f8a6c67b82500bf2c2a29de8505906b5825feb7194f84a1aa8f823e270a98e6abcf0879292e06e27981cd54d4e8b71406c4911d1da8d5b0"; + sha512 = "9b3d4b0abd19ff7ddb51ce1925e2f8929621b215be80f124dbcaed7b34320914c9593645bd6b1b406fabf7693016816fd27a9b66d0d577e72c659a28ecb86fed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/cak/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "183dee44d7e7dc976af12a1dfade5760dcb6580d9a8fbba8d3ff3b5d420b8446c3db915add99d0d5d2112a42d80ac14e71426f1f67298c5f2781c5f6610713b1"; + sha512 = "fac861443276137842c0b7ca0620d0714bd4ed391abe28ee9a377686261670301d5cd62c105ca31379d9ea97a42aba3bea0edc284bf3058da1748dfb3456cef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/cs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "6829647082ea1e130f84eb98ffa7c66757f4d06a6024d86bba49e1e50280e067c41b3a6c1e877b3124fe54b30d2946f9326f88faa00803f72c9b08d08c426b24"; + sha512 = "3de6a8c71d2befe5ae58d1968420c72ef52eefc6f0ad2330c817baa3ce9a2160d5e332846d00cbd1b8504f806620787fd967c1970f9bea7964ea1a6000c70c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/cy/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "57735aae71924ffca87a20bc69d75cc2683088dcb95476d67b7163e289c58c894d5c4b3a5cb85963ba0a6e567aba1a610c304bbaadb42fb7c21eb31fbe7c0719"; + sha512 = "71e9af6aee3e9d22a51274d8987a296b2906e8c3b1c85d3f4e0469db5c11a22f93948e78b76d1d8d12ebe22e8987781147ea5e028b97803da5f21755c5721a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/da/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "5b0383097ebf1cab5952bb223269f003d571843723a706d39a57e2ef79da3a9c58532aaa5b8f2e7847789f3f3b8e876ec8109e896183a4e37c0bc0f4fcc9767d"; + sha512 = "40d1325baad0050524df5a397e4d78d6f78d53a9ac34bd57188febdf8c6e291e723186c596cb634df18b5b8809d52401cca2f733de95015d658710e38fa8cb25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/de/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c299a3b3b1ea4ec98a5db63962295396b26232837e3c2d09a0d7ed7f3ea85d02b91e110c07d63c7a1a6fb7e4e39612073f8e47b9654b74552f411b6b71765118"; + sha512 = "4b1971ef58f68c2d2d8e37c2759bae6a0ddccdc14e4ab125712508885dbf7490323d568aff70702a056cdcb64c80b85cf67d2013c4efc9cb2f0063ade13ee1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/dsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8d38d279da194f2f375e2d9c9c007919d9d373bc570fe94d51f8fd67d46684abb0e347153fcd188743961120ec7bca69c8b0395292a607346131b197be16a728"; + sha512 = "78e9f74125d27c37067a52fe33503979a998fe0e0f84e3859b75d4544ac70cd387e76088cf28b520ac6185bf0884508c399077dbe8ad74b87b4a5d01c4e1a557"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/el/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d0d310456561925d6984674c2406c1a6d05b8507d8b405d59f8787fc92fffa23ecd6d68e0fd07e7c709eac684d86c80b65f69f7cdbbb1684121bfec0e44d9fbd"; + sha512 = "18d2bf64feb0a89f715ac8add7b46e296422c130d6afaf35edf1b4cb2a46ad5a77ed4e7c3131d0fc19750e3cd9b53e2bab835abc375daaed2a69195bf60781a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/en-GB/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "5e9887b56665f2d376287d73f4adf0ca707d4aa8f4e41c6150c6f15315e89d5ebe6c051ca3d33bbc105537d0ff5625af3ea25ef90e9af628bf9fca5660538fa4"; + sha512 = "2aaa98402c21153f1419d3319db5cc0db71cf23e02be560ad8051384fb8465049500d8a3b1b7c327916435ae4da61043492ff3a51a8da65699d6b9be368aaa36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/en-US/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ca0960db604d3471d17aae37d218da99d4523b021f80cb4beeda6c6ce0dc4bf9e95c69d596f8865e1d51d6096cd1eb8f027c1460c47a503521114dcd5e202b1a"; + sha512 = "5e281d84456a7c4cad57b13af5f77d2e9ce903be0993c752e995e0b3df7c1b2453a45f322833cf1bac872d1fe4bd9209a29dd5fc9c7571baab3665b3eca874f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/en-ZA/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "d019da53e07e13c976a0f7cd7b4fe5c81ed2363fd1ea2fc4a1bc0d9b66b0f5aa520ad674f25348f81d4013fe4bbddad07985cb723ac46b1be1b1cf83ef0d3988"; + sha512 = "c431628654fe39e59036ab1567749ff4f931bcf00b6b55a11a240823905a7ca6c5ccf0e1184f8f7495f3650bf0976fe2e3da2e09b0a5abbc6735235dbf4bc6cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/eo/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "8c4f18911e99d3a8a5ed172a8c7db9928a11b45533c5daaeb5f4a05c053f106cde27f3c1e909663688ee8e338d288ec3822d2f9ca7d4b88bafc4d1aff3876d09"; + sha512 = "b3b0307e5d9db7a12a7a0fcfa75cb179a1ce91d0760ef6196ecf734ebd0aa3cbe701f3c8610dfa6faf2b5e4d8c9b73d51b526bceae7d905b17dd76224c3ed15d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/es-AR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0f9c6f908d42e1d61fbd877b50b9a6fd58f57b7d44e008a1feadca33426c0a8b7e98fb1ca60a27bb4da28bd68af7da8482693c2c2727efb0d5e20527cc407b49"; + sha512 = "57baa3cdc360129bc68ebccdfc51d1cecd239aef84cf5043003cf2911e2f3ba4f13302acc096aee96c603e21f4df8e7dc81521bf5de5f8c70abdb9026ece189a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/es-CL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "28625436fdf96abb496112ca443013f77428f8184dfc19f0b654829049c552bd9778f56c5bda6b2639e5133efa85f2d62590df1bd5340458de2b2c41cf29e5f0"; + sha512 = "b385405596093d1a2fd25b290e0825110744bb702239be615809522595bbf34a1ed25e7b7abe17b078020a755a28a603823b7014a11967793e1d4597a3d6ba04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/es-ES/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "db3fe78a866977dcdb32a13ddf263f3b9b8eb6846a751f632948185dc03389513f8515897c38049f454fdd6e22db9030590e0917ef682f573a2611726d462680"; + sha512 = "f3921d502ed19c3c131f7aad613ccab775c173b4767f4bdbddd4aa98601ee7810254cb6f0c588809b9e0a61dacdd74a1662e83184d380830f35b7cbe326e116e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/es-MX/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "302d416f2b1b96c65b76b89cf669b17d996d5d24f6cd38b4069de09a0eaca3d2c4c6778fcc593e23c674913350d1d9270cd9644290b230e3a131d51a1bcae268"; + sha512 = "da072c427f2a232be0a84cb23897bfb6a93b92326b180dda491b2c9afb68afa7e798f1451a6ef5dd36f13f473fd9b667fcad96a0124490d0c89c0c5ff3887f92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/et/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c999bc5730113f5a6dc334540272322596d980775cbdfd5679478051acd2a503ba90353597b7c98d8925fbc7302e316a666f01d1f99ac406fecd836e233182f8"; + sha512 = "e8a72113b7df9193d6044fd6e6120087422c7f2d4456d5dd24881723c77039607ce8025f5f3547b80b671409b0a2017368fff376c9ae581eef285201661cd719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/eu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5f996b3cb4066a56e8482f1c448f18a8b27b3d08325379bbb689b60d728c753a3dc1a956d298a7b9405eb15e30e7db5874f3a6c37560ed857286f968f683e3d7"; + sha512 = "dfc9ff76c8e76fef732a89f29ff4d821af9190c45a02d0a56ecff9f6199b674aa6445817765eb01468b16b253aba9d4507d8750228bce74658f84f3c4daa64a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/fa/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "aa263c9fedb87c063cffc7a41afe471dd4b79765918e1ea5c3799e20fdac23c57a31030e6b9ad5ee305cba157c9ca8d79630ae1be88c2e359ce0f6ff9d69c9a1"; + sha512 = "a5d1ec23f3b7ae46b9aebbfd2e6d2f5df959a34c2df0660e3bd17fd45fdbfc696936e9fc921a783304a3bdafa548ae616c910a5e2e150fb2bf98739d52deeaeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ff/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "85ae69e9f3d7e7316cbe7e3632019996f0c9eaac51c4a7d6468a57425d6b36d57948b1a73a434d64dece54b5aea32fd1271b42d2388de411cc180a0a60ee7b85"; + sha512 = "2a70a2255a029db0222098304d5fd5a0e204764f1900705dc3de97c768aa1b729610c968cf73f885c05ff6bcc95c51329c752f5d58da07ecbd9bf1fb5d7f0e0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/fi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "611ef9e776d78afd1182a0a4d3fb11551e545139c36d9309663dfd50994ed77dd13f3051bf17615172b0f3fe802c64a073f8dbeae49d657af652a3305f02c69d"; + sha512 = "c346c7e849928fde63fbae05ac91030653dbd43779ea3042f9fb202f028063f98a6060ae36b0ec394ffd5d5956d6d87af99d85ed89b9d08fe06c1c34207f20d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/fr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "cc2c4d74052391b98fd03ea487018fccbe8aef85140a939b1a8a6a323a2b0ce8dc2b0a9701efc61e7b1e7e92347bda4112b58a650941fd72c53a5949220afd5d"; + sha512 = "3e54e6687bae4b9c62a63d2d3749d47132939febec5be09f3e7cbb3633d2cb0662bef0c86e4df7cd678c6f6e8391548cf01d27b8eaec9d9a45434584038c76f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/fy-NL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "4c8f291e85c0c2a22a9fa9e12e1e0c8f65b031365a155d3bd6705b4a08b8ce3b3563a8d571f7b73a8ceeca099c346033053f8c833c66ef7417e735bc88e5c8e9"; + sha512 = "47e2fb7fbea44595e9e70c7739cd7666e9ddd02c822cfdab932974bebdfe542ef560a02f4708866a33828b1427a3e71c71645974481a3c7fa327af53f43c0cb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ga-IE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8e69918a52854999a88ff15b7c8d99171bc497416ae9e34ce153e59308d6a3513a130c93409d4ef0a2f81a6e5994b31ea4a78620bd3363c68bf68badd7562b1b"; + sha512 = "3132195d3f304fccb1df185d331b5cc883b9e3017e6165c5e87e4cbdbb35bb5bf8a7341d4fc36595fc33493a63741a32a35a2bdb8ed3f5525d8216f467fdffdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/gd/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "cfb2f2d3e97256a1d3396174a4d0c2ea07a88efb10b7e506e782818cb7438b32502b8568a4b5a2c0cfd5eca3a254824157a674d8bbe78621c420ae104622d8c3"; + sha512 = "8d3603b4c237e725ea22aabf4d6cf8c28912d938836ab2b2440c12c3171f2acc27daeb143a8aaeee493471e956cb7a921213427a2302bddd46cd08ac29d73b16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/gl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "23b6f56cc48644e8e36db9572b146f054e87f1cec5725b37ce11bea2bc36a9c5fbd4821f0f071d9839a983a5d7e7693f1c6a59a943e62f145b8719adcb6b954c"; + sha512 = "ea4692cfaa6d3cc321ff871e415efa99521ff972c2b317249598268b52355acb8d7f19a9de2ab63a12d5cd8f36565cd7688b62712c828bbbe3b7132d13ef1998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/gn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "484b3404e6b625f5565b1d6b34bda016cb6c3aabfae5850077d1177045f95a3b8d590bec3c5ccc0b9b4ce65952f69d4fafd90b1b9dab2f400cd20f9bb0775cf2"; + sha512 = "7e574c7664ef33ca6d922a7cb4cf65bf89e5a63358a8b3c3630aefa0687be675b19bc4aa0516e524a84a25ead6852ce435aec3645894eae8f68e58d5821efb0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/gu-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2ec16e2a48f2bf04c5377cb2d1a6cb65924de9348ce7de1e334f19ba5282a6091ae619fe0841ad47b22284c5d21473d177d16592ca52a7c158e3b9a5dad243bf"; + sha512 = "b24eed7e1c5d81eb7938b7da957b7f94b735111d37510d13a14bc928477a5868aecf3c3e0b37e3422c8a8bebda6bb30bc56fdf339cc718be0f4a478c13c12eb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/he/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "02a601620b234206557aa37ab8238cf1ba680e12603bce76af5c01d0a7c86305847d1febe780b1d2253d0d97251da780616ffbfcb238d9bdbe919e3648781097"; + sha512 = "10bd7ba2a8d8cc003428bf3afc710ef3e5a1fa8bbf24542dd764f622f74ba8a4f4e6f1cc0978c907f9bd9104d870f2cc38763d9a6d80b47134318d48fa0af90c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hi-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "6d0e5a3b9d8b8fc0d7be5b8f66657cf426414d38792430de08fcb567b6f1eaa2f27fc3d4b5d18ccd46759b435f9698040ce47aea05c1e1f3dc162c4bebe434a3"; + sha512 = "66c3151b9b2785025c4bb70cea9f4c12d4b2549239c3a2fbd96098c72118d0ac0306458142a1cc2ddb73232620717a03ccf84e27c606769d0725ad29c2a871d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "91a25d4660f45f854cfe033a19e913d9d324cd911c0c899168e8a91df4ce9ccdce5c541c27ed501fa3d29d21119faa554d0d2891b556a8bb6568febf8e696789"; + sha512 = "9abfb9cce29b06b0618d8d5c5ec0a91aec78b875054e1b1af522e5f05546fc861a86493c9fb026fd5e133bd38522ff8583208557ae207b94e338fa8a2b153880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "36246d7eeccae3bc54058c8cf8e2d1277347428c451fc44513abae9536d59d13ffe2cd9a5dbdc7431d6f6c48aebb41995a6d644e8434d86722a330807a019d38"; + sha512 = "65135c16685a448a374e1ef9eddda23e7a11167d72a4d66acb22f6f204112d45c2720d9f61e07bfb37e219b8d9d2264cc1bd80f75c7e3683ab69fb50a617a4ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "097847b8e03283e7c8b2f3cebae3d4dbabe0f4630b7db9779419441d7e6f1b7178d951d8aa22d7f2a7e27237046fe3e11a1e9889c1d103623236c11a5bd05105"; + sha512 = "edcf63cd231ca163881d6ffc61cb6b21936b30a0c05286d8bd79e20f3b89cf727832ade1e799ae3067fbc0e84593da60fc0a865233fbbd65a16c887c6f56fb72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/hy-AM/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "aef4ba8acad1d563cecccc33a30fb77e55bd659ac33a2358f941cbeb94235bb269b3148e18a71988b82f5fb9a5d65a7c03a53e1c408f70ddd24814b85b1373d3"; + sha512 = "30c9e552e0f5a369ea072bfa2518643199da84242f233367b2bff23c387ee18bf4b377f4539222b69885cc991410904ed2f725de99009d6c9e25f6cd560ed3dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ia/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ia/firefox-59.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "29745a582e8146bb68e2edc78311a26f654c914478a94e9dd4264fc9d19d39f3297942d189202e226a9303e4ee0af4719519694f10e06debea824d4d0cd0d1c2"; + sha512 = "26ae62912440ffc4fc55799bbde78e2aaad0cb5bdd653fad0f7d2b7d0be479efc89750c5ff1b67f1dfb89540f8cdd16c5b3db446c06bdade2bf27e7d6d605fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/id/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c5b0412fa99620f5dcbf9d4aef88f53cbfaa70304afd31e19f6956c0a9d1e301d026d0ef6178eb6e2b62719034ce91feac386622d60b321b0737928c668800f2"; + sha512 = "b0a2c2a60550e478d8cab3e7608464411961ea4b561a9554d174165856104475432e8b2c62cf5e0dd6f9e893241f40d8479ce9bca5bb56bd2ca0206539fe50a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/is/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9e1e677b0ce76fb5a97cde4535c76cfce56e9cb964d9686433964050f21ad9b04bbeb5783e3ba1e0116aff3765327ef6b9d7a0ba6fb1aad7d4e9405470169d42"; + sha512 = "63bfc964d60e59349ff1a6e9619ded97be07345cabdd95f372938500cd16ce7729c091e740bee8065f8fe43d3205f6b617d7eb90f2e9e3f956e4af59356dcb39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/it/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a87936a0b3f845f2509b9c7a281fe24971910ad77665d802740d1fc97d4e77200524f3cdf19f90bb46eb2bd741dd6a87402972916bdc43da5cb568b6dbe7dd61"; + sha512 = "a9eb83e6b82b13ea962405575f849e9fbfcead7ee704bdc2076ac6578231d075c66273cf164b222ea38ade1412a690080acd297dc58d0e993310173d2afc3e4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ja/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "e870594ad2427fd230703f05616c265abdd3d9f00327d6dacafb6deff871384bf9e675927fda177cf0d8a578cea06ff377c40dcfcfec258d71027127bdf6e818"; + sha512 = "9241e09e3d13fd270165250413b8ca08e012e7ac6911fd9bca886d9a2d4d95d514f8842b6aef6654bcc1df54b7aec1b02a6a56350b56f2011e885c56540ed706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ka/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "bcff95e376a93ad3ab181cfc6cf8a4e548af47019e1ffcd511602f11e5a155fdbb2f2630956c632a0b454c28c6fed8eaf0e6c7e0437bc76ea79474620a5de9f7"; + sha512 = "5753301f447753748b26b1ceff617a5e5efdc9723415325d131abfd17f354316345713365a5a0be31bf787c0b34ad12e9d6be0d6aad9a10409ef0c21b45283c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/kab/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0ff190cd724b03cdf9f76f54a6205b0c4a58635f681c82f51e875e85c8f229fe4640ad91f8e3789ccb1cdaa64cdacb687a3942fdb6b393f90c1b6a11cf1b1bb7"; + sha512 = "67808d90c284355a0df44d9386e902264fa44e36cbf3a043e423c30939d1fb4b7501889ff4a28799a31d5330c858958f4510b77f13ff2b9f7d27e22e903f9b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/kk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1286386ceb7f6cf078867cdfba518f3eda08fc0630734d8af75b63813ff2f8c2fc57b9a4cd3994b7c805257dd4c98a9efef897500c79337886ac412223f92918"; + sha512 = "d7cf93cece39a033a541c44093253721de2846c5d5a1864429d009db1c6eee1351b525bdcd997a454dc551b647db6308afd5561ebd585e23c4ac528ebd47afe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/km/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "d911b71e065825b6ce98941ec9aa222ca2833384ad6b49cf2ed6d3a85c35378182019453e3f306a580d2c2bc63e2ac1ce8458f0a9250a967b3e307595f70305f"; + sha512 = "01b09dbc3bd6308304783c144bad3d75d119ed61a60c30aff821f28de887e05875e4718f30538dd0edba5abdc7f7cf4fe7d0592d29f60baec58d546590b9fff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/kn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "34dda00ac8d20c511f3d1e21b617e98bbb72754b95f80afd3104678760a597bd212304358424ba3d8e9dd54186e00e6070634fb220dfee51db2e46672bf00c92"; + sha512 = "d1aed9ef1e98f028a2827abab0f581b3957601301d60f8dbf365429b7dc228942b329f148703581a3d4556cc7b9420065f7c5b8b18b7ef6b65c661dbf7bfc3d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ko/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "413865ff7ea50c816dd382f42315196c0afa68ed81fec2af46f9db887feb5e7ec57f6e566712dd44ed57c2fd602dc8753e4bf042d06552b83e42974ec753b113"; + sha512 = "bbf106777b4e8f41fbc84157e25f113e1703f96a1cddd63ab95bf08ad4057614318f3ffd85ab51c8191a20bce6c457d44c8f34db3484341083a8348690447217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/lij/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "8a0072c67976226340034fc4266a852271678465ecbb42dea5975f5ef16c2dd202dba300b5b0bc53988380cfebee6bc328243d35ee13706d7e9b1e6b827b83e3"; + sha512 = "618b7eaa94b81420bccd0216a6b12eebfa0934c06fd3d415bf7f49e042d2a56eb8c90c59ed58f7a459cce985d6bd1b5e1ff19c2dfc86b5824a2e909a81a90360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/lt/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "be2b484af860f4f08971080ed96366ae03a0608c5d5663413633681e3dc1e2588cd793e21dfd48c218baa3527da2fb6e823756e75900fadd90db9e0ccc13eb5c"; + sha512 = "4a00c16b74e07c4b485d348f78b8b369dc1d069ca158ec8ae8cbbab416434b4129bca283c01a9880c19503bf332a12c520f266363a3212ddfb379c5a3aae74ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/lv/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6f93b2ab0909f14787ad42ec646ef708067a93745c845290df5d450f854f8631f581660e5b79eb4e11de9c9fcafef3eed104a3d6a586b576eba8d1952649e861"; + sha512 = "c2facfdf8862c84ae1d3186d83d653982e9b0e5cbbdffa987ee83c72be8866b64bdad2ea8de7b7c7d2f301d7a3740a9ce6f0ca6facfa7552fb71956586328d10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/mai/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "51ab95bac97bc8f3405c0a333def0a0b4cc8e75ff365e2a9220391bf8a488c9fda58fe0e8eef0466928cd9f8fa2c300bb462c88090814d452efaf960a5b39278"; + sha512 = "0b83cd5d65108e126408dd56124965699daad192b318a085fd5e0af77864b998606e15a21260606785bdd49602e275595ff44c0e72318d37aa0ab129c413c947"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/mk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "3d4a6cf74dbdb72f94a377709b77cdfbb3d535411b45227e3be6f5f957b08981c565baf3b4edcfb8e268082c510c52d0c048cdd1769c2e327e28bbcd52ca2441"; + sha512 = "62cb3e3b9dcb6eb76a1f26a443286b99a5d46f0d492c0ef0c5d93d85d7c0a4659eae448b5458e859ae5a2570f8b8a15fd10c033c49b933e1ce612e5ac7305c92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ml/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b3c2d8921eba5031423c8fc1516886ed1663adc29df2f4bb4b20110e4d067a0093b15d36eab598862a3186788dc0d895b60ac4afa9cd050819b1b011e6425f46"; + sha512 = "4faf79a4cf834f51a3e0716a523b9f3b1225d32180222e357bb6ad5ab3ee3b858c7822cd5c5c9e468ff216cd5d7969b71bd18e111c89fe83eee95cb1696937bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/mr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "25d8c5fcc30ee2c106d16f14f72b10d26c5765f9aa423d7557455813d47d2b0d88dfc92f7ef28650f33327be50e60ecaece9b8f270e060d9b94ce76a2a00fb10"; + sha512 = "608a2efaeed3225c8a3f2609afe4160fcdb5286e3777def703e172864adc9b0a76a87889a7e93cde7f118afd218b5eff38b00dee923222c3cc1a044ba0ce00d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ms/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "e93f7184cccb2710d7318302068fea4367ff8fa3665481731a7a7cfdb7230a21a0fa7771c1641d127cfa1fb2a691ca56d27357fd8d8cd8b6e5c3a1fb2a1dc763"; + sha512 = "ea717a9bb9a8f644e66b8b0e0f28645460c9ac3a4f49db4c9f2f87b6419901d41e358f1f90a01122a70557bbd5fb4425bceffa8262e04c02759bb15ccff91d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/my/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "21aef802f332b2d5a6f20dafc2756ff5a71d744b7305e703452161e504f719ad68add940421b13898e32caab6a85bf6e12eefd262ebf039dec56ca54dd7e8b07"; + sha512 = "71468ad6a258665873122759364af4bd9a9f4b9d4c02d77a02c13512482b044c2b00f4c18332560d78fa77b413e89cf1d7d6625884b4e52f48345c0b4f62d04b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/nb-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "4f9ee45afd6fd149999ac71e6fe4b21e0bb8432f04a26902ec22fd5210c0c1643276ee5f47bb6fc27bee5d74f923c2db34a6ca19ede30e6f2735237c27554e9b"; + sha512 = "594054e80f00111076786e322d561cea228e0ef9879d59fcbb9c3346a10314ca35df7466e2e008ab2a866ec627cdaee005deeed8be17d85a1803c35c0c6cc989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ne-NP/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "92c5c892a0f4c6745cea04f1fc12622356b83fadf42011ce9b01e4550fb6b592d3b4169f26060f82326262c271a98b711ef703747bf3ddf8bd967a02b4979587"; + sha512 = "2fb3bacfc57f664423af9672ecec7ca8bc68207cfb809423120e894760fa3a4d388fed7398a6d66803707b8e0571a21eeb313b09df6275c8c3f77cdf2a39563d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/nl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9d0e28c01d6ddac5ecc45da39a83c28638708cb7aef499069d3f4e129c8c1bce3127c78ad286fc936364a69dde7a9c4135f5a86308fe3c8e0aa6dfb62c2a01a6"; + sha512 = "f1afa644f76b76c88d4607e08de50724e9dcdcd407a98e2dc1de4fe408fc6b1ac7beffd26174d1919bb4a6136c82d12c95d13c0fbdfc2cc4d7b7c5d519a6125e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/nn-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "459e7883820a99ee8f893ffca1d050f4bf9da58aaf9db876a4264da34c879d631e298ea54c143c625bcc360aa6fcfa26de09dd9d65d14dbbd5234e0e4e37d5f9"; + sha512 = "b9a8a7ae6cb3e91c780a83219281abe84318e17906f0f4b47ca9300720141a90679a55438956050a54cf733320210bc9e60bc903fed4e4b5b6a41e0d6cc46446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/or/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ec663495ac17cd24fdf249ce8ca58d904339c62d9d31057d0aed490457549a4864c9c1b62d5067bd9a6863aba6b71d16594f8900153101593493a23c136219ca"; + sha512 = "0b062d8b564442ffcee2617faf0e55ff4d23e56342c3602e6bdedb986542206486e776b701fac5ff31102e3dab3d7c68d6facb348d29476a64cda8aaefed3ba0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/pa-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c59069d48e0149b801de4dc654d9cdd9d53a317542d6348580453703092dd0930fc426dfcaa96ffb90512b2b7ece11232c6e9ebf423b4ee0ed237953a40cd424"; + sha512 = "dd8154289d9d948db4a1d91020968b1f9502dbc6cbf1477d705396fe531a8f06f8d06289c9173c799be033e5e0f44b341b5029e492a8b7c8b0f81e918198d605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/pl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "307487c99e3176eef7d4327f1541684bcf34e678d25629487fcc2a61e16823b56c3bd11ba8bc436f62180db0f3ce499e5e6fcadbb2902adad232073c0dc820e3"; + sha512 = "f6cde5bc5bec287feb3882de991a86506f0cbee8f9ed2f02b655911a2e0d69136b615f5a7a0bc782eb3cf6f68d99fefa4ff0a47c7058f344a9a8e9aef94ae4a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/pt-BR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "58e6c177f3bc891fa01a0347965c55ac8af1048f10e9640e82f71101fde900d7289b8b7113375370a6c1464b7c40a38e4ff727fff2b33f4be30ac23fc9581229"; + sha512 = "978dbbee8f116d9123d121d778c52e19cb95d1b7cc565b538e65e0c24257e568bc01354841ba97c642d4f832c1e5279a844c98044b5a5aee4b44e0641f7f4105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/pt-PT/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d765deabee2f0111a4620f8fc2a6d7caeb2210b76e075078e751cd9be54dde48283595e4017c40d44e740f5ec010feb30d7b46a5504c706ac426bbe941acf894"; + sha512 = "b634de4ef37db1b8c96a03149aef441844728b25430dcef579edc62798ea54da7d2af50573cfe7963bd19c6c758104fc8f1efe159fc096a8f0479b851239049e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/rm/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "99909553804905c4c2e677b9120816b0971c32bcd4b5bab2fd9ddb542b08ea4e1a9ee71b2a910d0f72d7b7135425901d4f5b34e9d3f3b9d9d99320ec0073b614"; + sha512 = "64d5e36a600dc11aef92d6a3e80688ff6f9d6fd03c17c94ccfa5cbefae3e05c2cce0ba86286861989bf1201ed05fc373de327953c944e7b3b692f4a670a3ac4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ro/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "984a68bd2e3feebd0161178ab6fdd34be2eafacc063f44a32a094100c04f2bd251816fe985687ccf48312b3c108dda25d332149a3cef8e7b6078aaa588919696"; + sha512 = "8a4ef1a88ed197f3fa8042faf34e234d7b7fe6cd61a54a19aa19244a2b3f56da284062861978d7711536ed7e4722a3351d31d3f73a1f8782a2748f52d7197e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ru/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "77d7efcb4de72edd74ad9eb0af72e02b7b5df17cbbb533ca360f9876afd09f4a8686d6aa89b99220fe767de3ea3b5c417be64625168f93b9ee39a2e7be6d983d"; + sha512 = "5b43553eb9cc67be6bc5d7b0341d8f9f7df936f6a918a5bdc229c6b1e478067eef34eb0e593c2e9dec1724283e32bc8b6ef77fa93a3b20f367d5d2445b99f439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/si/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "bc4c7219cc8286b950c5e9524d8b3cc11d27cadc68536f3c82343e0f0b1101e76a2cea54af875b493066e9ddd621b0818329ec15364f668be5ca1e50c70f2a17"; + sha512 = "29bc4104a50c28b2b8cb7e7d7e652bc430dd42bb719dfc6d81902a2a5c5bb0f9ec31cefdcca2c71edbf9ff1f27f91317ab04f89e910ec6cdf8d7bb93a46d80a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3373c00ff9198e77614802a238fa4a5e2cf9234f3e5b163ea5d51b6075e9c847b573721e6f94bbc5ed2ce3acc1c633e68e578a99296b992216f87cd9063c3627"; + sha512 = "b84bf339d93296c3c2c6debe1bb5bdd6dd1873c21f2345f81beeede0f6c68f5853e6ab092c63d973010798aa0f74afc81b1c4a3433ad02419d81475e73951ad7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a7dcd31e3dc14463af6a383d353e45862b0ef32801fa0cc69a61100c347df903d961bb0c82c8ccc91879cfc206fcc4c7cc36dfd776c9619544c1729f767b7cdc"; + sha512 = "0fb0878e5addb1a66530238ace042dc5821e89ae23ca2e9404b2c41b66bd56b9764bf3babaf9cb21c7259bc32cbabdc52372fba84fabf1415e783b06dd9935e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/son/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "37616bb7a9274ebc6023b5f12dbda66d97cfad63c9725109928c10cc5079fdab700b0d389c634ee4606046018dd67a4e17447a8e09eba239cf8ae1c5b72808a9"; + sha512 = "5edad9a53752a63484b3256eaac74832fa34d46182d54c5dfc71a5e7c0d7b0e2308209e03f5ac118e9870913d02815f25a3124b15cb98c2d9df190d5c6ec9f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sq/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "70e50a11ef4c1c33aede1589362299f98729bddd9b7297cb9c4b023795bd4bfa007979e0e2c5cb2b91e648644dc4c20efe8c0d8be7f8ec4c7471df413cfaf5bf"; + sha512 = "53eb9336acd2759e5d4022dc5924010b73d0152342931dcf8bc97d2b9f6bb8f3c1f6512a004796558b74144781a9785a380ac3d1786b66f95fe0b0394f474663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "dd5da07fc797fa794ae2a0adde6b79ff6b71bc262c95fc65d15fa34085f7615202178148018bdede01d11452ea4f9c8a05f8be67221ca890bdd344232874b146"; + sha512 = "60fb87b0d71f879be495827fae12987de865863e88dcc623642093b287a8a7dd959274760f78c1b824b8a9e5282badad49811369a5b575fa29e993f5f960d1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/sv-SE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3162e41a7ff5d19e5f79ad748a380389ea56abaadf5909e068311cc079d3d3b9c3b81823c893cd459c53b61797e362bb4194edb046e0b7ec39b8730782811adf"; + sha512 = "8314d679716002e4bd162a5408a2d6286b325ff1b08f92a455bd33399870acea023bd31693d7c10469d853c134e283a87bb5cf0dad2f525266f882581ba93ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ta/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1e27ba06de6434f5a0da20b291e62361691db9113f3c856a0b3898a30bbea19a7c5a0f79b402ef452bb4169f308e9dd7e6dbd3deb07ee8db5df8e454824e08b9"; + sha512 = "4ac7867c2e6c0e3bbbdeb38254e8c425b9630f314ab78a177a9dd83d2aa7495a7720400ba4095301fdace8179e30b5b15ab6f67d0beed7b026f581b2d0143bb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/te/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0aee77c2f56356d2416f90c85b052c26dccdfa2d8d541964e6d8b6892e06785d134f4dd777bb0d19143cc3aef33798667b91de6f3a8dc619ca77f288370a941b"; + sha512 = "717c6489dd2863e39a9148b3394c81e855cdfaabb01aaaa90729797cf53760b8003c354eb9e1b98a453f23f2d2173bb5a37116eadcf03ed470d5670e562f422a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/th/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "cfd7ad7074db6e4e7cef25a691d146f38ad6e8285c5540c5848c15e6c7be8278d33c38d101ef87f1524fd45860a9da0ca1d25eb39e9d7db98217181edf3ec6d1"; + sha512 = "a2d6fa4f9bc9327afce0aa74d8fdf6a632bd40158b3b9dff3d553e18a79fc893bce74b45e78ddb42ff913c3338d918a552058a69a313975fc04ecd832595062a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/tr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "e73b2941308baddd1e24c5579f64d094112f304bfee654b528ca15528ab5ffc3a44be8c8f9717833774b75a99cbfa4078b5ff1283a478e1279e98558c440faeb"; + sha512 = "65a01e7b7777f4e96b8fc195d17ec433bad492918e3fc2978e945c6d5c8125f10e4d7ef1356fb003381b5bd41a1c2930b249065822d1f461a185c70b11455844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/uk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "a51f17f851b834df48bd2eeb7b0fe4e2a305c144269af9e10632f78640d504c45f88e3a8d903a96fbb583c668a947f20565e4c2bb81852d9e3b839a67949d52d"; + sha512 = "38fccfbcac23f03f3801064d4cbd10fac73aa1f14b622f6d0cf01582a2fe4e5b18350b1fe6d338266604823af61131d830d2d673ddadd51b45e2beb2d201e18c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/ur/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "142818d1b5639fc673ef0550fd545fadc5dc23f20f95e10786a28becf1cd23d3a33ae9e63727100c64ee483103da1a71f0cf1b95274733701cc3c8abdb40a749"; + sha512 = "5e8becb32d19c51673cfa6ba87fff0790fc4bef9a885195e15b7f42272c486b1d27de4f3e1d09ec9817184620d66adf8c42e61692c80181ff497cfdca06ae584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/uz/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7e8a1b6abeebe1dbb66e741a41b7c7b5432fe6355921bf100921642f4999698d058ab2bd11d7f5ae3c4d6ea1ac63fc5f66cf910d9a3ced2565d1119601782c0f"; + sha512 = "2076ef96b2a4dc236234f33e400b7c3406d0fba417c7e1d9af5dc1f005ad2bf09673b3420cd885a23a7e0113b6fbc4e569a655f8cae6052448d7c7118d46ce41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/vi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b58f1cb46a1f1fac15f536ef6d1269a9b8106d2cd74dc5b5f2165783c2058d6f0a41d6574ae5764ed48a9a678bb01a979cd28cdd985331f566eb55d58f190b43"; + sha512 = "bad0038493b166255cd25e500c6a751fd6fa9dccb72dfc6161660d5bae2267039ea8a7fee4c54e58cffb5a2cc819623a3239a5a49a07933e4e76340cfc13960d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/xh/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "55d893a38f03230c97f0e1d81d736bf1f8e850fb8ff27931673bad9f9086aaa7b626243536f00ea205e0561850ca50d1fa60431a12c57009400634de58e08270"; + sha512 = "d3b9cd39b1f558e63c34ec9cfea0348e4aae20789fb11059a6d9bc39b47dbd66fb79b24d7d296d665aaf3d42cdf672ad73e832b39b4bd5f62869a3d8c693c0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/zh-CN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2fe3e2f222851586489fe07684355294dc5f5d7c1994727a1b6268ad1c2e09ad88ce028b07817dc7d0a917f3f9e4bac77cb6ceee9c411b006641153eed422c94"; + sha512 = "150fe754440b8fad0b372539875261de4bfa46dacb5711a672fb1016b9909929378a5465b2500c79fd6d5babe5084050044d9bf1722c8ab5752549b081245bc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-x86_64/zh-TW/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "1964d7943118193f2eccccd36daa337200c25120603eef888db8f1f88c1b4e4a75ea4af6caf2a77562887e0b7be6a2f79812f0e6bb1b1ffb3e050c10cf8f217a"; + sha512 = "b0a6f82e4f4118087a97daf4e8772b9ceeed0fe537510df600e88abe5a9d6c6b81c85813cc64b19df9d2bf799c042bf1aeb9e2a014adff0eb08c937ec113b9a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ach/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "53c0a2b602b4629dbfe73c01db111f4a3c1b6e183c25ce19e1d84be373eefc88291d2f07511614a640f9a295097d9c860046b150a579308365f63181c781feda"; + sha512 = "7c9a45c296acf084fd8c4ae9203f6c09125dffde389f5cdad903c4beea09e379a4e2f55fbc292fffd6242cd5124bb9fd865fc73c4d738671f6dce27e2fceb38c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/af/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "7fad9c59f38580c422d4eb2aab21a86b21c6935c63d72f8ee9ee358f98fa6a09babe5c20293ec232593a6651715636402c1e4b349504428998b6fb6443c73f0e"; + sha512 = "3964d406c54fd20c93fba2a6fa967670a0e866c2d05e1ce6e4a0279ef355ebd65b1bd9b730d0c2d4e6bcf56bd72d5d543e3ac8c2824deec503159c96ef434227"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/an/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "6680345bd870f44995c63fd6cc0b99194d52d18c0e439efe45629c5d310c8dc4e779d348208b63eb372eb4caa350728af2dae26b0272d7e85c8e79fdba9345b9"; + sha512 = "b6c5873a0e42d171b46615c751b3ab2fd8b668aac0d95da0d4c8f5f64514780221ce373421f5ac3edc44bb185a319f34f8d970703b0e44ec413512c6a337955d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ar/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "cd5abcd32cf2cb8aab7c5e712347b1b7d0c2bf026d76aee00de20c9e01db727cf42807add5fbc5f47a4aaab60b4c8268b2025943122e783f51bb8ea4eda5699f"; + sha512 = "9f3812eb426ff05eadbdf38a67044365de649e4954f33642947222ae05e273d650b54ff3d4fee6d4fbdf6b7145df86d3bfd45de2d9055cf7b1555c3d903c7f3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/as/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d30feddeec0148b77e6b566fe9f7f7974405436a525adc3264be68d89691b98797d5d512c9a00e80e732d408dba0586435419400aeec07ddf8f7daa9144ccf94"; + sha512 = "c32997341f7280d3481a586747cf74efa2d136b25881d5cb1b8efdea51884dbc82524ecc856b14f21c8d70a95bbe1957637c3d74c7a22adf7f595a8af90b05b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ast/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a816887cae1397dcba16aac96b45fd307fd561585d5b3c01df33e9912d7d42c6053ab6927291c9cbca48001c90e14fc79cc1260e7ed0efbdf24114fc926a5db8"; + sha512 = "991cd6ed0e8470d3896a103fd96faf945dc73357d804552fb6ecb15144aa7a75a0154974be0a41997343b2c7e55eed16f1c6d864f1d556101a9eab8436aaba8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/az/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "014d9c5918de4a8dd9dacaa96ecaf2aa1d1831c0abf2aa1fdc13516bced15aa47da6ed6eaea3552e30ab06859a9bc38a4cd250c38bdad8bd38e8251e94dcd6d6"; + sha512 = "0ca184beb54fcd0a494ffef3bea069db2bd2d834ae09d1d30073b951d0ed7556d805bd9d2c90b1343e3522872d6be4a2f913f17a7682e16fd88dc3d33c9892c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/be/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "34f889e008724b551005a17fb02c778b8cd47b4a8051e2b342425f4bb4a173d9971b9eb963c1f875d104dda0592a9867d398310a49e3c8e5f7f3da9d76fc1ea8"; + sha512 = "5ba9d89726e051a3d2b620bdda0dde16d79c3dd8fe8bf3d2518c4203d3c5109052560ee41e288dccb23bcae8a20319165274009503931d9fce04085376b44d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/bg/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "8e8109eeacc53901990309aa150a2ab5d844eb99cc0f2fec4b74d55690cc2744f9070390f4b7d093e7bc99aa7fc2d11a7fffde39c16e7b2b9eac68d775e5ef4c"; + sha512 = "3e118566762363f5a28acf0db68f2579dbcd8671bf6422583e868c50e70c8b59f7bbf847d4ee2a2b01fe199d0f0b7d2ddb3f0648a4726e39320744dd097cdfa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/bn-BD/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f8ade5ad0ffe73141e9bcc957aabbf2d2a6236e2f8180ca8182d2f5274d528a7befd11747c02f1de2880184144b88503f73131116615e4cd4d92a427446b6caf"; + sha512 = "80e0d0b8199bd4ce35d2b9e88fd7602fd0c1f232251fbde89376c77cafc96cc75833d9d0b3756dbbe6b538bf237d57fb717b8ee6da4ec000540288344fa059f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/bn-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "36b41c3234abf77412af408b82ad04cdb622b06effec71c71652043050b35a2fa0c050d16d3667b734595318e93bfa0ff5a95f57e88edc0552f3b74290e12844"; + sha512 = "f887684ad0ab676a063bff238bdba8e0a05e6dd57d7472b7a834c6443f5c5697788cb408ba11399f38b949da0d57b4a9e90bcedd032b3d5fd9f6e1029b6657d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/br/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "39001881b040fc7a323b9495d17756b017dc4e05bcd3af18cbd3f69016090ef64621fce35fbffa8cd352622db415f86a0961e12e7f26de190fd435d3189fb36e"; + sha512 = "50d422b2863e3384de0c7fdf5bb10abbaf878c047532865226d6af5089e8a87c1515856e3ad294762f2de0335d18fdaf9efaaa7bd95245ac29a0c663aa73bb57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/bs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "62d47a17da9f6d2b756303689d383fa5fa22c2d613718b95421310c750229607611374aad5a136fcce18c76fda5da5c360781a11516c09b66d39d74de95cca6e"; + sha512 = "2de27aba569a25b1f45a328b255c5bb7933fce48b0ed1c006d9befd164b6ad7af26b255c9688dcb86dc92a36b35d12c0be4bdd91e4ef08a398259eed2ae6d9ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ca/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "fb475b21ebb5236ac9bd5c609337b2f87e66de5e412b66b214bb8653e6658a25399896c69321ac1e738f61eca9a17bd730ac127fcba5980cb6cb79c639067725"; + sha512 = "70ec71c259b8f5935d0b603d586e5a71d28382e848543d81eb7a004d38530b6107be6ac63be2d908b47110110ec93331fadf33397ee5af057df35991909c5f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/cak/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "58eda9278feab7fd25f0940c764d9c5a6abe405fa263b3d5861a1c0b62ea66f832ce89ee26f4256ec80da18714f72a3d09e3833fd52ac428e424a3318814f5eb"; + sha512 = "ae1ee282f71c133fdd3cab09bf44da6f1613ac4eb6679747ba3922b4233f76879aac57cb88a976b0c1135c08914d8aeb024a88cd9e6636a79e5010bba1d2221c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/cs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "cb0d29adcd6da7a3d1f0e9c8dfee53f7fdea8dd9d65f9292d9e27f646ffc07cc31e544cb6a458c2ce0178f7550afad88c235fb70ab827e4a53a78bd5db8267f1"; + sha512 = "d9f5f4dc2117c98d08d28098221356bdb7a86f2c48a9f2fa5826618a861f013d72455d14706e05784c19e61864241a923c7987d3ce5fc9703502b80645e81546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/cy/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "98094ffe76a2b69efee3f2e50491d536579916bbc0310fe845ecc53a500f375a00fc381b5ec1640eb5a036bb4e2b064ecc0396cfb87d602948425899e80260e6"; + sha512 = "b05a5ed0231a7c36f179112318e00a4905120f4174cddabdd15e7425b669d7d9af319cf4fd81d87865afa7a9c18ef4fbdf16b271133884ef4d30951b19e9c266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/da/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e53617024bea3ff625b5cb60f76d30a446c2a759370656f7267bb636c03f353d96113ed3f536fc2cf86c38adfb13c8a04dbd5c530430aa4c41bf6c81f5c2389a"; + sha512 = "280a4a86b21c66757b0b21c5a1620720a8d395052e1b36c7f4968a628c2b44d6131e93eafa17c33ca5e02a002ddcd21304983f02768e3f03b854f31fe9ecc509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/de/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c8134e4db3f9eefcea81d2bffaffd877afca39fc966f7bccc5b250db567fe51f0c5e4b8d14b2d65bf0e0a297462dafdbd9dbf934c71bf8e4194cb3a81302f7ed"; + sha512 = "48b782b1e1dfcd68cb5a0529a3cff471178ef219d622db1d217adccb4aeb80d0574e10fe07eeaac4d709e8ff8425b60892a9ddd5dfa090292fbaafa047fc420a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/dsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a3a8252f420af629717a32979fcb0ea84dd8b83ab0132fb215b422697ac5264c06ebdf31584aa2c3b2049a78c30514ba2746f77574f8bfc937b4f30d5047a2b5"; + sha512 = "b2e9c73317460bdca82d08754c591c18a6b078b14f8f0a1f0544040ab618d22215d014d8275dc1a4d9ca4e36201a26404006dcf8ac9443b383afcb6983c07005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/el/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "36553703e6cbe18280001adf3db5fd9c922a592138da001726b8b188ea79d69ce6ecea80f8eaf8c79f37b90d635af55df7b0837aeade761da45a97fbd2e2ee82"; + sha512 = "2bc5f65d92b3dfa86485809fd92fcbd61bfe6fddb28a928385ec54527a4b1beed9d6db6db987dadaedc17639d1d1e2a3e5d8f1cb96f55f20b203c6e537749159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/en-GB/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ebdf19484a316e737be220005e70f63d8748b3ea981f986149ea786aa1d423d6ee905ae34bf3a252a6cdb6b9f57fcd89fa1ba1ad9e2071c76e868388d2ecb440"; + sha512 = "6f85e6e2590f181f52fa79fae12bc59a1d53c44a8df75e360dbc7dcdf4078d02e6d34b904c47b214f7c23a978092b995cdab92093b85432907d28dd0ef054bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/en-US/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "8b2499092bc4de819d890be54365ba1be1fd8cf811b3076b426192d5b3f27adeb567ab0346c1596fa468b933360481d4b905c8ae3edaf0adaf315e327f0d515e"; + sha512 = "2d84381da9042b0682377660f8d524f503c4e71e2002a98d2f443d00d0761ea8aac59464a54b7807e6c133e7aa9f983d00c6fee09c4020dfa15377a1d662dc1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/en-ZA/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "896177f3b46e6e05d64f3e6b631ce592e9f2590a65317126d2e4f5f3c3c35e6bcf5c9e292a57d0f192a5a18da6539259c8734bc49697cce9e445d08f700b282d"; + sha512 = "d38ebe9d512e64bddba19d4ededa6a9df596b43d61ee7b8d06c183884639d693a1ed7f1b2086027f30cbeb8eb5aadc7f8a902802c827a31751985509067ecd6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/eo/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "96c1bdd73fad8c3ffe3c4df183fe004e0db4ca957d2533048882c05d97052aac4798ab2a918f2712e39818f84bc6df2f1b676a05cf98d1559ac3381ffc4646bc"; + sha512 = "8f7d50d14c75137d61156a360330e8e086da96fd13e1a32bc956f93f5c3361943b8011ec7ce95ff1c45194b0adcb980d123d0f58e67fc7e1b881571d81e68adb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/es-AR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4841a984d39ad52d0ae3107042883057f55ace2ed9bcc042a136522d39a89a7d12f07e3cd7e904b43560b3aa5627103192e0b4d0ab6ac2d6a3cc5986f4d55ba0"; + sha512 = "fd3bf685c7ef048b29fd10131b1f06ee4de9f5af5704ec1b3ed657678ffab6aeb901fc64a6a9461ffad4ae6fa8f04535ff91276cf15a886642821ef5f739217b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/es-CL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "84a861405d7573d526af7c29adbc8b6512f95a2a19340b58e72665758b0e67b73bccdc9801da8a965a9247b39006d5f64f90618495e2c7fc1280303295770234"; + sha512 = "e6711cf4073c120228afc230aaa4ba45da0b93fb7bfc10eb48f0cf8194ac9022aca243fc9457af208c5dc8ad2702eadce88fe1e598b86ba6c2f34eab426eaaac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/es-ES/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ffcfff4ffd2f238fb5ccbf1156d341df9df9dacb39c725084e592d5a4079e58ddd9ae21bae187a77ddd6a5f4575f2961d09ce460a45d67f5f3ed3d36fc6c9f3f"; + sha512 = "939eb996a025362181e89e1a978b6cbca4157a84f314c3f75e43e5f041738548a467ff2d8346ec6bb76305f40856b8530803784a8feffbbd8cd3d77cc0a28b51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/es-MX/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "8cf5dc55c3c0f8d88b9b8cb4c4a78d03447ee04eb9463ac83148e723016388693ed4c3b36cf70e1875f393d410bfdc2c620873cd6abb72a228222e3da32b4571"; + sha512 = "f2e13cc14f3356ea205b0553de6a856cc5ca65b3ac2ad64026137e4fd018df71dbc308473fbbe8c5d77f63c813351fe5f8392acc14a90ff89fd0c0f971c4ad7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/et/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "ebeb9b562828df9ffef7dadb1663e678a011198d61bc29ce075f6de3213b59952e837058d539d5af6467f0f44cfe7cfb24a5fcc0b691384a1ef16a84fb73a643"; + sha512 = "305dc29de3ba9f73deae066963c6d1c687128aa2f132ca1405d09da04b6a0a112d9b0353f9b59fe0503769301fe8cb14fb469e64de8d1e313ff3d415c032e33f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/eu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "aef876e8326e52d74b65ac0525c5f3d4cc08d622488703e5e9d2d2468f929b85ab7b7917fb80765d1c5b06afe4471fd24475b972d3afcdca793568961d20d39b"; + sha512 = "61134d922d05bb5599f70106128911e1e7beb8430f1f9a100a5a32f02b6144d6313010e6fe29f7c422af4210c510edb55ffeafe4858ee7f1202f41941982f784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/fa/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "5162b011c54be9d464f6ae822b237872f12c9114f4965b82079512fbc3871ebab4774fa46c8003c2a5ef19405f38b576091e0525f09a3f49a5283ba2d26a47e6"; + sha512 = "83f3ec87151cfe565a3e350ad98558741a6b4e8c72b5f36e0aab07d4ac26ae2b4d6622f0faafff8ee1a6f851c723349bbfbaf175f209bd97ae8bea2c4ba811e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ff/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "cfa9f6becda5dd1aee89a57e6ddd0dea98cb993924cae54e535b6f553e8b10806fd9e9ca22b9de882eb21f29f82738d4d4cf3e8034dc06bd1cc7345930a85d36"; + sha512 = "99f781590e7bc8ea63cfe13e3fe56e1f14346caa4b3e32d23d53600c0d4ea8f55bfded6ec422ad8b41eaa47313dd3726c952e547ddde6cdb17f6515308791bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/fi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "50e1b2561b38fb2ce1c6f9347c441916d1ed810fb3c51818f353a48720a27d46312fa3b0d77a0254e9dd3a72b86a877edaa10ca2dcb0a62c884bd086206ff0f0"; + sha512 = "27de47eb3ec0ed3517ef6a3cb00933a8b891f8f1c1cc0e9c4a7ae2b732141c8872dd35c8a54bf6c5ceaa054360e053f5e52dd2c5cbe2f5ca4156ccc8ea337c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/fr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "2601e6276f0351d8180c18f4ee2247e362f997d58764b31d3eb7600b22ab1831ffacb150be1458e178c186250109a73f332432c64c235480b1c0cbad9d81f349"; + sha512 = "25fbf0d23dff1f37d069e34afa3b8249da51e33522013608b4e623b0334ca63dafeebbc6db5718ef829282a78d0fd06bf00d6233123e0f405773dc1188dd4615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/fy-NL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "136cef825011e9ab2951bafdd5ea24c41299099c50988911fed7a413f42c318a704ac8078c74e0fba1899dc5970ac750b1b025c3b1200ed39078262cc41a53ff"; + sha512 = "e82bdef3a02f356eab85facddb6a643a0059de873782691bd663d741f29f06b223acc6e1d1058a5f8a0692262a764ad019abd1b77b1d5bd5610eb9a338e2fb43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ga-IE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "29055d41e4923485dad3b76b1088f74821d5c8367f4f1d71acfacb4a248803750b3b0b4f339077ba84dacb31d16967f67ce8e432938078e55f830f78ad3972cc"; + sha512 = "36e2a43da67b1f6e941ddc5a68db953186af1ea0f505bf4a1affb70aadf3ee5f9a61562d66fb87007ceeff87ff33fe5244ba1337f83ee187cb004b9859b4f2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/gd/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "28eb53f5d1a6f0869554b44199b1efe17ff4784c274c4af1e34e0cc28f6d941a83030532b17c7050e42c0e36f328c80ed18f715c5198bb7db5b0cb107b0e0173"; + sha512 = "45bdb9aa59647238d457ee1eb61ce31777734b1054a7045b0ab917cac82ee0636aa033a578492966ed2c405890743334b942c962cddf00c7aab7cc8a2868faa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/gl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bf959f4f160dd842750968561c902e68289e4a204a36add8ec3b6ad651639aa0cce9d849961a7eb6bb7b40918a059dabd9aada3b23b367e6b6d22578433186dd"; + sha512 = "cbee32deb9cf59e94f6144d88f8b78d053fca294f050cca739e81c5cceb33d6c34153a082413317353bf5e792c8ad1c34a3db34fe2bd5cdf9c7f59d70d050d73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/gn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "84b02bc76542d63b006ee96fa3a5302dfbed75e198a7e28ccbf31d5b81f5ed55aa3501700a8791d55fbebe69ed16a826e123e498ff8c846a21e818b477e25e72"; + sha512 = "f824fe5a4cc0b56e7d479f3f54f33ad939e93c9911c4a133e567607b325c75b36e0ae40b2c4ee52eb90ede34f64fc9ef83e56d86000194e453c76c8cd505e43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/gu-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "009d040a98df25e6c02efb89bf04f5a3a6cf177bb7583773bccc58cd67bab56cce50c3b91bcbd563f4392c7203b1357322162b6a6033785516151f966956fd68"; + sha512 = "2706befded2f4ce9c7bcbc907dd634ae90309dc3e55849b2862498323fe854d563f7445701e652d7205e41f3bf23f17bbf7e7c43ef8e9808cb63f873d3a5b343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/he/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "35d02da918f0c5690e996ba1abd12b3c96dfe7cb8081680a6dd3c70d9db1acd14cb07b18908b3a4c89100c48f1ae5cd3d0731f1d7ae3a764c49104262d16671e"; + sha512 = "572c907f6c8d8de9da98a68d74b50a17f073aa2af45d7c6d3af1e637ef9bb7192804ac89bc77b10a9e99dd0ecfd1eeb8b5594473125b1265e41ae91da1fdc3ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hi-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "809a89e3000c55606748ab5e5b6ab32e2902a9a6adbb2ef7ad6b25c8229983e031755a49a0f87a0ab75b658099a353f98da6b7576282b0f07a53cdda17844ac1"; + sha512 = "48d3b243d4b656f6ffaf18d63c549c71a530f4a252f368d879f5c854ea8107674b50b4ed4bddb5c36d937b7652bdfc6150672dbaf639eb1efb1f2982f2b8622a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "43e152f761294da17606e31f6f5bb5753b514f530304470a7f3b6f709a2ac58c97ab6290c69de9412160991185e9115ffa8c694cb819cf7bfd30d37c2d32eb9b"; + sha512 = "18d4d5e1892fdb647b4decc13e4e48b74195f924533a32c1e7a8387e94b51d02da2f7accee7420d8112093951a311a7e871c8547ebcdda4c3226f4fa5ce294a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "caee87b61c156e753e85428f215b0602cf1c0ea608ac6ae111a706c827783221038743178560126240601912498f10a555210fe2691e38d4960ea5df214618be"; + sha512 = "ef3cdf002efcc9fc2c3fad7c0ee0e098b0a967f610066d7efc180dbadb30dcd3d0696136391f15a9304758fb610a96cb84321d9e40bfe28c36e7f43a96e1d7df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "686cf21b6456e86de1287af870df6ffbbc726bb10aaa564ae7e53ad7ca08828babe2d99cc4fa8d00fb001f6e1a52c3eae0246e493147020601ee808e7b8a5226"; + sha512 = "4bbc24ab9700af5449709fc2fdc612955e3b75e5973765c698ade3ac9f041510999033edf5a587983ad62574fd45eac467043b1a1671133cf5b9ac07834e0ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/hy-AM/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "81f7708bba6356127522de30543e3a6322735c9c1b204a18d89adb7d6e848f9155f6929eebb4509423186c807bc8f874501e3e3d4ee27d308598ade33a7169cf"; + sha512 = "987ee31ec5ae384c6f6dffab7583a246f1d67fb94aed09ae3d389eff8e3f6d898fecb2afb0db41ef7521ca5c8d8ae5f525071fa7931f83524462634c3b3d049c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ia/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ia/firefox-59.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "527cd14e9593d5f01a40a016d3eb4fd1375ce6286f926f47a05ebab0332bdf1d3359eefb63413ad860d1779e82a2065c46653c61e38f6035223a8fca9a5a56b6"; + sha512 = "e419094a4bffba6e1ed263a14a92039d861832bceaa1da6eb91fd2ac07f625736bcfa483434f303c6370a8c4212f32365bcfb469cf8183c6a6bdae59643ba42d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/id/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ff101783cae4e86a897caff95bb1d0d7b0063b8b3e2428debdc6d4b4b294ac6aa486e0e68967808f90f230e69885454243ba89c69a3aa766f314e08a0184bfbb"; + sha512 = "c65d19533e0e9174a5a290dfe932284109308f3a9a227a59b533ca5d68eeeffcb064d52bf407baafa497b1b569cbf03ea4f5565d6e39b2886496d2bae9aef2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/is/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "08cb22907cb3ec484cd510e6801fc33e6b2fe3df0afce5f8df5f84d3929277ae9bcb5cc555f0644e8e1e5234a4fb111df7cc92dc21a2549b9331ff12e2644942"; + sha512 = "19452bc2f73d53ba8eb6d5d5b5a67540f2130a43508c7841b1e724e143783f973458ae1948e71263fd1bd9ff12dd717f02a6c6e57ef7b165d189a7428bc00007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/it/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4064c7acd0c8193be70a1f9a4479b0dc4905c24497bb44809ce34815e953d1a0e717506751d7ad43245a08f6df20cdea54cba4c588cad917c2344f335800ad0f"; + sha512 = "577bba4202831b92ecf74484016c5ea0cd9161ee64d6df2bf0f81f6ca88ae718e64ada78d8d3e190dc3a54aa9ae15881b34e04949f6c6376bbbcf59225a9b6ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ja/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f76383ce08ccd80cff05c4242de23a82e3a1e12ee02af7f73f7cda8d03e934dbf7e27490c4134dde712d7d05f6a9141cbf13e3f7234ed27f781fc823b4b64b5e"; + sha512 = "80ff213322a015c906adf43f278f0ed7691964692b036e8bd03fa9417f46bd7d2604b1fcb7f6d1038741c592b1ca63a1accdbef1b9e8e40e150230f6ccb350ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ka/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "a86a1f537e8ff975a55023dbc6fe6bdefef7ffdb674305e5880750eaf4b5c17b7d866607563db77cb20cba097790822643997a9f93d5ddb72622719aac793be1"; + sha512 = "542a019b300edbee543e86b265b80f899dcd646423b367957c255be864a4c25f1cd7a5e566368492f83c0b76854d48563764e01cf660d41666420c3d959f4505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/kab/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "fc3f9b62c181679918ba9b1085ea35dff6c7fb583445ef7295b62adfbf6eaf4f4cb110427d1f5a05e5561068008d6ff9006626be8bf95c68e87669e69fa4ee8b"; + sha512 = "b2f158e86a62c345cb82fbd7be2d3f4888c0a39d239b1973083ea7f710da755b160ad5b7b0c2c15a11ec4c7f707df9aa5fa1f9c479821bc7bdb71e5732410721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/kk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "614026b48fab34f0ef2f5cc91d36afcbb3eeab3c905d3363110382596d23983abdaeba1890abfe2d7f4ff86db3481875e7837c9fd67951047af2207e204b2b0b"; + sha512 = "f78ca53fe7fb3a74b46cabc079f5ed837f76196a0253b7525fa7f0e9b0e96c21f0c93f04da3e6b50393c262a34cc399d3c6a2f02fd5e75b9b05ae99a1237ee18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/km/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "0b2c7e117f6288c2e7a584edeece3b579a1a3116d23e825d39807b6fbd33a8d3e720918f90b73d8a8772d7ceb8ed3a578f667e4993cf1c38b9b04c28463e5e89"; + sha512 = "9a63de9bb32eecfd7cdebbdcd43ecf8977a96a73199dac06561964fc874d785e67db5583b7300023048524208d7ea6d4d83df68d713ed3227fe3371269d54951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/kn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7d74fa5332648397696f1bf656ed925706eb90da46273df0e0ea9438dd3498be6024e62ead0bdbbd835f37c7c685daa348edce0fe8ff264a1ad0a3627ec079c9"; + sha512 = "0500919759971c60007c9766d4c719ccb3f794859aee0d06ec46b552cea6186b0c49a3e0ae7439c48326e6562a50cadccc138a1ed425d677aab070d15e53ef89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ko/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4fe7a9509463b3980551fc8317e21b71fbfae62f76a600a7199139d64e220fc14faf3de1f4a35598b1bc3e1fa41659d0ff166359b125c4536df232bcb53cb373"; + sha512 = "96043eca2dc79f2ba635b7fa930219e1e8995f7983c9aaca73d700153002cd05375feffd9c501681ae73caebb060ec7c6ccfb2a3666f8b6424575728f1975f82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/lij/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "0cb23d92701b076e828dd036420ba44ac0b238cc66e3065485e2d8fc7c7bff3410a87fa9e4044ad7bf9c79a016de44525f8cf321d8a071719d8a712bb10afbaf"; + sha512 = "603b9d3764d92f3fc66f89e451526749ae11c5329e4052e81d1949bb17171e0d1536b6824a9b0fc9017b98ce5a7ae31adfbc51583b275a770f361b77d6dfe742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/lt/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "3bd497b5585682a52f3d16d9bbb728d59dc39de289fc3b1c9259e28f740db8e55b46b6ade290ddade308974d38877b972fa50c89a982a2b26084c86c0739eb42"; + sha512 = "dc7447ec483b1419d8b752045bd8380f2678bf976368734800daae02085d99323a931954aface4e1f701f970a3ad70e07107812fe930eb300a1458a14ff88b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/lv/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c35266a35160b0b333f87958de81469f3f5ccf3bcb4e6e2049768256883a6f59d0b1d42f7b67b55741af81561bd227acc00e2912709ff72fe3e8787b680bee5d"; + sha512 = "f63e391b4c490ecd76d3b2806f4413817d0ed8da5298cdf2e9da7abe0499ff3fe612474f8f040d35f186a9a4cc0c989074affb26b8ee0f25e774fffcce049f78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/mai/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "f4c6924895f9b89dc24a8f1e811d11ee5ca8c15c19ab02f58bfc9082afd05e0c4d4e3b4620b16a28deb70a7237edf6864c7a76b24ac596a2ff88e58224ad61af"; + sha512 = "ceb3d5005b5e7b2edef0447ab9372feb14dea49bd0a3d2946cc7852f30aa0c174a0535c8edcc1e5164faa3c7829f5016daaa3641203dc2690984cb2a72cee626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/mk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ae13d6b0a3df9cadfff91df9acc1d45181d96519099fd3d2d04f9fd5d3c21f3003e893cdf49127e4a1cd57c38cdd38feed0f321fd3165ba38148dbcdaecaf2fd"; + sha512 = "a2d4ba92c6971e99521617ffa1ae2f047c63d106f2644ad22a09eb76aab516f1468fe6e2aebdfa71b51a9d92379140e19f5ad968a11b61cee027cebcc84d0552"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ml/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "423dbd22a046a26225573996ccc9b1ebc246a68d978c832ab04890998d507c24f3c19babba656d3615a48eb68c928c4f68f5766f137a0555eb5ababaf2d6d34d"; + sha512 = "00b6358ca10bd1728f80954d2a2660888e1c73dd2892855c72ab3ec0ba746786dde29e6b7fd4d559eac704fefd2c87a05ebfee1c226eb46440ef8ec354c08fa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/mr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "52b92efb1284da07f356a04803d13385861dec151dc243f84d36aedfcf3a5daf5f77693aafc76337a1cff8c9712ef6ed8be1907c979b24af1f155234a5a9377a"; + sha512 = "2b3c154a9ffe91e0882e4ac7b42fb2b332e9cbce726a68522f9a99d159ab11d2aa75ffd017d8d0ed73ba700c4612e4802ac9a7767e2751b2833d48c850536b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ms/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "91f3cee6370404ff3a9a9f392aedf5733004869865875f7dd9c7c7a4ed5fda6816ee6b58f501829eb4581f070d357358bbe9b01ac434d395986b2d5e7c94cff7"; + sha512 = "71c16d638faa108c26419913f3bd7ed5aa65774a4a1b6de4b89f1613290ffb321ad85cde2a423573bfc0fcac2a6d26d2235318e87f4a534919e5726bbeecf910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/my/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "50da79453d7c95927aff9de5ee7a3da70b91ea8cb499bd8b2048868dce095a71075997ef3e6990a42f657417c64c1c3da80d873e978b7d536322e8e23773c402"; + sha512 = "f45356d2b746928c1a210489a8936ad267905c192c9bdb8c703c86cdf52a9db0cb118512649803c5f64a7f7b5c5e9bad1480284d09ce16f27d1630ce16326f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/nb-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "7c4ade5e88227ababff39e639c6e12496c6fd5e4c4d9a94ab59057f35afdbc55732026838ebc3402a83ca26115cd5ee6c497ce2ed4de62d32423390a2308e010"; + sha512 = "64310a4d25756915efd8a586861419a3daf6b85ec3c5fcf52dcfe0446267f217fcc11f375e67e917f37177ebf8edd5da9e945afcfc114ab90102282e94e39d14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ne-NP/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5592130474f72a4ac1e24095b84dffbf043c078b0e78e746f5c8a69ac1aafa907fa28dc55bc89f82b9459641eddd3520b5ca4e6d942f67856e5f44e920a3a0d9"; + sha512 = "87e5586928918b8b8c294f3a3c229c393abd116ebc27ce64f641671a5cbc10a0165ec62f8b4f9fc8fee084feb51fd16a43db6288dd62abf6f4319cf58a3fc0fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/nl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0dd59de2256f6bf027fd746f9a575d5f958033439d1699cc08417147a9da9bda0bbfd198911f46fe8df6daa1d3d91e23ffd88e391be54a5496915e4437b54a20"; + sha512 = "fa96336f5db42925016592845cece77d369775ad8463aaf72090a759bac0c69032e1b7379b1be3dbb2a131d5f3dae3317d5b0dcd9e36f5a91fe7a2dfdbc9d5fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/nn-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7d3f1c6fe9009c5ba6f7e667a586a52a08e7625fed869f9bccf8fff6dcba033323224fb405841b4e6e2ce0f676cd0f6c06b1bd16ca939b473d24345d99ee5936"; + sha512 = "7ddd0ace9adb84cde7910c0b247468e47b802d90cd00307f9e660110d5fd80d79dd6dbbd9efc1baae632812742c977a58d0d8f951f1c1e70648a2b2054bc63a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/or/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "067b3286a675c359c87b77a41c8d7eadf4ea5558a9dfa6961686141a0ca2772998e93dd821832aea019d626241466e627726d64adf4b7c96a8e6e48ee6b25e81"; + sha512 = "a4a1eec3e2e62ba617cf6a921f125522a6ac49a2f5deff0855dcbee3037f17f6d5e32180a215893028f933dcdd879c95cdcf4f133c6c952db073a7543012e474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/pa-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d383f44caff525e73403b5c643ef38d2ea5ef72f4fd6a432f019bcd554be010d8b7575a682c4e7ea0c9e514c4e60ca63481bdd294605064f2b9b94798d825505"; + sha512 = "71fc1b5f4a1525e3358783498232db6df0b92b52d6ac2420051b5f15191c40e94ce3c7409b917ba171e1b8c65b316e771b56e46812b5e9421163c9e6267adc2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/pl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1f24b54f2c3cdf382503b466df96ad473c2e8e153f4815720e8ae8d9a91de365db987211a0419e143680c9241aeee5417b8d382787c589267b8b6e4280848123"; + sha512 = "8ab57e4bbf78abc9e6ead70fb579d0c5c0066ee8297941e6030a6132c74cd965d23775029c7c4357dc80b24223473311b13f0a826ce7a763a4fb87b80de81f9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/pt-BR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b06a23354ece3b3e874015dca4836ce6882870844d01e1ffcd0e965f4acea32d8ab90f89e0bb2eb0ff9b558745afa623db274ac6b1a7bbe6a6726d79fcd15fc3"; + sha512 = "3ef11e84ac83cb2c38b029342b4e7782554af6831e8c18c27e12efc97243e2b84e041633b43ce8d4162d451ad0df6109481d94c3bc4c9bbcea27807427c9e830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/pt-PT/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b98c9d5bfd69c30f152ba592767bb76af25da59370526180aa6a55c703498d0967e5488e42b49a177f610a57f7cac9e1eda505c7d4691071873cc875d01d24e3"; + sha512 = "a795e111da79b03dcf73c90cfacb58d56fcd866ba1a7d5d70474844d91586eb98191cde4c18cdceb481cf5be3fdf7ab2fe98f22690421877b9c9f87afa8c5bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/rm/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "dcef4e5408f26632b32f0e3e91221af920d9f039ad6745a566faa555dfafc3ac79909176fa9d97967a27af6628dc963d657cb9270842a701c528c58064162756"; + sha512 = "8dec0be4a506c750c6c6cc3a52964b6d3cf072ea6a37c9d5a6ef855eaadd3b715ff48fe9ee320716ed23ec56889e3585c729f1f8c22683d45fb1a04a344475ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ro/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "217f9aec9a46c8bb93108b4e5fe24a16c4c54a74fe481643191d45f0128491bb84930e94a1ef1f6f5f0a1af34bb64dc090b3f6fcf55d4ad6b0718280e2ff6906"; + sha512 = "e9adb45a8e22243de0113007a3b6f4f2eeed119cd326a0024e3b7e42abbbeccf0be26c8ea80c951e50e857fb773cfaca6532b6ae32df0f6516421b1d1683d98b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ru/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "4f58e27746a15c69312dd3ee20147119e34ba504342c0814679cf4686978c4af13d77f277c3dea92a8302cdae5dd9d2da58daf3d793e25ce6fc932d1a98db20b"; + sha512 = "dece61a88d1a3fa706a26a847601bd633c06dab512afcc4815c1a379a56589b6afaf2877658f9745d328657803e248f5c22d5e611db79c46b7d78d38f3819778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/si/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "19fd4044d50146827514c836fb92aa3d2e1bed10795c99b0b8cddb5436ac4cf9aeffbf2a9f472882b9f1b1f1d2688c8a81730e25083520f43a7c79b1464f540c"; + sha512 = "63a57a44e92e2dff5e24dc720aa1e2c5f469ff670b839ffac11ed27e242afb8fd30f5472d6a120c0d9a75553242e4017566460f0a374ba71e08cdb967bef198a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fb9590e9be48ee8ac2e0a2704ffdc32d26830ac46bda8038563d08fa96779ab90054790a44a063634a1abe7388e98b44f34ee60a770dd03084e37a49b3993a9f"; + sha512 = "f4d2d08315d00374bf1bd5f9b0aa156df9fa27676c191bb11a8add1396f506651298ccc6e35f6a260c1d1ae36deee51c0aba39dd0a996bf532f6c627db07d52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "abc0a9fddd62e3b311ba15ff8edc66e20b68f5d1fa5a0d2152b03cae396df9f2e1de0c50b70b986381661646e3c857f85e5d709eceb0b7572d8e4b6cb69f7445"; + sha512 = "bd067c5ce137d3d60c2646c6121823c5b2d466b1d5e6ea8b97e3a341ac66088f6d7cd86d1530fdffaeb5a9298972b6823596940ed8133712e4ea2420df337f40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/son/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "14b1d590fc7b562e5a9d15a02c52b09b3afbb4d14ba4f8ab4b7b2779db7c92515c0b094a3efcabf30ea54606fcee821684f697110ecbde9d8e1099e389dee6ee"; + sha512 = "60dcea372bc427733d1939ba10e476545ea2545ab63358152947d7aa92581800384e4f9812945651db911523c48b7b8279248d01dcd6e331dec8457bd6eb68df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sq/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "aa0284796e51726e90e601e948bac237e9b214454d995789c690b8f17fbcaaf2f9512d0e54bc36cc1676d5c13428ab006e7139e3bc5fa16b33df99f176c80369"; + sha512 = "ee0120540d500cb9e23843a970c9d0a7c4c59d93dce098580e0e26a1de789d82f86252767553f42b58146c8c9bade95de4aa0b0834c8c73a9654bc646e241ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ca930637b1bf17ddd7201da883633ae1eb051c31ecd11f7e97217cca2a9727d1ce25a17182dacb6db077527152fba7e477a2995188c1c41f260c40aff189fd6d"; + sha512 = "572949804891307635ea3edeaa3f8a2a5fd9417491b73c3314785749889b32a89ea454d84b87e26af78f06bd65a9b40069e7015e12de702c68e1600f1ff55291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/sv-SE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "9dbd2f0ace46e0251d2b6e1404e9a57352750542dc23676ad0b615650cc1ad415ba585c614aa752e8262d7924858860eb8b6ea123fe9f3f2bae52fe6b5e5ee4e"; + sha512 = "30320faa886b39827eb6a167e133b205e0628570c29013c123f30919fd6f08c9eee13d9a989d518ffd5a7115c07b0c4144ae7ec1d4a78a6abe130ad1b6ecc3fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ta/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "8245abd62543e71ee4c0f9ccf8e20f45669427df7d8e4dbd8f252c53f3e57d2aab1da0bf7821f6f0dbeaeddb2201f2e345c58618207733024eae9e5d69f9eb6a"; + sha512 = "d8caab89ce3d95f432f5e05415fdd2bfabd8ccc4019312df87d56aae9cbd991baadcdf4d7bccd2c549f01f4fbaa3bdc08e48de36258ad1dac6cc91e7983c4736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/te/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ebbbbe4fd689ad68336e6e02fd69400fa339ac654dc0bf7c77a8011eb0139eaf0836fb7cf9ac09354af79b31d150383e112fca56444a9313763784805ec62dc3"; + sha512 = "f1f063ab4115fb66fb3c16330748be402dce101fca5139ac62174c4efaa877282390a435a1998d28950f8c2d37267a930f8b5c72ff86ff88c3fd472075ea0794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/th/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f603f2c8d2f6c02e7d508cf5a8f2884cb3b15af082b815ac37d8b6276b39b7fa2ab685814f19d9bd317b5b3c9f24385ed4bca887b641a7f3c715ff81822444ef"; + sha512 = "dc35e94d5329de50ee8a6d49bbf7c1a21163e6e93d94ba42cb9e6f15e7b173d21df218388130d9033afb6dc4d4af402c42614841b22c97d98ce8a68c8a1b02a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/tr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "1e5e560f04ed6f04c93dbcbe366323678087829197496bf76d4ccc4bc429cae44e875aa2b0f1e5282f43f8f7d699fd0a3ae928827d77abffa77c8cdeb5a7d759"; + sha512 = "295f600dd18fb684534ec301541f144bf21bdc245d812507cb8b7425c46337af4100e8cd9265c5e9b3bd76e65fa2d6ac48619d1253a4458b7d2a5d003366c694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/uk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c6149c7a5a29dc9ea1863d96a75d7489c069ae658538bfba0bb58a79fccf5987ca6f197e4a72d18a4fffbd377ef96b3e73a44d31c0c9d6984527b5f63f51c2ab"; + sha512 = "77aa3e08489d5c2fa15c793ef1cb514c7f210eae4e24a331513e7d40a729f58b92b339ec05ce646c9861c8524bcb6e312af267e4db7586ef058aef0e53e3f5bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/ur/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "f305ddc3f1a91df5931906cbefafb5f05c2353fea61630105f127e33d68474b3e6eda1bb5566a567440ddbfddcf83193604e1ebf1b004813fd1c1f3d3d8d6237"; + sha512 = "4da69920ffbc3120a6ca75da79252e6bf1ca97b4540315683599cc702b6c3db4c996b0cf0565a9c97ffcf316f3519a8fc16529350aa9e22fd6b4ca48f734a289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/uz/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "1fbfc43f3f092818f3c791853c18bf1973105fe8a7b357bc3331f3a6f5b35366bb7a530f7c6fd4dc7ce1a2ce472e4c7225c043d11f9ad719c67f2ed79a44785a"; + sha512 = "12639e719842e98181c4c0fed1ba284da143e49d42950dc350c7ae996bbe07154979a2377cf59b2979e91f8b75a64b9e7ba20cc64388de94329488d1151ddeca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/vi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5d6b65521396d2860ffd334f4827dc0854a96418dc3e95d867b44b4ca5072b28057ba55d86236858541182595052c3de868b121e0e52c4032fa0dae9eea81c34"; + sha512 = "946a0b00c94a030ab0547a0529b2639d880795c821952a71b467f199332424e42de4fa06c015208d58be12e52ff5044c8ca40dcb57480a838b4688917e9d527f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/xh/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b545e18707af5a7a6cab6306dca12ce50f07586d6338ba1d72cafd891695ab04d85c7416d35a13bc6ed6c1fdd460df903b1fe2eddfa32d75f5c5fc7f3a1fed87"; + sha512 = "7f71bb5dc8af9733b3cf14b72e74034942b46f06945870b550489e178f21c348da4b67fd4c7e51c601c59caad9868d1b64dd8e7d5ae5976525d57b739a847308"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/zh-CN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "8a12935dc84f34d7c9df07406c7f228121e31602e40a5d1e061d90a13fb235142affa70033902ee095addfa355ebf41797d136eeb3d2c06297b0332b7bf8dcd5"; + sha512 = "79ecb68f4b4da883e7238ded7a40fa9e61e830926e5943e7c70d7fde63d9757963e3ca7c763df12a929615a1817580074f661f03fa02712479d1b677578ffada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b3/linux-i686/zh-TW/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "27a43df4c9d47510e694062febad58d19c5b57adaf9106bdaf9b3ad86c8e47daeb34e01ee346c92fed45126a9ddbb2cd3963751fdc8c13e9c974300c8105b640"; + sha512 = "c41ced6025916634099a01dfe9213472b936b89e4719cde0a1a06404140fc564d93b2a0188b7cd74afc90dba4777d0919e64ee496ad9fcf76966f3392f434592"; } ]; } From 557284de3324ecccb4b8967ea53b45f96d2c2ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 29 Jan 2018 10:41:28 +0000 Subject: [PATCH 104/373] firefox-devedition-bin: 59.0b3 -> 59.0b5 --- .../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 a20178cba9f..23ea0b80267 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.0b3"; + version = "59.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ach/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "2a08f6447c5451cd7fbf094c3e263db55d37128ad1969af30bd904ccc43ce31fccd73397f509d21351304ba19ad06544e433a1b9e5c05c7f58e3b9e219ce44c7"; + sha512 = "6de09f1ba2bdfb652ed32a7cb64bcea7afb52f29eeed965c02643dbe032083c7c37e5151aa03033fb93c6b29fc1f2dac03575af8e03887f74fa0e3161294eea0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/af/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7d9effe3b13a05e7821eed807b799968fbf79e6f20de9059b7059e7fdeee4134f82f47cd417d555d136ae7c692e64ca305b1e79e7b348e0d817c9dd26d16cbc3"; + sha512 = "44d2b1de47ed25b0fc363b310046532739cbe16281ffa43715ff2e0cab090dec91bd21d237c06eb364f0fe015258fbb2366015a6f9be12fbf6ebfaa1bde165bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/an/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "5de509043b42c2979cbeab0c05506de65477f551f7be2cd0e84035463819cfdc841cc0697def15a1f253b9ba1e189dfb8e501bf2341fcc03e7e17ef7188b436d"; + sha512 = "2c58f4eb227b58ac804d98cd6388fe2f9630d423a2ab45c5c4cee448aa6a07aeb5f7e54f373a39dc280557d0e2400e233100b5721465f96f5cb53c28289aaa60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ar/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ff6f78ee4889e56b6afa2935a4c927350d01ffc1d28125866ae07525a6c9d6cc8dc28416ff9815a539eec4fa936e7f292178289ea0484e62491f7c908c521cb5"; + sha512 = "1bc623e6eb796a679aa3e60acb418a49dad24267849db4e54c962b54bd3d2193444bf39912075dc3687b83f5d579c23d4ced940102a046608cea744ecf0fc9f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/as/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "52e1991409108c4805d0a0f90da32533ef5f9bc90275a8cc4053864918417813a0c12507c06eb04dc61deb5385800a82c9f43ce29772efc8f196ac7481fc4019"; + sha512 = "b40d5955835c7370553967ac32870c47625c493992e1f1672be363ded1a5a2b3637cc3b2756530f324aad0149a84fc90df5a0992f16aa1b6939c15f6c8ef9d14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ast/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d88197793be6c610208749c77487afe018405f4a21107cad46e1a4d62b1dffda6083918a3eede403ac726eba1baee67f5ab55938f39dbac6270c4428950a38d9"; + sha512 = "e9be9a5b55504784cc6531f90356a2a256a27ad20faf5880b5eae58b326163d43bff138feb48f23993e6d9715cfca8bd48c601cb6786129ed814c5c9d8e97261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/az/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "a24ef7b0ea1372e91f5b82dafe955fbd175f0cd00a3323033a706a9184965bbf4eb3898bae35b85ce25e774429fecf2b3463b973ec5c2c7a409e455722f64660"; + sha512 = "f067b3e1f4482dd32f7dbb1611f33052d55f835f164e7fb23bbc7244ecee3eb11b49b49447cae2c2d29b29c3769296ff98fa716a9171c8083825f6403d2c7fbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/be/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "a78ae804d8dac484b8fb6a2ca526ffd3fccde4cf45ef075b82e96338512d31f69c45aa6edde795502cb7ef90c6b8a81bce7fc26c1bcc2898d3cd30920fc90b12"; + sha512 = "489f7df280844c60e5badea653c51c9649dc484ca7e8d114309a4849afe3cf20c4f3dde58e041500d654d40fdd7452cddcafc971976e0aa163fce3bc1815930d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/bg/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "9d6f78ed4154fdd2d2a89c8881624e36094869870f6972a8a61a62ce84b90a50f679b37eede6c1bac02730121b1df61be90065b6932736c66eb12f18b7cda69e"; + sha512 = "8e563ec2b7640369134c1490b753a39de957b326042547805d99fefb24c5d35aed09f6dc66a93077d09d367542a64200e19729ab3e7f86cf30d7444054f3f931"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/bn-BD/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "7208b11b55b7042d401206fc9d6d035776fc0cffc4945c81185cf6b7fee0d0861dfac76578fc27234ba908efd465f1283cfca1963877ab1b030b7d599e8b3ecf"; + sha512 = "08ecdc5d4da416d6b2119f328137db2f707ed6dd9fb49084b8b4052bcfe7d221ad3e9b65ebca8b2f72e728603a30e66c5ea21066b7ce7a97c8b5c2aafa2eabe0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/bn-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "f14376e94038ffd564b8bb63d73464bd5c52a89f8c1e883bc55d78e0f5df7abff67ccd7020783829aca81093093e05e2476f78050fa7cc946ccdab0d2a69ece6"; + sha512 = "981881c012a33e3b63bba012d4c692cccde51590b1ba75367ffad3d26b75499d6e5acfd8a532991f1901ec8a1950d58d6f3c629d48b2f8cc6559799c1792f76a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/br/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b5e3b0c4203850e1191bc9e2ad3f7b6f784ada565b64a968eb80897460ecbea91fd4e21cbb13a0073df5fdb23e259a6f98df2b233c676fc5a831ce5acbd3f636"; + sha512 = "ff6f6ef5d457b4df00366bc872dbcf605568b6161b0ac74da9b1bde2c4e9900aecd62448e2bc3dc4923c4f62a760e15ca351ed69490213f7db31e62a0aa8874e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/bs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f2bcd8ea9e6d22778102e95885b152a669a0d7baafe8dce26068502f4fd975f9f818c1df5a96e0b95309b438f1bc42693183659060cca7f58de9183b7024cff2"; + sha512 = "19e98369d4c0add670870fff37d9eee743a6ccffc56d173d539c4a0bf59525969fa77f3e9f36a4d130ca8c8bfe817c0d9a3f4d3b9acec4abf6e7e2e2cd739c46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ca/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7bc7d66c2898c8ddddf413f41f0998a498f76231b0dcf10506b514da96690d879169992635033853a5a63c9e9043ad9220df5dbbbc9a48cdd02b5d1597bd931b"; + sha512 = "14a226c60421c441c835e68cf23d0754f0bc5639ca034e9a0e5aad766faadc57feff03b0174df87c1dee0ccf66bffd4530ddad5c264f8ff6aaa5d55c0968bfaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/cak/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "4bde7c7039b72950ea3adb84c32cffed523888f4a12c63e2661ec43483db175a98d864b0b70f6612c4296e607726ab31b46be39f2145cce4458f76680743a81c"; + sha512 = "5ec83245a40eebe7fc7eb43058149816ce2b54d35fb4b413a86f1509d59b467c0ee77a0f5cac3f5bbb4af7ef9068e30971bb00f40eb1a483d5b60e60f3d06c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/cs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a27b0be4082178bdbe7d7f5f5e9048b3bb2180a319b2d5e127426367f47f02a3c821ea01905205a62b2dc845005f9c0538bacef72e29abf30d286c1adbfa91c7"; + sha512 = "a0156ec17dd39619256fcc2c03722f6dee9a722b16ab1f0c8cfa0ff91c4110f471704f59eb26010d4f10f5e18facc9e4ecd1793320ec344280c5b009af3a5afb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/cy/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "25f9270bc08de85c620425fdd7c6d5cc5290426c3efaedb09e7275c46ad54bfb0d23a0c9e73d6ff5f42af4a7b6af4ef6e4651add35abc925a2a76d13e35fad9b"; + sha512 = "32f54e38fb4a3a79b1ec63e80d4bb89c652976f9b978ade25ae9e4e4a0957ab0321054207ea9251be256637615b647d2b94499d9b9b1cbc427e7671de16a749e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/da/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "fdf7354e1aaf0cf8f76ec69f7dc67fb4bc2dcbca301e718af33bed648e1627701af5a956553f7b8d2ee7bea43ec7c94256b9c25ba32fb2fd7822659deeed7fb6"; + sha512 = "958ab9b7a29e3a0b71425345a643b8d3ffb2f052fa8aeac80d06c4bfd549a0215dadcb6290e0975b177b1120ed299a487b1c18c58a316d681c7bb7ed9e6de9c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/de/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "a5424208058383ed7ec324839ee417374002ef0c3fb949183e51cc7e06c80e3a73101bc13b371e028af29a912bdb5cb212e3ae798475532621a9248883f70666"; + sha512 = "29e11ccfecf52fd1f6636de3062382c0476cc86644d8d7d0ad05ecbdf8c1640ae4064b348504d1e86f9fedab9303c4f504bb655f01bf2ef5b6607335f5f580a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/dsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3766884bfffcbdc614d3e2b1e4d9b455bb6599a5594acca61399dbef5017b693c15b539795c4ca75f023b95939d034f23b4ee706f49a0fe359c8f0ba1f0e3a7e"; + sha512 = "7b2542d0c4737f5665be10f540895b1af9fe5320dc5c40ab24feb523588925b159862cdeb18c9a4f14dc78715703c048ea56ca53d1fcec7fbcc9d3f9bf256cfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/el/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "fdcdfd8b83f49b74acf6aab98207e143711983505e93749d356ad4804045eb0d47c1af94b837a383c10a98f72f81eb45cc6b756f1c1f75b4697255eb312b6b3c"; + sha512 = "233ebd6c09a91521ff69f947ade1539ad136e284e539d06df08552c9bfb0efe4fb755484d6038e2161865e0997aeff93002f613fde3e93b6eb9c205f63a5191f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/en-GB/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "dadfd5cdb268223682ee58833bb5f3ef23047e061cc0f9bb58db444973f063b12853a19057164fe57db8964ce4612767eb7273eaeb6ac2498991ca07651656b3"; + sha512 = "1bb4e2b3db6291c74769e2d335553cff68bd426fd3aec20e858d2db29d558b327f316e25b73ae0131e2cbee7a58ad337d85b05b347a2a0abe442473e94cf29ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/en-US/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "88ae77ea8eb15260ead00802d99a5d3a770b37aac180f107634ef466c8fa88b09e6178dd2c21e5ebcfd6a6e4e733d4a829f6ef97937a678f076f82f5ac3fbe78"; + sha512 = "72db0fb93a0a58f0ecbefcf27808439e5488df47851ea584101e1308e0569297a32f6ad7fe2a523af099ddd197845a3582f12a1c0381e080f31253a5334cf767"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/en-ZA/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ddc912df5fe6389c27e7e7465eb5b4a2770a2603c536602434b9ca9dfb9ea06afef6ab327d54a13794f7b200252073c38d3526c353a25f0f797c3c0b50f9e245"; + sha512 = "58b0dc3614f56570556ccc20407d9070f8aeca22308b0e3975e44108b9c21a95546a9625a41aff6cd887aecd6119390d32769295e08e88de76ad0b5c48a57ee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/eo/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "5789a9c91d704461c4d5c0a7bc4bfec8a36179cb4ae1a7fb9a5e953db6ba2e5ab7ca58402251ee29460ed9f14b2b3ad26ca3e5ef1741d7ef5cd63e20848d5e50"; + sha512 = "6b2b1653e3cd3c6858e4259f51dcf7cd8e34cc38445d995f5aa08461ddecf9d961502500e0e43f6059c7255216917305ce40bcaa6e208b027f22dab035b5dc19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/es-AR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b1c89d4e7b01cea2036a8a1e15c6cac488bfd4382cbfbf44341dc8815c950018afe0bcd3628a4e53fdfa0d9ac5d18f752cee7527dabfcf7c194fbe2d8b49011f"; + sha512 = "e884adf45c7b5897722ea80052de616cce2fe45dbb6e4af6c20f74294e9becbf5d2e15804772f23ee697adb66af2d230b2d3834785ce40f3989cef22d28f8714"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/es-CL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "d7bd2fa80f3ab8241267e7b8d911584bd24fea92f77006e4fa447d26fb8c12b9cb7e3ee3102b09cc5fe11335c01edd9eb9c8c24c48ea85d070cc66683c39da22"; + sha512 = "31e7bc4a6b6151a9411acce7ec713f12ce4fd00651f757d2ba989ee5c870c78c5bbf4453333a5063edfb0a6a58d533dec738bc1b93020855e38911fa29eaed6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/es-ES/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "fbf08892719cbcd7b3bbbb17ec668a5333fcf8fbe4bb4e25f6984e032396351e3326fb22ad69d62eee0269dc98291cdf63ba00796bbc94da3a1a9de1b7761e45"; + sha512 = "63b17939a194b1042d350c5a793262d674d41d6ee2e2c0cf92d6f8ed35f0f05457bfe4de61fd97c5d1bd2b256386140d26c31e8db6b53f6a04d0ddd0bbaf34d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/es-MX/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "b52c39c3a8c1fc9b37503bf1839cf655473aa52c95b99b6de583cb3a8f3ff7cec6b373bf0f72e9696d3aaa52cf96b5b078376213998c671484b47ceea30258f1"; + sha512 = "d03c6a6b2bf9cb62b3fd44d8ad43b619e14489ffe163de376226f3c720aff84dcfbffeacb2590b11565f094f6b1c20e899d65d0457ae3889e054f74184ad5c37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/et/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "64960d2d5c8a837b5bf090b792825752dea124f0bafffdd77eccfa05ed8c130651c057b9f154f0959de8c0a187f276351c4d1366ec1b45c8183e3d3c1259a796"; + sha512 = "e7b0023505781e0ec8098ab98d2797a4341238c763aa5a0872fa4334e0116dc8bc74aa989522f7b2cb135c2c20bb580c8510e9e57f4363cac69d55b6b6d88d9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/eu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "7a4db9d48b10e5bd905bcd8795f829573c939e163c581c4477e52dc86e58d47796d9e82ce8c941c282984a206676ba2d026fc79c782d6a4365aa3eb84c5e5977"; + sha512 = "aeb87fa12ea9b5fb4e6e91d83df47f51a1e6c75f020202be6f0604854f8aa011820698328b92b3fb871599f9a94bf7f1ca2c0ebf0abccf84485e610cf5153ea6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/fa/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "dbe26b5c7ff41baa782be380e551ed0f22624780d6c72950005dd6045e019e520ec0636dd126018b9db5efdc1ab7d044ef3b75a3216820cb17cd665b4553e1f8"; + sha512 = "e8718666948beac9709fabc9505e8963fd3f00b09342193fe455c7e56265402922cb4151be0bfce0269297a14304ac966aec8ac696b18e3d7227e5dccae0c1c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ff/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "de6a97c790fa9d3c5e60b2918c757b39da0bfc0e2a3f9f8764616e3c49804a7c3f450ef756d83987c2fb41af2f60628b793d9d9aa512bc8cd52d77e706f635ed"; + sha512 = "b13f2b8a6522caa16c797c37bba806742a93addf1e1a88e31294c0667115f57d72744daa0af3fed160f02997409d4bd6f7c9170cdff75eae71f5427ff4fc98ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/fi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "6b1128f3cc00ab3a0f7874554bc14246bb13972d4575f7251d570418d68039313787a633c6ea4cfcd336ba2fb6a5a2321b85839e62e8fa37c4f964a202859d59"; + sha512 = "4951e56f9295dd6bff569c0d76fe082bcf498af4b675041d78dccc3725be0294db5cfd62e49ad8c08fad81d6a53236f56519bdf7b4f4177a69e824df0054efc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/fr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9e45a76c2298efffcaf0d7ee51088e6aca0e8f91ca0767462e4f0bfb4d4431af18f3e038a0312c0ac2903f82ad5e15a7b0b427e9b12b202720413a1e3305ea4c"; + sha512 = "be5388a199d18b85347caf3f3691149970b614a1f9ca4da7e379e2b8a49e37c6a70953e7342c6621fe3534fe8a1e7a9fd6b1c05c1769ea33f7a51b61c5803134"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/fy-NL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "4b26900536bf4e851cb194a5aa6ae8e54df0c0052d6ced49ce733c6668a82449fd3ea693b1bbd2fec5e5d241d50c43dce52c0a75d201711117e9a5904f5d34e3"; + sha512 = "6468b03d724ad585d8d31c17c75917eafe908d155a4e4544b6f2a3f6ca467c6ec34c2c0a5d7ffbcec17faf8cbd00c5bbbf4f71660e7dc04adc337295eadd4ed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ga-IE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c7e43f7f481478fc3079320861fbe65c66e7da53c9311314d8b78091a5e3b003af654775abe490c5d63c867e41306c733928b423b812303b662f333dce5848aa"; + sha512 = "531b36471ce64e3e9b1693081bd028b6d417b5c60543b9d1a192c67a20708a898595b80e7a2862f3f984e3c776bbb2b97870e6c88d4f474a215b31901ecf508d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/gd/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "9182c8a1083d9349c3ae307df350bb8fb16cf769d91960cedbe4a46c4bf050691d388dd87c988507a7695637b1cd7d3811a97a3806e0e9ad56d0e4a4e72dbe07"; + sha512 = "4b0df4896516396ba7593c579b528b5010d3be1c2db019a191263f28309a62d54bad9bdb013c8dbedd3094b22d31cd2a97c76bcb0045532b309aef3fa45b3260"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/gl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "57179613f1bff56db0db78454a08a5cc3e889112ec6c0aaf02585066c373cfa73dbc1bb320021d7791086956fc9e3fcc20cbbef3026bc1a00a5e5cab9b65e7e2"; + sha512 = "c8c15bb5df2798ed16d97849c620002747554f46f1c89de665df151581f6832a445e2e969f3cc25ce4bb97833894fbf06fe4e48c4a2bc89c436443101b2a8a6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/gn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "59664e909b6a4fb566c4458012b90afb04faa190b8971cbbb084697942514d71a2af22bd25f44043c0362bfafed107b4496bec9561e26d89db64253ba8730f8a"; + sha512 = "7bdc09008f5171515e63ee2625cafc2a2eaa14f2f7586ba977a890f2304ead1781a913e959508d277c93995ee5be9f519eb69782dc7c48244547a0fa6a36f5ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/gu-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "74f4af669e347d246896278e61aa5c0c753890ce1d2ccee82d227d7bac8efbbc4f8267a1cfa548934a0620ef1a30f9668b7c956477833a43348748130314fcf2"; + sha512 = "c29a89728ff91d3b8ea6c83d276122af2cea578ca36deeb56619fb03949b5efab37210d7bcbe4c248e01996e9feee83eb0bc88b72575a963131b17be956d7d56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/he/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "21a60909b5a4a87c1a2a836be2f989d6dd71398cd1fca94fa5faceb68df09031aff807ed763f7a70ffd1c94a2236e2054319ed0fbd227a1d6b23cf74c15b55ef"; + sha512 = "a8dfa6ff14c74e5c9df282e97e1f3fa719dac2d440531d6d34e065a4cf8ed54153153f9615ffb89fc8fe84131fb008ab27490ff8152e8a048d00a0e5ccc02c55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hi-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ab34c10023fed053ff93b3ea8c1c3a434d2c9ca10653a23a87070fd4a16b92fa7b1190f20a0bdfd05970184ca259f856a792be32b7cb18becc9b39a47630051f"; + sha512 = "1fd289c95ccc3aa5156489931171abc98a731a4faecac0fec605991f94b7ea001480ce1e623e2721376f221390eb7ea5555d8d982fdfefc8726d825bcab6fd2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b9f991a04977184352b8794da92cd2343b17a1145d8fbbb20d33a61b9f77721f4bbbb848f326dafe0bc08cfde0782e13b47d14fc6ce83180ba9ab6e6991d3921"; + sha512 = "2e26d9b4e4a994b0334ba7634152fa03d8de19d20ad0fd34c23a9c21d705bda57d328b6f9fdb7874aeada9bbd3c2b4468031630d7b3d49cfb78deefc67173b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "aa9ed845c7c486c1b2c85b85e64707ae902ec23ae496179b4b72affc46a56bff4dd23f5b41fe0213a68a97ea68d6b64cf4b2e6b7eb6e9b1f2b385a6b50d649fc"; + sha512 = "be5ad1cc7c389a6e11f368bde8395284eec98c4a7db4d450998d377a937c727b3318404610dd4c1de8b679e9064ad67a48957767121d5dd3e449447e448bf362"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "f04d149e4ea20de92395d942ccc2896e5bd5c71ee483f73ac5482a9508fdc0c31bf197bb90b16f522c86e980296ef7f161203a3526b8146371e86f5f0687827e"; + sha512 = "76aa9e09601f62bef027fdd35e473bff89af5cb026dea145480d321b6aa2b31bba4fd9960c48ff2abf464474f9884c2b1cca9563d1a0d8df4aba9ce73945ee8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/hy-AM/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "c374d8365adce41bc46f02932df1950308715c954209c35a677461aaeef5485547f22b90050d584440941a00c99ae25e0ca1a717bd19b1f9de233f96ba69952a"; + sha512 = "720e0c135a04f3af595c1e01d6e1241624df45d3494b08ba777ddad1b0784bab62854f581ff614a576d30a12cdd495ba5a53766976783e0169bd288d285c8187"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ia/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ia/firefox-59.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "d5f65934b238ec83a55cb45ed839f6fbb0dc117c8d92f7821f8d28916dcf0b9e6b1312c0d70094a3a10497b6cb3a5227492fbcb53cfb0d0df36840af0cf53033"; + sha512 = "5d19d1e1cbc7994dbb5c4c4d9dbfbc7a6514561659f737bb2f24f75a44c1b118293059f8e5276d6eac5418bdfbbb4020d8fb886f839450449bd2ac5c95e9c55e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/id/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "2cc38263fa3fbf430091e4e13cbd08a9275195865ba22d122a82c137c55b58dc036c8af00a31462baab5394bb0d388c8de46b9d32268702aab0b3d8fb8f49dec"; + sha512 = "2e30628640f68e78154331572c860c96400a7ed84b89a37f03520135b0bdd3c966b14a25fd0ab5467e4114fcc24a35a69c575b28e2fd213c2df338d7b26ae111"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/is/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "57ae93fe1bb56c3911ec9f598e3a8186045b93780c2a392c0337d150c67418cd6af5c798bee75adfc1e3cee36259b8e82ae77ddd8e6d1262d86a9faf19d5f254"; + sha512 = "c801600e229105f50d6343c7f2c912e94fe918e566f28e6d39da4df112d94d315db29abbd9854e5b39eb875364483f8ac65131b73d4574099c5cbee6fcfcedec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/it/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "d78348c0766cdbb694bcc083b5ccef9516a11b54dccab71832b77e988bd62e83acc825014b5375ce2521c9747867b048b0b064a2a91dfdee22284a18b4fc4955"; + sha512 = "83556862e82dd1f96a261e433e136f9ed30e0aaae28af6a3c5b4a3a9b68477e82e6b34d54cfde0c9aa8e694ec9df79405e6b8f0841096b46c09ccfdec0637ee4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ja/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a009bdacdeca8718275ea9fea2f77353022b28e907ea1d6c79c761dd36c20c771692c43986f9cf0a9eaf843d1af5ddff0381977cb53cddf37272bfe3e5b76b80"; + sha512 = "cc0a5e22cded43e999eeda350cc8e7adc11c7e6dcb8eef3eee209e0f663fa4b1e7e57fda928d163a27421195a233690c939385544e6293305c33fb3fc6f56c00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ka/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "eaf727a6720bf84cfa77d531593da46ef864f49e19e569036042ac716cdec83805a6ca77feaa9d9de0e17f4a33104893f8a833a48b30544c34b2e7b46d068b64"; + sha512 = "c2c5609a180033b41866f4acd356a7830fe5204f81e1eb0702c5e1a7f228f46846012bbef7fcabc02d76f7d79a0079ea580a602f381672a75230b2f8f66e53a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/kab/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d70596ed880ae12384f37bd98d1f39e5a62fb47ae3c832c051a8e6580f0a01ec39f004f3bf7a8ce592981cc70f8c3dcfa87ba89e5e2c4b7516998bce2c458c12"; + sha512 = "567a0ba23f39fa88cb5c242adc372016fb771dc562fc086597a48e6a28e329403d4eda194726a181d1ca4b45ea55e721fd02c2c1cf013f8dd7b15d9a525cafc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/kk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9b54084515b7af6b37231acd9085ad7190f163f01c7854c06773967a95984a4bc4a7b07872fd267a4119996ce97af4dcf069a162be5bfbb42efa62b2af50af11"; + sha512 = "5d5367d2e60de1577aac257137d8449028f30b75cd278d378dcd213acdac31ebb6fdd86082b387404aeb68a1d41552c96221bb647be62f4b968c433caf6a5dad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/km/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6fffcd7cf4418a1a3bd5a8452080add6eff10ef483fef51e29fc2eec7769736154b620661674a327db42495deaa2e2f32e34536fb200ef699da363831cf5fa41"; + sha512 = "8540ba0245932a3de10985fdc4f99db61700af56a3529c412e30a960fe05ac2ed1e9511355f6a2d1022b99ceabb16448adf0468b94ecc4aa3d5b91ea63b59be6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/kn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "edf7dfe2eb01c5ccccff9892c55016ed9ac0261dccee7fac591d7549bbbc9d1de80672b3e8e51ec9087444a3208297070c33727597bc8f17a5a724d9d9d978e0"; + sha512 = "0f860427adc1b5f40dc44663124363e69415a8daf1551aa8671282a717cd7443dc47fbf5dd75c961ac9973833c255dcea212bb9457297f9eab28df8db5c2db26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ko/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "65851847f452954d1881fbb308119a61919935dbf7945eedcdcf8386dadf746150a83ae260737f5d7a031aa312305209872433be86656c9399c2672944b44fc3"; + sha512 = "79e997f5506e55a0685d26988052df7404f0e91f8c3a3eec0ec894c6a40a8e2483dde0b47b43fbaf8ced5fbc8aaebc13bbf487e079ad10cded9ebe6450d7a9ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/lij/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "f5092b0e9c8207ba8a18d7e25f42b95a07d431ed62ffbdce503d2dc52b9f01622608c1766c4e84f8ee116d3bfef0ded8b6e4176ba83a40494f35a3b468d73677"; + sha512 = "1779bd366a6c9b36e3dd7f069baf07a383c0a9f863427f325ff3d9d60ac96d25aa6b70c069bd0419f412243adfafe21dbd9c232dbf4dc8e6bf7fb02d6761290d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/lt/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4f81f3ad8b2d9110634e8b7eaf2bb99528a2a02f5ddd067d8500629d0f96fc81d3048010f1b46ade6b0905ef2a3248e008357af83a806a4009f47d386dc65011"; + sha512 = "7531d092f9b47d6d5eb0a5c21f9a47d60d9790b8db93a36179c4a333afdffc89408ffd49a7ef664097ade6d741131912846d52ee0077c834010fcdb438d07045"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/lv/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "8c0c423e2f68b4b07ff74d60b06c7b031de7915401d22b82da136aba622acec5e63eb67b6d9a174f25757447fc0dff080a472de55c8e82ddb5f1891ee4977875"; + sha512 = "acd88bad84d7c1280298f968139878d1dcfb9851266666c59a0fc830d61c46a2feb95f34c0fc7bc81874d6f393175ad1c48d317cdc475149b06ac11824f4d1ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/mai/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "99205e9f145c2e6ae885687d5da3d187f3c8d65b5dabe30ab5d1554d3aac88a2f04628a2ca96fc47efbeb22f0bb429ef8de241513e2c6f56a015bc5f52bb7df7"; + sha512 = "c4612d9b2aa2bada63a484f705788a97bf7895c2d92f32eb88684374f8fc10bc6e99514084568d4ca1e142f06208e8f4bd0135a8c4f4b7f6941e993cb12b88ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/mk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "e2acbe91f447648d537e9a524786e6ab1fe31a3769049e57028cd93223c0c4b9948ace8ed370b40cb67f5e95f7227a8d8d72f62166e773f52fbc5863e17879fd"; + sha512 = "6bb1ad34746943553e22d9424e015c698bcace10e16487c854d4ecfea05ba47e6d2f1bb68fce244b7c8ad9b5ead69cefd20b39eadc77433a5084abca4a5edd69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ml/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a38d221225b00c716bafd729fbed526ca7a78afd7b256909972985459481ec07e78fbaefa7108330293b8e35479b2653bb7f452ae388b507993e92dec3fac743"; + sha512 = "97656ea9ae3f252c012f2b6946768226cc8fce1a5ad44fede8fb436bb439681c8183cadaa16bb17e7529865b8991ed1856bd90f884fdabe87aa4973d75b451f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/mr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "5b8e69e54234eb39bec83b86f5654373f14440870d6eecf22fe9ce6ac421f94cc0bc940c4d27044039d369cd78c0fae3fdfce580c15004ef3a10a03537164077"; + sha512 = "f90820153d06ffcb98e881bdf3ea761d1548e0b54f91cd734a5d6fcd86439c1aebdb695ed0a73cab1cf03e3f26aa4833b85845dfc9bc5394c07da51db70a6022"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ms/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "dfedb637c97da86c09f6cc7a0bea17e9d49c164fe03eeabb4f5cd74c357fb5a86f12232c0bbdf9ffed12845765f49846f438fef869068ccf98c41aaa534f9a4f"; + sha512 = "7dd3bc7b383015d437d9f8cfcb2288b40fbeb00caf562cd4127c85e4324f7c0bb18c34e37eb5472fc7082f9d4101393315ab50a9af016d6d56d6df022d8cc912"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/my/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "f951dc3e2805b5d69d72c0a5c23597f824255a81ea69df018552e5327c5da5f201f8d8b8898e45b6b56676722ee043741c5bedb29afce0882d7cd7c825d22de5"; + sha512 = "fd69a6880d932b1957a2da3a457cecb1cf0350144044777155f59ec09969e8e0977f12b5980b180a086b4a75c1d94b74aec11113b683bdb58722e745fd4dfefe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/nb-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ced5dca5416d5a451ad624abb2a568fd79a01c61f76f39cccc73d929dd7280d6d9318d7f33c67b6cdd26e7b48c0225ee90585b7513646625ca7d649329e0bc66"; + sha512 = "dae68bdf96119efea5820e281bae73cebfb857a26fb7f3e308b6fc5a89ce9ec409cf73d6f8360ea63de849e46ccbc9299fd941c3bb1d18100692aaa55215782a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ne-NP/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "5856a3c0aa48b3c73dd8554a099bee30fd4ce5f5cd676a8edc3bd3432e40791ecd6ce9ad18b3ef99466017ab5008adbafcb78e23d91abf6b1c8f36e8a135d4df"; + sha512 = "6dae447690cbfe761ac805b2a006b09d5bbeebd4ccb65b71f9ac7d6873f416c59f84bd1146ca3950fb44f926447d603f262f78b2ee4ce06119c729bacf5ee8d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/nl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d4de32ddab80beb280f46f8cbd7c2fdeaae71b19e8dd508400b406b6fff8d6a52aa8ef8ee464d9c37a45879cdadd63fd07d85d5f246a6c20aed8fa0cacfff016"; + sha512 = "931e2a9e95c8aece76c7b7cf8c9ab7da8ec50868157bfa18eefdca40fce33d2d8deafd26e177b8c6d880d17a81abbc4fd53d77928bed7e8378652033d35e4d45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/nn-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9ace63a9f0c3959f076450a5303176f1ebfc3d958cf26cedd8462b5b09279ce90ef66675c8361934c0fbc506e6c803f404da87e46b912593736789233fca7b72"; + sha512 = "926f3ef2cb66b816ef12969f5841aae4662a495cc9f7a69d4ffe6a9e53f7286122416dab24550e93cdfdb1a9523f989dd6949aaa9a43b9f9128e9db4d5886482"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/or/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f8447541efc6cbb47c18f524a12eac39aa07c74426a690b8685e5642e9ace22d94d962d99cf29e8a5acf14cfe2a54ae2933d4628e6800a20406a0bab08057eca"; + sha512 = "4a432b203baf674acb654ba8efbfd5f18f40bc3a03ab31f627783dfd3e13797e45de8a115e08b73afdd440f3e7a3cafa695969c8225593a55d09c58a1c5f6971"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/pa-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f9c4e08516bc66a62ff538a382404025ed4fc9761c978684b61d034e5a7514abff80516a30e5e6fe055adcecc8a7a703081a09332e4e13ca4ce8bddac879421f"; + sha512 = "1036eb53799852063433ed2b9e85e964f6073da7a384759e740385602ebbb20bf5101d2317663c56933eef13fd963e8299ea3166cdf61b94b5efbab614067553"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/pl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "06be2c47dd7c1a6ddb5dbbf72463c376daf79e2ed164c87a90d2fd73e3daf25eefed17330d181d41691bc1701fd74ba26d8f71bf8394e4f0e1b291deccd3bcf5"; + sha512 = "4038ac928a5ab61c47a6de53e5563f84995480e19f846e67c7cfbc9137736191010d605647f0e95d3c19c3abd7095d935c6afde9719c71df802ffd1236915066"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/pt-BR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d5aebb6166b65b0411e506ccd7392d330a722d8162b1a9c69e9a273329a6032549bd0d00336d7b1181f4137aecc05405c6290a7e2a0cc7ccd9d7cf845ceaa630"; + sha512 = "7de41f598b616c7e1144410a2f25f105ae307d7d6d9099d48f8f6044a9eeb65f4652b80371d4d61065cb7b48a9190087dfdc55b7118d0ff4246255ba3f1f90f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/pt-PT/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8e3bc7b9481dbf1416d811867bd2e34b6f2eb78433a3351762494682fe4de68caaffefdc574c2fb309c987a7016b0a892a08d0b590384676874f9651a423317d"; + sha512 = "1508f24a9f3bb206dc33fb7182c203ead18261cce765605e2460341dafae5d6b908923d2611b93157e8f437427f93051d8400f50da36cb3cc155fb97a11b79f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/rm/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "255299df1da93dd0152590009888517dc18c2d624c94d4277207d97e1261e2c7d6b3f6a564bcdac21ad9fbc81b579a0581972725c56a03e47543c0f3c9c4e392"; + sha512 = "6ea10d8335c2011b3e413e2e0a9e9d7f1471509cc6238f44251183318ab3d80c87050e15329ac5df5643304325cdeb32c821028cf994784b2d4ef719d7a2afaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ro/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "035d47a7daae4d0c6fab7dd0b98fb9b48b0602e7fe493ae0cd374fee612020848366cf56f9dec0824cd1b74e32e16b86a70b1238ac493c64320b68ae66446071"; + sha512 = "8f052d48a41f43527b7eafffbbfddfa9e7e5d38ee9066e279fda3e714f3f29bcaa2b2808f4090df49210171e9d337ceea60589203a57d49bf2c3fd1c1c45f3d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ru/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9bae20347104bdb8a66e31dc1c8417fee71994060e67a4ef88efb9edc39ce7c1d9f0d9f09661c6f9153274ab2db269009c89a81131f961ce8fad05fd69b8d8e9"; + sha512 = "71cf09dc451dd58eff03a90610e8507a5084833500d7b29671051a1202274f59fcfb237d47a33d07b26eb5cb8b9130cd8126c4eb546200fdafb56aa86bf885f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/si/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b4b0bc99b3ba228a8d1e6f7a6fa6121083c0bc80c529e45440a2e6e1904f28b0af616badaf7ab41d42235ae14f8a13b848b66090b3afbe9519a9728f795d36ea"; + sha512 = "edd4764173bd0db3eabe024260d1630385bb40736092a2dd2eef2d53652f31c0cc7d919e99c938d1ad1a76d2b1dab43482c011c1bc1608a2f0589508ef6d082b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "52507584b43a8aa2c4ef83b3b232c8676bd0df7ac4efb4f69663bfcc714db8a7edbf564ab4920db9bcdf6f87cb73d80b54ec9235eef78bd8595b56636aecd330"; + sha512 = "6004642d3b2a5c81e82473c8ce36d1154165f7690959ee2ccf5e26387cbce3aa5081dc01a441f90bf13f4b95ed4456daa1026f76a4634bd2a076db84f72f9ae6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "71366e112dda767c4ec77b0fd9daa16573c0952e918c69c2fe7d053bcd48dda48b60f18c3c4bc96027b63d3bfe00a7f77c28e58c000ae772ea26289e542f2277"; + sha512 = "7c34ba23fdc3999717928cd4465d88ffb77551bfe6e1d142a4675719fec1976094a5afa6117ce5240fc52741bc1fc616338f30227fddbf08be253d9e9e15a632"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/son/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "98c55b1ee11af276c2daee9c272d5aa6afb371b52c8041d5388a15e6fb764f55f327c87517ea83ac4644b94a8306a6b99094982a89328bd71632ceb4937a9df6"; + sha512 = "c15314dc5063751a291b50b1f319eb8bc99ec8f5dfadfe6e6c2c87fa6c9c97b2be9ad4836ec16954a6785ff18259c3c77806d09d9b2aa62318fe8acacdec6149"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sq/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f2a4b38f40fa4491ca95de02396ca37e7f007c3594b61cae3ca1e0169fe3d6dc2d86312562e533a5c294ae6b6442b3dd8a54f964e0092809f6d1ffaa7dbe7925"; + sha512 = "4d6b82218287c243a9bf15a95b7abbf38fd733042f33bde959d16452a8a15c10e4a999397c71624bc4b4234e3128b73875fc467992fe9ffc6a859fff7d328572"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "cfb026027bece16c9de1285efbecf17735916afb98cd9036930c58854a2cc9ff429db20c9b63b099bb9833e137c06481813fc99ef2f742f1b54cb1eedf4c9ada"; + sha512 = "18e152bf426300ea964cbc539740883b8a62dc12ea8a48cb5ff8171fd3499a4dc6b8a824eab8e711762a5146899d62f4bfcfd03b3878f16aa997a8583b004643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/sv-SE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "1801ec136f4b0c605ca2163ce3fc7cc7de43c6d6d2ab3ab42cba1ed8ee671ce93c2ea3833491a16678b9fd4483cb26e5abd11ebb484a9adb6333fbb308752c5f"; + sha512 = "53a3ca59a8535a3b7a69b5116ce0906f8162611a14b877dc56a86946b1ba7b55885fe822309d00b12d8855a3ac7dc515bd8bc396c71b4055fdb2203f119d7fb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ta/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "00a221c57f2e0915eb1c8989d1e2401dda23a94fcdeb863e159f134a2b33d143b1ffb4c748d1efd4e3538115af258f937fb7f69159bbcbd1179d35bc69d13f02"; + sha512 = "922f626af6df624d4154dfb074627bad3a7e6ccb95e1e607bfdca0a3c0823a68720614a52d5dd51a2773f8214695803899a3b160c1220fab3d43351d4c41d3a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/te/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0f0f436b85d45368ef0a194e822710bf7e9bde08673c2eb785b949815c5d76aed5cc3a7a34ee8d55d663908aab834f4a51b7c51bcba6ed9ecbd9d4fedc757a1d"; + sha512 = "2138095dc31f49b6266c8b8789ce7ffd674d9d3888eb0f2255a04f15b884d3f076d4e7f00331f6b4782e0bb5f32db9fd923679c19b07da029b691283ad9cfcf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/th/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "253dffde4858d4351fcebe57fb7028c394ca27fa41125dc7fee7774e1d0aeaff25fcd45b9529fccc4e404f876fdcc5488ba82c83863895d0829a6d53f4d8fea2"; + sha512 = "cbe73835e029354327ae3ab08617508750252056b1ce5d6bae244e12e0141eb284fac068670afa40abd7da568c50f0d278f12c9650d605d785feb040d911e53f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/tr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "022a6cb49774d0648d43e72a7cbde816a573ce4225bcbeced4f5b837b68700fe593430ebcabe0a175d97078cbbfe064caa1cc7a5857d562db0935cd7ee3eba93"; + sha512 = "c02b011ef67bd32c07140e2a994de8751eeb48594f872ee7f4e2e886f3e0c80821a9a2937bf1dedf673561b0a18961953699116ae3a3b409a47ef1c9bf56159d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/uk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "b70e8869ccd47cf085f4c15520073721e1b32e5605bf3056a1e41a5c06cce4f9838ed8be6eedb47237a71667da99ce70397f8a0695c326d02ed79847801ac91d"; + sha512 = "929b9c653d9d4fb0b930256638238a70ac6b000b688cabccba5dd408742756a54fe08857ac43d4c18ac638ecd2b4219d5b885897aad4f2c665cfc7f3a8250128"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/ur/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "f512c5c4f60712b7c52c32e96bfca4f08065df6b0279fa347425150ad580582f00968b2e68847a2cae68348bc3255a31230965ad0d24b531ff6c36af39e42b14"; + sha512 = "349d6c15c211b1b764797e46a6275a4ad6d50d17c50968e91e23d9d3f185180436c63eb3d5c98eba1d7ac48844ba296de15c4cf22be26a169e38cd9c9682343a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/uz/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e0390eba3ce569206f12d8fb2c996a022f63b4c12c1e3bc58b14ce71c49de819926235ec48c67f82ed8796299a80dfd668439c99396c94cd444d9528934f8e1a"; + sha512 = "19a7fccc33c0b71af6ffa2a699041bd0f04e2aeed3d22db11354250e3d5ac50149e38c23fcc7b2fb61ab7edc4cae30bbb34b7c0331e22e35652eb3f0a6d20c65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/vi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e29304651a752a9bc90468472e505040920e0e1d52ff5e0d294347fa66d1428cddd8b8f4394673bba164eddf61fc1e207bdaced891d490f7c9d0720675595502"; + sha512 = "d1ed26f2c38e6918bb58d9284f1e190f1d644014b567d71603ef06d181d550e10cad198efc1758a0f84ae91edd272f7ea2cb96c79c32dbc8dd4124977d984348"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/xh/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "27ed1798f07a1c3fd34a4298ac5d5aed55374c03674551827d20538bccfd68cb7df09b96774ca2873e7c3097bb51e53af513de536f7cddb028fbc1f8feab976f"; + sha512 = "dde88337bd1aecd728234f4a868d7fd32087b863c193d8ba87875b2dd7acf6c3bf72ac2fe3b0283929e64320b7fd481a898637b7860e58303f41c59e6adcafb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/zh-CN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "20e5c70d073d706f5b4a217be7c6dab3e593bb922e8984b723c59d924cfba14011dc00c0872066fe8c7183b1ab73bbb86027a1996f6b597cd1fbfb0b889f2354"; + sha512 = "dd659b712c7c5f36eaecf62a382cfd45fb70dff95fe9f1bd162d9cafae860de71fb64dc5d6dc3eaaa19af3ba7df714aacc63fa471ca29afd7616f80038e65b35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-x86_64/zh-TW/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "fec28a65df092a16810c2b75a261f86cdc48756d4a0765ce107820908108fd082fc22c08b35c9bd2a0e6a4d21854d2f009f64981b13948df281ca8f02bb4679f"; + sha512 = "9b3ebec8f372ce750ec17dec78013e910f8b05bbbf8b270aa7e9be84f627719190c2dd8525c82c04a4f6e957ef71dfd4bd0aaee1e92fd019cba9a297802a49ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ach/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "2cd5778ae52ace4cecc79e4b62f4d143ee26b6c5e2d828cbe73306a1ed1520a069c124778d2c95d2de10a3196797bbc3368a0ce266bed97b5c3e0ba353771bde"; + sha512 = "666100224cb7c90409b86921ef4f01eac685187bcbe306077909f4822691935d77c72f7685483e76ae7eb830d57d3fa2e404bcb542247564114239e3933c0497"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/af/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "39be754f989fa2706d6ce2adf00b5962b599601bce72ad17be53e3d05c2e81d352bf16f21fb5824a54e470bb956bcb859a6abc997a5afae49f535de5318d4b30"; + sha512 = "32024e9c4870efa6576b35559ee04ee5130d90ed5e9931e0b6665b65d202314bb343d197f5d1ce3bd5d0a2e3136b18beaea033825f225b157a5a47ec78e9c35f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/an/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "bce6f7dc0df3c6813e86d08d672ba780e6016e1ffca1479153736ef2baf26c242071b4ead67b079a1712bc01fd0dafe69d0cf27f2414b425a7a9ffa5d3d623cd"; + sha512 = "5291bd5d28a1d3f28473731bf916e8a2d2f0e1fa521423f588b35155c889d1784c986ee6fc40faee0b6c879088bdc04987037ae5b34585cc981611ab2d1c2bb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ar/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "4fc259743465dd9045fa632568a2f59b1cd24d352b945efea8ab97df440fd221248d93e4982a0d739144c3dda74b716e6d9648e95468331ba685569edaecb0da"; + sha512 = "b8c744f892dfcfbbeaea16e137b37860f447235f7a6842a1e5164030253974aa713cab0e9ec4646b15bd62e23794c6d69065457cb7aeab18214dfd898062995a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/as/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "9975f31579fab0037bc062c3844801723a9e77c25c71f674def49098e8f756ca49387d7ad8e36debbf50e01b4b32f4986399ce905202a5b17311e056612c0d8c"; + sha512 = "4964447e37193809decfc09a47ed96133560dbada6178dbb2b6f2cf974f2b2daa62b3eff0d015f890dd651bf9f2432cb47bbfabdedc75315af97b2158ef5046b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ast/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "102703b0fe4baf7cb40805e2db937b3ebf5045aed55e95d5d7ba6776c5a6f19c7ff20bee43c228fc9c88d2271735f4c240d5a5c0ef4c2d3f5f1b26dbe39e726c"; + sha512 = "e34a66027afdd4191a11888a9e0c9cb5b35996f57255caf1fa8eb2b7effcc373fd96a253ec8067a1b6c36e5cd4d6071d04cc94071ca4212ca49308200d09545e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/az/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2e7407ed4f6d01ca1fd4d799afe11c97d665d0919edd79316f97c019c551c87ffc531d6dd3096e7fdcaaeadd2ba7e28af7c6ecbc78d684ffb1d65188b13ccd2a"; + sha512 = "83ac6d10d9e5606011e6addc54b02026d1ca272a87813e84756fa3e8015c7070e3f617c9d9f17a673b161af1cda86a418ed96bca46c8397d7950bb40f1255825"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/be/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b5775bf2a1ee741da8b249f7a51685bfd81758b962e8254767fb98cba9497cd9593dd412b9bfca5c6c910ca9f0a1a112860aea6d19b300be03955fcc3f254e65"; + sha512 = "482a0ea33bcac3a760b6d8ae3ac7d52e514654ae340c22f8db17fb39b92d5db5796821bf8c658435624550adc92ec9f1d3567bc6c277ad182820756cf41ea19c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/bg/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "afd11e9ed73205d625db1c363640160c6c7641cf3e009cfeb613b03f845fefeac3f37a267b8f493152fc5a149865d6dce28bacc8a835315c4cdcfd19b56b7bea"; + sha512 = "e57d29c139f43d42bac98434ce0285405c16ad48141485ac9d0fb15ce3b1ee920bdbc5ff1f763faf45c71553086b9001d5e24e2940635ed6caa6bfbbebefabc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/bn-BD/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "e278fb6af3968f67d475bd7b8be5566ef1840e43b40d213af8f45f356ecaba54e6121505a5a9f06f2d7fff3a55da2cf0425cae505ca4e9764f30ef8a707c4cfc"; + sha512 = "4e145b1a7a5681d43178a210981785ee3a44d9c8b7a1e166b44331daf99bcd4d0413e2ddc6e323d228ef6c26f0bfc5cdbcac82a34d71a7964b4a67bb5348356d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/bn-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "d1a37af0132bbe5ca0c6a74f13c57d9fee63cb8f9f628341759e32ce605806b779e26931f7348839c7ac9c4ad43d7addcdde5468852dd855105c202ad2ad28c9"; + sha512 = "fc33f3661e98cdcdedff6a5bef544ff059861389f14cf7854044e6ee32950f53a1cb74339599e407f60d92dd82ca8a6df77b877501a323a67186100da640267e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/br/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0a639514bba78df5df671c83fa09a6e55b55c9cb59ee1cebef60108ce3eccd483a6078fcee0ebc8ff205a5991530f8bdc6c672bc493136393ce94059a8ca122c"; + sha512 = "af31f2571a2cf85598412f7921a286f44c2f78ecf46f94f76626de29e2b5a7278963757a47746d974c085297ecda8b42d7ba02b0613091a1eaa116c5cf36876d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/bs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "0b93082a827cd1eb3447979dd66d1977532a5ce75af851fbb0e5266ee9e8c4ee081f33d7dbd2c2f9ed09f9d7b0cc1fe80fc3c185bc025d03bf2008876140133f"; + sha512 = "c1016709138e985608d6edba3edaff43f46af60bad19247cb1f7942fc609d2ff845341b2aad38336456dfa1d74783cede88eeef3abb97dfeb1c3c2ebdc4be1ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ca/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "33445a4bcbaf1ae93cfda71d788b991c8091d82e3a0ef001eab032f5f7c175c3082cc51873b4948bdd975db16962b996c0995fc416ef3ed9519a68386b090826"; + sha512 = "d862326e3d3045bc0939d444b12399f89392a1b91972b27c93f475d1a8432272bab3b9c568a3f597abc540e2a085d1538906e8c3a8dd79ecd5afdb0891a07c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/cak/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e90146c6fd1c80a2c62f1bfd4a211ccd074baa732c2a0f7fea6586c23ff1729601dc89f2fbe65524605fe468c62f2300f5a991b307a6eb393bb5af92bca67214"; + sha512 = "10d2d073868fbdd8b8b9c49d10368948e9d24e641b3c86d2629fb513077ddd1c364aeefedadd47f6d8709df4372b26624b3211f09816bbe60fd02be7ea7a59ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/cs/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f05854b9076e28d2a14655cc6418363871636dd5d59096b1f52f2d7bea18632b0b25daac8e16504a38f43668a1420cd067b0595d1376a49a82f3443630cb11d1"; + sha512 = "488d65b5c33faf6de23f922f8456f14ed4dda2db7fcd307b3b34b01fe22ee7abc679cf0ca009917fd00bf71383965239320011b0e275a103c45c6e22056816c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/cy/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3b5cb998868df9286a37dcea421eb31964f5f3aba5a3a90ea2bcc2f254b1e7140ec153ebe8bdc1e7bb7d6d7028b7a71a0c4e6cfc906d8f1390056e076bc167cf"; + sha512 = "03450045a45114d7228d3534c3488e34a8c1a163396592a8194db6d599aaf7542843123bfc136cb8b9b2a7e5f58ae8b8187717a0c05aad7bd0f3051c0ec0876c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/da/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7ee405d1ab8ca16f1cef0c77469e006d9a13cf46e284612f4443dc17560ceafd4973cdbf6a224aa6bfbf889d4d8a97e7e338c2a23af0a991c852d9e863cd090d"; + sha512 = "f91d643d5e90bfee170437c990e01744bc5e4fffccfe16c3b806cd4c299c9601b651645ea8c52bef6fde3c1b4a4509e1bba433a315671cd4c614fe0462af4ced"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/de/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d073ed4a8bae41e3d181a9aba72d454e7b38072f698b5f690df2856a1ef4c16506c43805587373cd46a9a00ec1654e83d62af1d8c02091f9c0ec2b8a0c26eaa6"; + sha512 = "224a65f6a82c8a50d9a1349e88879dd93e7bd5f958ad0208d5f7264d6e5deef0b76659627ffdb21bbbdedd6853050d7a0a3ae1a86c5f6713418c6447eba00ea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/dsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e41d25e71d05a7e90209b63a9c9928b0893ab2ad6eef04c74a0f82ded4c13a85652bd8fccc3332a5e7dbb96d65a1ac1c2fd29e32641c6bd6c2bc598b49896163"; + sha512 = "c5639b8c3c002d79992deeb2d6156f82cb04e11e646fcd0f41437faeb8b49fd7e08ff89c00eb5a9aff80e70c5b90ccf62498865fccd08c1e4db64f4b27633fcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/el/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b4a9e5c6dc135ebd9467045078180097503592f888b949b88924fd8a85788bd3d2ecf35a65a30ac583503e767747798691ef2034e9e0e916b392491851ccc0b1"; + sha512 = "6175fde499171372212d088882203c62cd75addb138946ef7dc0a61d1ba4cda71dda6e3070688b5b4075ac602073a001999ddc0be52ca41f23899b23d053e659"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/en-GB/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "788a8fe3d48ca12d60a942cc97c113379482e65ab1aedb2e1cd4892b90acb2bac2b273d6180767ca7209650b2a82c35557d83166717e7884a43ffda69ed8b43c"; + sha512 = "a694c3260358baadf3eab7b0feadab53facceef72ce1c760e845183ca0309fc67ea02581d977f0b45d64742c48792f8b07658c83f4ec9cc9aef6e5fc126f8842"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/en-US/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "82f0c46efcd0ba5a9814c36dc49fd513c7706c892960380c496b68272b3634fca861908ef35661324a7bbff4cf6a9933eaa730eb6ad417057a444ceaa62d1ca0"; + sha512 = "c2f2a3599280f0a44053879ed5fdce337c15a78952e93d93d3138b550e31b5ffb62403ddc0092c4ac82d04908d2b0aaa6a7698fe2dd94cf78ebab066dc40585c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/en-ZA/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "589c0b4f7d114d9a62d1a488136007d67b9002683548b11b60bfcd9e14ab98cd01d90ba70e67ab498805c0ab957dc9ee6f2eefb35ca414d6b7410c15874657bc"; + sha512 = "bd6e7c2732503ff2ed9b4e0b399bd4f98e02e1fa1d43637ea1deaff00d1916fbdb5951430ae06296370a4959c2364a7473ecaff145eacb304a9ea888a0d5af53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/eo/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "5696abf8aa03faafee7947843077d6fa1d0d2e9a12707f8fefc49addd4085313100dee577851419b5bf7bae1475e0b088b3f08e96f306dab293c24acf60d27d8"; + sha512 = "e737792c3ae820aaa9e01ebb5dc6ed508fcc25fbf1b873942f5dba8e99c4ada0320b7924de31813794b76998c1ea8ef555e9a8ea98f394a455eea5614a1c2a60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/es-AR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "cdbc40af7806fc4f64a27a60b7d41096a6f440ab6e00b8be279724483065884731ded97e54dd7a3838ab67823ce3451dc088eb73ff899e9497adcbbf1455a937"; + sha512 = "3043e15fc4e6b4cc19f2e0c74ac87cab1ce4ddf79b7227bbf986c6e325d60edc33924909939def86092368f7158a5f12d725ac20b71f53ac038e2f3ca7709f8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/es-CL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "97cf5ec8c2f63c56ec36957d759784f93c9d138b14021eb5db66377607d7a299e73cc96b41d91fef90acc0353a49c942fbe1d79888a99bde7f0a558c07c56242"; + sha512 = "396a832f795c20eca7adc9147cacad5a90a56bf4008699f96cd8180d9fc52f1d318656a8729c82052a985444ef3a3ba4bdeaf2caa279b2a1c9d6618c94a2c517"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/es-ES/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c774b9e91bec98aced2ef6909ad1f5793e6064311ea6c298f9cd8fb5de4289b02d958e1d8af0a0418dca2bf8ddc752120ada65ab8b61c0300fdce32420e94600"; + sha512 = "c7101edd19e9a1106d586ae79e9678e3526beb1c90f1d0922b898ebb986236338cae2c93121b3186b9e9084fb293f7725b769586059b2dfff5ad7646d294b3f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/es-MX/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "831d11520c02422940d67f67f62ebd3b9e6af501ebb5277592a32d67017fa8b2e42ee09aaeaa07aeded85c6277f601357390e8771c4c0eb91f150c660c13a977"; + sha512 = "859be5955ea7066be34c8436ad79e8a19add4794be5fe8822df5c5b418f63d675f5a22e0608aca1b872873289288cfb5bd3e98a18774ff23afa0a66af5dbe0a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/et/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "40bee2445def5e57338e9d0f6d93e58945f7d5b2f38eb8c2c522843c748fe8cd112db227901ef574575102fcf1d61764f7f241d518d1e3df84e1cce19f12dc00"; + sha512 = "10e1085be63d4baa19391b54e8960344d70f901d07f67f5c1eaaf8f2bf8fb2b90635da1e5c423aab6ccc6368a7d4bf27ce5dfd3693ffdcf7311f9c1bd888e1f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/eu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f1f570696db1421544483b4c12d84e04b024d7d2493167d543ca771b35f48601b30a92445919a3ac629b2875ee79b0b50ce70de098d3ec3f368ed87da56ffc15"; + sha512 = "ce1c796b1bb419c27d949fc268d5eaa0e1baa9fe93cd10603bf1a4ae60f66f6fdb8a29e14255859c45adc37e000dc65a9887f9eeb5ebd3e05d46a0f0f73dbdf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/fa/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "293b0e1965b2f412a1237d95f60df58638cbff332561b176479dfb39492d7da916d5d68be632bdda67cb25d518b7ef7400aa1ef56c8c7f6c1d95ada74cbc1f7d"; + sha512 = "5ccf9dbfcb55b67658611c049d6ec5e859493c45015ff9f424cff8dab45b69be5426c1905006b04f79762ec7be5e63dd8bfb19e0d5cc59e02f31033b1529d57f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ff/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3e8dcb3435974f45fb515691424047677cf9483f7a0e880829cc80cc40159c2314e39e5519bd543bfc3ee15c0d5e42cbd2442705f7d88be940b1445910a706fb"; + sha512 = "f2ddf1065e5e848bc99e2fcf8ee9c6e5049070380c9414e675581bb842c98ed7e9e1fa3958662282bffb9ba41d52dac0a66c1376d094573019cdb101401b4e5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/fi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "5e18e33506c0e60bc86da8ec20359da4938d567abbbaa64f95b32442e856dc9df3927c2f779068a833d47c7caf35bd9a943d6333950d166822da5c9148a8a004"; + sha512 = "4fb98ca5bd53beed2dd33f3f3d1bc802690a7e856c8cab0e830f062c0f115a964c60117392cc9b24b75adbc564c9196fc951174bb2da72b76941ec2148895393"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/fr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e7946312fe453ea7e4f2945c34f321b3f37b57df4935132563b15d9df676a1ac0dde47d8b2efb931f1638a335146f30ee4c3452edda6c77b9fdc9f1597b7cba8"; + sha512 = "6a2c6c1f0f4e72db4125e613c9c9c3c91b0bea8945bf4e12f3e2682cb50f7cecfcb0fddd63c9591bc39fd31e9eea575b159fc65bd3fb8326e24bd315ad1fbd40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/fy-NL/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0d41d291e2f605487c4826e5ebf677217460b3f8275245705716272a2acf01cf5724d093ea16efcd2bd46c5c6e6600daaf3513df4992333305d1873549dc2456"; + sha512 = "3d1de44f6c0b01951777ae913dd25b89ea0c0fed1d12eb8571aa4c79769cc2222f4c417c29a81cef908def319482eaa09c3c09549bf388841806b2ec27edcffa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ga-IE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bd5e84475b42be7c40ace78d00b7e66bcfdf18baa071bc7841ed296653dc246d99e16d623e69d792548037b3d0617350a49d9e30b174fb5f2f7371f95d01d61a"; + sha512 = "3bf2882d814b539ecd3f7445fd48983d585d40e530693160b39342215ba5a65623985d1b189ad76b07c1c0c39cbb4ea1b2f45234182766e4bd9f13ef1707d009"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/gd/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ea7955f902c22a9f36c57c6392a36443eb45697d2b3b131215a5fe153eac93d39a407d62edd744a2264d02f46ca103f36ef3126bce5dbd743871e3091f02af29"; + sha512 = "547f62c2cd0105e4328171b30b2747e4d75424e42866b19fc600206d90208c9e21b484df2455f5c2354be493ae22f7c8ccbc5c26a4c17a7d4c55f5b177d77f56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/gl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ca616271a493f335f6a2dae72e6e539b1c2b2605a98426ae0ef4e4437474f49a12f74564abcc6846efb17f5bb5559255498b24dbe82dab3eae70d4d3124035eb"; + sha512 = "90676f1f7ea1cb0fbeef5a3bb8ec28acf389ab755cfeaa1484639fe44add3fa89ec994f93dc7eede2cb71f76bb085a3351dca6a0a8374997db855f921aea889c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/gn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "364a4127236b8c681cc5e2bc33795f5f1e608b5cda2c83e3ff0acc626948021f1c048920fe4923104470de00d8a02fff9523efebed9fb415cc8d5716dd78e272"; + sha512 = "43b55fb395cf9cb2b9705f4986b95cd323c26bf1c6fe47d6548f58fa03084e5213b1be99ce843d0af7947b94cd8891fb0431a1c80cbfb42bf09e69eff3b9998d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/gu-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e87801862b132c319aef7fee5642c62431f197a587651f5189d2ed97cce43924b92e359f789b1aa90ec253e5772d546e04c4c827570e22f511239a89119527df"; + sha512 = "c294b70d51d0ef31d8db3fce36ecaa0d50b79efa272731a473d8eb7502ec9461ee6a5acceae6e6f46ecc008713e28f943817153c458664238be01c21fcd1952e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/he/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "a32773b58a73d243166cce86a0335955fc265fa38f00618afc7656f3ef7b912553d3e11cf8c848a28b6fe08a2a31a71177e67666713d1604e254345975d801cd"; + sha512 = "872384072f61046c18169ec399c7a72f9231b58d05fef6b41b5591ae0b28c8f496bf9210738c56249e682b451f257cb220204aab74e7f3fcf6e998b5350f7665"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hi-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "90ce71f362bea122f2ec6298721677126a2bec531b12899b28f16523c11d302cf2ca170cb8017027de7cf2752c69ec933385b187c0421f04d739a040ac2fead5"; + sha512 = "6adff5467cc9a2514a456ca84de2bf91dfeb8d528e1296a636fac7048a353c4373270d551902cbcaf62567af53df3d4db0abb2788d28c24b014aa73cc515be69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8b4904a0c9a71d7a6dbbd56ce312e68c9f0d06d5a11ce8ced66573fc83fec780a3b6f7ae93cb16d4b0651252610a60bf60b49c9f5b6e866a412af96227b4d05f"; + sha512 = "09694e46fd369ce0c8b6b11c04916032880056529a4fa5d7acdcc2d46b1a47f01efdcccdae8f569e597a52acf45198b132654dd3fac094031ba729101cd36aed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hsb/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "027fbd7b92e0b996c24017c9ef21898032aec9925c70cd3b54d6072de95edef0aaaa7baca036b2064e04949443993cd864cf42988107b43a16fb18a5f899dd37"; + sha512 = "7eeb065f6c7b971a9a9f9f94e1eac6cfb45b2c7c32b9770cdd49d50162a5b409abeb349e676568f3c63e973311791dd8ce6b9df340a8f13cf5afa19df780dad6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hu/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "784d7c692acec190cc14c65345396f512c2f487bb9c1f5140f5b7ff002e431533c3653f98a1bb254ee75541e1765ecc9bbac764d26a94bc953707a880fb01eef"; + sha512 = "da930d401adcad3c1648cbbbfb7148e8ee7255b937a4503f9e8c686504ce7b1c40cd5aae54dd5084669a153c449807414eaf689804b56c06a0f453a998aecd40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/hy-AM/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0717091ca6fe037a05e42ffc240539816cd34644910336a91d2c6bd312d5c434951100b9980d81f3f940a7ca898073fe3e6c2f1c2444cf8cd7687156d2219ce6"; + sha512 = "e5686af9acdf7d11f0cbf80492e9288570d358ed8b4db9567b943f3e2de5f44715caa2fee8da5e11affda917a896a8822658c8a55f0085a93e73fe9540cfb09f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ia/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ia/firefox-59.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "114ab370a0368007542bfd5ba6f4584b1f13f6c852ead2ae3df04133fa8b3096094bd02ce3ba163b2f80655c847865f07b463d824c798a4e2c378dd4f379bc71"; + sha512 = "bc7600040fc001e39fb654946ffee9317983729391767b91793711bd1083d7cdc16af7c1fbb91fc3bb8bc903529da3c398de9da4a3e4b0d3ecfea6e1ba8904ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/id/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "26a96ec15a928aaedf57f9c0877f0722116c8c9afa1d4aaf4c7554f1a0f50045585d158ec5644dcccba5c69078e7169924297a33032534ffbe7d678fa61b2c3e"; + sha512 = "0b3e845a2f346f21ec90e0e423c7d3f1b635fa0ab1cebeeb7cffdb4f4c849ac100f17f370ab4902b18997a8f883ad71f651d397fcc8b7ad3ade7b643f2e75a79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/is/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "2eb047634f222c45eb0e170e04e7afa39764e0b722bec5a3e94ae7222998219629b240057aa99f2d2d41e627374dbdc3198335914937db098085ec8b2d7bf7d1"; + sha512 = "f345579826a039d7008a86e04f437fa112579f6b21e2032e8120f9444fd86d38831629683c9441d7f1f5010c02f18a0b7232e7c0db0ebfa82012fc38d7f90165"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/it/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a4c00112fef9d03ca8ed78fd74854427a76f190c798f808ec6a1dcc97b362383f7c5485ab89affd2231cd7e1772fa702e7cc1dadb10b9e6983fc92c523921616"; + sha512 = "27e4ebb4674c0ce189f649d5dca273787386103f9b2274600fcdbff10b78bcd5ce39e7d530e5438e2c3127ff2ad15ea82bfbe07a9118baa2d1b722ba8ec2be18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ja/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "77eb05efef6c112aed75247fd96a2b550a2213e21a038d74b846a716fe400f1e8c863a88399bb659641eee5f3f7a73032dd582cb282bb6c1a5f06dd8ab8b3bbb"; + sha512 = "30ba80bf62edbc26314b10ae2bf0caa41c69f92d6fa04fb086471b5d7b9f439f74d37b0c9265f8de888c599e8efd074f284a085fc22251599753c65fba7bbca7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ka/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c2857c83985cea8e1b721fc88f205c4d078d7c6e222050cc1d0457462f54f751388ebe9bb960d8a5b9cedf533f5569474c95824799eec5981c6b39dd6f5a892d"; + sha512 = "fe305ca5165d693841e151e3356068e797c2058a017f8108cdf2e9959a13055fdd77091c206bbfbbf92971b0bc3141821159add88c031053370da266883c887e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/kab/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "39727469286a1975e2b4bc8aabb8edc61c7065f69c142d8d833c5c188189fdfe40b454e3e22b92260fb53627b54c86fb2e6488af9fc925c6a9d85c26dc92635e"; + sha512 = "3413725d76686e50a4bc8125efa0160ac0ce89c92ae1afc41e9977dd2212a59042e4c02c75e2a48c9b09d1ea2da7fd8683a524f90f8217e58292b0abbd0a3242"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/kk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "708319f6f7a7a1fca46136d9396514f9b8f0c9c29ad117eccf0dcd8329d451ca29fe7ad543fddd1ecad3a21b98d72db87582d00dbf242154120d750c05c5b53b"; + sha512 = "12dbec279fceef28b199510175a18455e2db411beff26d6593dd5ed4deac509be50ecd55f9c4e31e65eccec59a8bef6fc02dd054ec9644505166d4a0de672cf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/km/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3f227b4bb51cdb424193c316677d425e7221a0dc2039620f93f1e1dbf4cbe37a48946fa9c4356b7308581cf90ba031f3474dc8da476c408da927bbc4e0575fb8"; + sha512 = "e69c4aad3b2fda0249dc5840af8f48b2420a213f0801397c434ecf17d096773f235817bd9f6205a06fc22529fc289417fc3ebb292cc7932ffff9e7de07ab0c4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/kn/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "763b7b158bbd8c4b688b78dfbf5f1c34df59dc5c2b0bd4b5cee9e6768257650ef220b656f2016cdc713a8c754b61de83978ad479b54d7c5697324f41a912a4ea"; + sha512 = "7748d7f3666684021affd3d50fe3005ca5bb47e0eede9aa4379de60a0d6fab292753e577ced60c117ae6225517828bf750e05cb24a0406a9f5b4aef7f09aaf2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ko/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a03768a46fe3ffb504801368d8536e9aa88533f25c3e6048cd27864b2115244d339d93c0f259cded5fe32361cb85bffeb689bd915f4c5146bb390ea420f24472"; + sha512 = "04de73ca7c1ab3611baf8192b108aa5cd56582804e17a822f3fb39595cfc155538ffabe38324a1475d95605ff7c702988cb9f4b6e086813b5c661428774c2fa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/lij/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "8b401b3545c24a34e654ccaae66c7109d28f113de61cecdf512abfe8b20c163172311dbb38d27b10d98f1527b185b46ffd7a6d9ac4c07a8ed4b658a4cccce91c"; + sha512 = "d35f733597a2faff1ca54fc4fecd97ac03576443b1c2ed8114e14f59bcc71e58e3a828451146a592222d406b631b6c55cb554c5900593a8cfce83ea68d29f88c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/lt/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "d699e8e9a22a96f976506302292275f2b9ef861c87dca78bbfe61676d61d91426173812132dae8565030982f7b13a163c3097ea9e69484b61e22913a136df0ca"; + sha512 = "594d93a8537b9d4ada5b87d74f12902580c8488f9e0dca9b5a8be109025006c27d6b92ab45b76f177cc15bc0b7e95d2544c0d2acad5a7ac64119b008c8304703"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/lv/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e786c67a813207c2abb575781c97e4153bc74050f24eee4deace5fe9323d8c61fbe7f7bf333f27bbc1f6dfd3608bce5624eac5f4aec26a89512ef0e3bc2a2649"; + sha512 = "f904004e0bf94ee2cfb9fa22c020f6e3a4c0377522f6ccc00ac69df1133717b57bfd5403ce97ba8b69775c3caec9c730513c53db262e8b62f8b8360a0e340c7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/mai/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "3bf31d6d3a558f1da0e3761500170c58cfcde17aec5252e7f2ee6e8931e66943bdb1d5070c637163037392209ebe8f82b042f92cd70a9d4fa7443dbc26eb2ca6"; + sha512 = "47fc45930445344210762116c56004c8e6dab52e70926ea9837852faff9d717a4d6f5d04df66026fb33487051776bdbbf07d4faa2a3eddae23faae3c88df7618"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/mk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "5f9621ae445181cda3467e92d516e3eea905ca64ccaea015ef4e331ac8ed3dfe54943a4f6386d9ce3316b3f04594c61b2843559ca3281e798319e8ca196be07e"; + sha512 = "8747d1626b54a83da79780ae9919aa75a6828fa94b5eabeb299b0bacb1fe5f44f2540a223206df3c3a3cb3ddc890e87a062b7acdbc890e19cb5d957d29a28fc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ml/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "0434438376c20f3f9aaa92127e708e28ac48da0bdae626e8b8d81c26d6d89ae4495811a3ad19618536791770d4572950753b9ac885738786c122d61afa64db59"; + sha512 = "9388c5f3b3a12f72149899d4f13ef305396f5d3d4e838bd909050cf24a0c72b4b26017ed5057f30b42d59d8bb27532f71d174ce7285fef82672d12e50297d283"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/mr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "abebe02c72586ffbf99ae2e37573b207c0542d2fe976f80803b007e4eedc5f24e0e95412220ab6ff8b613855681b0eda0c4368efd2b2113461173a1606baea40"; + sha512 = "2db6f9628f9cbb533ec2575cd95c54423cfffd185251b65cffe8233b9af92a6000a371f1ac1efe5fa2e7939e3cff36da5a8f0d7ae1bbc8354a3b3ecd3a0eb7ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ms/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "944b852cfd77d2461598b7550450184bf4e57b4e273a99848aa2caec6737aa777dee4bab699b78d80335fcd05c8d5542da762477fbb8b36f7de24a0ae77617bd"; + sha512 = "1513aa8958e26c1b8c618151ba88c7a0279fbd42f1a8e3ae6616cf069657337647cb180bc9d42f88a53d8d1f71e6515412f0da2cba16fa177f87a048988024f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/my/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "06a1736a390231f92bfc3f3afbe9fc10d66f43f9100696528a792766eb6bdf1eddd2ac4dc96b446580034005f400063608d547eef33c0a1a802779c708bca578"; + sha512 = "200d0ca08a7a2215f56b71e73ddc37c6b57188aed3926b1852d53253327ff631274442536cfcebedf2e78e4bdee6e431fbf4e722f867819484707ffb882a2e3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/nb-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ca4bf388e38392b86eea522d76c1b56420e8f0bce9beadf9b7835da7890f3350c640b7e6c4dc69a9578fe4ad2af3495e30c2e1c069b345025310dfe9facb95d0"; + sha512 = "dcb391720e9b2d51f10346fae4d46396e47ab391ec80c57d9ce4a3c96a631e61c94b23e1e7bcf00360822ab32a803732e686f7f54bcb60207b190dcc271ca8b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ne-NP/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "32dcb1279bdb3880260b50a4c533241c86b6b61c76da0676aac607a9f6e26a061b69460475b9ed554ec11f295cabd1aeb0da0a1d284caf94cc8a1d707de732c5"; + sha512 = "c977b42a401be633b40435ef25dd0b3faf362cda71f02f1991d41ab43d8b465497792a6b80c0d57ad693a5fd542832c98057a915f64fe9a75181d91bdbc7df87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/nl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6d58e28f1634066f27f3e693b22aa257e016b60d8b2a5d7b3e6e82d2027574b34d6770b819d286041a6315748894f5dfa5a9406ce1471d2413207de3f31f6044"; + sha512 = "9b91c4663f12df7c1bed18d928b41ab7f767f751b33b83aac9655bcfdbd6385e26cd72564f422e79060740d03ff512bdbc03df75603016dab6651520d2c83c4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/nn-NO/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0ec2e11ae36985bd7ec5d2bcf2392a4602008055420bf06756ffee006a242948f2ab9bb6ef411567aa20e11128c9681a75d6c36f8b0bab2376f24e8ecc164f12"; + sha512 = "66a72b57845cf85362756b9abdeedaa754a82ba792b9d736419a80ea6bc2214f01b875b3307156c73a5f58a858b18bc11cb9adc04fa71d19e2aadecfd2ae4e10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/or/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "7833ebe2611e09f023620e04a02bd2969106e69c5ae56e4820d7fc914bc239ef1096c20298cace76327a1d4e3943c2b835eb1bcf850149a4039b391dea5ad0e3"; + sha512 = "b821114749a241c9c68c0d8a19aaeebcc72b89eae1ce9ec141c06ea4c09432a8d26426092a35d5daa2886bb4b129e74e2254e6aa6b795ea537413cd31f1f738a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/pa-IN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8d8f3e41b905e021cbafd2cd0990d08d5bfc38dc013604856639105a5ff0d99a1aa09f200de58aabadc6ba0532225632847bdd933c1a7afa7e969ae8b4ca0774"; + sha512 = "211e65d8a4d681be39f6b1d47210f07ecb357c6e3c51d078d21827681f8a168489ce4c01d251f5f711063dd3ff9ccf0585b2bc11c3f1399f06761678541ed911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/pl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "cec3f84bb46f7f2952e78352acd306ead77c1e59f00430d883172ff50183b54cc59d646abdcc1595ad386b881eb5dab1670308ef7bbebd7758d7844200919665"; + sha512 = "310d890061a823e9cb2014b8555dd29d201bd80d1e846ae7a457ae7bfe0df06b0a331ff1dcea09cf159d7d969454a2f730304254bb7775b995414f0f20617806"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/pt-BR/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b02a49e4da0eb8deb43fc9bdd0636223e5a442662725b3bfd41d278943f1ea7ade4840655510541f5d2ee2b9653ede530e13c1fe6ce646c8fb5886b51ea6431d"; + sha512 = "f39ec82806e5a83eb997d2c16f93238d417d39a3ddc62d591d153da16a7b71e7d916220ce7721307589dfc671239fec15b0a15b8387620eca6478452e0605d41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/pt-PT/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "94a169848ec7d5d77d0829d8f2145126422f56db2e10c1fe5bfaa63cc50ba176825d2b46e85fd99ea882df3cad7caee3c7c2b44adb95e0b36807dfb47ebc7c8c"; + sha512 = "8463135fe439ba1e8796ebf626dac84c3672296a84ad8217ae90e104260ac4c89d036c7c87c496f2bc45b259f98e10af99d3ac2a370b2a6ba04223a9b71a9029"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/rm/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c000ecf6e9a639886e0025a4f74f01b462e27dfa54faf1d63d647a67951d4e64cf62979db57a058430877fec666bf729aaf6421e618f74337c384d7f9acfd58b"; + sha512 = "8b5b601e3b458e75b1cc27fd6f6be45c503c52d3f70be5a2a0fbed0aa8e1badb2d88cf8011d852a4f39caa87d894c3c412ba7b2351049dccd34eaa5f8d493c6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ro/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "599cd05155c3774fd54a20633c75335cb7a6e4d9fbe8a050cedebfebea46ad5769cf6aac1b908970176b415306e05ee84094277a3117b1ccb18a87cf698f9832"; + sha512 = "4dcf71bdf2fb5cdb238230b5ef33a01db062bfbfc29cf0a6ace929e5fb84e6d0aa7598faf5b040a4b7ac899fd3024f5d91a1838098b91135bf2f3351f48678d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ru/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2ce3463b1fb0bd6c4b00a3fef1ed72651d8d6ef1bfba3e0ec5c4514ad5c246973afd0006da71bd258c381bd16140ab5159af2597e9092adf8edd953a800126fe"; + sha512 = "0dbc609a7d10351772f807b78f1fb68dca4df80dcbbcfc48a3872fef07fbf0179bfaa53b08d58f54751e2648e792547d314d39c29c37ea036d8ba501cd2f5670"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/si/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e8ff8fa40baf11b686a8a3b82a0dfa3657f708fc312b663a9c7f4c5da0fe1cf66f3207d8ac1946dbef37747243b57ee9092749484fceb76c475b2dbdab968501"; + sha512 = "66c1e12658008c762ab66cdb617e04ec6c6cd1d950ff81a3e278f5473b7e552d27e5906b01419c954081372ff02a06195d3daaf513ac83cd40c71b4f4cab5385"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "704f4371ecdcfbee104665853d18ee879a0994b6ddb54758dd305a7154735cd7e869a93cdcbbd142deca3ce66da50914e32647e1467411199936d5511c2f7bb8"; + sha512 = "11383a0760432febf961e2342dc5ab4d1bfe89732be71f776d313f14443caf8e2673cd81476979465f333dd6e338db9368d969c736234195b5bce4f57db4ab10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sl/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "143c3eb7a62bf137dbd09aefe2f79d18ebe65bfd3e0e09e9bf0aba3a21d7c052bf80dd2fa00f17037917eb7466475e68084d357bddbaf57facb91641fc59a9f7"; + sha512 = "c137a8f2e5932cf1eb07b3d374dfabc5d3465fc9496a6e8932de12f8b166bd2647071ba64918f42df38af9becb574ec5c4fccf7e9fd323a64488f057aef0f06e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/son/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "8f156ca2c4491ef0aace2060eadc808797b8ae7f9a5a065b3c0ae021d0e79390a1330b8b15688a36083893ca8828222fdd15d30cbf30c936e70b581705a2aadd"; + sha512 = "29865376c3dd16a0c54c4b1c47685ce862d0455351f6c22acb118a987f8258fe5ba0ddfc62d904a9e11b787d34bd8d22414acc2b95a6f9d6d051621a990497b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sq/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ee8570f187bf66b595f43b6d9cc5c69c87539958230045dc743e1b2bd8ddb42db3440810e633e3f20279a3ecf00bc90059262bebfffdbd5bd25a0ccc69297792"; + sha512 = "1a52f547683a7380d605b43ee3eee9d2a34efe42adf68bc74905adf168d30ea4bb23ff33e3e954a8ebd580920aaab70473c001562b0c77e983aa5f365f8bd238"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "6b02054f418272d84b84f78139e9762679198674691c78b3a3068a3cc61941d978b974dc4c1ded4e7528e44572dd89144ebb66c15543a2fa3f13dbaaa82bf1c1"; + sha512 = "c1ca752f999d54a6c2c9c37b78d98e9fe87bdd82e3769c6312a74b63dd402f874c1e9e708b88945745f2ab1f8309b7c9955104e4e2981a9e7b53fb196b01ebbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/sv-SE/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "f25ca3ec9a73c09c688e44b992ac8ac927632dde14531a4526b24e86f42b43a689700c68a21410848dd4d7212f7ed58c0df8ff98ae32924c4d50e7712c8ba60f"; + sha512 = "31b94482b5a2c7627a08f40b67480c26d685eea350b6ac6e22d6e8014375e9d45fe74d81782cc2056ee69e27a06dc36f78898f9b7419a4745987b162fe34c6c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ta/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "6b8e559fb742f5979b9098fc443a6a87efcc3a2a985f0bed4572b8d6d9141c7ecd58a0cd7c5a483f163f0788c0bcefecc207e7416819a79acf801a2ee93fa67d"; + sha512 = "254a0b805ea3b24d05248a6abca647dff6a95a28c939acaf6e01b68646a94643123e7ff49977ad6d7bc54ba0aca71b2b4d3d147ad02ca84173ff15c21464d271"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/te/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "46fbfdb593cbe9e94a586c1de22d629ae2f6b69b5e5c9c1cd24dec23688f3d78b8f571025d7bbed175e1040c06c69875d5e70631de51598b58364224e1d431ab"; + sha512 = "32c86b921324e81ee8bb1c2e64b8c9a9815006ce29b19a2269066ec13d6c6ceb3c45e3c83a22dc8f1dcc78ee13845bdf5a9d9776ea84c8a9a2128a0b45f7c074"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/th/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "2bf16bf1be5473d3d424163d551621ac51c3a6fee5af97cf2ec17bd4804bdcadb3096aafc8194476e5a10268b14d55d489c05d1f7d0fb579feeabe4b0f266ae2"; + sha512 = "9d2f979e7bfa97b6b6705f77a38948de80327fc657e43e574a2ab7bcb100aa58c7450c1bcb30d3894e150323e1c8e1c4fde91877be782c67996a95987a61bbad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/tr/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "67ab00731c1ee4a781df931eac650f54d6af6772c7ec525eb00d182f99b89a3045f937cf5c9aaa9b436214bb26cf4514466bfd55b4c1c7c832ed5ec4daea568a"; + sha512 = "672136b49e6805960e209c7b743fb7b8428a7bb78474f355efe01830e253888c5939714ff72a7fa0e87c848557002bd45cfcd2d502f9a703193ce1c42db5d13e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/uk/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7d57035ba2331c459830a65f581310fa62b376fcc24c7e7377ea9a20851f0ad83ae2df7b1ae3cf3a3ca5b2c2d172f57169cb5a1b30e81feb295df128a8a57106"; + sha512 = "d8f619b346de9c3b36d20704524b464b1dc44ad230b17048cf884cf7999996fe08c543285611b358f9afc219f7448976f9d831f4eb6cf4e965f365f17ddf3382"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/ur/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b8e0732079d8a81472b26418da486eb5f3b731e3461c08a41eb8751e260777742c823f295baf95e84ff4b44f87b68d2d110767dabbc4a9db3f102f05a10b3948"; + sha512 = "1cfc67675838e768e7c330f1dc0b0289feb18deecfcf68b726f0636438fba5b577627e5aa9d241f510a123fc1793ac14a35a2c0d098dafa2e3a6213b6fa9be93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/uz/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "201933bf5e2d078365b59682292201fbd5b0bdf313cc3dfcf0803ea920989baaacbabe6a5f506d48665a272e19afc3892b77f36b91dd0f63699461791ef49640"; + sha512 = "00dca0daef262c75e3aa6ea91a0339e7716ec696d747db04b3a308efffceb908ad772abf929c190c1a6e2b8f09c64dcb6d09784bb092070c87cbfcf82dc004cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/vi/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "0ad0ee37b2c85d4cfb4b11795f2023add8a826aa481651f8a56b725f7b69efcff55841bd473d2154d27480fad704a3e1020c5c53a5fad14e4199a0344939c19f"; + sha512 = "84cbcb02d41dab03ce9c35c9de44a73f06255fab65f5d5f3fceab968e6162add3c9fc2b6694559107625e1a9e429ab974223806899bd5fe47c9d87b38ceaf68d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/xh/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "7d704e72a100c790fec7e57b4e713331b42c154afc2fd16fc026d6bbd730dae1c62a810664149899aea3d3cf5d4536ecb7f991521b7258b35629b7dea02acae8"; + sha512 = "90648cc26f600e52b46e4e6ea2fad93550a904d762300ca3167c46a10d16c7148aa88ab807165928e6a15b91b21528b503b017d87e084386bc102574932b1326"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/zh-CN/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3995e8a4c0a232ab9f2c64c45c0a9a9252e12c1bf700fd84b4bceee0e520b7a772985befd92c9375bbd24b1eb5b3cea4fcee2119effa78608f29250adb57aae8"; + sha512 = "33efcd6f165827b951c0e4e05fbd24a759ba4405f7148c7b78481bbc02edc87d6bcdd31c7c7acde88da8660c9178687878ef2f3a2362fec2c037f244efc335ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b3/linux-i686/zh-TW/firefox-59.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e52c6bf36d9cb527bf8a8e717e2ee2e171da0577ee4a7f588c5910beae7ba6af3fcf8b88e5b8b3264a8e3c738c47dbbbab2a1e038f3da8af96c768727af44930"; + sha512 = "e2dc8c395b5a5aed89e3231bde24550f8f6f964b02a5fbebfd199c8263aaf79e6d4cd28808be61ff65ffa281418585f066986c49c6ab94708a28d470031935ad"; } ]; } From 44ebac05fea5daf0011601f808fcdd9c9d38f152 Mon Sep 17 00:00:00 2001 From: dywedir Date: Mon, 29 Jan 2018 13:02:13 +0200 Subject: [PATCH 105/373] exfat: 1.2.4 -> 1.2.7 --- pkgs/tools/filesystems/exfat/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index f404d06eda4..831594973e2 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -2,22 +2,23 @@ stdenv.mkDerivation rec { name = "exfat-${version}"; - version = "1.2.4"; + version = "1.2.7"; src = fetchFromGitHub { - sha256 = "0x8wjvvlqmp0g2361m6d24csi1p4df8za2cqhyys03s1hv1qmy0k"; - rev = "v${version}"; - repo = "exfat"; owner = "relan"; + repo = "exfat"; + rev = "v${version}"; + sha256 = "1sk4z133djh8sdvx2vvmd8kf4qfly2i3hdar4zpg0s41jpbzdx69"; }; - buildInputs = [ fuse ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ fuse ]; meta = with stdenv.lib; { - inherit (src.meta) homepage; description = "Free exFAT file system implementation"; - platforms = platforms.linux; + inherit (src.meta) homepage; license = licenses.gpl2Plus; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.linux; }; } From 192c2330d08ff2dda2ff0a7986fec9cb1e60d27b Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 21 Jan 2018 02:12:40 +0700 Subject: [PATCH 106/373] nixos/less configure less with module --- lib/maintainers.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/less.nix | 123 ++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 nixos/modules/programs/less.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 65718e31897..e1fdc3a6e5a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -325,6 +325,7 @@ joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; johbo = "Johannes Bornhold "; + johnazoidberg = "Daniel Schäfer "; johnmh = "John M. Harris, Jr. "; johnramsden = "John Ramsden "; joko = "Ioannis Koutras "; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bb3abc256fc..611318fc5a1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -84,6 +84,7 @@ ./programs/info.nix ./programs/java.nix ./programs/kbdlight.nix + ./programs/less.nix ./programs/light.nix ./programs/man.nix ./programs/mosh.nix diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix new file mode 100644 index 00000000000..a7f2290764a --- /dev/null +++ b/nixos/modules/programs/less.nix @@ -0,0 +1,123 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.less; + + configFile = '' + #command + ${concatStringsSep "\n" + (mapAttrsToList (command: action: "${command} ${action}") cfg.commands) + } + ${if cfg.clearDefaultCommands then "#stop" else ""} + + #line-edit + ${concatStringsSep "\n" + (mapAttrsToList (command: action: "${command} ${action}") cfg.lineEditingKeys) + } + + #env + ${concatStringsSep "\n" + (mapAttrsToList (variable: values: "${variable}=${values}") cfg.envVariables) + } + ''; + + lessKey = pkgs.runCommand "lesskey" + { src = pkgs.writeText "lessconfig" configFile; } + "${pkgs.less}/bin/lesskey -o $out $src"; + + lessPipe = pkgs.writeScriptBin "lesspipe.sh" '' + #! /bin/sh + case "$1" in + *.gz) + ${pkgs.gzip}/bin/gunzip --stdout "$1" 2>/dev/null + ;; + *.xz) + ${pkgs.xz}/bin/unxz --stdout "$1" 2>/dev/null + ;; + *.bz2) + ${pkgs.bzip2}/bin/bunzip2 --stdout "$1" 2>/dev/null + ;; + *) exit 1 + ;; + esac + exit $? + ''; + +in + +{ + options = { + + programs.less = { + + enable = mkEnableOption "less"; + + commands = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + "h" = "noaction 5\e("; + "l" = "noaction 5\e)"; + }; + description = "Defines new command keys."; + }; + + clearDefaultCommands = mkOption { + type = types.bool; + default = false; + description = '' + Clear all default commands. + You should remember to set the quit key. + Otherwise you will not be able to leave less without killing it. + ''; + }; + + lineEditingKeys = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + "\e" = "abort"; + }; + description = "Defines new line-editing keys."; + }; + + envVariables = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + LESS = "--quit-if-one-screen"; + }; + description = "Defines environment variables."; + }; + + autoExtract = mkOption { + type = types.bool; + default = true; + description = '' + When enabled less automatically extracts .gz .xz .bz2 files before reading them. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.less ]; + + environment.variables."LESSKEY_SYSTEM" = toString lessKey; + environment.variables."LESSOPEN" = "|${lessPipe}/bin/lesspipe.sh %s"; + + warnings = optional ( + cfg.clearDefaultCommands && (all (x: x != "quit") (attrValues cfg.commands)) + ) '' + config.programs.less.clearDefaultCommands clears all default commands of less but there is no alternative binding for exiting. + Consider adding a binding for 'quit'. + ''; + }; + + meta.maintainers = with maintainers; [ johnazoidberg ]; + +} From 72141a630bc27660a858dc8b80b7c48818365ec7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jan 2018 14:40:46 +0100 Subject: [PATCH 107/373] ghc-8.4.1: un-revert "update to 8.4.1-alpha2" This commit undoes the revert from a74b0e717d9156c61264e15a1e7fed680a5e4b31. See https://github.com/NixOS/nixpkgs/issues/34229 and https://github.com/NixOS/nixpkgs/pull/34232 for further details about why this build seemed broken. --- 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 88bcc3e148b..17dc24e567f 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.20180115" +, version ? "8.4.20180122" }: assert !enableIntegerSimple -> gmp != null; @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; - rev = "3e3a096885c0fcd0703edbeffb4e47f5cbd8f4cc"; - sha256 = "06slymbsd7vsfp4hh40v7cxf7nmp0kvlni2wfq7ag5wlqh04slgs"; + rev = "61db0b8941cfb7ed8941ed29bdb04bd8ef3b71a5"; + sha256 = "15sbpgkal4854jc1xn3sprvpnxwdj0fyy43y5am0h9vja3pjhjyi"; }; enableParallelBuilding = true; From 57ecb3a8f02010c7dd0d5aa1ee33929286966dcf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 13:39:35 +0100 Subject: [PATCH 108/373] rsync: 3.1.2 -> 3.1.3 The CVE patches weren't previously applied because they depend on the enableCopyDevicesPatch parameter. The naming of the patches attribute in base.nix was misleading. The new rsync release now really fixes: * CVE-2017-15994 * CVE-2017-16548 * CVE-2017-17433 * CVE-2017-17434 --- .../networking/sync/rsync/base.nix | 39 +++++-------------- .../networking/sync/rsync/default.nix | 2 +- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index 69613c489e1..abc1f27e4f6 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,42 +1,21 @@ { stdenv, fetchurl, fetchpatch }: rec { - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; - sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc"; + sha256 = "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m"; + }; + upstreamPatchTarball = fetchurl { + # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 + url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; + sha256 = "167vk463bb3xl9c4gsbxms111dk1ip7pq8y361xc0xfa427q9hhd"; }; - patches = [ - (fetchurl { - # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; - sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd"; - }) - (fetchpatch { - name = "CVE-2017-16548.patch"; - url = "https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce"; - sha256 = "1dcdnfhbc5gd0ph7pds0xr2v8rpb2a4p7l9c1wml96nhnyww1pg1"; - }) - (fetchpatch { - name = "CVE-2017-17433.patch"; - url = "https://git.samba.org/?p=rsync.git;a=patch;h=3e06d40029cfdce9d0f73d87cfd4edaf54be9c51"; - sha256 = "1kvnh6znp37a447h9fm2pk7v4phx20bk60j4wbsd92xlpp7vck52"; - }) - (fetchpatch { - name = "CVE-2017-17434-patch1.patch"; - url = "https://git.samba.org/?p=rsync.git;a=patch;h=5509597decdbd7b91994210f700329d8a35e70a1"; - sha256 = "16gg670s6b4gn3fywkkagixkpkpf31a3fiqx2a544640pblbgvyx"; - }) - (fetchpatch { - name = "CVE-2017-17434-patch2.patch"; - url = "https://git.samba.org/?p=rsync.git;a=patch;h=70aeb5fddd1b2f8e143276f8d5a085db16c593b9"; - sha256 = "182pc5bk1i57ganyn51bcs6vi2fib7zcw4kz3iyqkzihnjds10a6"; - }) - ]; meta = with stdenv.lib; { - homepage = http://rsync.samba.org/; + description = "Fast incremental file transfer utility"; + homepage = https://rsync.samba.org/; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 8c66e41f4cd..f1e3f6b7301 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { mainSrc = base.src; - patchesSrc = base.patches; + patchesSrc = base.upstreamPatchTarball; srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; From 60331e6e9062ff4a9d880c9559bc64f5a32e4757 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 14:14:07 +0100 Subject: [PATCH 109/373] 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 0a70f3727583e54a75223563caba2a316b78ca7c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Jan 2018 15:15:00 +0100 Subject: [PATCH 110/373] lispPackages.clwrapper: build helper; saving dynamic library search path from NIX_LISP_ --- .../lisp-modules/clwrapper/cl-wrapper.sh | 27 +++++++++++++++++++ .../quicklisp-to-nix-overrides.nix | 15 +++++------ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 55b469729f9..fa914f6d26b 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -87,6 +87,33 @@ nix_lisp_run_single_form(){ "$NIX_LISP_EXEC_CODE" "$NIX_LISP_QUIT" $NIX_LISP_NODEBUG) } +nix_lisp_build_system(){ + NIX_LISP_FINAL_PARAMETERS=( + "$NIX_LISP_EXEC_CODE" "(progn + (asdf:make :$1) + (loop for s in (list $(for i in $3; do echo ":$i"; done)) do (asdf:make s)))" + "$NIX_LISP_EXEC_CODE" "(progn + (setf (asdf/system:component-entry-point (asdf:find-system :$1)) ${2:-nil}) + #+cffi(setf cffi:*foreign-library-directories* + (cffi::explode-path-environment-variable \"NIX_LISP_LD_LIBRARY_PATH\")) + #+sbcl(loop + with libpath := (uiop:split-string (uiop:getenv \"NIX_LISP_LD_LIBRARY_PATH\") + :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) "/")) + (let* + ((prefix (find-if (lambda (s) (probe-file (format nil \"~a/~a\" s ns))) libpath)) + (fullpath (and prefix (format nil \"~a/~a\" prefix ns)))) + (when fullpath + (setf + (sb-alien::shared-object-namestring l) fullpath + (sb-alien::shared-object-pathname l) (probe-file fullpath))))) + ) + (asdf:perform (quote asdf:program-op) :$1) + )") +} + eval "$NIX_LISP_PRELAUNCH_HOOK" [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 09113bc30bb..4de4947c073 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -15,9 +15,8 @@ in export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; ''; postInstall = '' - "$out/bin/stumpwm-lisp-launcher.sh" --eval '(asdf:make :stumpwm)' \ - --eval '(setf (asdf/system:component-entry-point (asdf:find-system :stumpwm)) (function stumpwm:stumpwm))' \ - --eval '(asdf:perform (quote asdf:program-op) :stumpwm)' + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm '(function stumpwm:stumpwm)'" + "$out/bin/stumpwm-lisp-launcher.sh" cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin" ''; @@ -69,12 +68,10 @@ in export NIX_LISP_ASDF_PATHS="$NIX_LISP_ASDF_PATHS $out/lib/common-lisp/query-fs" export HOME=$PWD - "$out/bin/query-fs-lisp-launcher.sh" --eval '(asdf:make :query-fs)' \ - --eval "(progn $(for i in $linkedSystems; do echo "(asdf:make :$i)"; done) )" \ - --eval '(setf (asdf/system:component-entry-point (asdf:find-system :query-fs)) - (function query-fs:run-fs-with-cmdline-args))' \ - --eval '(asdf:perform (quote asdf:program-op) :query-fs)' - cp "$out/lib/common-lisp/query-fs/query-fs" "$out/bin/" + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system query-fs \ + '(function query-fs:run-fs-with-cmdline-args)' '$linkedSystems'" + "$out/bin/query-fs-lisp-launcher.sh" + cp "$out/lib/common-lisp/query-fs/query-fs" "$out/bin/" ''; }; }; From 8a5f77ffbc8896a1f06ff4d2d61bb48d419cf66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 2 Jan 2018 09:08:38 +0100 Subject: [PATCH 111/373] nixos/borgbackup: add test We had problems to get borg's own test suite running. This test is intended to perform a quick smoke test to see whether we have missed not any important dependency necessary to create backups with borg. tested with: $ nix-build nixos/release.nix -A tests.borgbackup.x86_64-linux --- nixos/release.nix | 1 + nixos/tests/borgbackup.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 nixos/tests/borgbackup.nix diff --git a/nixos/release.nix b/nixos/release.nix index 7c2e5b6415c..972c89c1a41 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -227,6 +227,7 @@ in rec { tests.blivet = callTest tests/blivet.nix {}; tests.boot = callSubTests tests/boot.nix {}; tests.boot-stage1 = callTest tests/boot-stage1.nix {}; + tests.borgbackup = callTest tests/borgbackup.nix {}; tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {}; tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable; tests.cjdns = callTest tests/cjdns.nix {}; diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix new file mode 100644 index 00000000000..123b02be725 --- /dev/null +++ b/nixos/tests/borgbackup.nix @@ -0,0 +1,21 @@ +import ./make-test.nix ({ pkgs, ...}: { + name = "borgbackup"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mic92 ]; + }; + + nodes = { + machine = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.borgbackup ]; + }; + }; + + testScript = '' + my $borg = "BORG_PASSPHRASE=supersecret borg"; + $machine->succeed("$borg init --encryption=repokey /tmp/backup"); + $machine->succeed("mkdir /tmp/data/ && echo 'data' >/tmp/data/file"); + $machine->succeed("$borg create --stats /tmp/backup::test /tmp/data"); + $machine->succeed("$borg extract /tmp/backup::test"); + $machine->succeed('c=$(cat data/file) && echo "c = $c" >&2 && [[ "$c" == "data" ]]'); + ''; +}) From 762b1bbcbd445b93a384a5b2fd3b72a0d9a55cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jan 2018 12:31:27 +0100 Subject: [PATCH 112/373] python3Packages.pyhomematic: init at 0.1.38 --- .../python-modules/pyhomematic/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pyhomematic/default.nix diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix new file mode 100644 index 00000000000..094274cefec --- /dev/null +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: + +buildPythonPackage rec { + pname = "pyhomematic"; + version = "0.1.38"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "15b09ppn5sn3vpnwfb7gygrvn5v65k3zvahkfx2kqpk1xah0mqbf"; + }; + + # 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; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 334d09d09d2..54f116dc750 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6156,6 +6156,8 @@ in { pydotplus = callPackage ../development/python-modules/pydotplus { }; + pyhomematic = callPackage ../development/python-modules/pyhomematic { }; + pyphen = callPackage ../development/python-modules/pyphen {}; pypoppler = buildPythonPackage rec { From c0aa35a21796c02a1801555db47599839751fd69 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 29 Jan 2018 16:02:35 +0100 Subject: [PATCH 113/373] nano: 2.9.2 -> 2.9.3 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 87ead669b70..a4dd39b8f76 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0m9xm085pi0fhmmshgppipjimr1jkxksbyg8pa5cwaap3d2vgk2f"; + sha256 = "04j05nbnp8vjjwja90d83p4s6ywyl6qhggflcjzw0p9d9gyvr0vp"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From 288898d6f1dc532e1dfb8785a591a2d8ad55320b Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Mon, 29 Jan 2018 22:08:32 +0700 Subject: [PATCH 114/373] nixos/less: use lesspipe package for preprocessing Rather than a custom script the less config now uses the lesspipe package config by default. --- nixos/modules/programs/less.nix | 43 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index a7f2290764a..c0283c9e686 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -28,24 +28,6 @@ let { src = pkgs.writeText "lessconfig" configFile; } "${pkgs.less}/bin/lesskey -o $out $src"; - lessPipe = pkgs.writeScriptBin "lesspipe.sh" '' - #! /bin/sh - case "$1" in - *.gz) - ${pkgs.gzip}/bin/gunzip --stdout "$1" 2>/dev/null - ;; - *.xz) - ${pkgs.xz}/bin/unxz --stdout "$1" 2>/dev/null - ;; - *.bz2) - ${pkgs.bzip2}/bin/bunzip2 --stdout "$1" 2>/dev/null - ;; - *) exit 1 - ;; - esac - exit $? - ''; - in { @@ -93,11 +75,19 @@ in description = "Defines environment variables."; }; - autoExtract = mkOption { - type = types.bool; - default = true; + lessopen = mkOption { + type = types.nullOr types.str; + default = "|${pkgs.lesspipe}/bin/lesspipe.sh %s"; description = '' - When enabled less automatically extracts .gz .xz .bz2 files before reading them. + Before less opens a file, it first gives your input preprocessor a chance to modify the way the contents of the file are displayed. + ''; + }; + + lessclose = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + When less closes a file opened in such a way, it will call another program, called the input postprocessor, which may perform any desired clean-up action (such as deleting the replacement file created by LESSOPEN). ''; }; }; @@ -107,8 +97,13 @@ in environment.systemPackages = [ pkgs.less ]; - environment.variables."LESSKEY_SYSTEM" = toString lessKey; - environment.variables."LESSOPEN" = "|${lessPipe}/bin/lesspipe.sh %s"; + environment.variables = { + "LESSKEY_SYSTEM" = toString lessKey; + } // optionalAttrs (cfg.lessopen != null) { + "LESSOPEN" = cfg.lessopen; + } // optionalAttrs (cfg.lessclose != null) { + "LESSCLOSE" = cfg.lessclose; + }; warnings = optional ( cfg.clearDefaultCommands && (all (x: x != "quit") (attrValues cfg.commands)) From b05ad671fb75daf1bfd9030c950801e56905e9ca Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 29 Jan 2018 16:13:55 +0100 Subject: [PATCH 115/373] signing-party: 2.6 -> 2.7 --- pkgs/tools/security/signing-party/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 3ec6abc3eb1..fc7639b1d5a 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -14,12 +14,12 @@ let ]; in stdenv.mkDerivation rec { pname = "signing-party"; - version = "2.6"; + version = "2.7"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz"; - sha256 = "1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr"; + sha256 = "0znklgvxn7k7p6q7r8chcj86zmzildjamr3qlqfxkj5m7yziqr21"; }; sourceRoot = "."; From 62ad671a80e2f7e1468ffc0354ea811d02660828 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 29 Jan 2018 17:42:53 +0100 Subject: [PATCH 116/373] highlight: 3.41 -> 3.42 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 90d7c2f4aa8..1fcfdd85e7a 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.41"; + version = "3.42"; src = fetchFromGitHub { owner = "andre-simon"; repo = "highlight"; rev = "${version}"; - sha256 = "163ghkyv3v6v200pskajlsz6sbq3hi31qx7abjcbwc0dajqfngvj"; + sha256 = "1fxx827igzqjn5rri57b8980hnd3ixz3j7smfxwi1ivfhlfznzgr"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; From 04b45828c671d8ff26560ff5c347e31de802e01a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 29 Jan 2018 14:40:54 +0900 Subject: [PATCH 117/373] pulp: init at 1.6.0 A python Linear Programming API. --- .../python-modules/pulp/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pulp/default.nix diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix new file mode 100644 index 00000000000..aacac72d2aa --- /dev/null +++ b/pkgs/development/python-modules/pulp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, pyparsing }: + +buildPythonPackage rec { + pname = "PuLP"; + version = "1.6.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1irzpfnnm5f0qf8y9ddxi489nwixyj0q4zlvqafm621bijkxdv6g"; + }; + + buildInputs = []; + propagatedBuildInputs = [ pyparsing ]; + + # only one test that requires an extra + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/coin-or/pulp; + description = "PuLP is an LP modeler written in python"; + maintainers = with maintainers; [ teto ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9b0a61d884..5194063a6f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22374,6 +22374,8 @@ EOF pyemd = callPackage ../development/python-modules/pyemd { }; + pulp = callPackage ../development/python-modules/pulp { }; + behave = callPackage ../development/python-modules/behave { }; pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; From da26e920789f1d0b63ec9b5af79c611063d4561d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:39:57 -0500 Subject: [PATCH 118/373] linux-copperhead: 4.14.15.a -> 4.15.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 08649e61c7b..c449d632ba8 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.14.15"; + version = "4.15"; revision = "a"; - sha256 = "1ziw1wbbm35rkj69in4f2b28slplxdsz43w29hxngbp88137h1vx"; + sha256 = "1jia6isz4mi7a76rg7nd5iqll6py5kjz0myp4z0dx17xm9axcgqm"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 61043ad4d1425af2d2b5cb3af8b3740fdd90e3ad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:41:02 -0500 Subject: [PATCH 119/373] linux: Add 4.15 --- pkgs/os-specific/linux/kernel/linux-4.15.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 18 ++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.15.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix new file mode 100644 index 00000000000..0f1aae1aa1b --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: + +with stdenv.lib; + +import ./generic.nix (args // rec { + version = "4.15"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); + + # 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 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d89405433a0..fd5ca5872e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12837,7 +12837,6 @@ with pkgs; kernelPatches = with kernelPatches; [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.tag_hardened ]; extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { @@ -12924,6 +12923,21 @@ with pkgs; ]; }; + linux_4_15 = callPackage ../os-specific/linux/kernel/linux-4.15.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # 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") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -13112,7 +13126,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_14; + linuxPackages_latest = linuxPackages_4_15; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. From 0e852076c4b23d5a29fb3aa9739e37aefb287edb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:41:31 -0500 Subject: [PATCH 120/373] minikube: 0.24.1 -> 0.25.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index f69b0e5eca9..d27693823a6 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,15 +15,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.8.0"; + localkube-version = "1.9.0"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc"; + sha256 = "1z5c061mx2flg6hq05d00bvkn722gxv8y9rfpjyk23nk697k31fh"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.24.1"; + version = "0.25.0"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "18b5ic4lcn84hq2ji5alyx58x9vi0b03544i5xzfgn3h2k78kynk"; + sha256 = "0nsdi8mr8p69z696ksfb5ahzqqnvjn4a2z6cp0kyby8sakcjhsby"; }; patches = [ From 900c0241c911f5f51229e1f943f330f000f9688c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:41:50 -0500 Subject: [PATCH 121/373] kotlin: 1.2.20 -> 1.2.21 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 1c1c428ebab..108fefca863 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.20"; + version = "1.2.21"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0mx047j98jaw0smpk150ipfbb922il2kqqp3fmsz6hvvygcx6qzv"; + sha256 = "08mg0xl6n5kl71rn4ix6innqa7dlirmw1rlj9qwmqv5abp9wpwn5"; }; propagatedBuildInputs = [ jre ] ; From 0f01846e974e8151cd80a6ff9e3f53e8c1ec63d8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:42:05 -0500 Subject: [PATCH 122/373] gradle: 4.4.1 -> 4.5 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index c7da0947607..bdf446d4d12 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.4.1"; + name = "gradle-4.5"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "12b3d0cyj9wdk1m6pdi3500fzvgfks8x6wgm8hf0rhyzacc7vkz7"; + sha256 = "1qxmb4mki2gjhfwmy7lwak283l86iq3nivw57a2gpw2g64xa9wh3"; }; }; From 9b7c2371f71df0ed8a300aa58feeb534e3d91369 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 29 Jan 2018 11:55:14 -0500 Subject: [PATCH 123/373] Fix kernelPackages for 4.15 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd5ca5872e3..788087d5775 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13138,6 +13138,7 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_13); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); + linuxPackages_4_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_15); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. From 4b0000a1de2e4d45c9d3e9c232321f1dfe15e8fc Mon Sep 17 00:00:00 2001 From: Pierre-Etienne Meunier Date: Mon, 29 Jan 2018 18:17:04 +0100 Subject: [PATCH 124/373] Pyrseas: init at 0.8.0 (#34225) * Pyrseas: init at 0.8.0 Pyrseas is a declarative tool for managing PostgreSQL schemas. * Replacing python27Packages with python2Packages * Explaining why the tests are disabled * Pyrseas: updating after review --- .../tools/database/pyrseas/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/tools/database/pyrseas/default.nix diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix new file mode 100644 index 00000000000..20123a0600e --- /dev/null +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -0,0 +1,45 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +let + pgdbconn = pythonPackages.buildPythonPackage rec { + pname = "pgdbconn"; + version = "0.8.0"; + src = fetchFromGitHub { + owner = "perseas"; + repo = "pgdbconn"; + rev = "26c1490e4f32e4b5b925e5b82014ad106ba5b057"; + sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z"; + }; + # The tests are impure (they try to access a PostgreSQL server) + doCheck = false; + propagatedBuildInputs = [ + pythonPackages.psycopg2 + pythonPackages.pytest + ]; + }; +in + +pythonPackages.buildPythonApplication rec { + pname = "pyrseas"; + version = "0.8.0"; + src = fetchFromGitHub { + owner = "perseas"; + repo = "Pyrseas"; + rev = "2e9be763e61168cf20d28bd69010dc5875bd7b97"; + sha256 = "1h9vahplqh0rzqjsdq64qqar6hj1bpbc6nl1pqwwgca56385br8r"; + }; + # The tests are impure (they try to access a PostgreSQL server) + doCheck = false; + propagatedBuildInputs = [ + pythonPackages.psycopg2 + pythonPackages.pytest + pythonPackages.pyyaml + pgdbconn + ]; + meta = { + description = "A declarative language to describe PostgreSQL databases"; + homepage = http://perseas.github.io/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ pmeunier ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788087d5775..ef2ce297bbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7808,6 +7808,8 @@ with pkgs; pup = callPackage ../development/tools/pup { }; + pyrseas = callPackage ../development/tools/database/pyrseas { }; + qtcreator = libsForQt5.callPackage ../development/qtcreator { }; r10k = callPackage ../tools/system/r10k { }; From 4e593638670a01392206ec5a5a700d204b01a01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 29 Jan 2018 18:45:38 +0100 Subject: [PATCH 125/373] pythonPackages.discordpy: Mark as broken --- .../python-modules/discordpy/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index e11ee54f1a6..e548781fde6 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , pythonOlder , withVoice ? true, libopus @@ -9,14 +9,12 @@ , pynacl }: -let +buildPythonPackage rec { pname = "discord.py"; version = "0.16.12"; -in buildPythonPackage rec { - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108"; }; @@ -38,5 +36,9 @@ in buildPythonPackage rec { description = "A python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; license = lib.licenses.mit; + + # discord.py requires websockets<4.0 + # See https://github.com/Rapptz/discord.py/issues/973 + broken = true; }; } From f2dc4781f1ff6d3f10b84aaf1fa9f0acbdace632 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 14:26:49 +0100 Subject: [PATCH 126/373] upower: 0.99.4 -> 0.99.7 --- pkgs/os-specific/linux/upower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index b1a8ac7d518..c46ed2d0c01 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.99.4"; + name = "upower-0.99.7"; src = fetchurl { url = "https://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1c1ph1j1fnrf3vipxb7ncmdfc36dpvcvpsv8n8lmal7grjk2b8ww"; + sha256 = "00d4830yvg84brdhz4kn60lr3r8rn2y8gdbhmhxm78i5mgvc5g14"; }; buildInputs = From f833dd70674e609e6e7296d1ef0481337a630b86 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 19:25:17 +0100 Subject: [PATCH 127/373] imagemagick: fetch sources from github Release tarballs are deleted after a new release. --- pkgs/applications/graphics/ImageMagick/7.0.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 0cb95d75fcf..e716146ec7a 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices @@ -15,7 +15,7 @@ let cfg = { version = "7.0.7-22"; - sha256 = "12c48cfhc2a3zvhgxdywrfy8b4m2vx85vn2qj69iyni5x849xpj9"; + sha256 = "1ad7mwx48xrkvm3v060n2f67kmi0qk7gfql1shiwbkkjvzzaaiam"; patches = []; }; in @@ -24,13 +24,10 @@ stdenv.mkDerivation rec { name = "imagemagick-${version}"; inherit (cfg) version; - src = fetchurl { - urls = [ - "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" - # the original source above removes tarballs quickly - "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" - "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" - ]; + src = fetchFromGitHub { + owner = "ImageMagick"; + repo = "ImageMagick"; + rev = cfg.version; inherit (cfg) sha256; }; From fe0a15eaca4eeb08496a1ffe195d570f86ee7f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Mon, 29 Jan 2018 20:15:43 +0100 Subject: [PATCH 128/373] btrbk: install to bin --- pkgs/tools/backup/btrbk/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index e68bf846363..3565d8cbeb2 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { --replace '$btrbk' 'btrbk' ''; - fixupPhase = '' - patchShebangs $out/ - + preFixup = '' wrapProgram $out/sbin/btrbk \ --set PERL5LIB $PERL5LIB \ --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash openssh ]}" From 393e39e2e58722db3f46aa5e8247a4b88c813b34 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 29 Jan 2018 20:24:11 +0100 Subject: [PATCH 129/373] Revert "microcodeIntel: 20171117 -> 20170108" This reverts commit 9b7ef9c738e743992ef268beba13d52bcc8a0b04. Intel recommends to stop deployment of the updated microcode as it introduces unexpected system behaviour on many platforms. See https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00088&languageid=en-fr cc #33414 --- pkgs/os-specific/linux/microcode/intel.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index f7393d79cc2..97843b2253f 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "microcode-intel-${version}"; - version = "20180108"; + version = "20171117"; src = fetchurl { - url = "https://downloadmirror.intel.com/27431/eng/microcode-${version}.tgz"; - sha256 = "0c214238mjks07zwif07f4041c74jil522sy78r4kjs6lniilgq6"; + url = "https://downloadmirror.intel.com/27337/eng/microcode-${version}.tgz"; + sha256 = "1p14ypbg28bdkbza6dx6dpjrdr5p13vmgrh2cw0y1v2qzalivgck"; }; buildInputs = [ libarchive ]; 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 130/373] 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 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 131/373] 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 106666365333684cac004e688f2fef5ed3316300 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 29 Jan 2018 21:45:02 +0100 Subject: [PATCH 132/373] perlPackages: bump some package versions - Crypt-JWT: 0.018 -> 0.019 - DBIx-Class: 0.082840 -> 0.082841 - Getopt-Long-Descriptive: 0.100 -> 0.101 - SQL-Abstract: 1.81 -> 1.85 --- pkgs/top-level/perl-packages.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3dffc1ab312..7989f742b83 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.018"; + name = "Crypt-JWT-0.019"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "90e78f7f0ced17e5c2080ad8c7008ce3badd05186e2ff20cf9c7232ed863cdaf"; + sha256 = "26aaaaedc153b04bdaaba7df7ac2f7ce3bdf672c8d7111d09347a8d0c794725c"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { @@ -3835,15 +3835,12 @@ let self = _self // overrides; _self = with self; { }; DBIxClass = buildPerlPackage rec { - # tests broken again - doCheck = false; - name = "DBIx-Class-0.082840"; + name = "DBIx-Class-0.082841"; src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef"; + sha256 = "d705f85825aced299020534349778537524526d64f524217ca362787f683c3bd"; }; - patches = [ ../development/perl-modules/dbiclassx-fix.patch ]; # Remove after next release - buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; + buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { homepage = http://www.dbix-class.org/; @@ -6053,10 +6050,10 @@ let self = _self // overrides; _self = with self; { }; GetoptLongDescriptive = buildPerlPackage rec { - name = "Getopt-Long-Descriptive-0.100"; + name = "Getopt-Long-Descriptive-0.101"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "1451e79310d1630de37690e3aba5c38ea5f01a486c5a43f0cd95bef2a02dffb6"; + sha256 = "752e898ea6eb8706ceb836668ca645704f5dcbc3124b6d1b21d04007dbc46948"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; @@ -6064,7 +6061,6 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/Getopt-Long-Descriptive; description = "Getopt::Long, but simpler and more powerful"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12313,17 +12309,16 @@ let self = _self // overrides; _self = with self; { }; SQLAbstract = buildPerlPackage rec { - name = "SQL-Abstract-1.81"; + name = "SQL-Abstract-1.85"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "5f4d5618ce2424d62bbfdb5228b382e8be0e0ccedbb273d6d850e25d07e64f9f"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + sha256 = "9f44afe031a0cc63a6ccabaa46ba7ec58ef4db940559cee7fbc2dfbbf37bccab"; }; buildInputs = [ TestDeep TestException TestWarn ]; - propagatedBuildInputs = [ HashMerge MROCompat Moo ]; + propagatedBuildInputs = [ HashMerge MROCompat Moo SubQuote ]; meta = { description = "Generate SQL from Perl data structures"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; From 609a86bbc36126c0cb22c2bca2883e1440620767 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Mon, 29 Jan 2018 20:51:58 +0000 Subject: [PATCH 133/373] keepass: change from mono40 to mono54 Issue #31859 (https://github.com/NixOS/nixpkgs/issues/31859) highlighted TLSv1.1 / TLSv1.2 support isn't available with older versions of Mono 4. This change moves to use Mono 5.4. Tested as working with Keepass v2.38 for which PR https://github.com/NixOS/nixpkgs/pull/34360 is already open. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bffcba0951e..35fc715f0b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14977,7 +14977,9 @@ 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; }; + }; keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; From 499b3edb306988d9ec91db50174aa85a896e585b Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 28 Jan 2018 20:36:51 +0100 Subject: [PATCH 134/373] criu: 2.12.1 -> 3.7 cc @thoughtpolice --- .../linux/criu/criu-2.12.1-glibc-2.26.patch | 13 ------------- pkgs/os-specific/linux/criu/default.nix | 11 ++--------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch diff --git a/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch b/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch deleted file mode 100644 index 916161e35a4..00000000000 --- a/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/criu/cr-restore.c -+++ b/criu/cr-restore.c -@@ -650,3 +650,2 @@ static void zombie_prepare_signals(void) - (1 << SIGSYS) |\ -- (1 << SIGUNUSED)|\ - (1 << SIGSTKFLT)|\ ---- a/test/zdtm/static/pthread01.c -+++ b/test/zdtm/static/pthread01.c -@@ -45,3 +45,3 @@ static char *decode_signal(const sigset_t *s, char *buf) - COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO); -- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED); -+ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); - #undef COLLECT diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 4ceb397d9f8..4ef162e56c7 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,30 +4,23 @@ stdenv.mkDerivation rec { name = "criu-${version}"; - version = "2.12.1"; + version = "3.7"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k"; + sha256 = "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq"; }; - patches = [ ./criu-2.12.1-glibc-2.26.patch ]; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig docbook_xsl ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; postPatch = '' - chmod +w ./scripts/gen-offsets.sh - substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto - - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. - sed 1i'#include ' -i criu/include/util.h ''; buildPhase = "make PREFIX=$out"; From 8baa11d46cf6647a06be691ba272814083e59bba Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 30 Jan 2018 00:18:22 +0100 Subject: [PATCH 135/373] rtv: 1.19.0 -> 1.21.0 --- pkgs/applications/misc/rtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 02af4c28d59..c9064d93740 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with pythonPackages; buildPythonApplication rec { - version = "1.19.0"; + version = "1.21.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "19rnw9cac06ns10vqn2cj0v61ycrj9g1ysa3hncamwxxibmkycp7"; + sha256 = "0srm01nrb23hdmj3ripsa9p8nv2cgss3m6and9rdr875qw5ii130"; }; # Tests try to access network From d19f29c1e15280a3af2d0efe96528ff5f7b9447b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 29 Jan 2018 16:37:23 -0500 Subject: [PATCH 136/373] elpa-packages: 2018-01-29 --- .../editors/emacs-modes/elpa-generated.nix | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 6c4d209ad5b..9d37287d84a 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.8.0"; + version = "1.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar"; - sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar"; + sha256 = "14q5yw56n82qph09bk7wmj5b1snhh9w0nk5s1l7yn9ldg71xq6pm"; }; packageRequires = [ emacs ]; meta = { @@ -765,15 +765,15 @@ license = lib.licenses.free; }; }) {}; - el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: + el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.5.1.tar"; - sha256 = "0bbq59d8x4ncrmpfq54w6rwpp604f1x834b81l7wflwxv7ni5msx"; + url = "https://elpa.gnu.org/packages/el-search-1.5.3.tar"; + sha256 = "095gpanpf88j65cbf4r6c787qxi07kqpvdsh0dsdpg9m3ivmxbra"; }; - packageRequires = [ emacs stream ]; + packageRequires = [ cl-print emacs stream ]; meta = { homepage = "https://elpa.gnu.org/packages/el-search.html"; license = lib.licenses.free; @@ -1386,10 +1386,10 @@ mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "mines"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mines-1.5.tar"; - sha256 = "1wpkn47iza78hzj396z5c05hsimnhhhmr1cq598azd6h8c1zca7g"; + url = "https://elpa.gnu.org/packages/mines-1.6.tar"; + sha256 = "1199s1v4my0qpvc5aaxzbqayjn59vilxbqnywvyhvm7hz088aps2"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1637,10 +1637,10 @@ }) {}; paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "paced"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/paced-1.0.tar"; - sha256 = "0ld7cnlk6pn41hx2yfga5w7vfgg4ql6k25ffnf400nsn7y6wcapd"; + url = "https://elpa.gnu.org/packages/paced-1.0.1.tar"; + sha256 = "1y2sl3iqz2vjgkbc859sm3h9jhnrgla9ynazy9d5rql0nsb6sn8p"; }; packageRequires = [ async emacs ]; meta = { @@ -1754,6 +1754,19 @@ license = lib.licenses.free; }; }) {}; + rbit = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "rbit"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rbit-0.1.el"; + sha256 = "0h0f9jx4xmkbyxk39wibrvnj65b1ylkz4sk4np7qcavfjs6dz3lm"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/rbit.html"; + license = lib.licenses.free; + }; + }) {}; rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "rcirc-color"; version = "0.3"; From 7d58054cf780e8118d451028f489888fde8a1d1a Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 29 Jan 2018 16:38:05 -0500 Subject: [PATCH 137/373] org-packages: 2018-01-29 --- .../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 b792b57c3b7..f74ae6ab381 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 = "20180122"; + version = "20180129"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180122.tar"; - sha256 = "0a3a5v5x43xknqc6m5rcgdsqlw047w1djq372akfn5wafsk8a916"; + url = "https://orgmode.org/elpa/org-20180129.tar"; + sha256 = "0cwxqr34c77qmv7flcpd46qwkn0nzli21s3m9km00mwc8xy308n4"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180122"; + version = "20180129"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180122.tar"; - sha256 = "1ss6h03xkvgk2qm1dx4dxxxalbswjc1jl9v87q99nls8iavmqa8x"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180129.tar"; + sha256 = "1bk7jmizlvfbq2bbis3kal8nllxj752a8dkq7j68q6kfbc6w1z24"; }; packageRequires = []; meta = { From 2b73676db8b70e7d6e2e34a1a6c8477432a31fd6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 29 Jan 2018 16:38:42 -0500 Subject: [PATCH 138/373] melpa-stable-packages: 2018-01-29 --- .../emacs-modes/melpa-stable-generated.nix | 324 +++++++++++------- 1 file changed, 194 insertions(+), 130 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 158a17f0aa3..507e7bfcbe3 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -548,12 +548,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "519b5cd886f484693fd69b226e307d56137b321b"; - sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -569,12 +569,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "519b5cd886f484693fd69b226e307d56137b321b"; - sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -1094,12 +1094,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476"; - sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg"; + rev = "45bf75f17752c8e8dd4c8a4531c0aa419cdccb84"; + sha256 = "03xypgq6vy7819r42g23kgn7p775bc0v9blzhi0zp5c61p4cw8v3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1217,22 +1217,22 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: + all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "bb69345ead914345faad582723a2b61618f13289"; - sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf"; + rev = "52d1f2d36468146c93aaf11399f581401a233306"; + sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; name = "all-the-icons"; }; - packageRequires = [ emacs font-lock-plus memoize ]; + packageRequires = [ emacs memoize ]; meta = { homepage = "https://melpa.org/#/all-the-icons"; license = lib.licenses.free; @@ -3376,12 +3376,12 @@ bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bug-reference-github"; - version = "0.2.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "arnested"; repo = "bug-reference-github"; - rev = "671d32083aad5cf813a5e61075b70889bc95dec5"; - sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v"; + rev = "f570a0532bfb44f095b42cf68ab1f69799101137"; + sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github"; @@ -4361,12 +4361,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6"; - sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j"; + rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484"; + sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -5486,12 +5486,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "519b5cd886f484693fd69b226e307d56137b321b"; - sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -6059,12 +6059,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "1.3.8"; + version = "1.3.9"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "e05fdb306eee197d63976d24bf0e16db241c6c06"; - sha256 = "1m6m2ygafy38483rd8qfq4zwmw1x7m5zpnvqdmsckiqik3s2z98n"; + rev = "2219bf8d9a4584abc905c7470455777553496056"; + sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -6542,12 +6542,12 @@ cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "cwl-mode"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "tom-tan"; repo = "cwl-mode"; - rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9"; - sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59"; + rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7"; + sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; @@ -7277,12 +7277,12 @@ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dimmer"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "gonewest818"; repo = "dimmer.el"; - rev = "031be18db14c5c45758d64584b0f94d77e8f32da"; - sha256 = "0csj6194cjds4lzyk850jfndg38447w0dk6xza4vafwx2nd9lfvf"; + rev = "12fc52a6570ec25020281735f5a0ca780a9105af"; + sha256 = "1jv9rrv15nb5hpwcaqlpjj932gyisrkwbv11czkg3v0bn7qn6yif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; @@ -8901,13 +8901,13 @@ pname = "eide"; version = "2.1.2"; src = fetchgit { - url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; + url = "https://git.tuxfamily.org/eide/emacs-ide.git"; rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3"; sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide"; - sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide"; + sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni"; name = "eide"; }; packageRequires = []; @@ -9094,22 +9094,22 @@ license = lib.licenses.free; }; }) {}; - el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }: + el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-spice"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "vedang"; repo = "el-spice"; - rev = "53921ffe9a84d9395eea90709309d3d5529921ea"; - sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i"; + rev = "972dace20ec61cd27b9322432d0c7a688c6f061a"; + sha256 = "1wrb46y4s4v0lwwyriz2qn1j1l804jyb4dmadf462jxln85rml70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice"; sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg"; name = "el-spice"; }; - packageRequires = [ thingatpt-plus ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/el-spice"; license = lib.licenses.free; @@ -9157,6 +9157,27 @@ license = lib.licenses.free; }; }) {}; + elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "elbank"; + version = "1.0"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "Elbank"; + rev = "e4b532373a32889b8ab3389bd3e726dff5dd0bcf"; + sha256 = "0kqiwa5gr8q0rhr598v9p7dx88i3359j49j04crqwnc5y107s1xk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; + sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997"; + name = "elbank"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/elbank"; + license = lib.licenses.free; + }; + }) {}; elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elcord"; @@ -9514,15 +9535,15 @@ license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: + elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "99f0b6401bff25d40b9f58123533271f7870a286"; - sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j"; + rev = "30cb5e3c344edef572b6cffac94c6ff80bf6595f"; + sha256 = "17iwdaly9kw17ih86rk9w1iswn8r6vvj9sh71picsxg6gqdrqnrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -9531,6 +9552,7 @@ }; packageRequires = [ company + emacs find-file-in-project highlight-indentation pyvenv @@ -9608,12 +9630,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "127fd4fca8ac6470cfda62f47bb1c29859862cfc"; - sha256 = "0j7j7wh89a34scilw11pbdb86nf515ig38pjkwyarfvj93gigc04"; + rev = "9f32e91ebbaebd7f1125107dce2aa979827b26c0"; + sha256 = "1hc4jw2fy25ri2hh3xw7sp67yfl2jvrgj1a25xa6svchjq3h1yf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -9763,8 +9785,8 @@ sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; - sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; + sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x"; name = "emacsql-sqlite"; }; packageRequires = [ cl-generic cl-lib emacs emacsql ]; @@ -11345,12 +11367,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "ceb13ad1b34eb0debe2472c024841bdddce9e593"; - sha256 = "1wal8kwz1gx0cw1a91rf0d9wl490kjiilv6kwd779zf5041hnhwf"; + rev = "50bb88241983f0bf06d35a455a87c04eddc11c83"; + sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -12372,12 +12394,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.4.6"; + version = "5.4.7"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "31ebfd65d254904ba3e5ec96507c0b01d7768940"; - sha256 = "1xy7a6crng5x7k0x810ijrm882gm597ljwzi4cj2i93js625cw2b"; + rev = "7be14de3c737e70606d208d8d443b89e58cd646d"; + sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -17162,12 +17184,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161"; - sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9"; + rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26"; + sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -17390,22 +17412,22 @@ license = lib.licenses.free; }; }) {}; - helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: + helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-cider"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "a24ef274e382c1a158a76eae2570f1f007031cb8"; - sha256 = "062abfb4sfpcc6fx3nrf3j0bisglrhyrg7rxwhhcqm9jhalksmdl"; + rev = "9a948b834dd31b3f60d4701d6dd0ecfab0adbb72"; + sha256 = "0wssd9jv6xighjhfh3p8if1anz3rcrjr71a4j063v6gyknb7fv27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x"; name = "helm-cider"; }; - packageRequires = [ cider emacs helm-core seq ]; + packageRequires = [ cider emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-cider"; license = lib.licenses.free; @@ -17498,12 +17520,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161"; - sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9"; + rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26"; + sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -18587,6 +18609,27 @@ license = lib.licenses.free; }; }) {}; + helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: + melpaBuild { + pname = "helm-system-packages"; + version = "1.7.0"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-system-packages"; + rev = "22ff951b092a3fbde8eadf284a24e86bb4694f6a"; + sha256 = "0argxi8dppgyfljwn654a7183lva74wnnwzkk3xlrvgngmir56kp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; + sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4"; + name = "helm-system-packages"; + }; + packageRequires = [ emacs helm seq ]; + meta = { + homepage = "https://melpa.org/#/helm-system-packages"; + license = lib.licenses.free; + }; + }) {}; helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-themes"; @@ -19532,6 +19575,27 @@ license = lib.licenses.free; }; }) {}; + ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ibuffer-tramp"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "svend"; + repo = "ibuffer-tramp"; + rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3"; + sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp"; + sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32"; + name = "ibuffer-tramp"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ibuffer-tramp"; + license = lib.licenses.free; + }; + }) {}; ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-vc"; @@ -19640,12 +19704,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "4.5"; + version = "4.7"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345"; - sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih"; + rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; + sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -19742,22 +19806,22 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: + ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "4.5"; + version = "4.7"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345"; - sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih"; + rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; + sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; name = "ido-ubiquitous"; }; - packageRequires = [ cl-lib emacs ido-completing-read-plus ]; + packageRequires = [ cl-lib ido-completing-read-plus ]; meta = { homepage = "https://melpa.org/#/ido-ubiquitous"; license = lib.licenses.free; @@ -20104,14 +20168,14 @@ pname = "impatient-mode"; version = "1.0.0"; src = fetchFromGitHub { - owner = "netguy204"; - repo = "imp.el"; + owner = "skeeto"; + repo = "impatient-mode"; rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0"; sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode"; - sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode"; + sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j"; name = "impatient-mode"; }; packageRequires = [ cl-lib htmlize simple-httpd ]; @@ -21254,12 +21318,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "37e83641fd5eab45e813e4bc74a835fe7229c160"; - sha256 = "0hmrhp3lijd77kl0b98nbl1p8fmgjfry2hhvh5vickx3315w7qgw"; + rev = "6bd44162ac422304803f606278bb0c08ab940a5d"; + sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -21695,12 +21759,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "88a25b89a480f1193cc1c5502f3a5d0b68cb7227"; - sha256 = "03bbpaih29yx8s16v59mca8v6sak6294zq7d534613la28n4h6w7"; + rev = "56bafd9b1b022ebfd98cad022792957164ec56fb"; + sha256 = "02nmrdc2ldvfzyn3s9qrvq61nl93krc1vyr4ad1vkmbyqrwszyvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -22472,12 +22536,12 @@ linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "linum-relative"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "coldnew"; repo = "linum-relative"; - rev = "b8a99dcfe38a491172a8193053fb7849634b43c0"; - sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s"; + rev = "896df4b40c1e1eb59f55fcee48a1543f0ccd724e"; + sha256 = "0b3n1gk2w1p72x0zfdz9l70winq2fnjpjrgq0awxx730xk7ypp5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative"; @@ -22689,12 +22753,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.20.1"; + version = "2.21.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "eed38dc66430802e754c48bb44aaf524d7b1596c"; - sha256 = "1rl279h18z9fka4zdaqm2h4jxpq3wykja3x7jyhj4bnrqvkw66gh"; + rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0"; + sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -27526,12 +27590,12 @@ org-wild-notifier = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-wild-notifier"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "akhramov"; repo = "org-wild-notifier.el"; - rev = "f5bf3b13c630265051904cb4c9a0613ead86847c"; - sha256 = "0z2flnqimwndq8w7ahi57n7a87l5iknn3dpwirxynq4brzazzi7j"; + rev = "28f6af12a9efbcab53e310363c451f53ce8ea3f2"; + sha256 = "00v4f26np4i947xgqr03wylz4ichc168znlwxn4l6np1s85i3mzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; @@ -27997,12 +28061,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "b47f6f79603adb4f505500ed83150afca7601cfc"; - sha256 = "1xlkmiwgxsai0hsx9r1gx88bdj72vxaq0icr399ksnwba58rwmr1"; + rev = "9751d34e1133b89a533a978c085b0715f85db648"; + sha256 = "11h464cyc28ld0b0zridgm4drydc1qjxbm1y24zrwlkyqqjk6yr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -28394,12 +28458,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; - sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; + rev = "166975683225367c866e6ae6f6acb88d24e21a35"; + sha256 = "02mh8w2na6qa94p3bh6pvdvmg36p2vrbp5hpjnwjcayrb92dskgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -30834,12 +30898,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55"; - sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh"; + rev = "f925bcb46ea64b699f7cd06933c48e0d5db88b73"; + sha256 = "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -31254,12 +31318,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "25cc3c8902f16191496b549705b00ffc7dff51f1"; - sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy"; + rev = "164136d05505275d42d1ca3a390f55fcc89694b8"; + sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -33757,12 +33821,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "8fd76a66abe4d37925e3d6152c6bd1e8648a293a"; - sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx"; + rev = "5aca51956fae55d7310c1f96b5d128201087864a"; + sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -33778,12 +33842,12 @@ smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }: melpaBuild { pname = "smart-mode-line-powerline-theme"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "8fd76a66abe4d37925e3d6152c6bd1e8648a293a"; - sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx"; + rev = "5aca51956fae55d7310c1f96b5d128201087864a"; + sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -34030,12 +34094,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "22b3efd741e26f59e18c9fd28691d8b84c9130ab"; - sha256 = "0hjp5ci7miggw0gs2y8q867gi7p3dq2yyfkckkh52isrp0yvz0wf"; + rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7"; + sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -35121,12 +35185,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "8c45f69a078c41619a7a3db6d54a732c3fad8e3f"; - sha256 = "1isy71vkws3ywm4iwa85dk12810az3h85n6bimd36dfqbhfwdrli"; + rev = "7739e4954cc614ecd6b37e935f82ad057e256d56"; + sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -36295,12 +36359,12 @@ tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tracking"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6"; - sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j"; + rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484"; + sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -37792,12 +37856,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "aed3e00b6332a068d53ce482f5139a95c3dcd245"; - sha256 = "1p4sgn0rh8a5f0f6f1njq329zwgs6yp8j3zqs0yfz4kaikw1xw10"; + rev = "2da60b8857d107721b089346121a7d51296a58bf"; + sha256 = "1r945qz7z5z80qvzlqvz985mz51zy3pj3fk36y0flc380y4ap6hd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -39048,22 +39112,22 @@ license = lib.licenses.free; }; }) {}; - yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; - version = "2.0"; + version = "3.0"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "90c14d2e2b8247eeba464a52560af484f8542558"; - sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is"; + rev = "c1de31d2b16d98af197a4392b6481346ab4e8d57"; + sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q"; name = "yatemplate"; }; - packageRequires = [ yasnippet ]; + packageRequires = [ emacs yasnippet ]; meta = { homepage = "https://melpa.org/#/yatemplate"; license = lib.licenses.free; @@ -39074,8 +39138,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "5bb46b7ab3de"; - sha256 = "1ap043fq9yl2n4slrjkjld9b743ac7ygj52z9af709v6sa660ahg"; + rev = "b1896ef49747"; + sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; From accbc72ceef6f91ded7f1d90b58fe8a6499009bf Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 29 Jan 2018 16:48:45 -0500 Subject: [PATCH 139/373] melpa-packages: 2018-01-29 --- .../editors/emacs-modes/melpa-generated.nix | 1442 ++++++++++------- 1 file changed, 827 insertions(+), 615 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index f7ee4fdc65e..468b40f1181 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 = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; - sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; + rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; + sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; }; 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 = "20180111.116"; + version = "20180126.2015"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; - sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; + rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; + sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -1114,12 +1114,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20180119.1226"; + version = "20180123.1111"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "ceea53d7b6cb982cded8335ef79a13cc2d0bd2b2"; - sha256 = "0m69g0yqxfjxzmp4h0i50kdclyaj052bdz2gamar8m7d0i2dyvj3"; + rev = "208ea2a4e809f0c91caf3354b44a8f4a4f1cbb73"; + sha256 = "1bkck2gbbgxhh1swzkdsyk5vp9h08dv8skc5hr4ncgxy2fq8m27g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1406,11 +1406,11 @@ }) {}; ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahg"; - version = "20171123.201"; + version = "20180125.944"; src = fetchhg { url = "https://bitbucket.com/agriggio/ahg"; - rev = "fbe148d4ab94"; - sha256 = "1is92jw37wadzmkbm3qqz3sxfs5lkvvz6dx6flhm9kfgfmk9vkvh"; + rev = "622b519d8586"; + sha256 = "14jayh9bn8f6mjiln6h7ny404g0iy8zr7b6s6faqqhd840h519mz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg"; @@ -1447,12 +1447,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20171103.2238"; + version = "20180126.2021"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "9ec7fca8002b213c7eee1168258e36a683190d18"; - sha256 = "01gjmyxb0m6i321md77wscqrhy30gyhrk4fjcx7mg2z9hzxvzljb"; + rev = "9367e4a277fdabde7433640fbae48407bab7c4da"; + sha256 = "0y71h25vi10qirn0q48csxd1xjhha17f9za9fdvfs7pcsqmkk8im"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1573,12 +1573,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20180116.1751"; + version = "20180122.1242"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "9a9abb98a24aa14852c2e00f4f11a41d1465e7db"; - sha256 = "1dwsypcvpsrjhyim9marzwz097vqlmdg0wv6cww4c8h9iah52dn6"; + rev = "103d34c83fe77e46a6976dcaba3db678199e0c9c"; + sha256 = "1nbk768d8iqjf1mx956497hbjfxar144h3m3sd298byc54z8bvmf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -1633,22 +1633,22 @@ license = lib.licenses.free; }; }) {}; - all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: + all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20171011.324"; + version = "20180125.757"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "b93707e3a3a7a4968b3e212b890edfe265dcd57d"; - sha256 = "09hyg0fs3qgyc6dbn23pw8p7w2m9xvkf5cz8v0f18a7fkvq2j2f9"; + rev = "52d1f2d36468146c93aaf11399f581401a233306"; + sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; name = "all-the-icons"; }; - packageRequires = [ emacs font-lock-plus memoize ]; + packageRequires = [ emacs memoize ]; meta = { homepage = "https://melpa.org/#/all-the-icons"; license = lib.licenses.free; @@ -1960,12 +1960,12 @@ anki-editor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anki-editor"; - version = "20180121.2040"; + version = "20180128.129"; src = fetchFromGitHub { owner = "louietan"; repo = "anki-editor"; - rev = "01776197ec408bf9efe0b2001dfd87dfc16a074d"; - sha256 = "1m3rdkahf0nab230ldgcvhxk6iqj4r855k7b346g55jrziscj595"; + rev = "690121ce582105239f8bf20a9c011b8c6bb1661a"; + sha256 = "168lixn9s3s1p33qw8x6wr5ll6mikkx3316xfsql0bdnz1rkk6cp"; }; 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 = "20180119.1941"; + version = "20180125.612"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "62c170856047792dc5879cd5b54ab523f09ab186"; - sha256 = "10lvy4961dksrsy63bxr1dxycbkbiywx2hlxq1x3nfpwpj0iwnhb"; + rev = "dfb500b394cfb8332f40d8b9ba344f106fdb9370"; + sha256 = "1w6dfnrz3gi2d800k5ih2daak5krnpddkzjhmv92nyvgrn7x3hd3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -3113,12 +3113,12 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20171109.1045"; + version = "20180129.34"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "57c4bb749eb0fad9188c870098a61b03af346b75"; - sha256 = "0hmi8q59spjqchc7zkpfsyi5mplkb8npxfa00f4rxfspwd2il5wc"; + rev = "0470e6bde546b34677e393c92e2b064db61b6e9b"; + sha256 = "0m309nhiqbyrk2mwymha66xcl05x5vryzz0vj90pak62yil15mnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -4341,8 +4341,8 @@ src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "31bc1c1c21691668c6cc16a46361490d5bec303a"; - sha256 = "0iq9q0isaynrjhzgkm5hvw26162m52vbzwf12vic5nr9frxbxkv5"; + rev = "2c0b8d6a6e5cec52740b8f773297459b98f3e064"; + sha256 = "0psp1rli7h477js25kzm00s4j5x3604ly1m3xh2w29lz8jpc0nvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; @@ -4902,12 +4902,12 @@ bibliothek = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pdf-tools }: melpaBuild { pname = "bibliothek"; - version = "20180122.430"; + version = "20180122.2021"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "adc5a29738ac99ab715b2dfc04f9137e38b592a6"; - sha256 = "068ralnk1rhrq0vkcn0xg13n1pajn6z3p19w7crrnvxzfqgchcsa"; + rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; + sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek"; @@ -5032,8 +5032,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; - sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; @@ -5053,8 +5053,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; - sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5553,12 +5553,12 @@ borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "borg"; - version = "20180117.339"; + version = "20180125.849"; src = fetchFromGitHub { owner = "emacscollective"; repo = "borg"; - rev = "454daf91e53e94292a59308c54b251fd83f99464"; - sha256 = "0y03pwd4ssl9dv613l3f1r42x6mwfyj2k87r8pmx7qj66zs7w0d2"; + rev = "593314b8f1f4542155eb4dae0ff1be375895b83d"; + sha256 = "095l5cakz0clmna7njqdng3k1gpy4q6h1bld0pvichkkbqh8is6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; @@ -6098,12 +6098,12 @@ bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bug-reference-github"; - version = "20131202.1303"; + version = "20180128.514"; src = fetchFromGitHub { owner = "arnested"; repo = "bug-reference-github"; - rev = "6f693e1f659d9a75abea3f23e95946c7f67138cd"; - sha256 = "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr"; + rev = "f570a0532bfb44f095b42cf68ab1f69799101137"; + sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github"; @@ -6308,12 +6308,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20171029.1011"; + version = "20180128.228"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "bbbf6924ff214b518718687ead96ceec92bdbaba"; - sha256 = "0z05rr85mf9as2byj3k1ai9x5ci45a7g425svv0ywgz1lgv2vsi4"; + rev = "6848057a224e2548a58ec81ce042c81a44dd481c"; + sha256 = "0qzfj57lwxqff3d9kpdg290ishy8h3il43y114kqs1gxcgyxzsv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6539,12 +6539,12 @@ cakecrumbs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cakecrumbs"; - version = "20180118.912"; + version = "20180127.456"; src = fetchFromGitHub { owner = "kuanyui"; repo = "cakecrumbs.el"; - rev = "57888efc1ea983501d01d398e1147b1e7960a6a7"; - sha256 = "1x1f7mwh45r998jy7f5y3jrqnkrahj20k1rmdz6l6x1f5ypi8n43"; + rev = "b7bfcc46aed139abc1d30f700076f82584084f3f"; + sha256 = "1jl196qfgmn87kzkzhrqliarp9cmvl9c4ka2v20knw6ca2ymzbp9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c970907affeb4a21fa1b7c350edf171dbdcd8de5/recipes/cakecrumbs"; @@ -6774,8 +6774,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "b4db8646f434860c11bd0850b1135e8c22801768"; - sha256 = "02fmwsxn0y7fynj2g1mhs89haj471gkbn7aswi4k3sq8nz40wm7q"; + rev = "261c7144e18d54dd38ec1b0b48ae6e7c46eccb02"; + sha256 = "1687rg64i64if3mm0k8sjjbblpkshdhf5aksm8gx24gm1vw3yid6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -6879,8 +6879,8 @@ src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "02ebe8013ea60c6318dbe678ee4866b916f0210f"; - sha256 = "181slnp2jz9wcsgp9lsvbidm2maxkvx45scpcjsg84nxn96fkfby"; + rev = "3cbb32d25ea5691e64bd150188643808846b3688"; + sha256 = "1jxqy8sb2asyck6wp68lbczffpf6b3bg87r965nhxac7kgqhvq4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -7277,8 +7277,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "a9223abdec4445fb47749b4093d5a29853787e94"; - sha256 = "1dn5sjs6r81xjmp0qn4848qk340zkpiqgfq1nqy201mfjgnls2sv"; + rev = "e7f50592d1ff0c8e2fa175e56190566f447fbaf2"; + sha256 = "10f2an6pmz7a088rllf7k1kcyllak6xr4fhvxqgvyqm1h1jbqjbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7861,12 +7861,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180121.1106"; + version = "20180129.1017"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "9fe07e30bc974542d91f3f8267f949a04bfbaf32"; - sha256 = "17vchclbazv9jd8sxichh35rq4n7s3kf7768172843v9rmircfdz"; + rev = "c51903c8ba144ddb8e2b742db5daa572e09e6b97"; + sha256 = "066fvw3dgnrakl5bjpmkymnvv0nzhlbil15xhaywdygy2cylm00d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8075,8 +8075,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "9835ecb758c09400082eb8f1c0336eedbfed0134"; - sha256 = "0vhzqcqmhl3rzxrhfyy6r2yp5d07wd8y820cf0hfby6j5i4j247p"; + rev = "58fc1a3c7f9f6e3126585b1ab2f3d00f824b7d7c"; + sha256 = "1vsh2x794zaf02zql4s6bn3v0m3xm43icvrn7jfmi660qh3f4bsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -8302,12 +8302,12 @@ clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clipmon"; - version = "20160926.329"; + version = "20180129.254"; src = fetchFromGitHub { owner = "bburns"; repo = "clipmon"; - rev = "3f985aa2a55fbfd8566425c90e1968998f57b8ee"; - sha256 = "0jkim6zdmqq8swq70yic7cypj89d1rks5lla1kq9qvrmll36x31w"; + rev = "95dc56c7ed84a654ec90f4740eb6df1050de8cf1"; + sha256 = "0mfb4k0i71y49hn0xk5a1mv4zaj249qcan0y0nzvgf7mmvr32n9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4dc92d73705ebb61ff8218f3483dd2da51ce8d32/recipes/clipmon"; @@ -8776,12 +8776,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20171221.1616"; + version = "20180122.1301"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "dc32d518fdfcb3f6cd014c8235b61562482dfd09"; - sha256 = "0plyqbvb99nplw15bvp246kmn1hyh1l6q2sjnpkdjxc4rrjxhrwg"; + rev = "21c1ca99393ea0160f0503a6adb8f3606d33926a"; + sha256 = "11kqczlc8rwq9v9wk15h8hzhdffz9nxifr9laa07bx74yiddxmyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8801,8 +8801,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "5c3c70201d225359e235e53132788e6f75c2661b"; - sha256 = "0x0yvp0cl36hchwdpc9lv04f13wh15x8d92xj8n87fab1b79k7fy"; + rev = "92cd3d06772ada13935790d66927ab4663c7d628"; + sha256 = "03f04yn0gphcd4664w73pdpmq46ljkvxbv7xyg5s084j5mk263hx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9259,12 +9259,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20180114.2348"; + version = "20180122.1154"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "dd60e9929a0e1819457eeb4a7934864a31a0266a"; - sha256 = "0ljzgiy9pdzr9b64zfxkxrs84d82iiwvykg6wq19mzgd7gpd3g63"; + rev = "0358ee25ba27741a41c62414785308b417cdc308"; + sha256 = "1dqssw407f9d4bbaks9k921fzcs2fz7ccbwpcm22ly46krlzxfpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9553,12 +9553,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20180101.1101"; + version = "20180123.1315"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "4a8289dc257c3991c3953b64671fc25c887b2ca4"; - sha256 = "178wf0n1mdfx6yqwdqlw7drbr5fy7gf6x6p4094s9br7slk9kssk"; + rev = "d789f2643c11f7c53fc47ed9d9b271bb6f6718a3"; + sha256 = "0kqpjxbv9gfkki5cz78dslfgwwf2n15y32dq059lmbfm4mg9f5n4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9749,12 +9749,12 @@ company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-childframe"; - version = "20180118.1903"; + version = "20180124.1744"; src = fetchFromGitHub { owner = "tumashu"; repo = "company-childframe"; - rev = "8e23363066ad4fe3f55a1360663cdcd010a7b814"; - sha256 = "1hzfpjlp7zp9y6d612y37kffv617m3d8cvgzr95z180biz6v6wbw"; + rev = "bb3d778bb12d47c7f2311eecb17985a5695acd31"; + sha256 = "1b1xyy0f20ls7v695vg6m5g0vb3pn7v7vdbsziarf2jaqgc8ps57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4fda072eb1e3f4feb9ad9834104f748f5b749a0d/recipes/company-childframe"; @@ -10159,8 +10159,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "3403179a38693a221bfa86def0c99f6342c5eb73"; - sha256 = "0w6zc1w7kic3ds5hf30i3mj9wxbq2c8wdywbslfprwwi1hxyzmsq"; + rev = "ae90bd280588c96d540892d0f42247db5a126f51"; + sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean"; @@ -10176,12 +10176,12 @@ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20180108.2225"; + version = "20180122.1747"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "f790850035c38a19a153cd5babca1ff778432cbc"; - sha256 = "12d4ajk1lz3r92smg69yfn1nj8g08jjddg4zfjzxvswvgnyk2ka7"; + rev = "0f750d4cbde7063472b1f25b7cef7e632ae307cb"; + sha256 = "1xszd359y7f93azf1b8805v4s99ql4hfajbz9nzwkb5py1jqxxn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10306,8 +10306,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; - sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; + rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; + sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10390,8 +10390,8 @@ src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "432c62f034a5097d3f85d7f54afcdc016d7afa12"; - sha256 = "06ijf4ayqkmlmk5waxi7alinv3wpy23b8xm35llf3h1ncg99zwqj"; + rev = "c42610040ccfaacd8040f47c5e1c629a18987614"; + sha256 = "0j1fqyi97imv1zp0w0y51j2svs494r2bdi2q9jm11b9bdi3jmf7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -11089,8 +11089,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ac856a0b8ca30c55422a58f9f079f36fb476e57f"; - sha256 = "1ch8d52pq74258azb555hwzapki7ny5ivqy363y46hzbng8qisrh"; + rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; + sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11148,12 +11148,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20180121.1738"; + version = "20180129.219"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "e05fdb306eee197d63976d24bf0e16db241c6c06"; - sha256 = "1m6m2ygafy38483rd8qfq4zwmw1x7m5zpnvqdmsckiqik3s2z98n"; + rev = "2219bf8d9a4584abc905c7470455777553496056"; + sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -11484,12 +11484,12 @@ cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "cquery"; - version = "20180121.2203"; + version = "20180129.1017"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "f078372075b2ad6fdede38e4e7b4ed791012ee26"; - sha256 = "1xh1drc5hzgfkhw2nbmlfh2zypal74ais0px1ppajm4mphggizhx"; + rev = "275bf669d14bfcbd342833c245fa9129c5ff76a1"; + sha256 = "0rm0m35sqwas9ayx8lvq19g04y3ndnhfgl7mpfmmjqab9pcqdrjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; @@ -12097,8 +12097,8 @@ src = fetchFromGitHub { owner = "tom-tan"; repo = "cwl-mode"; - rev = "2fa8c8db68a8665ed555126975edd8749bcfc009"; - sha256 = "0zgnnvf8k5zcigykcf6slgcjmwb1l0jdfaqm19r34wp3md8wf0v1"; + rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7"; + sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; @@ -12244,8 +12244,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "a4398a4eed261240be894f5263628648e28cae21"; - sha256 = "09gxyx8vc8vknk7shhx4fgxbxsx8as776xd2qiid6an194qf9b73"; + rev = "eb17d235aade6e338841bf4e53108e1a7c832190"; + sha256 = "1rf73qcyxf48pfxdrnr2bhqy8k5zj001dhixmg1d35z28cwx975n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12387,12 +12387,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20180116.211"; + version = "20180129.634"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "5784843c9ff8b22535d571c25d275eb4ffb1588e"; - sha256 = "027dfhj0ah2fy2r46m4gnxhd4svrkrjs5nkc224mr32fca5lj1bw"; + rev = "13e5ea8758465e7d23081fbb524603394b09a689"; + sha256 = "1zhn2bblafmxc83rg33ipy8pd0i7qrn9630cy74bigl3x5zxs3xd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12408,12 +12408,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180120.1341"; + version = "20180125.116"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "fcfd391b46e6b0e5db5cb0c7e1506ed10d844eda"; - sha256 = "068b1wv16grq2vgjpchx6001rn13azcav308ia7492kr2hlj1sqh"; + rev = "5fb1765fcf5ac896c8d439d7f2d4030672e7509c"; + sha256 = "11nj1x9yxdkwvpsz7lkc9msgnkbzkrcw088nfryic9398mnrrccf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -13080,12 +13080,12 @@ define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "define-word"; - version = "20180105.1152"; + version = "20180128.725"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "d52e9898a2719bd5003184196aa3b889c4fcb7b3"; - sha256 = "1is3yjk7jv3nqn7fg76pnicwkhc7bf0wklvygdw1hskwj46ii6g8"; + rev = "06d094f070b5d675441f74e05a449ce4941529e8"; + sha256 = "0r0lihmkz802ik9qlbs41wfw86vj23mlm7z41zw8h845drxc8vl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -13395,12 +13395,12 @@ diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20170709.2000"; + version = "20180123.1420"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "bec9889de7bf48d28826039880cec9bfad24a628"; - sha256 = "0f9krv08jlw1sawjajdfy0cp5mzbq7hzvy478z8p54s1fwga6wxd"; + rev = "9ef21e4ea2389545417741e20a89d92bfd72d6ff"; + sha256 = "0fj4yjmvfbzqrcmngfbszvr1i8i17ap4lb99idyc9drgiq53xdw1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -13583,12 +13583,12 @@ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dimmer"; - version = "20180121.2108"; + version = "20180124.1822"; src = fetchFromGitHub { owner = "gonewest818"; repo = "dimmer.el"; - rev = "c1bdcf2a09eb4800d862e442a59599e316c5f0ef"; - sha256 = "0n80ykbxjwah3xcg81b9zg6hhjmi5vfsmkilydgzil7x58nvx0vh"; + rev = "7dd76eb41f5684928365b28301412e8aff7235a9"; + sha256 = "14gf6z1pgy8rkxb2777yc7ng94y0yf3rppq3gfb98xfcl09ff06n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; @@ -14066,12 +14066,12 @@ dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sidebar"; - version = "20180121.2250"; + version = "20180126.1812"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "1ff41be87771b8bad389815aa334156940208279"; - sha256 = "1vamjz8kb11lyi27whsrhm117vxzh4a0147ysd6yin3rd51pr4fn"; + rev = "6b2d1df460d4b0dd1448b092d3753314cba784c5"; + sha256 = "1i5ia9m7r63gr91ll9xmqq48y9823hg0mqq69rnzfvbw0zjbgkrq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -15102,12 +15102,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20180108.1934"; + version = "20180128.2355"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "d74fb168948c2b0142a2ae9cb6180d7c67b137eb"; - sha256 = "0pra1kq4z2cmkgm278dw9nxza2sw056hh2463f28crdw6scdim3d"; + rev = "f7c05d390fa733ec7998025d407608fe9f67c111"; + sha256 = "18c3347n3x327qnpd0ab8j74zqs4yb5rn6gz0x2y8kknzzn4h76q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15186,12 +15186,12 @@ download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "download-region"; - version = "20160430.1116"; + version = "20180123.1733"; src = fetchFromGitHub { owner = "zk-phi"; repo = "download-region"; - rev = "eb9e557529a73b4cfc8281c70dd0d95db333fffa"; - sha256 = "0v52djg39b6k2snizd9x0qc009ws5y0ywqsfwhqgcbs5ymzh7dsc"; + rev = "bbba3ecd80818d5d940d41fe89a6e2ec5dd2c53c"; + sha256 = "1cwlbdmdils5rzhjpc3fqjmd3dhalk6i7bxskpahbrr9xxfq0iw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7801d9fac121f213609a802fe9d88bdc5364d1f3/recipes/download-region"; @@ -15606,12 +15606,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20180109.1318"; + version = "20180123.1100"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "a2bcfd357e16b3404cd0e210fedbc9a584da83b8"; - sha256 = "1pqwra01w7wga9jrhafbnnlbn5rh31a0j84ffzsdpkcmac4xk0gy"; + rev = "3bd7c23c3e4ac0936679ad6ebb68f14e37c7bc5d"; + sha256 = "0vnbp8q059z9bfhf1bq1n6cvc4ia3rkdk0iambgwd48i959mdsvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -16050,8 +16050,8 @@ src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "61a504616705feae8c3fd8b01bf315e2cb89f699"; - sha256 = "1lr2hbz4gxcn2r5m3hx4izk8aawgy0fls0isp6cvcgs1s54s2kxi"; + rev = "62a79c5d359674c95719dd129260e4e1f6e760bd"; + sha256 = "084a99klm1lpjvsfls1m2zgwrh4wbwwj4fw7xb84qw5fzzy32ba1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16856,8 +16856,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "bec32916e7b6513e00001e1db92e5508fcdaba27"; - sha256 = "06wada7cvgp8v1hsl0ksm6kycdrlg39zd7dsk9m40ifk6bz010q7"; + rev = "5eeb1b8c8d8e2f394724700f930c9063b9fd279d"; + sha256 = "1kx574bqjsgcri40qhkw8p2rg0rvcbwhbrmiyd5znprk5pz5x1ps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16873,12 +16873,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20180120.849"; + version = "20180123.2256"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "78b284b1e0582d4e32db16914ade6a1e9bb73e72"; - sha256 = "13kn93989cf8nb8bcs27c15hi60x95syk2333w2vsqzp2sigap2y"; + rev = "ec91e8234e2b8fbfd37b6135dfda352a923c556e"; + sha256 = "1m98zkmyy1bbcz7jpa15in9kdgskl3l498q7a9vxpr8w2scq3cls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego"; @@ -16895,13 +16895,13 @@ pname = "eide"; version = "20171229.1435"; src = fetchgit { - url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; + url = "https://git.tuxfamily.org/eide/emacs-ide.git"; rev = "faae6f1384826d18f70b28826dc528d70e91a5c9"; sha256 = "02hylmgs6il59kkq59i9lpdg9gdirpb2y37xzybh7n5lqyzdafai"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide"; - sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide"; + sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni"; name = "eide"; }; packageRequires = []; @@ -16934,12 +16934,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20171128.516"; + version = "20180124.1435"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "1bd6155005ee9749e51bcc8232c80690484c8ca2"; - sha256 = "1cawqhb5ii3mq5i26v1lcwgf9hb4c96j76843zii9iy4b22qs7b6"; + rev = "63388e5d0cf318bdb687054e2de4a4205108ed73"; + sha256 = "0c1pd2d0yv0d4zclh6ri1mwcj1pa7bxbf376kwia4rz400jx5fah"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -17057,12 +17057,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20180110.753"; + version = "20180126.1603"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "f64264389c9d261f4487e20cf699be35e05e61e9"; - sha256 = "1m4d05yvmj3q1ik76pw977l9asqpj45bpsfbiiympnv08yfyxsai"; + rev = "67dcb92c972f67f81c0667ee95d97f05eaa1907b"; + sha256 = "0yhcpcp22n4mj8yq2m9p020mzcmjcv3fb1vw7bnbz8qc42g58xai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -17201,22 +17201,22 @@ license = lib.licenses.free; }; }) {}; - el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }: + el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-spice"; - version = "20140805.1138"; + version = "20180128.921"; src = fetchFromGitHub { owner = "vedang"; repo = "el-spice"; - rev = "65d9ec84b581a5867eebbc58de93958e992ca80d"; - sha256 = "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri"; + rev = "4e0852ebf5d8e9cbb3eaaa6ae9c53d126b53f58c"; + sha256 = "08mkn4qfxax3fgppw79117phm05hihifwj4pgll9ivrilbf75lb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice"; sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg"; name = "el-spice"; }; - packageRequires = [ thingatpt-plus ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/el-spice"; license = lib.licenses.free; @@ -17330,12 +17330,12 @@ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elbank"; - version = "20171206.1508"; + version = "20180125.823"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "8d3a1f89da0b6a90ebf340703513178a409e66d8"; - sha256 = "1y8hmlc966322b7i76592zi3pq190ywk354bn8ckd5zki8iny13h"; + rev = "0b39f801ff614dd2cf36532ed12327138ac36682"; + sha256 = "1yk9mbjcw13lh8cwmwwq6i9ma5hrv7aiqwfsj0rn4x9vygsxwhgi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; @@ -17351,12 +17351,12 @@ elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elcord"; - version = "20180121.1636"; + version = "20180125.659"; src = fetchFromGitHub { owner = "Zulu-Inuoe"; repo = "elcord"; - rev = "3a13d7b1cbbb9b586dae8e79fe4c8a8a09d8146c"; - sha256 = "1c541r9147kdhkmlq3d45nh7gkgyxcc0ws8i1z1705ydbwaz68wk"; + rev = "8fe9c8cd6b5f32aab28fa4e12e3af2c113c7c0eb"; + sha256 = "0ka732ij7ahrqx6xm6s7yncazlpw530ck9dxy06m2rax7gfm6l51"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36b64d0fead049df5ebd6606943a8f769324539e/recipes/elcord"; @@ -17519,12 +17519,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20180121.1648"; + version = "20180127.1442"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "3b6f866ca35654600e2873c4fb798c3af1f3fbcd"; - sha256 = "141qvfgad54yz0naaw72nbajz8bsf65avcfsjz34l0vn0bakmkim"; + rev = "e2b0e255fc3a3cb3e9d69c05df3b8e9d7ca70e86"; + sha256 = "1sq2w40ac8nc6pvifl0r5ri255jcd237x5rxfliwd2wdwqhk9izd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17568,12 +17568,12 @@ elfeed-org = callPackage ({ cl-lib ? null, dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "elfeed-org"; - version = "20171113.356"; + version = "20180129.507"; src = fetchFromGitHub { owner = "remyhonig"; repo = "elfeed-org"; - rev = "1a2bacc160d4e164f012ebf23f3ecccac85df18f"; - sha256 = "0g8hhcfg2rahq6mry4aqqggkc7s26q8is9akzrxwi7dlbhc1ljd4"; + rev = "b9d09a554127244d4807a3d2d90e062df63b2fd5"; + sha256 = "0szij299pfxbgqfps8njnxa2w862zzn40crsbc1ppww267dbp60j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elfeed-org"; @@ -17614,8 +17614,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "3b6f866ca35654600e2873c4fb798c3af1f3fbcd"; - sha256 = "141qvfgad54yz0naaw72nbajz8bsf65avcfsjz34l0vn0bakmkim"; + rev = "e2b0e255fc3a3cb3e9d69c05df3b8e9d7ca70e86"; + sha256 = "1sq2w40ac8nc6pvifl0r5ri255jcd237x5rxfliwd2wdwqhk9izd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -18055,8 +18055,8 @@ src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "a545e51c73baabdd42535c6064030fb018d38290"; - sha256 = "1bvhgi6msimhfgv9y6is0kbyrckb83qnf8z4q22gy3l83impql01"; + rev = "3fedb1ca6f84cdbfc27723d6906b67a0e2ca2972"; + sha256 = "087sa553aqyphrdrn8clb8pjl609aw3qkmim47hvnq8npzvhhr0l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -18311,12 +18311,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20180114.707"; + version = "20180129.124"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "127fd4fca8ac6470cfda62f47bb1c29859862cfc"; - sha256 = "0j7j7wh89a34scilw11pbdb86nf515ig38pjkwyarfvj93gigc04"; + rev = "09bbb07688c0c14130c5e38837aa26b8d607829d"; + sha256 = "0623fzyjjx08i98zmxpq4mcamr83jqj76nfn8ck0ql9k3bss1zlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -18420,8 +18420,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "616dde37524f47246bbb161f20d3f5f090f10fbf"; - sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -18441,8 +18441,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "616dde37524f47246bbb161f20d3f5f090f10fbf"; - sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -18462,8 +18462,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "616dde37524f47246bbb161f20d3f5f090f10fbf"; - sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -18479,16 +18479,16 @@ emacsql-sqlite = callPackage ({ emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "20171218.1827"; + version = "20180128.1252"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "616dde37524f47246bbb161f20d3f5f090f10fbf"; - sha256 = "14l61iq31lyz26nxxr2b5s57wra11xy87lp4d0s2fn03ac9i8nww"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; - sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; + sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x"; name = "emacsql-sqlite"; }; packageRequires = [ emacs emacsql ]; @@ -18982,12 +18982,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20171018.744"; + version = "20180128.607"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "001c3adcc521223f6b53a2243635528b2cb7f7e8"; - sha256 = "0hsrlzx8bslzhpipryxxqrdaiw66cgak14p8v47l0ylvwmxxqn13"; + rev = "8d89c10a5eb975544f8475261e758de390d141ba"; + sha256 = "1aa9kvfq6vh5rjwg5hif9lc7c886893f9ayl5nqgpxcdjvlpnvc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -19141,12 +19141,12 @@ enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20171212.1249"; + version = "20180123.1835"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "4f43eab67a9afb91b0408221d478dcb98131478f"; - sha256 = "0ahvsazrdlwfz0imsfvnhv1f58m7cnib8fzbffdjvvwmmc9g511y"; + rev = "989f7191078c8c1c46921167f5f96119fad930a5"; + sha256 = "167b34cgp5f7nfrcp9jn8phzs125jx8mkbni8yshfb5i2mf7g0ml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -19359,12 +19359,12 @@ epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; - version = "20150517.433"; + version = "20180127.351"; src = fetchFromGitHub { owner = "cask"; repo = "epl"; - rev = "83797835f729f39b80acba4c7e83d73a2e410e26"; - sha256 = "1rgxvmz9nv7922c30xz8ax3cwj8mmwxfni3xjwnhpfa744in4441"; + rev = "28af1ab1217c46367ab5f29d72a57fcc6d9cd45e"; + sha256 = "0hgqhzgbsi3gmnj0809mh1mqib4yrx16ibyn8j0h7v02dms4pk9q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; @@ -19908,8 +19908,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "b7ff9c0d76372f16d14ecaac04c6fbbbadaf9435"; - sha256 = "101qjqra9b32al2cpcf3ymyqcss8dxvi4ifpiaa6450rmjc89y5h"; + rev = "fc6eb93ae081ac5ebf715e53d0d2519067fcea95"; + sha256 = "07fizaia7pvq4fzjmw7461qn4mkl0346377mr2nqnva1h8r48mz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20071,12 +20071,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20171220.719"; + version = "20180126.711"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "adf879cb108819fc18fea52788b3fa98a57f5177"; - sha256 = "1zcv11vi3vs5i2i104an9nzm9jy889pqfs9xlifz7w9l81qfa2nl"; + rev = "8c1c601a72fbc9b0e0a80974856abfc679843c86"; + sha256 = "0ppci48cz453ivkd37zbs3sgan0v7nf9d65qy77zvkn55qn2f4bq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -20533,12 +20533,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20180116.142"; + version = "20180128.1545"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "f072e2630578119543e8ab3615c923487089c01a"; - sha256 = "0rqk19w3s0z3lpzjw4qcra9apww60m6vdr4klkrd0r4khd7x0z5s"; + rev = "ec2c2f5649d01071ce9a7079072ef415f9426149"; + sha256 = "0sp1q6wrv3q0w8rlhj390v2584mdwswznj0nyp42bf8qdb74ba87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20890,12 +20890,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20180122.35"; + version = "20180126.1159"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "76d846bc4abbefdcdeae843b6a1cd61a9bd88d04"; - sha256 = "1xvjj180l3ir7z4kgway17z877jb6l1fd5j4z0dhbvba0j20ysh2"; + rev = "2992858748e6fe8ae706d182b86b684e7b9be8b9"; + sha256 = "18jyqf1k7b09j0q1sxavqyqyx21msbqklia83kbrn51wbhy70k49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -21037,12 +21037,12 @@ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180120.1247"; + version = "20180128.1213"; src = fetchFromGitHub { owner = "jojojames"; repo = "evil-collection"; - rev = "69d20122b5f4fc2caa2d52b9ae953bccb88bdda6"; - sha256 = "0lx86gjbxz0hp3x0wg9z9rz5r6rc32cwl3yvgxbjgb568843hrmg"; + rev = "52462cb8bfc523f93e20aede2d1936c32fdf14b2"; + sha256 = "0h01pa5zwh3jf7kfdl4vy5f8lcv147m1pcsmkmkg51qn520qr7f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; @@ -21520,12 +21520,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20171127.245"; + version = "20180129.401"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "ceb13ad1b34eb0debe2472c024841bdddce9e593"; - sha256 = "1wal8kwz1gx0cw1a91rf0d9wl490kjiilv6kwd779zf5041hnhwf"; + rev = "50bb88241983f0bf06d35a455a87c04eddc11c83"; + sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -22028,8 +22028,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "76d846bc4abbefdcdeae843b6a1cd61a9bd88d04"; - sha256 = "1xvjj180l3ir7z4kgway17z877jb6l1fd5j4z0dhbvba0j20ysh2"; + rev = "2992858748e6fe8ae706d182b86b684e7b9be8b9"; + sha256 = "18jyqf1k7b09j0q1sxavqyqyx21msbqklia83kbrn51wbhy70k49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -22363,8 +22363,8 @@ src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "7ff5bcff446956de30ca87483097788cdc071572"; - sha256 = "1ml6n3y668jvxvnyq2k6daih6kvr7icvjhk98jrafnz2a5gckxm3"; + rev = "aca4fb0a6e460317ea1a04bdcb3e5175d30dc172"; + sha256 = "14iwsd1dck3pfa6hh2griwd3y02b432wi2pkknckzp61s912iz0y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -23225,12 +23225,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20171219.1858"; + version = "20180125.1859"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "b9dff2881cefaf2926df35fe23366ce3bd59d157"; - sha256 = "0f6nwbnwh06phg9560q97ksh3m50a9z73z7vrqlppfs27aqx2jbp"; + rev = "7be14de3c737e70606d208d8d443b89e58cd646d"; + sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23456,12 +23456,12 @@ firrtl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firrtl-mode"; - version = "20180121.1930"; + version = "20180122.1950"; src = fetchFromGitHub { owner = "ibm"; repo = "firrtl-mode"; - rev = "8da2573cda885dee7540ea1ee44fc67f5794ecfa"; - sha256 = "18pda18rmdmqa399rrq194bgh167qv6y74dgyibjar6zl063ck3l"; + rev = "285f5c18722de98fd3dae195a2bd653497cf7daa"; + sha256 = "1a4dhx2dv7ld14jn4r941w5mdrh085nxnlc1w93r93h13fj352q3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbf9ab9db03410c35b8b73a23bf8062b10f0815/recipes/firrtl-mode"; @@ -23987,12 +23987,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20180116.147"; + version = "20180123.1419"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "b2c35409071e4b6f2a7542269d0f92a13619e88a"; - sha256 = "1mq37hd7nzl20apkx1wgqhgkv5sgd97izd4zf08wa22w72ji7a3s"; + rev = "31122714e1971d8403d9daf5815482bf5118c94d"; + sha256 = "0ag0ffh4lnnsiqfplnjlwd7lnvz3zjnw68a2pf17jgx28jwdqz64"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24474,8 +24474,8 @@ src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "a10fd82290be2359cc47b81d88f871a6cf4bcd52"; - sha256 = "03g89byjhjiab29sh2aq9dbamyf9ljv76yikhi3nqzciy1jl3kyx"; + rev = "d4f6fde2ce5cbdbfef44b68affee394c9c891a1c"; + sha256 = "11wg0mgrw2sphfr8dm27x500lyw6lkf94yk8nmlxx2fb2ns1nlyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -24642,8 +24642,8 @@ src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-gradle"; - rev = "864a6780eb38fd76fa72be62d82e0608c7637807"; - sha256 = "0ccz4r6wk0br40s6x1ban98dr21ihnp3asr0kk4csljq7cpvxx7y"; + rev = "f8c7ec0abdd77f35c5a9a653f8a80acea717b014"; + sha256 = "11lsk5mw2fkx81vd9r2xychh4nwadi516mpg8hr0ibh154p4ql6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle"; @@ -24659,12 +24659,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20171107.1420"; + version = "20180125.1531"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "ff21330a5a7db4e42d6ccf4410ef4a3231e5f19a"; - sha256 = "0vdm6bmvqvf5s7cvadkl0l88cza429xcy21icv55ii5iw1k4hywf"; + rev = "f97cefa9b69235bdc9a406c54d223ea26fb33107"; + sha256 = "1kcm0lssjb5lqx556sxxw1v1pvp7hybw38a4sva2s0is3w9pxl1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -24806,12 +24806,12 @@ flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-ledger"; - version = "20140605.1146"; + version = "20180125.31"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-ledger"; - rev = "2944c56ad72945f78f88fa363e0239b40650d829"; - sha256 = "16zfa0npi6jmyvjalsiqk11zp41vc5bfpgz5ssh1xa8v9fk6rxaj"; + rev = "044f28d126d1bce55c4b78ba6d5bc92e1f6cfd69"; + sha256 = "1k14jwz79mjsm0cfig5lc0byfrhvm495wrkybdl36b56q4qhxf58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger"; @@ -25398,8 +25398,8 @@ src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-swiftlint"; - rev = "ae1f5ff754d6da401a2b287a1d53f0049ed40c06"; - sha256 = "0vm47rrsym9ma8m165xjr2f6v1i30wbr86s3hpp5n775a3gwyxgj"; + rev = "fef7fd20cc167790cb29f16de16a8045717e0a18"; + sha256 = "06m352s5ixxm5wdrkljfk0b2chlqhm8f7bp8c2f2fkcf1l2gvs5q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e2a979726507e974a0a19dfc2ca6884157025be/recipes/flycheck-swiftlint"; @@ -26637,8 +26637,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "adc5a29738ac99ab715b2dfc04f9137e38b592a6"; - sha256 = "068ralnk1rhrq0vkcn0xg13n1pajn6z3p19w7crrnvxzfqgchcsa"; + rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; + sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -27111,12 +27111,12 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170805.2030"; + version = "20180129.312"; src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "ed32c5df2b2229af0f65910b71d4e819c5e35d8a"; - sha256 = "170ah3acqc7bq3ikvaqf8lz1ixd5yb83kj6474r754s08f834ccc"; + rev = "5709e0b621dc56491d4b52782f190744be2ca0a1"; + sha256 = "0a29p14fa2xqbafdl0l5wgrch89klp0v5naqkrn2vii1gfkcyck6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -27241,8 +27241,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "1382bac6b35cdd427edd38dfd06b81cd49981d60"; - sha256 = "0b9y0ihqk2g2jpxszbdljqfbfhmb75yqaqf645ra2qicwzxhl15m"; + rev = "e6406d573c58ac30eec0a263211ffb4f06437925"; + sha256 = "0ydfhnbn4z50l777y8c1b85mfvk71rvwbjrn43kyqxasxdry5n59"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27550,12 +27550,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20171217.1353"; + version = "20180128.1821"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "0bfc6be0d25ff311d739d2f65fd343135142f6f3"; - sha256 = "01jz9yp5g003mhwq0blxy509xcwb8whzqaf90ibdr7v39y96jmdm"; + rev = "33783307abab46433ce18273f562b3a729628e8e"; + sha256 = "1vzcfy9qw32xmi7h4g9vlnxp2z2f23s01nqgs5vp42vls5yzdirr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -28075,12 +28075,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20180118.507"; + version = "20180126.913"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6c1156dff915161b28eb0aeeede130f87296c197"; - sha256 = "1i9djad6ciqjc5sv5abdzv3m1r7957r5dz0b3xznbqy3x070xvvl"; + rev = "275a32b8af950f59324d69c39f01d653948f6481"; + sha256 = "1cm1ryd4hidaybv323gjbrqpdaicwr18ar7bhzkfjnkakvrb35pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28289,8 +28289,8 @@ src = fetchFromGitHub { owner = "kidd"; repo = "git-msg-prefix.el"; - rev = "c6acf10b014607f1541a398206208e568a4714e4"; - sha256 = "1jpak1ji63xxpivyjxi0wicw66zbyxdc725nbg8dbf5n3h9v80bk"; + rev = "848f2c7475f5e4937b09f55e85ea89a3be5f8588"; + sha256 = "0ab6qjq5nky15vj88j5s8sh7gp9lbwgxrfqsc08bg6gdf2rx2dvx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd37811d17beaa54e08eb4968791da960d37b391/recipes/git-msg-prefix"; @@ -28915,12 +28915,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20180118.838"; + version = "20180124.143"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "68fac681312faad1258798c7c9c306b44f084094"; - sha256 = "1yvksfrsqx9v9ybxpxyr24zvw9q8my19xcz6517p2yghvhrxva4r"; + rev = "dc46c72e1a4e759c04d17c0411a8c53c2f9915f5"; + sha256 = "03ia362bwkkkysfp2wz5jpqlvsjvvzgl06i1gcrkb1aa8ssb82lc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -30049,12 +30049,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20171108.1429"; + version = "20180129.905"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "68594a1cbf2d82d9695b9e687fe95b3bba97aa59"; - sha256 = "0jnparmzz8phdpygqgnlvjici7wbmi33z46w2vznhsa8ldvcgxzq"; + rev = "406990cbb165af7510b6282f88742c005edd2aa1"; + sha256 = "1pm5ndfxf6qmq4dlvawd4v8j75ipl12vbw13yxzrc5q0rfqqqgdl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -30456,6 +30456,27 @@ license = lib.licenses.free; }; }) {}; + gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gregorio-mode"; + version = "20170705.751"; + src = fetchFromGitHub { + owner = "jsrjenkins"; + repo = "gregorio-mode"; + rev = "736fd3d05fb67f707cca1a7ce24e3ee7ca5e9567"; + sha256 = "1w13a3irak6i74kl7va8d2simd2kjvw5253s8jvapi1mg4ifw379"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/34cdc536cd0509c5a151c16f44f4db2c5b44365f/recipes/gregorio-mode"; + sha256 = "1x3z4gc88h13miz72a597lz9hcn2lxps9jvldl2j62s6nvr88pff"; + name = "gregorio-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gregorio-mode"; + license = lib.licenses.free; + }; + }) {}; grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-a-lot"; @@ -30944,8 +30965,8 @@ src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "52ca44054f11f8ac3e844e3995aa6e6a8f27ef41"; - sha256 = "1dzjfrgy12is01k16dr821g88w8j9i07zbk32fxkhyivxhh0llzy"; + rev = "fe0c7284f17f00cc6f1971a9bd565467faa0574e"; + sha256 = "0kxj49x16j7avbgry6advw4qixr76hdawfq6vy8rfj42kzmdj179"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -31547,12 +31568,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180119.1053"; + version = "20180127.2219"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "c00949a5136a3cb7ab82e4b2f3e33e92ee2b0734"; - sha256 = "1qdf7b5g5723mydyd364a3wvfpskc36w0n5v2f1p1qfiaw6i2hl8"; + rev = "5882f69be33e255b4f3cb182879c9cf5464364e6"; + sha256 = "0k4mlffs5a2k1g53dzrkqclhkcsyzvn9z1nmhwajhlrijx8z8ym9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31778,12 +31799,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20180110.1209"; + version = "20180124.338"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "adf0e363ef1a1feaa1c83ef7f16a7d6c408b62ce"; - sha256 = "0jj2qgia2sf4954g56ldgx1wf734qzqhxjy31m06xanvsmamyl6i"; + rev = "f5f7d45fb9d636fad1429867ccbc327a446bb350"; + sha256 = "1dpxw8h6aqdajqf929hwmrm2iik7vwhkv05m0vl8vf1i5zbz307i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -32013,8 +32034,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "9a948b834dd31b3f60d4701d6dd0ecfab0adbb72"; - sha256 = "0wssd9jv6xighjhfh3p8if1anz3rcrjr71a4j063v6gyknb7fv27"; + rev = "739589b6c6b3cedc71ca366da95fd1b147931c34"; + sha256 = "025z5dbrh5a9jwrfsckvmzd4nxq672m6bfikzcmhkvqs89kw1s2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; @@ -32114,12 +32135,12 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20171215.26"; + version = "20180127.2237"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "ccb99aee4851bc156a67835299b24099aa8ff5c1"; - sha256 = "0yhhiax06arvimgxvh9xdflgjbkflhi1cp0g8816bwr0hdmv57dh"; + rev = "1ccbd68acab682d2d348aaff81022123939e53fd"; + sha256 = "1afjvdjqp91n44ijfc5kh8x5lmkiyncin5l25rfpxcljkfixblcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -32177,12 +32198,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180121.2320"; + version = "20180129.39"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "c00949a5136a3cb7ab82e4b2f3e33e92ee2b0734"; - sha256 = "1qdf7b5g5723mydyd364a3wvfpskc36w0n5v2f1p1qfiaw6i2hl8"; + rev = "5882f69be33e255b4f3cb182879c9cf5464364e6"; + sha256 = "0k4mlffs5a2k1g53dzrkqclhkcsyzvn9z1nmhwajhlrijx8z8ym9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32240,12 +32261,12 @@ helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }: melpaBuild { pname = "helm-ctest"; - version = "20171101.934"; + version = "20180125.2058"; src = fetchFromGitHub { owner = "danlamanna"; repo = "helm-ctest"; - rev = "6de962e355e12a69e4aeaf6484f497e28b2e8a68"; - sha256 = "0nd1ij7iqf02hni4d77mndbxi8w27vawjd9b3d7fia22vdsha040"; + rev = "034927a922f40d9f5978786feed9bc9fe1f7655f"; + sha256 = "0mbsxlc0isfzqlwvwqxyjkcdvpn9a6qsa29r7mqqihy0jkqi4473"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc85ff5554df10fc2066eec4d90de3b25536923/recipes/helm-ctest"; @@ -32471,12 +32492,12 @@ helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emms"; - version = "20180104.2127"; + version = "20180124.1023"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "8133c1a854c8f9e32b3b4c74638fe197535c08f1"; - sha256 = "06111034rvh770ljzdbw7d6rkvy40bjvp4c06ss5s624pyd6qd74"; + rev = "6e05efc4612262b39732d2d82d606c48fd6bf46b"; + sha256 = "04iaxzx3r5f7jr42nycnvrrs3rx51nf9a20l2zpyz14i2g4pqjvn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; @@ -33357,8 +33378,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "3403179a38693a221bfa86def0c99f6342c5eb73"; - sha256 = "0w6zc1w7kic3ds5hf30i3mj9wxbq2c8wdywbslfprwwi1hxyzmsq"; + rev = "ae90bd280588c96d540892d0f42247db5a126f51"; + sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean"; @@ -34403,12 +34424,12 @@ helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: melpaBuild { pname = "helm-system-packages"; - version = "20171224.50"; + version = "20180129.530"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "bfc4b6f6f2f05edd6009a2295ed90e8448a52474"; - sha256 = "0jnjgwiqfc2lr452wamdln2fhi7p4r2d9wvkha260gdbld54871q"; + rev = "2f5297294901d1845e2245bca76486c383f1c49c"; + sha256 = "03qb5al26qfn2sh3bwnvfyqxiwbxgmcwd4qkbad32nsk4s51d1z0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -34946,6 +34967,27 @@ license = lib.licenses.free; }; }) {}; + highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "highlight"; + version = "20180125.1126"; + src = fetchFromGitHub { + owner = "steckerhalter"; + repo = "highlight.el"; + rev = "2371d6d134f07ac648d525b7eafd4eecfb0e36fe"; + sha256 = "0x0mr52fy1cc6f710ibqy0fh68jpfb1gj4ddg173q0azb76m2klq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/89c619b90665385c8f5408935105c52b4d0290ab/recipes/highlight"; + sha256 = "0hc515042gpwqj2wqa3lmbgmccb3im5d313nk5lma9sphqi2yx9q"; + name = "highlight"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/highlight"; + license = lib.licenses.free; + }; + }) {}; highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-blocks"; @@ -36460,8 +36502,8 @@ src = fetchFromGitHub { owner = "svend"; repo = "ibuffer-tramp"; - rev = "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4"; - sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq"; + rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3"; + sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp"; @@ -36666,12 +36708,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20180115.1009"; + version = "20180122.1340"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "34374f498f3d52f225c00803c0500ef23a2dbe10"; - sha256 = "1xlqr5v9frld03ardak94n3rbd4hjqnp3in4cyjnqn4b7hdlgnjn"; + rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; + sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -36981,12 +37023,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170923.842"; + version = "20180122.1340"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "34374f498f3d52f225c00803c0500ef23a2dbe10"; - sha256 = "1xlqr5v9frld03ardak94n3rbd4hjqnp3in4cyjnqn4b7hdlgnjn"; + rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; + sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; @@ -37461,16 +37503,16 @@ impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "impatient-mode"; - version = "20170505.1921"; + version = "20180124.1828"; src = fetchFromGitHub { - owner = "netguy204"; - repo = "imp.el"; - rev = "48e6c4842b1fc2657a3c6c23029f89e35fafc859"; - sha256 = "0srjgzcmdgvdi9fm127wlj7zsbq00wsmb3fkzzpy05nvmm2dgng5"; + owner = "skeeto"; + repo = "impatient-mode"; + rev = "4099906914cee4991907fc501799fb80cafa3f7d"; + sha256 = "1j9s5zpdi03qvvga59izxx3389k0g1vk2hiiivc8bph6zyr52fw0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode"; - sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode"; + sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j"; name = "impatient-mode"; }; packageRequires = [ cl-lib htmlize simple-httpd ]; @@ -37587,12 +37629,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20171215.327"; + version = "20180124.408"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "7d7ff66e699f28478c0d63f39ff6b1477cf0bee7"; - sha256 = "1y2dlq2n0rn70bccjd20s44ihyq1jja7lh2h3d8syy31xc6i1i6z"; + rev = "b650b2ca82ccd9ccb4f3142afa0da4737ddd364f"; + sha256 = "01xkkrdfn3c8ivs2wc3ck2278m75gq73wv59fchb6gw1a9d6xj7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -37671,12 +37713,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20180121.2250"; + version = "20180128.901"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "f4478ad09359e0edfc7c423315ccce61eff788a4"; - sha256 = "05n4jyvddxlvyrj2hf9g1dqswgfj095x4jnzpnaprh1yw6pq7w6q"; + rev = "ec99211bbe9bef6d579a313ab6422694ef63b181"; + sha256 = "0d54m3g8ahz7xg06qb592ai25ydpjh0dzxxnhbp5jk2l0r0irwnq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -38157,8 +38199,8 @@ src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "d6d39492b89855291bac8a9d15d8aa1e5ff85461"; - sha256 = "15g2ihln74n2a8jwshl14dzk4cxas6fy15dn3schzvizafzaxjij"; + rev = "b6ef262dee10a92bc31935644e087e83957f6d74"; + sha256 = "1hxfmrq10r39inysa1x104siwdladpdpcdjqbniml0hcpzrdcpd9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -38762,12 +38804,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180115.1555"; + version = "20180124.1127"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ac856a0b8ca30c55422a58f9f079f36fb476e57f"; - sha256 = "1ch8d52pq74258azb555hwzapki7ny5ivqy363y46hzbng8qisrh"; + rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; + sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38783,12 +38825,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20180110.1209"; + version = "20180124.338"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "adf0e363ef1a1feaa1c83ef7f16a7d6c408b62ce"; - sha256 = "0jj2qgia2sf4954g56ldgx1wf734qzqhxjy31m06xanvsmamyl6i"; + rev = "f5f7d45fb9d636fad1429867ccbc327a446bb350"; + sha256 = "1dpxw8h6aqdajqf929hwmrm2iik7vwhkv05m0vl8vf1i5zbz307i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -38913,8 +38955,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ac856a0b8ca30c55422a58f9f079f36fb476e57f"; - sha256 = "1ch8d52pq74258azb555hwzapki7ny5ivqy363y46hzbng8qisrh"; + rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; + sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -39999,12 +40041,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "20180103.718"; + version = "20180123.830"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "37e83641fd5eab45e813e4bc74a835fe7229c160"; - sha256 = "0hmrhp3lijd77kl0b98nbl1p8fmgjfry2hhvh5vickx3315w7qgw"; + rev = "6bd44162ac422304803f606278bb0c08ab940a5d"; + sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -40856,12 +40898,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180121.453"; + version = "20180128.1459"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "9ec14147b9ce64aa447b59cdae81e1c80ea229c1"; - sha256 = "049zcxjbzlizvx05adlrqyfq5jnxc5r4df56g7aqfbfkzpppw3wk"; + rev = "14d73a1ffce245b1ef4bb962bd9d9051e2a9fe1c"; + sha256 = "1b8669qc8hpz99ybdpz60mls00kxqj1fj6xy522jrhyij87dws7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -40919,12 +40961,12 @@ kdeconnect = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kdeconnect"; - version = "20161022.700"; + version = "20180126.1540"; src = fetchFromGitHub { owner = "carldotac"; repo = "kdeconnect.el"; - rev = "a91a045cd4aabd671b689361efa10f2e01ad8e8e"; - sha256 = "0j9j3mlzkr8zw03fghpmvkb3i8r1ar0rarjcmvh9k6m4dk7l0g2d"; + rev = "ca0cbf9a628ba7b519b43fa85e0d988ca26bf853"; + sha256 = "07aqzfg2nn35bkikrmk1lszqkc6h8vn2551m22mwc19lmdx94p2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c363866d30fb86ae636d30def8c3847711ada762/recipes/kdeconnect"; @@ -41364,8 +41406,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "33aad9995ed4524880d9aaa581ccc863fd443cf5"; - sha256 = "0ql02qd2mk8jkksy2fg5fvlmf51h4kf6zb69gcs0a3fcrg2vx86f"; + rev = "8776f284f75f5589d3b0c6f1e82795d73e9f3c45"; + sha256 = "0zhdj13bjvs8yxq1jndgifbniigbmpq35r27fsn014wg3ih5k17q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41444,12 +41486,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20171008.2226"; + version = "20180126.822"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "479075d96857696cf029cd1f482b9f2f31d82452"; - sha256 = "0kvx43ny49j115kj6zpy1i5g87bjgiimfgj9xp2fn9830adymc24"; + rev = "c49d137f10f8e07de915126a766eb1f59f7fd193"; + sha256 = "1sja17fd2gvl16jlya6cl2mj7lzg19vgl830yz1dc2iqvf3nnsfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -42112,6 +42154,27 @@ license = lib.licenses.free; }; }) {}; + lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lcr"; + version = "20180127.1229"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "lcr"; + rev = "8a6306a08066aa6b17cba1d1f278cb359d6b6c6a"; + sha256 = "12fc6k71cly9xznh461sdlfb6vlp0pddvv7p0vdzr03mspw4qa9s"; + }; + 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; + }; + }) {}; ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ldap-mode"; @@ -42136,12 +42199,12 @@ lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "lean-mode"; - version = "20180105.1619"; + version = "20180123.413"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "3403179a38693a221bfa86def0c99f6342c5eb73"; - sha256 = "0w6zc1w7kic3ds5hf30i3mj9wxbq2c8wdywbslfprwwi1hxyzmsq"; + rev = "ae90bd280588c96d540892d0f42247db5a126f51"; + sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode"; @@ -42178,12 +42241,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20180121.2003"; + version = "20180126.1808"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "f874f604a437a4c2da9c9b5f9544b7284dd79260"; - sha256 = "19a4rmrsr6770yyzxki17k3jvsrrzv8x4fng9dl5prgz273fjs8p"; + rev = "e098be20cf603f48dfe18c6237546a8c49e1f97c"; + sha256 = "140hl7s2gxhh14yx34d9ys4ryqp87qckvcjscqllnc51qmkjwf1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -42640,12 +42703,12 @@ linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "linum-relative"; - version = "20160510.118"; + version = "20180124.247"; src = fetchFromGitHub { owner = "coldnew"; repo = "linum-relative"; - rev = "b8a99dcfe38a491172a8193053fb7849634b43c0"; - sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s"; + rev = "c74a6981b688a5e1e6b8e0809363963ff558ce4d"; + sha256 = "0svxi1l3s4rg1k1apfw25gzi127rsks56b5yfg79a48b5rf1xmkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative"; @@ -42729,15 +42792,36 @@ license = lib.licenses.free; }; }) {}; + lispxmp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lispxmp"; + version = "20170925.1723"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "lispxmp"; + rev = "7ad077b4ee91ce8a42f84eeddb9fc7ea4eac7814"; + sha256 = "1156jynii783v9sjj3a7s20ysa26mqaq22zk5nbia949hwbibx16"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/lispxmp"; + sha256 = "1a641v5cx4wy2v8a2swxzn1y9cz4g2bp4mn9q290n3ifpn5356dl"; + name = "lispxmp"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/lispxmp"; + license = lib.licenses.free; + }; + }) {}; lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180119.1126"; + version = "20180123.1255"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "1d2212cc3810605756f19529bf18631dba7923cb"; - sha256 = "1n997wxysjm8yb3jbmlwjcbqynf2csm8nnv1alb7a25cfr2iy3sq"; + rev = "aac21815d8fe833faf1043ee2ec582f96e56c4e5"; + sha256 = "1wmgpygadkkyrsxscrxvjdy314qdlrzgs3rg3kvmd5j9nhdiwnnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -43047,12 +43131,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20180117.2205"; + version = "20180126.2158"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "4be31468b54e3568ba4782ce7ebb26d9c15c3d28"; - sha256 = "0kfpcyv77lvf31n5wm5dfljzxj5vjha6pknldi4xv244wwap0zms"; + rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0"; + sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -43149,26 +43233,6 @@ license = lib.licenses.free; }; }) {}; - llvm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "llvm-mode"; - version = "20150910.644"; - src = fetchgit { - url = "https://llvm.org/git/llvm"; - rev = "95a5df84b6c036e30ae155786d8f5df7f8ee1ff9"; - sha256 = "1782vy77hp6zi4s0icasy61fryqa23w21klqz0zf42l79y0czga1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; - sha256 = "0jxwa7gaxv9kkgjp87ggzlfqbf6xs19z0s9ycnv2h5hlxpnzrlnb"; - name = "llvm-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/llvm-mode"; - license = lib.licenses.free; - }; - }) {}; lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lms"; @@ -43442,12 +43506,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170928.820"; + version = "20180128.1429"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; - sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; + rev = "60b86ec5888d3bbd857f4abb434a6ae3406b7c93"; + sha256 = "0f292yh493lpwllgs9mihfdmp6ian2rqmldfv92qz0jb348khmdn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -43694,12 +43758,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20171125.147"; + version = "20180124.2058"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "456854bdee8729c21331f93ee9054f2d980fe2ab"; - sha256 = "1vrzi12zsrrbyihin1n83adk7q0vvksalpizd5g42g8d1pnf3zfx"; + rev = "213dd077ec181eb3f5b8139ed02cde82398ed5ea"; + sha256 = "1zqvpk65m6hfgharjvrmjwp88n5nkvz32ra82k57d3jkgbslxsw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -43715,12 +43779,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180121.517"; + version = "20180129.409"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "a1cfa78689f4502d560f58560d978f16a4b97d6c"; - sha256 = "0inr079i5bygfm3b42zjf46bki72jhc8h6c59fs9g9fgysz874fv"; + rev = "111fcdb3929e015e95645548686687efabb3c7de"; + sha256 = "1hanr9njdyc5b6n5awfknb6rxnmskm7vikrpwbg3f6iiq56mzsbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -43796,43 +43860,43 @@ license = lib.licenses.free; }; }) {}; - lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }: + lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }: melpaBuild { pname = "lsp-rust"; - version = "20180115.556"; + version = "20180126.6"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "bdd9e82864a2fb34f7a67775158caa948e237e7e"; - sha256 = "00rlmsq9pab5r6lari82bhqfh6yr875p5vn7npckl0gfcwzad8kv"; + rev = "660dfa99917440acf79e1e2d3ede4d3a90f0d196"; + sha256 = "1drr2wlbgn6zyr15hjgdwldw94ryi1dbazbb44f4h9qakw7nqd2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28"; name = "lsp-rust"; }; - packageRequires = [ lsp-mode rust-mode ]; + packageRequires = [ dash emacs lsp-mode markdown-mode rust-mode ]; meta = { homepage = "https://melpa.org/#/lsp-rust"; license = lib.licenses.free; }; }) {}; - lsp-ui = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: + lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180121.1544"; + version = "20180124.414"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "1a7b6274763acd142dc365761a2fa5b93169c790"; - sha256 = "1yq45m2w9g57pw20m2yzixmqxniqh3xvg46drzcdn7j6knqcn73l"; + rev = "7aeff9326ec7664ab935cb4c4ada6062a0a26981"; + sha256 = "0v6jg9jna3bnxbkzx8k5d7is4fr0g1dfz6gyqqxpnd1gzjwq15w8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; name = "lsp-ui"; }; - packageRequires = [ emacs flycheck lsp-mode markdown-mode ]; + packageRequires = [ dash emacs flycheck lsp-mode markdown-mode ]; meta = { homepage = "https://melpa.org/#/lsp-ui"; license = lib.licenses.free; @@ -43925,12 +43989,12 @@ lusty-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lusty-explorer"; - version = "20171126.1221"; + version = "20180127.1443"; src = fetchFromGitHub { owner = "sjbach"; repo = "lusty-emacs"; - rev = "303618cafa01da3c8f99da4849d3ddbdc146a5d1"; - sha256 = "0i8hgg3hpmmvchldxlqmvd1c5j24qv0k8vv222k026ilk95dpy2p"; + rev = "3df794ed4829e353ee3c1e3c6686440f9e868ef6"; + sha256 = "1z2nzjlmmcnin3h0713kqaaikyc0h4iiazv50lsvrp0agjbmhcqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efedaa3b1de5f6406c7dcd842eee42eefaf8ab50/recipes/lusty-explorer"; @@ -43967,12 +44031,12 @@ lyrics = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lyrics"; - version = "20160920.1945"; + version = "20180123.2004"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "lyrics.el"; - rev = "1378d534614793a51ebbed661c59eb8818299182"; - sha256 = "10mp9vavmbkhgb133n490kjfbk63j2b0plvaf57w432nalxcwf5n"; + rev = "fb35b387796f64f48b4daa5a163f4a576210f200"; + sha256 = "17al49f633h3fsa6aq9v5c1r8dp2gj97f46z1fhmgxbijmpfzs0w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b04c8f3dfa9fc07cc0ff3df5c4069f864b6db92e/recipes/lyrics"; @@ -44177,12 +44241,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180120.1529"; + version = "20180129.629"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "6c1156dff915161b28eb0aeeede130f87296c197"; - sha256 = "1i9djad6ciqjc5sv5abdzv3m1r7957r5dz0b3xznbqy3x070xvvl"; + rev = "275a32b8af950f59324d69c39f01d653948f6481"; + sha256 = "1cm1ryd4hidaybv323gjbrqpdaicwr18ar7bhzkfjnkakvrb35pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; @@ -44522,12 +44586,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20180121.1457"; + version = "20180128.1035"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "8b3a8f5c682f87e620b109130c53ad8ea58280c3"; - sha256 = "1z8ly1vs30r9n3dxdnkv61sqvis53pkxnlpbllvjqvc5p5frrhma"; + rev = "f6273604ef87e1b513f69430af50600ee4b20deb"; + sha256 = "00cwc2qbspqjrxrz00vjfcfx4ydfj7q977d2gffsg2lkjyjspzpp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -44648,12 +44712,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20171129.655"; + version = "20180128.1307"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "4f8b61011700036c98993e287d7aa36a52f2e206"; - sha256 = "1ks3mj78xcsi7f4xx95hhpi2gpdgz9fhy60qy3z780814ylq856w"; + rev = "bc3b01d6b9ed6ff66ebbd524234f9d6df60dd4be"; + sha256 = "0833bzlscpnkvjnrg3g54yr246afbjwri8n5wxk8drnsq6acvd8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -45013,12 +45077,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20180115.1905"; + version = "20180124.138"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "1c343f5ce4213e6a6e9562c4ab621a1f8e6c31c5"; - sha256 = "182rr36waaiq71pg84s5w6pmgd6sy177m6w4jc06bzrcbnif3aha"; + rev = "668de4a965980d618637a3b5754e721b54c51e83"; + sha256 = "00biiz0s5mwq092qxdh9943f6qf6k6n7dhrrj7nvj2b8iciid9as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -45209,12 +45273,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "20180102.201"; + version = "20180124.439"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "e25b170779ca8d0cdef0bfeb6f35c264a23a44e8"; - sha256 = "01m5cjjhi02aqpv1c9h7n4kq1b7vplb9cwncb4kx17k5xyml7yb1"; + rev = "f038689cbd5b3680b80b44edd0c7a63ca3038e26"; + sha256 = "1n79im1r7h1ilvppn9alqwl96zhyxbm5hk7kbmqh022dggw0cx15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -45335,11 +45399,11 @@ matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "matlab-mode"; - version = "20160902.459"; + version = "20180125.1010"; src = fetchgit { url = "https://git.code.sf.net/p/matlab-emacs/src"; - rev = "3b3c48ac0c27039e0bef89c643f0ee4c0b53d3d0"; - sha256 = "0kizmzpmc8iw15n6xkrf7m5kbjcs5rwdrxyrfij6cj43szlnkf1z"; + rev = "50266ff812607e55bddacd71a46d1b96e36fb0bd"; + sha256 = "1spyfnkw6j0v947m6yj6mv6ni1za0a9m9iycpjycpcb42q7d9rlg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/matlab-mode"; @@ -45541,22 +45605,22 @@ license = lib.licenses.free; }; }) {}; - md4rd = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild, request, s }: + md4rd = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild, request, s, tree-mode }: melpaBuild { pname = "md4rd"; - version = "20180122.633"; + version = "20180123.1244"; src = fetchFromGitHub { owner = "ahungry"; repo = "md4rd"; - rev = "7081b469cf4b04110fba3b3c229608699e1bd85a"; - sha256 = "0kq5gbxija59skmymvsy665m3qzj8fb2qz7nbv9ydqa1s5idr19d"; + rev = "be0fc4951b2d1f5194ffa1fcaac706dbac560500"; + sha256 = "1i93shx5x192gd7cl2r6gvcvhhwyi1k08abi5w3izv1hn3pmksgq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d4a3b3337e16e68631409d1de0ce67ae22b837/recipes/md4rd"; sha256 = "0ayr5qw0cz7bd46djfhm8slr2kfgssi5bsnzqcasr8n4lyg9jvfc"; name = "md4rd"; }; - packageRequires = [ cl-lib dash emacs hierarchy request s ]; + packageRequires = [ cl-lib dash emacs hierarchy request s tree-mode ]; meta = { homepage = "https://melpa.org/#/md4rd"; license = lib.licenses.free; @@ -45800,8 +45864,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "e882ac7f7658dd9507aca0ff88c88fcf74618252"; - sha256 = "0h8zg2nvb0yn0z8xv1101r8rjxgs05k08j3n71inr7n118sa98bj"; + rev = "1f8d635301d1f9849416c551bf1530e87e31d235"; + sha256 = "19y4iwi24p86d64n9075zjrjj6i27vpvwi898qanw1ih7spgpg1q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -45922,12 +45986,12 @@ mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; - version = "20171016.335"; + version = "20180127.621"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "03a50a7dd5f90fb981b72e4b9e9385e4d1fe3be3"; - sha256 = "17p6gkf6xmx6sflzd3pyc3p3x7ma8p497hmj1yc7w863kqm8jclk"; + rev = "5c5265be1a0099d48ada502aaa28c7f3f08f9078"; + sha256 = "0xaqbkdmn3hlalnzz69812a2cigpgh1199fl6hp20d4dq4hj4m6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -46275,6 +46339,27 @@ license = lib.licenses.free; }; }) {}; + minor-mode-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "minor-mode-hack"; + version = "20170925.1734"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "minor-mode-hack"; + rev = "9688994e23ccb2de568225ef125b41c46e5667c3"; + sha256 = "0f6kafr7zqgdlw914bxh2390a1bjz5zy3h30yrfpavz283ycvrrw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/minor-mode-hack"; + sha256 = "07ga48xvbi641i053bykv9v4wxhka6jhhg76b1ll24rys02az526"; + name = "minor-mode-hack"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/minor-mode-hack"; + license = lib.licenses.free; + }; + }) {}; mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mip-mode"; @@ -47850,12 +47935,12 @@ mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "mysql-to-org"; - version = "20170205.1306"; + version = "20180123.714"; src = fetchFromGitHub { owner = "mallt"; repo = "mysql-to-org-mode"; - rev = "d87e9b6117fc0db4b156e8a12550cf9ee4bd692a"; - sha256 = "10wz20842j6yj4k9kg7pd93pzppsc31klbfzlvlkfywqv6j311cz"; + rev = "2526205ad484ad3fa38d41e7d537ace38c27645c"; + sha256 = "1yinix08mzr7v2jm3yx1j3h15cw7i202wi100nmnmvqrylpd9zr2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mysql-to-org"; @@ -47896,8 +47981,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "3edcef051f882342ca769b84527bf92dfb755e14"; - sha256 = "0g9vyy639aqnk0g9rmrlszc7i0rl2f2ygnzfs4pwakgfiwig5r0c"; + rev = "eaa8c82b8e140f4c0f2e286ee14253b76e4639a6"; + sha256 = "1vy34f8gcaspjmgamz5dbxmjxjiixf0wmhgpr61fwd4vh5rvwcci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -48353,12 +48438,12 @@ ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ncl-mode"; - version = "20170903.2355"; + version = "20180128.2303"; src = fetchFromGitHub { owner = "yyr"; repo = "ncl-mode"; - rev = "84599a730169b9b19f9dcc532e20dcdc9648bbaa"; - sha256 = "0sqbrvlx9n7abn71r4hb5fgps7nm6cfyg84hjwdbkrw0cgy2w1hc"; + rev = "602292712a9e6b7e7c25155978999e77d06b7338"; + sha256 = "0sv44hn2ylick7ywpcbij8h2vxdj06zridjdmcfgpv5d090dbl9n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode"; @@ -48605,12 +48690,12 @@ ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "ng2-mode"; - version = "20170504.2007"; + version = "20180128.1006"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "adbfe16a47cf26edeb1b508cbedae5307b4efbf6"; - sha256 = "0ll850wpr4dyh25mq41afwbz17mqz82i53hfn970n9vw2icf36py"; + rev = "43179216c08958486ed7a8e7a3766d1df11d38d8"; + sha256 = "1biww57phq5mcd80is38fnishj3jmj09iwiqkn6j03p53kvgqchb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -48730,12 +48815,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20180106.437"; + version = "20180129.536"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "3cb301760d3ff8bb26cad325dc29001893672a46"; - sha256 = "1h1yxn0whyb8wf13vs55a8zs66jz9svm9780sxaxcdr3gkvgqmd7"; + rev = "22c4a1cf1ce8686c01a341477502d2676829699b"; + sha256 = "1sf8ijk08kivfj0dxgmx73l10hkd921z766z5x4w1p3axwc8w9j1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -48793,12 +48878,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "20180121.1157"; + version = "20180126.1935"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "14322f186fc2a36bfb7d5351bc80e24c50cf6e3e"; - sha256 = "1d8rb183xjmpbagsa34lm12sdjisakc4ynpqypb9icjrsab9p7c1"; + rev = "664fa51cfa9d8e4c39f2086ad1b6b6fdc1e8fbd7"; + sha256 = "0nnxd2lis4qx2zakfcy5ypvlp1nrw70dq2jcf0gldg0qmr1dhlgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -48961,12 +49046,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20180116.427"; + version = "20180125.1539"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "c6de27af80edadc3cc09fe8a6832058d00ad570c"; - sha256 = "1x8ij0gwnl4wp3j44w660l6cgidw27674s4pnpbn6j33mglbr43j"; + rev = "5156e005d59453f2608b9c38e9fe92ba8df550db"; + sha256 = "086y8y5309hhmhiq9c5yqvya0fm6j3vxba47861ckwjqyp7d3ygk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -49757,22 +49842,22 @@ license = lib.licenses.free; }; }) {}; - ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ob-coffeescript = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-coffeescript"; - version = "20170719.121"; + version = "20180125.2319"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-coffeescript"; - rev = "d68a8335d29c947f388b4fa556de4f3ee75a19c6"; - sha256 = "0hjyvvq089c0m9hqjlk3fb07z24vha7fmvfy8w9203jxqkazm1di"; + rev = "5a5bb04aea9c2a6eab5b05f90f5c7cb6de7b4261"; + sha256 = "0yy20w1127xmz0mx2swbr294vg0jh8g0ibj5bpdf55xwdnv6im2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript"; sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p"; name = "ob-coffeescript"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ob-coffeescript"; license = lib.licenses.free; @@ -49781,12 +49866,12 @@ ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-crystal"; - version = "20171101.347"; + version = "20180125.2318"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-crystal"; - rev = "9d58b880b74e0ad83b37596bb44635e5d7ae5c3f"; - sha256 = "11qly91h6cm0qdj2dx8lvmfgp7bakrvvwf106rqh4f98y1qv22xh"; + rev = "d84c1adee4b269cdba06a97caedb8071561a09af"; + sha256 = "1fny4fj4407lcp4k3379gbixk3wd171snw49p1kny2mvxrliz22h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal"; @@ -49970,12 +50055,12 @@ ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-hy"; - version = "20171101.344"; + version = "20180125.2316"; src = fetchFromGitHub { owner = "brantou"; repo = "ob-hy"; - rev = "cad6a1aaa463e8d72d37b12744be1c5732bb8cc4"; - sha256 = "0cm238139vf356vayv3xzx5gw2hlklzgrbpzk3ixnfh4gkgnmdj0"; + rev = "44b1afb42c8a72febdbe68b6816134bc5957e5ba"; + sha256 = "0j34fsyqz28qjpggibbaqfwja10f06d9gh3pndlj6ghfx8i0plrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; @@ -51575,12 +51660,12 @@ org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-clock-csv"; - version = "20170904.1745"; + version = "20180128.2130"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6"; - sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm"; + rev = "e3b1c4236f6b74105b291ec68c0909226621b4ac"; + sha256 = "1ykam54wz53n0gx0raywhd92diggyxw8669w988sw6jghhg65ivs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; @@ -52082,8 +52167,8 @@ src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "ad61dcd1645de4292aef2e0450d41bee3b21fa4f"; - sha256 = "1ghxiij45nvfdxwdbr3p02fiynlv9zdw3i317dp9x2g4yrqb1j64"; + rev = "1d6f7ddf3baa296bf7ca7ed008f0d86c10397021"; + sha256 = "02r4h7l8mj5blxwsiv0zyfiwagmxckxdsi39vbx2kxjvxasv4zw3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -52288,12 +52373,12 @@ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-noter"; - version = "20180109.1823"; + version = "20180129.840"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "3f1f1c7856e3e3b1482acba990bf440c13274752"; - sha256 = "1ll0ips9hs8ayk2ykh3297kby8imjl638rv12zps480mg15fmrvi"; + rev = "107fae73d5149a774d8c3a5d8a05c7355160388e"; + sha256 = "04269kll3dfh0jd8s6w6xdp90c9hbyfy68ifv1z30x67mz18chbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -52700,12 +52785,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 = "20180115.1933"; + version = "20180129.719"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "f70ad81afafdb6ab4b7beb21aea33ba0dfdaa948"; - sha256 = "0m5pb9a3nw3w26y2asypvfa1yjzn3j59md6kan0dg12vd3fqgi6f"; + rev = "3b16a4f7c98bcccd54a2d41d5ff7b5796b87a42d"; + sha256 = "0qiflgczhvav2wlgpy6fxm7vdh21ai75hdh00qs8b6d0d4i2mqhy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -53215,12 +53300,12 @@ org-wild-notifier = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-wild-notifier"; - version = "20180121.2232"; + version = "20180125.721"; src = fetchFromGitHub { owner = "akhramov"; repo = "org-wild-notifier.el"; - rev = "65cc0adfbfeb5140762c25fa9969320280da92aa"; - sha256 = "1j9awgmsl9fxc11y8q483x0d320x6f0dxhc909dizr6wpwhkcl0r"; + rev = "3f87465d6c4ea63010b9beab8de3cfa54429bce8"; + sha256 = "1vxjlfdkl6yxgh50nmz87qsyga71wf8cmrggnp6bkljak88vgz98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; @@ -53917,12 +54002,12 @@ outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outrespace"; - version = "20170904.511"; + version = "20180126.857"; src = fetchFromGitHub { owner = "articuluxe"; repo = "outrespace"; - rev = "0a3b53d283fe8adb8de45766d284704ed4557e23"; - sha256 = "0cas2divgdjai06f6jk5c808vhvg5dcwyc9nam2krvd8k5y5nd8q"; + rev = "5c3e036e0d72889b5084c67eeac317e88b1bf2f6"; + sha256 = "025lgvy8m70m72zxzdsdxgsayi3hr0hfp076mf0b97zfcw6h87c3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace"; @@ -54148,12 +54233,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180121.1840"; + version = "20180129.1108"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "0384f444bdc4825edbc9b9c57df374d6c0dbfce7"; - sha256 = "1507w3k4q5y4qpwh3ak9bww1fwrxl9m2zlcw71ga3qmsgqlqhish"; + rev = "ebb670b73be1b8759ce093c4101b198f12b5cea2"; + sha256 = "0ks6q0fgbyz0bq222dqh88fivkr150hlhb5kkibdr644bjwmcwcy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -54862,12 +54947,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20180111.1014"; + version = "20180122.1325"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "1eddc9be67ff66cc4a8e4eefc28f891f455df8d9"; - sha256 = "1pgkxyrgcf7c2yydq3694kgaz2h85iw2ybh9z4w297yh0zkp9a45"; + rev = "f531518bd9952d39af8605f461fc43aa6b6fa5f4"; + sha256 = "110jnj7yp6j2qj5ar72c5kgkpj43b4b82ipq725xivk6zsvrhicr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -54943,22 +55028,22 @@ license = lib.licenses.free; }; }) {}; - paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }: + paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paper-theme"; - version = "20180107.1613"; + version = "20180125.926"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "adc5a29738ac99ab715b2dfc04f9137e38b592a6"; - sha256 = "068ralnk1rhrq0vkcn0xg13n1pajn6z3p19w7crrnvxzfqgchcsa"; + rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; + sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; sha256 = "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr"; name = "paper-theme"; }; - packageRequires = [ emacs hexrgb ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/paper-theme"; license = lib.licenses.free; @@ -55091,12 +55176,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "20161028.1127"; + version = "20180124.352"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; - sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; + rev = "166975683225367c866e6ae6f6acb88d24e21a35"; + sha256 = "02mh8w2na6qa94p3bh6pvdvmg36p2vrbp5hpjnwjcayrb92dskgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -55968,6 +56053,27 @@ license = lib.licenses.free; }; }) {}; + perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + melpaBuild { + pname = "perl6-mode"; + version = "20161228.430"; + src = fetchFromGitHub { + owner = "perl6"; + repo = "perl6-mode"; + rev = "4867c6d268545f5356111d72c4ae77917d34cb21"; + sha256 = "1bpq2wa27rlmyx13vg0ig2nzzivzxzh9hdmhyw285dcn8agashnp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e912dccdee12f745272d26ea10d5f106a27cabc/recipes/perl6-mode"; + sha256 = "0r5q2nggb9kbjcdfv81d7sm41jqz040j9z52fnck4b9mlz2dy6d0"; + name = "perl6-mode"; + }; + packageRequires = [ emacs pkg-info ]; + meta = { + homepage = "https://melpa.org/#/perl6-mode"; + license = lib.licenses.free; + }; + }) {}; perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "perlbrew"; @@ -56601,12 +56707,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20180105.541"; + version = "20180128.843"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "c3f3ac1665a77a0d3ee425244c77d923eadc9621"; - sha256 = "1flhbqqg2jnlh8l8p7g130arq3fx27z5h8ki98wgd070s794x39y"; + rev = "ff86ba6e5e9b9b27539eeec61a4adde65bb59f6c"; + sha256 = "0nh9sw9ykbgw8ljs3cqcx3c8aq00zz6ywlin4l3sjbhrgc2lpdab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -57189,12 +57295,12 @@ plaster = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plaster"; - version = "20180122.513"; + version = "20180127.1250"; src = fetchFromGitHub { owner = "Shirakumo"; repo = "plaster"; - rev = "64a6130d42a11a5c98ae917f453166248e08ce10"; - sha256 = "1z65zlq76znvcxg42s0fhvs3w2bg38bai2jyl3rm9cm6q4qg3svk"; + rev = "11eb23920410818fe444887b97ad4c8722d66c85"; + sha256 = "0lqz8m8a2ahvgm0i9cz0j4bisi34czc4s29z70p5p6rdg4g21fk1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e363cffa021e649c052f38cedb7cc01dbe9e24a/recipes/plaster"; @@ -57420,8 +57526,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "d4e434046121b395e8e96ac3dcb4a8f6113f4fd3"; - sha256 = "1abk6v8afmbn1sfyjkw14zvq1xgfnpsvi6m4qaglpa460awsnq9c"; + rev = "7b967191976bf013cca0a5b21b1e3dbe34e86889"; + sha256 = "18ar8m5sj3drflcpl7z528x28nskhahjl5bwa8624csdzn0fhngy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -57682,8 +57788,8 @@ src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "612912789b01d5d53975f0b2e64322ab79035be1"; - sha256 = "0ia344z9gvnq37kvac534mpcl5rx84qg2cjgr6lrxa4svnq6353x"; + rev = "000dd3800829c469a072e788a272edca24313ee2"; + sha256 = "1rhc1n4r3yjlrxxj1mkziflb475z7gqcqm2r7r7b667f8k1b5wg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -58473,6 +58579,27 @@ license = lib.licenses.free; }; }) {}; + prog-fill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "prog-fill"; + version = "20180128.2019"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "prog-fill"; + rev = "ad38e2f6a45a8dd7eb08c407506256dd2e045de1"; + sha256 = "13dsihqs0wc2bjxgyiqb5xbav9va432qqkpl84a0rdrwndpc7lpc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/90d680ed481688c9899adb28fbd9a22a17fa8943/recipes/prog-fill"; + sha256 = "0wnqzkzhaywcyw93z86pngpycsrd1mi79psmck6qbhms1aia79p3"; + name = "prog-fill"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/prog-fill"; + license = lib.licenses.free; + }; + }) {}; prognth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prognth"; @@ -58622,12 +58749,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20180118.745"; + version = "20180128.655"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "38824040fa08a02536fbc5253144d482434e4746"; - sha256 = "0lbm10h4fxqjlwjm72lkcn0nhzqkdajygrrih6f06m246aahjbrk"; + rev = "c3562c3a182d3c9948db9c8f364e84da2e90c218"; + sha256 = "044fdvcjqkp25kn20lr77jirgdnzjrxp8i024zp3lz7wa4gywyhy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -59067,8 +59194,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "47b7d2c7cadf74ceec90fc5042232819cd0dd557"; - sha256 = "0kjhxqrbyj5rlfrkfbn8wlr4w1yi2i2r8pgsw7dz63rabf1xd0fd"; + rev = "da6b07a2e58cf6b6d5326b1f538e902aab3de5be"; + sha256 = "00baxp6nh6lskc0w5mm4w7m0pd0z6ai2sbpcl9ylcajqw0n4kknq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -59806,12 +59933,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20180116.2341"; + version = "20180128.405"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "225df86a4b84a0efcd099877574825a22b4d9739"; - sha256 = "029yxgbgn1ygi2cip45174imvr1sl6a1f4v0izqg7ivly934hinw"; + rev = "37be07e2e585d1cb5964d7187fca22e863714056"; + sha256 = "1kgf363a7g7kpy32qw0n7iwlpkr93k4g6h84r3f0g58d8ckargm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -59936,8 +60063,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "91969b046e7aa8cfaa20e5c7e4fce925a802f1f7"; - sha256 = "01m8javlq48b5sy91rw3kga75y2b9rzpscy7pnn5m2n9mfycjrmc"; + rev = "60d471c36f0f390b4f51744eacd73ed99aae164a"; + sha256 = "07bwknfcf148vp6hs9jq3f2ixkkiwwg1xy9jck4disfvym81kqz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -60184,12 +60311,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20171215.1329"; + version = "20180126.303"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "651a624fb41898d0c68970889ef7a72bad78b10b"; - sha256 = "0plpj3ndwvdzmnwinhpkq4z3pk6zmhjwxq0wjkkgl8vy12jkywpx"; + rev = "f925bcb46ea64b699f7cd06933c48e0d5db88b73"; + sha256 = "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -60314,8 +60441,8 @@ src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "582e9c16cff8d6b00741ee9e109e38fd5f4c108d"; - sha256 = "0li971qccbq9k95qgnxd26dnj96028kvgwp0fwr95zmf44vwf832"; + rev = "fc393aeb3bb1a9a35e603515d13c90cc008caece"; + sha256 = "1zkx7bpzmphhfwgqf5pfwf6qb4vjwgvhmds38vm6h2302hl4racx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -61024,12 +61151,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20170915.1200"; + version = "20180127.1006"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "25cc3c8902f16191496b549705b00ffc7dff51f1"; - sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy"; + rev = "164136d05505275d42d1ca3a390f55fcc89694b8"; + sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -61363,6 +61490,27 @@ license = lib.licenses.free; }; }) {}; + recentf-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "recentf-ext"; + version = "20170925.1735"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "recentf-ext"; + rev = "450de5f8544ed6414e88d4924d7daa5caa55b7fe"; + sha256 = "1jylpqgngbl594a1qvd305m9lda48cib4dsasimdqxp20d4c56iy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/recentf-ext"; + sha256 = "122kns45l75cdwxbfjznks3kvm5jc89ik714ij2qx14qyik0xmni"; + name = "recentf-ext"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/recentf-ext"; + license = lib.licenses.free; + }; + }) {}; recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recompile-on-save"; @@ -61534,12 +61682,12 @@ redshank = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "redshank"; - version = "20171115.1156"; + version = "20180128.1348"; src = fetchFromGitHub { owner = "emacsattic"; repo = "redshank"; - rev = "9b64da7895973a29a32320a13c08de69befa0006"; - sha256 = "0vzha8pn4bgdnri1j5cgmasvn9j3ny0rh0i0plhjbys26f88klnb"; + rev = "f3eef7d4891570e6bcb74eb52c73edb765a639b8"; + sha256 = "00mihmjd0amr9wzb3qsz69bp7y5iqx9vvh1hg77i57zlm88x6ma6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2677a5cf74ebace6510517f47eaa43b35f736683/recipes/redshank"; @@ -62289,12 +62437,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20180121.1233"; + version = "20180122.855"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "3b582d428b23d1a714e9bb95d6e81be594fd60a0"; - sha256 = "0pikwz87x30m3lia2n58pyhqdiz6ps54yh583bmzqgmkbk6q8q28"; + rev = "0a4df0c3a64ace6a5aebbfeea5c0161e752471ab"; + sha256 = "0z1igj5c74qdjx5knsf73d7qwfyybfixyilw7z7chbyffw77z1km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -63574,8 +63722,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "52465c0fdf93cfd3e18f24f5e4f68bc86104b5f8"; - sha256 = "0cc7raj25dl4s21vca59m4jjv0d384kg1ni4nwzi1jpv1kvj49di"; + rev = "b635c493875e43e57102eb54bc80d008e3ca85b5"; + sha256 = "1vx7ybj4p5smal2sxa4j96dxfgzw184xxqn9m8y2s5lpwlndpz49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -64010,12 +64158,12 @@ scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scss-mode"; - version = "20150107.1400"; + version = "20180123.908"; src = fetchFromGitHub { owner = "antonj"; repo = "scss-mode"; - rev = "b010d134f499c4b4ad33fe8a669a81e9a531b0b2"; - sha256 = "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0"; + rev = "cf58dbec5394280503eb5502938f3b5445d1b53d"; + sha256 = "0raja19l0igwr0pn0ghr1pj1d8i9k3m3764ma4r8nwzxcj9qw4ja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/scss-mode"; @@ -64405,6 +64553,27 @@ license = lib.licenses.free; }; }) {}; + sequential-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sequential-command"; + version = "20170925.1740"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "sequential-command"; + rev = "a48cbcbe273b33edd3ae56e68f44b4100fa3a48a"; + sha256 = "1f05amz22klvs2yqyw7n5bmivgdn5zc7vkv5x6bgc9b5k977lggj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sequential-command"; + sha256 = "0qhrpwcgn89sqdj8yhgax0qk81ycdanlgwx25cxy8wnxkqqcvh9m"; + name = "sequential-command"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sequential-command"; + license = lib.licenses.free; + }; + }) {}; servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }: melpaBuild { pname = "servant"; @@ -65458,12 +65627,12 @@ simple-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-screen"; - version = "20141023.758"; + version = "20161009.220"; src = fetchFromGitHub { owner = "wachikun"; repo = "simple-screen"; - rev = "4fcbdb4575310c0a2b4dd17fc8aeb4d7e6e9ffae"; - sha256 = "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i"; + rev = "596e3a451d9af24730ab31a8fe15c91a4264d09d"; + sha256 = "0mqlwrkipgf977s0gx57fv5xrqli67hixprvra6q64isapr86yh1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02db9a649002ed9dec03661a518f74f3c7a176d9/recipes/simple-screen"; @@ -65609,8 +65778,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "7df248a4b7ec2eb0f3cabcbdfb052593d1f86590"; - sha256 = "07l90cqcngwy8vxx4yxx7i72lp10wzv44ypn07zwyrl69bcmf2q8"; + rev = "c8fc64300cbe85896f6e0719ef2c91bfba9c4fcd"; + sha256 = "1rl5rmvq0qgdr8zrzbdvahf8rxsdajj7zbyzxyqfmyqr83c9yrz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -65689,12 +65858,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20180103.1928"; + version = "20180125.450"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "58b1309255563819ee8f83f625af49ac0353bed1"; - sha256 = "1bj43ircd9djk4i58qwxvmcbhzybxb954k52l80pk441ffk8v4vx"; + rev = "8b92582a1b7567bd85de2996e5883982ef9c2f1b"; + sha256 = "1h7bd8dvcw0sqknh5wdnvci47l5ffhj539sz2vjf90fvmqhf51id"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -65752,12 +65921,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20180111.429"; + version = "20180126.1033"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "2e7f94633acebd5cf4074ce9601b021624ad8233"; - sha256 = "15brbny68wjfcm1sm6981d3w6hylvblg1y4jiq652bp04nhzdr84"; + rev = "ae3b7e7ed63a850e9cb5130e0ca5544150d74156"; + sha256 = "1q27jxagllhmnc44b3rg1lkas1w2q6xv91j3f020gvasnzmbv5gh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -65920,12 +66089,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20180117.533"; + version = "20180128.435"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "457956496b5267265632b551a4aa369bd1f25d8c"; - sha256 = "16g7icglq3vwd6jdijmjwx94xlyny518l52qf9yfznz6fqgamj7m"; + rev = "f6dda1ec006ee67122d864e6069e85194a628083"; + sha256 = "1g92nksifwh7yvrwkwqzrhrficrlkyi04nw9ydrf8mkvn3svybgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -66255,12 +66424,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20171013.849"; + version = "20180129.130"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; - sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; + rev = "5aca51956fae55d7310c1f96b5d128201087864a"; + sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -66280,8 +66449,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; - sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; + rev = "5aca51956fae55d7310c1f96b5d128201087864a"; + sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -66444,12 +66613,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20180118.735"; + version = "20180129.939"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "163a593137b8f81c9ca03f4804512198b81be372"; - sha256 = "1gnivh8bjyhzx4lv8hnilsm5icii7a3bqhnhdzxcmrpzpwvgfbj6"; + rev = "05591f370ca31edc6c5ff0a762f8b03ebc1309df"; + sha256 = "1lb4j0gddzk6wb0wslhmvm09r2q1rl7vfwjraldyfzkfwspmb6r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -66780,12 +66949,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20180120.1609"; + version = "20180128.752"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "bdb9de2ec2a33f04e7e5ecec5fca8cdef7935b15"; - sha256 = "1daxi74568pw1gkpk876lmm4z2jv14bg0pklbspp1m8vniq7m3jw"; + rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7"; + sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -67519,18 +67688,19 @@ license = lib.licenses.free; }; }) {}; - speechd-el = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: + speechd-el = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speechd-el"; - version = "20160710.359"; - src = fetchgit { - url = "git://git.freebsoft.org/git/speechd-el"; - rev = "ec344edd498f95e3c945958475b31bae6505c34c"; - sha256 = "1ycq2ncixkm6imnhp2iqdray5f1mngnzfb3f2i3f0pi9k6xgavkb"; + version = "20180105.1217"; + src = fetchFromGitHub { + owner = "brailcom"; + repo = "speechd-el"; + rev = "0b25d3eb7ae219d2af9a7e9df2f3334652156bf5"; + sha256 = "00b2851pgrzvcl828l48gxrmy779w8s1k4ngf8pf0sh1y9bd2715"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d28c4550ae3b0f7e5fc032754d698cccda6ac0c/recipes/speechd-el"; - sha256 = "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/96669a664122c2fb69acd4cad2d7bf75d3e8272d/recipes/speechd-el"; + sha256 = "0p8zih9s2x6l2xcfjbzriyhsicaiwxz54iq9h3c8szlzq708mayc"; name = "speechd-el"; }; packageRequires = []; @@ -67647,12 +67817,12 @@ spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }: melpaBuild { pname = "spiral"; - version = "20180118.1401"; + version = "20180125.900"; src = fetchFromGitHub { owner = "unrepl"; repo = "spiral"; - rev = "9808ed2bbcbc762efdd6215c7ae8d1ec1c80adf3"; - sha256 = "0xhcjx6svainx6nj7v52qw5rsprbb18nw4g8mzkfrbcmh52yjavw"; + rev = "8e9707af9d6d61d8ec54edc98b958f1c829e98dd"; + sha256 = "1p91k6xvy0w11p08nbk1b9x33ck6kxz4khgsc39wlhyv02rhqqi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral"; @@ -68046,12 +68216,12 @@ ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-agency"; - version = "20170807.1152"; + version = "20180127.1301"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "e572e031852561f98a7053afcdc9a3796dde2137"; - sha256 = "0z2ywkiwv983vz4bk5vc62p3xapp15a4715l9sp5c8x70nlq02y3"; + rev = "31b2b41e33d315fff54ace8bc2234abc38adf7cc"; + sha256 = "02kw4h3hzpad39ir6y8cg8lnldd01cl0lm8p22kf4bf5f7f3sdlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; @@ -68088,12 +68258,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20171211.311"; + version = "20180129.245"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "ee808acef916c7cf828923e6517a6867044caaf5"; - sha256 = "0dv2d6rhp23ckpzzdda3w3p5l7pps8vxs7b98r6320w2a2villq5"; + rev = "5d70d89cddae17e4e412c9246871c3cbc860e3c6"; + sha256 = "02cdd5jx03n1xzkkswlcb0l4zf32ysmz2hn76cc7lh4i20iqi06q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -68358,6 +68528,27 @@ license = lib.licenses.free; }; }) {}; + sticky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sticky"; + version = "20170925.1736"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "sticky"; + rev = "fec4e1af38f17f5cd80eca361d8e8ef8772db366"; + sha256 = "126zs059snzpg83q9mrb51y0pqawwrj9smr3y7rza4q4qkdp1nk0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/sticky"; + sha256 = "0g98qagqchwq9j5nvdz315wak8fvdw1l972cfh0fr4yyg7gxi6xr"; + name = "sticky"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sticky"; + license = lib.licenses.free; + }; + }) {}; stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stickyfunc-enhance"; @@ -69094,12 +69285,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20171228.2315"; + version = "20180124.2324"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "8c45f69a078c41619a7a3db6d54a732c3fad8e3f"; - sha256 = "1isy71vkws3ywm4iwa85dk12810az3h85n6bimd36dfqbhfwdrli"; + rev = "7739e4954cc614ecd6b37e935f82ad057e256d56"; + sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -69136,12 +69327,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20180119.911"; + version = "20180124.1142"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "ac856a0b8ca30c55422a58f9f079f36fb476e57f"; - sha256 = "1ch8d52pq74258azb555hwzapki7ny5ivqy363y46hzbng8qisrh"; + rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; + sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -69262,12 +69453,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20171225.1159"; + version = "20180128.1705"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "9488c03726464e4bd0ed0b448d203c5c7f8c212f"; - sha256 = "14b0cqq2qbr2nxl9pqpbb9m948bdlsjwgzmkif2hdfvrwrr2sbzd"; + rev = "0bc0adf1b5c93795ca814f3f123405d2782088f8"; + sha256 = "0r54y80x44ydpbhsx4rgxwcf37x9w099wis0yy8cbb95asl7765j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -69409,12 +69600,12 @@ synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "synosaurus"; - version = "20170621.957"; + version = "20180125.1034"; src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; - rev = "acc4c634eb7c7f6dd9bce8610efa7fc900e9c47b"; - sha256 = "0q8ggyfzvclgxvma2nvkfc89870hmii9cc8022ff0n7729rfj7m0"; + rev = "ceeb06e24d3af3643862ecfdb263590eec1f492f"; + sha256 = "1qdppyx24zmz9dzm9kjvcx30g6znik602mg2h2s835cww9n97idm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; @@ -69873,8 +70064,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "a8fc8300481a1e033a3811ccda54e552392d1689"; - sha256 = "1lkldr6rr21f97vp6kms2ha8hsszhmba4sn07is4k55lpvlnxd49"; + rev = "ba321af1103d463ee46cef68416cab635884cc7c"; + sha256 = "17038h6yxq8h0nb35vrjgxh0iwhqibbxympxlnxa1z2k46imzyhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -70671,8 +70862,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "0feeed3c93fc54305499bda5953112487f25a3a0"; - sha256 = "18fkfr7cihnkxbz7r2p6dl5w2yzaibx3qxgwqgmx3g47lb1g13gc"; + rev = "d520d29a8bf4061b2f5f750122a0f87f4dc3da6e"; + sha256 = "1zfmmn2wiw2vb0c262nnn5pkfjm7md91rx18l65glcq4y7200ra0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; @@ -70797,8 +70988,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "b636ffb613ab49e0f037fbe696d28a4b17a72c5f"; - sha256 = "1i0gifygv76wcdm04ydl1g8nii4zjyfni0d6gd77srcmipckyygx"; + rev = "3d556248a8b97310da49939195330691dfe9d9ad"; + sha256 = "0nz71cgi4ixs33x6f6lfdamsbn59sgjqn8x4z0ibssgb7ahahj2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -70877,12 +71068,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20171214.543"; + version = "20180125.418"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "008f8f9cf44c81e230d58ed3d932e0ee43c2e09f"; - sha256 = "0s42f66lp3mn44jq04r4ccxac0l150w9nvy3bbvx8xxza2zn7lrw"; + rev = "6a62e0709cf1f78c0596973217a167d233ad4a74"; + sha256 = "16f418sk0b7z2kq047pz1lxwx1yanbfcjyp7jlhxajklwmmsv43i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -71589,8 +71780,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "9835ecb758c09400082eb8f1c0336eedbfed0134"; - sha256 = "0vhzqcqmhl3rzxrhfyy6r2yp5d07wd8y820cf0hfby6j5i4j247p"; + rev = "58fc1a3c7f9f6e3126585b1ab2f3d00f824b7d7c"; + sha256 = "1vsh2x794zaf02zql4s6bn3v0m3xm43icvrn7jfmi660qh3f4bsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -71795,12 +71986,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20180115.923"; + version = "20180128.1312"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2e29096034c14679efb756de48dd8ab9216ae683"; - sha256 = "06m72wf5qfkb6vywl7azx8kxijy0560vq8l43g5g2mjxb78m2cml"; + rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; + sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -71820,8 +72011,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2e29096034c14679efb756de48dd8ab9216ae683"; - sha256 = "06m72wf5qfkb6vywl7azx8kxijy0560vq8l43g5g2mjxb78m2cml"; + rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; + sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -71841,8 +72032,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2e29096034c14679efb756de48dd8ab9216ae683"; - sha256 = "06m72wf5qfkb6vywl7azx8kxijy0560vq8l43g5g2mjxb78m2cml"; + rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; + sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -73102,15 +73293,36 @@ license = lib.licenses.free; }; }) {}; + usage-memo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "usage-memo"; + version = "20170925.1737"; + src = fetchFromGitHub { + owner = "rubikitch"; + repo = "usage-memo"; + rev = "88e15a9942a3e0a6e36e9c3e51e3edb746067b1a"; + sha256 = "1aalrgyk8pwsc07qmczqhgccjli6mcckkbgpass3kvrkcfxdl2zk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad10a684b4b2f01bc65883374f36fef156ff55d2/recipes/usage-memo"; + sha256 = "0fv96xd6gk12nv98zccwncr00qms0pmrp0cv7iipbz54s20g0745"; + name = "usage-memo"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/usage-memo"; + license = lib.licenses.free; + }; + }) {}; use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20180108.1754"; + version = "20180127.1413"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; - sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; @@ -73126,12 +73338,12 @@ use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-chords"; - version = "20171207.2240"; + version = "20180127.1413"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; - sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; @@ -73168,12 +73380,12 @@ use-package-ensure-system-package = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, system-packages, use-package }: melpaBuild { pname = "use-package-ensure-system-package"; - version = "20171205.1029"; + version = "20180127.46"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; - sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; @@ -73676,8 +73888,8 @@ src = fetchFromGitHub { owner = "baron42bba"; repo = "vertica-snippets"; - rev = "e977ed4b05f3f63ac629d56e643864bfe4af6490"; - sha256 = "0ribrnl9hl1g4h72dmvvkmcxy53cpv9k3b867r5c3dk369wgzhdw"; + rev = "61b33bb012801e6c883a72c829cddbbc4241590b"; + sha256 = "0n6gsblj6b3jnmjq9mgr0hx5jj5p4wg3b4mpvhilp3crw02zllw2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56/recipes/vertica-snippets"; @@ -74742,12 +74954,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20180117.137"; + version = "20180127.1434"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "d7047a976ac8ea25eb4f0c0cf5adf3cf1934b105"; - sha256 = "0v0yr20mf017p778s212ab29h272mra6svzrmbzjp2nnpfynxqsx"; + rev = "14fd97bc3c8554d9394b698610dca1186ff68b03"; + sha256 = "1q7pqkww6ggh9sdnqa4vbq6nzivw0w011w3mvwx1mi4zp0dv50zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -77009,12 +77221,12 @@ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20180116.538"; + version = "20180127.254"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "63be6d5ce9049f925800d9fe3828dd9e1d1b8c45"; - sha256 = "1xnjcra3h2shgq0sh4y3i943w44rd27vw68ayipk522ivwz7nkb7"; + rev = "4b04dd134599b2e360c10d8be9110078aa1aca9d"; + sha256 = "031v4r5spgsl8i0vgfzrwvcp8s8vbdw0kf56wj7qz9732hmb14j7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -77156,12 +77368,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20180111.1533"; + version = "20180124.1445"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "203059a95e320b031ac0d2cabe9c1de68604baec"; - sha256 = "186varms4zmvlvakwnyip19z46fagwa05mnahhpb8ncmpjg6i7cl"; + rev = "8b421bc78d56263a2adc128337540e50a1c19c6a"; + sha256 = "0ryzk38gdz87cr44nqn31wz74qjyrjzcnqwnjsisvzzz3ivhpdqm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -77202,8 +77414,8 @@ src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "caa8734afc559a28eb4ec5dc3f240434e51cafc9"; - sha256 = "0zzmhkadyyw56j1z6dgj3x81sb5mxd0s2r20vy5mrfm18cyvsdd1"; + rev = "c1de31d2b16d98af197a4392b6481346ab4e8d57"; + sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -77218,11 +77430,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20180119.519"; + version = "20180122.1744"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "5bb46b7ab3de"; - sha256 = "1ap043fq9yl2n4slrjkjld9b743ac7ygj52z9af709v6sa660ahg"; + rev = "b1896ef49747"; + sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -77500,12 +77712,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20180114.907"; + version = "20180123.59"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "ce1f08372391fa17a974769930b904a0b893fec2"; - sha256 = "0dx7xcvgvsbd3y0glc8pwjzrra3a5gpwm894lay2ql1fcf8z8lhh"; + rev = "4b3e541721f52dbfa307e2cab3cd682e25987fdd"; + sha256 = "0x3b3dbkgpf9py7z3bf9629q3vqi303xp2hy7vi2qdfrnqn0600q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -77583,12 +77795,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20180122.439"; + version = "20180125.739"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "80ed5714935272a938f2a6076649b49d61c8e778"; - sha256 = "1dh4z6iw5dgx3xzj5k5iv76gkr1dvz12pbjzqml70qbaxw42mxj0"; + rev = "f22ea6ed957440dccbb4a21bacc545d27830423e"; + sha256 = "0p317q99js4aynjvkxanwlbq0hb10njhzl9s975p7pi6abfxfkkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; From c00a10e75e1c34a940a7f4f9d514383117788b16 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 29 Jan 2018 16:50:00 -0500 Subject: [PATCH 140/373] melpa-packages: remove llvm-mode override This package was removed from melpa, so there's no value in overriding it, and in fact it won't evaluate. :) --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 61257c5b573..6b986aa7499 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -131,9 +131,6 @@ self: # upstream issue: mismatched filename link-hint = markBroken super.link-hint; - # part of a larger package - llvm-mode = dontConfigure super.llvm-mode; - # upstream issue: missing file header maxframe = markBroken super.maxframe; From bdffbc775ebc887932dd79965a70aff5a39feeba Mon Sep 17 00:00:00 2001 From: pjan vandaele Date: Tue, 30 Jan 2018 12:29:59 +0900 Subject: [PATCH 141/373] Adds modifier option to developPackage --- pkgs/development/haskell-modules/make-package-set.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index e1b0f78b715..223f0652887 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -161,18 +161,19 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # : { root : Path # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) + # , modifier : Defaulted # } -> NixShellAwareDerivation # Given a path to a haskell package directory whose cabal file is # named the same as the directory name, an optional set of # source overrides as appropriate for the 'packageSourceOverrides' - # function, and an optional set of arbitrary overrides, - # return a derivation appropriate for nix-build or nix-shell - # to build that package. - developPackage = { root, source-overrides ? {}, overrides ? self: super: {} }: + # function, an optional set of arbitrary overrides, and an optional + # haskell package modifier, return a derivation appropriate + # for nix-build or nix-shell to build that package. + developPackage = { root, source-overrides ? {}, overrides ? self: super: {}, modifier ? drv: drv }: let name = builtins.baseNameOf root; drv = (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {}; - in if pkgs.lib.inNixShell then drv.env else drv; + in if pkgs.lib.inNixShell then (modifier drv).env else modifier drv; ghcWithPackages = selectFrom: withPackages (selectFrom self); From e4570af4933a71ef701e0267c0d400b09dd44523 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 22 Jan 2018 20:16:50 -0800 Subject: [PATCH 142/373] beegfs: add rdma support --- pkgs/os-specific/linux/beegfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 1bb5612ce92..03b485b0ae3 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, unzip, which -, libuuid, attr, xfsprogs, cppunit +, libuuid, attr, xfsprogs, cppunit, rdma-core , zlib, openssl, sqlite, jre, openjdk, ant } : @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant]; - buildInputs = [ libuuid attr xfsprogs zlib openssl sqlite jre ]; + buildInputs = [ libuuid attr xfsprogs zlib openssl sqlite jre rdma-core ]; postPatch = '' patchShebangs ./ @@ -42,9 +42,9 @@ in stdenv.mkDerivation rec { buildPhase = '' for i in ${toString subdirs}; do - make -C $i + make -C $i BEEGFS_OPENTK_IBVERBS=1 done - make -C beegfs_admon/build admon_gui + make -C beegfs_admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1 ''; installPhase = '' From 043dece5b7de97930d9f010c880d1bf3eae6a61d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 24 Jan 2018 00:27:00 -0800 Subject: [PATCH 143/373] beegfs: build beeond --- pkgs/os-specific/linux/beegfs/default.nix | 36 +++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 03b485b0ae3..6cf233694cd 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, pkgconfig, unzip, which , libuuid, attr, xfsprogs, cppunit, rdma-core , zlib, openssl, sqlite, jre, openjdk, ant +, openssh, perl, gfortran } : let version = "6.17"; subdirs = [ + "beeond_thirdparty/build" + "beeond_thirdparty_gpl/build" "beegfs_thirdparty/build" "beegfs_opentk_lib/build" "beegfs_common/build" @@ -30,14 +33,34 @@ in stdenv.mkDerivation rec { sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3"; }; - nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant]; - buildInputs = [ libuuid attr xfsprogs zlib openssl sqlite jre rdma-core ]; + nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ]; + + buildInputs = [ + libuuid + attr + xfsprogs + zlib + openssl + sqlite + jre + rdma-core + openssh + gfortran ]; + + hardeningDisable = [ "format" ]; # required for building beeond postPatch = '' patchShebangs ./ find -type f -name Makefile -exec sed -i "s:/bin/bash:${stdenv.shell}:" \{} \; find -type f -name Makefile -exec sed -i "s:/bin/true:true:" \{} \; find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \; + + # unpack manually and patch variable name + sed -i '/tar -C $(SOURCE_PATH) -xzf $(PCOPY_TAR)/d' beeond_thirdparty/build/Makefile + cd beeond_thirdparty/source + tar xf pcopy-0.96.tar.gz + sed -i 's/\([^_]\)rank/\1grank/' pcopy-0.96/src/pcp.cpp + cd ../.. ''; buildPhase = '' @@ -93,6 +116,12 @@ in stdenv.mkDerivation rec { cp beegfs_client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir cp -r beegfs_client_devel/include/* $includeDir + + cp beeond_thirdparty_gpl/build/parallel $out/bin + cp beeond_thirdparty/build/pcopy/p* $out/bin + cp beeond_thirdparty/build/pcopy/s* $out/bin + cp -r beeond/scripts/* $out + cp beeond/source/* $out/bin ''; postFixup = '' @@ -100,6 +129,9 @@ in stdenv.mkDerivation rec { --replace " java " " ${jre}/bin/java " \ --replace "/opt/beegfs/beegfs-admon-gui/beegfs-admon-gui.jar" \ "$libDirPkg/beegfs-admon-gui.jar" + + substituteInPlace $out/bin/beeond \ + --replace /opt/beegfs/sbin "$out/bin" ''; doCheck = true; From dcdaea355ad5b44dbb0b9929c21d83c247d77ac0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 28 Jan 2018 01:09:22 -0800 Subject: [PATCH 144/373] 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 145/373] 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 6c744fc93da0f50e439030d142ea2cf0709b920a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 30 Jan 2018 10:09:36 +0100 Subject: [PATCH 146/373] pyprof2calltree: init at 1.4.3 (#34379) --- lib/maintainers.nix | 1 + .../profiling/pyprof2calltree/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/profiling/pyprof2calltree/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ed3fcd81951..d579395b20b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -617,6 +617,7 @@ sellout = "Greg Pfeil "; sepi = "Raffael Mancini "; seppeljordan = "Sebastian Jordan "; + sfrijters = "Stefan Frijters "; shanemikel = "Shane Pearlman "; shawndellysse = "Shawn Dellysse "; sheenobu = "Sheena Artrip "; diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/tools/profiling/pyprof2calltree/default.nix new file mode 100644 index 00000000000..b2497633a68 --- /dev/null +++ b/pkgs/development/tools/profiling/pyprof2calltree/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonApplication, fetchFromGitHub }: + +buildPythonApplication rec { + pname = "pyprof2calltree"; + version = "1.4.3"; + + # Fetch from GitHub because the PyPi packaged version does not + # include all test files. + src = fetchFromGitHub { + owner = "pwaller"; + repo = "pyprof2calltree"; + rev = "v" + version; + sha256 = "0i0a895zal193cpvzbv68fch606g4ik27rvzbby3vxk61zlxfqy5"; + }; + + meta = with lib; { + description = "Help visualize profiling data from cProfile with kcachegrind and qcachegrind"; + homepage = https://pypi.python.org/pypi/pyprof2calltree/; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2bc56aea51..fc958838f4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7792,6 +7792,8 @@ with pkgs; pprof = callPackage ../development/tools/profiling/pprof { }; + pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; + prelink = callPackage ../development/tools/misc/prelink { }; premake3 = callPackage ../development/tools/misc/premake/3.nix { }; From ab02f5400e02fa6e270ca62bbf1398317cbb1a3d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 23 Nov 2017 23:53:28 +0100 Subject: [PATCH 147/373] 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 148/373] 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 149/373] 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 150/373] 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 151/373] 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 ab5357b80d11565d691b61e00a13e5d128762984 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Jan 2018 07:43:41 +0200 Subject: [PATCH 152/373] eternal-terminal: init at 4.1.2 --- .../networking/eternal-terminal/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/eternal-terminal/default.nix diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix new file mode 100644 index 00000000000..8941494e316 --- /dev/null +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, gflags, glog, libsodium, protobuf }: + +stdenv.mkDerivation rec { + name = "eternal-terminal-${version}"; + version = "4.1.2"; + + src = fetchFromGitHub { + owner = "MisterTea"; + repo = "EternalTCP"; + rev = "refs/tags/et-v${version}"; + sha256 = "1zy30ccsddgs2wqwxphnx5i00j4gf69lr68mzg9x6imqfz0sbcjz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ gflags glog libsodium protobuf ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Remote shell that automatically reconnects without interrupting the session"; + license = licenses.asl20; + homepage = https://mistertea.github.io/EternalTCP/; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc958838f4a..ece4b90f5c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1107,6 +1107,8 @@ with pkgs; et = callPackage ../applications/misc/et {}; + eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + f3 = callPackage ../tools/filesystems/f3 { }; fac = callPackage ../development/tools/fac { }; From af38f1a5e78b2a69e2cc1a95d53102ff8ce74705 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Jan 2018 13:11:58 +0200 Subject: [PATCH 153/373] seturgent: Move out from linuxPackages_* It's not a kernel module at all! --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ece4b90f5c8..6064c87a251 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13086,8 +13086,6 @@ with pkgs; prl-tools = callPackage ../os-specific/linux/prl-tools { }; - seturgent = callPackage ../os-specific/linux/seturgent { }; - sch_cake = callPackage ../os-specific/linux/sch_cake { }; inherit (callPackage ../os-specific/linux/spl {}) @@ -13414,6 +13412,8 @@ with pkgs; setools = callPackage ../os-specific/linux/setools { }; + seturgent = callPackage ../os-specific/linux/seturgent { }; + shadow = callPackage ../os-specific/linux/shadow { }; sinit = callPackage ../os-specific/linux/sinit { 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 154/373] 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 aa2e60744c8783c1d6ddc105379fc1015dffbc1a Mon Sep 17 00:00:00 2001 From: dywedir Date: Tue, 30 Jan 2018 14:46:47 +0200 Subject: [PATCH 155/373] dunst: 1.3.0 -> 1.3.1 --- pkgs/applications/misc/dunst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index bc6ff91a312..9906b1fd858 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "dunst-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "1085v4193yfj8ksngp4mk5n0nwzr3s5y3cs3c74ymaldfl20x91k"; + sha256 = "0i518v2z9fklzl5w60gkwwmg30yz3bd0k4rxjrxjabx73pvxm1mz"; }; nativeBuildInputs = [ perl pkgconfig which systemd ]; From 89d66b84197816cdfb83ffd211ed8feb47553bda Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 30 Jan 2018 14:20:55 +0100 Subject: [PATCH 156/373] pythonPackages.xdot: 0.7 -> 0.9 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 272b57298e5..1820125b0a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18664,11 +18664,11 @@ EOF persistent = callPackage ../development/python-modules/persistent {}; xdot = buildPythonPackage rec { - name = "xdot-0.7"; + name = "xdot-0.9"; src = pkgs.fetchurl { - url = "mirror://pypi/x/xdot/xdot-0.7.tar.gz"; - sha256 = "1q0f3pskb09saw1qkd2s6vmk80rq5zjhq8l93dfr2x6r04r0q46j"; + url = "mirror://pypi/x/xdot/${name}.tar.gz"; + sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3"; }; nativeBuildInputs = with pkgs; [ wrapGAppsHook ]; From f7bb9f67777b27b2e2fde6afd5012215293eaa26 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 30 Jan 2018 13:35:45 +0000 Subject: [PATCH 157/373] vscode: 1.19.2 -> 1.19.3 --- 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 6b449193337..5f1d5c50d4e 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.2"; + version = "1.19.3"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "05qfcmwl1r43slwkb2rxh99hwpzd8c622la0ffd9p2jg4lbkgs1p"; - "x86_64-linux" = "0kjwmw68av9mnqcg1vaazm3k240y9jvbng6n7ycgzxwddzx0qlac"; - "x86_64-darwin" = "1mjmi5r9qlc6ggh3w566454ar06by15xsm6dymr8zv4sb352w70h"; + "i686-linux" = "0qaijcsjy9sysim19gyqmagg8rmxgamf0l74qj3ap0wsv2v7xixr"; + "x86_64-linux" = "1kvkcrr1hgnssy2z45h8fdgr9j6w94myr2hvlknwcahzxrnrwr7k"; + "x86_64-darwin" = "19vkv97yq0alnq4dvs62a2vx3f1mvfz1ic63114s9sd6smikrg0g"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From 3be9d4610f6bd9e62592846a5e4ee2a6ccd25511 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Jan 2018 11:21:31 +0200 Subject: [PATCH 158/373] nixos/tests: Drop unnecessary qemu-flags.nix include None of these files are using anything from there. --- nixos/tests/boot.nix | 1 - nixos/tests/cloud-init.nix | 1 - nixos/tests/ec2.nix | 1 - nixos/tests/installer.nix | 1 - nixos/tests/kubernetes/base.nix | 1 - 5 files changed, 5 deletions(-) diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 69ab4755e44..fc52cd09f20 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -1,7 +1,6 @@ { system ? builtins.currentSystem }: with import ../lib/testing.nix { inherit system; }; -with import ../lib/qemu-flags.nix; with pkgs.lib; let diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index c0add7eff36..2a258e4bff5 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -1,7 +1,6 @@ { system ? builtins.currentSystem }: with import ../lib/testing.nix { inherit system; }; -with import ../lib/qemu-flags.nix; with pkgs.lib; let diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 4ec7e56cc6c..f585fa2ec23 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -1,7 +1,6 @@ { system ? builtins.currentSystem }: with import ../lib/testing.nix { inherit system; }; -with import ../lib/qemu-flags.nix; with pkgs.lib; let diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 90ac5b933f3..637cbb45709 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -1,7 +1,6 @@ { system ? builtins.currentSystem }: with import ../lib/testing.nix { inherit system; }; -with import ../lib/qemu-flags.nix; with pkgs.lib; let diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index acf2e025081..f3b930b630b 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -1,7 +1,6 @@ { system ? builtins.currentSystem }: with import ../../lib/testing.nix { inherit system; }; -with import ../../lib/qemu-flags.nix; with pkgs.lib; let From 1ce13804978ef361511014d8fc8e4d358de72dfa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Jan 2018 11:22:41 +0200 Subject: [PATCH 159/373] nixos/qemu-flags: Take a 'pkgs' parameter I'm gonna use it in the next commit. --- nixos/lib/build-vms.nix | 2 +- nixos/lib/qemu-flags.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 1a17a080ba4..4685fe6914a 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -3,7 +3,7 @@ let pkgs = import ../.. { inherit system config; }; in with pkgs.lib; -with import ../lib/qemu-flags.nix; +with import ../lib/qemu-flags.nix { inherit pkgs; }; rec { diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index de355b08918..172da555ba7 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -1,4 +1,5 @@ # QEMU flags shared between various Nix expressions. +{ pkgs }: { From 8e83158f124f6c8d5583a32102f281bde10769cd Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Jan 2018 11:28:26 +0200 Subject: [PATCH 160/373] nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix --- nixos/lib/qemu-flags.nix | 4 ++++ .../modules/testing/test-instrumentation.nix | 19 ++++++++----------- nixos/modules/virtualisation/qemu-vm.nix | 8 ++------ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index 172da555ba7..fb00c3183fb 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -8,4 +8,8 @@ "-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}" ]; + qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" + else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; + } diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 9b4136223c0..41dec2af9ed 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -4,13 +4,10 @@ { config, lib, pkgs, ... }: with lib; +with import ../../lib/qemu-flags.nix { inherit pkgs; }; let kernel = config.boot.kernelPackages.kernel; - # FIXME: figure out a common place for this instead of copy pasting - serialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" - else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" - else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; in { @@ -28,8 +25,8 @@ in systemd.services.backdoor = { wantedBy = [ "multi-user.target" ]; - requires = [ "dev-hvc0.device" "dev-${serialDevice}.device" ]; - after = [ "dev-hvc0.device" "dev-${serialDevice}.device" ]; + requires = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ]; + after = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ]; script = '' export USER=root @@ -46,7 +43,7 @@ in cd /tmp exec < /dev/hvc0 > /dev/hvc0 - while ! exec 2> /dev/${serialDevice}; do sleep 0.1; done + while ! exec 2> /dev/${qemuSerialDevice}; do sleep 0.1; done echo "connecting to host..." >&2 stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion echo @@ -55,10 +52,10 @@ in serviceConfig.KillSignal = "SIGHUP"; }; - # Prevent agetty from being instantiated on ${serialDevice}, since it - # interferes with the backdoor (writes to ${serialDevice} will randomly fail + # Prevent agetty from being instantiated on the serial device, since it + # interferes with the backdoor (writes to it will randomly fail # with EIO). Likewise for hvc0. - systemd.services."serial-getty@${serialDevice}".enable = false; + systemd.services."serial-getty@${qemuSerialDevice}".enable = false; systemd.services."serial-getty@hvc0".enable = false; boot.initrd.preDeviceCommands = @@ -94,7 +91,7 @@ in # Panic if an error occurs in stage 1 (rather than waiting for # user intervention). boot.kernelParams = - [ "console=${serialDevice}" "panic=1" "boot.panic_on_fail" ]; + [ "console=${qemuSerialDevice}" "panic=1" "boot.panic_on_fail" ]; # `xwininfo' is used by the test driver to query open windows. environment.systemPackages = [ pkgs.xorg.xwininfo ]; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 26f7945a4ed..c52f637604a 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -10,6 +10,7 @@ { config, lib, pkgs, ... }: with lib; +with import ../../lib/qemu-flags.nix { inherit pkgs; }; let @@ -21,11 +22,6 @@ let "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; }.${pkgs.stdenv.system}; - # FIXME: figure out a common place for this instead of copy pasting - serialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" - else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" - else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; - vmName = if config.networking.hostName == "" then "noname" @@ -34,7 +30,7 @@ let cfg = config.virtualisation; qemuGraphics = if cfg.graphics then "" else "-nographic"; - kernelConsole = if cfg.graphics then "" else "console=${serialDevice}"; + kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; # Shell script to start the VM. From 8c4f8c51a640e169484e4513b62d50844b2ed779 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 6 Dec 2017 20:26:16 +0200 Subject: [PATCH 161/373] runInLinuxVM: Don't hardcode x86-specific serial device --- pkgs/build-support/vm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index aa340fcd8e2..cf6e7cc1fe4 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -8,6 +8,7 @@ }: with pkgs; +with import ../../../nixos/lib/qemu-flags.nix { inherit pkgs; }; rec { @@ -197,7 +198,7 @@ rec { export PATH=/bin:/usr/bin:${coreutils}/bin echo "Starting interactive shell..." echo "(To run the original builder: \$origBuilder \$origArgs)" - exec ${busybox}/bin/setsid ${bashInteractive}/bin/bash < /dev/ttyS0 &> /dev/ttyS0 + exec ${busybox}/bin/setsid ${bashInteractive}/bin/bash < /dev/${qemuSerialDevice} &> /dev/${qemuSerialDevice} fi ''; @@ -212,7 +213,7 @@ rec { ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ - -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ + -append "console=${qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ $QEMU_OPTS ''; From 71631a922b4005497fe3b93fdfe5899e2f6d7a2c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 6 Dec 2017 20:26:22 +0200 Subject: [PATCH 162/373] runInLinuxVM: Use QEMU command line that works on other architectures ... by moving the existing definition to qemu-flags.nix and reusing that. --- nixos/lib/qemu-flags.nix | 6 ++++++ nixos/modules/virtualisation/qemu-vm.nix | 8 +------- pkgs/build-support/vm/default.nix | 5 +---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index fb00c3183fb..fcdcbf1b007 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -12,4 +12,10 @@ else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; + qemuBinary = qemuPkg: { + "i686-linux" = "${qemuPkg}/bin/qemu-kvm"; + "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; + "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; + }.${pkgs.stdenv.system} or (throw "Unknown QEMU binary for '${pkgs.stdenv.system}'"); } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index c52f637604a..13d0eb7de5c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -15,12 +15,6 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; let qemu = config.system.build.qemu or pkgs.qemu_test; - qemuKvm = { - "i686-linux" = "${qemu}/bin/qemu-kvm"; - "x86_64-linux" = "${qemu}/bin/qemu-kvm -cpu kvm64"; - "armv7l-linux" = "${qemu}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; - "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; - }.${pkgs.stdenv.system}; vmName = if config.networking.hostName == "" @@ -79,7 +73,7 @@ let '')} # Start QEMU. - exec ${qemuKvm} \ + exec ${qemuBinary qemu} \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ -smp ${toString config.virtualisation.cores} \ diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index cf6e7cc1fe4..d599f9bbb65 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -23,8 +23,6 @@ rec { patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ]; }); - qemuProg = "${qemu}/bin/qemu-kvm"; - modulesClosure = makeModulesClosure { inherit kernel rootModules; @@ -204,8 +202,7 @@ rec { qemuCommandLinux = '' - ${qemuProg} \ - ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ + ${qemuBinary qemu} \ -nographic -no-reboot \ -device virtio-rng-pci \ -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ From ba2008938de62bcaeb04ec0b12d08a04da46ba34 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Tue, 30 Jan 2018 16:28:09 +0100 Subject: [PATCH 163/373] 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 164/373] 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 165/373] 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 166/373] 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 167/373] 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 168/373] 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 169/373] 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 170/373] 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 171/373] 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 172/373] 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 173/373] 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 174/373] 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 175/373] 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 176/373] 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 177/373] 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 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 178/373] 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 179/373] 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 180/373] 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 181/373] 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 182/373] 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 183/373] 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 184/373] 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 185/373] 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 186/373] 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 187/373] 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 188/373] 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 189/373] 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 190/373] 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 191/373] 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 192/373] 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 193/373] 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 194/373] 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 195/373] 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 196/373] 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 197/373] 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 198/373] 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 199/373] 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 200/373] 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 201/373] 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 202/373] 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 203/373] 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 204/373] 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 205/373] 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 206/373] 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 207/373] 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 208/373] 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 209/373] 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 210/373] 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 211/373] 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 212/373] 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 213/373] 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 214/373] 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 215/373] 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 216/373] 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 217/373] 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 218/373] 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 219/373] 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 220/373] 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 221/373] 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 222/373] 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 223/373] 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 224/373] 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 225/373] 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 226/373] 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 227/373] 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 228/373] 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 229/373] 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 e9559e6b0916d5e47f710f6f759e1597a36b0618 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Mon, 29 Jan 2018 18:05:31 +0100 Subject: [PATCH 230/373] 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 231/373] 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 232/373] 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 233/373] 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 234/373] 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 235/373] 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 236/373] =?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 237/373] =?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 238/373] 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 239/373] =?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 240/373] 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 241/373] 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 242/373] 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 243/373] 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 244/373] 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 245/373] 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 490ae6a50e829224defa9ab19ae2b092414f82c7 Mon Sep 17 00:00:00 2001 From: dywedir Date: Fri, 2 Feb 2018 10:09:53 +0200 Subject: [PATCH 246/373] 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 247/373] 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 81334e531e689dce1e15f61ec5d8643b73666d3e Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Fri, 2 Feb 2018 10:56:22 +0100 Subject: [PATCH 248/373] 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 b2cf8cff7d434e7979a6a70a3fec43dbecb27335 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Thu, 1 Feb 2018 13:36:44 +0100 Subject: [PATCH 249/373] 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 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 250/373] 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 251/373] 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 252/373] 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 253/373] 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 254/373] 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 255/373] 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 0bfa9a9dc2ec99ae4f29c2174a7be43938032d31 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 2 Feb 2018 18:15:12 +0200 Subject: [PATCH 256/373] 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 257/373] 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 258/373] 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 259/373] 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 260/373] 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 d198355ac65b9182b5a3f9b0ff94a28a4193aea5 Mon Sep 17 00:00:00 2001 From: jammerful Date: Fri, 2 Feb 2018 13:06:53 -0500 Subject: [PATCH 261/373] 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 262/373] 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 263/373] 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 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 264/373] 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 265/373] 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 266/373] 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 267/373] 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 268/373] 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 15d33a4c93d0e27ddc87a8ddef397c017d4844f0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 2 Feb 2018 18:32:53 +0800 Subject: [PATCH 269/373] 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 270/373] 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 096a07f5e274c2cfdcdb5c9b26d347517d5419ef Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 1 Feb 2018 22:30:26 +0100 Subject: [PATCH 271/373] 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 54abfdc667d9736cf3ba3eb826bc235ba9339f30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Feb 2018 09:35:22 +0100 Subject: [PATCH 272/373] 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 273/373] 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 274/373] 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 275/373] 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 276/373] 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 277/373] 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 278/373] 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 279/373] 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 280/373] 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 281/373] 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 282/373] 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 283/373] 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 284/373] 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 285/373] 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 286/373] 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 287/373] 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 288/373] 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 289/373] 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 290/373] 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 291/373] 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 292/373] 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 293/373] 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 294/373] 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 295/373] 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 296/373] 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 297/373] 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 298/373] 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 299/373] 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 300/373] 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 301/373] 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 302/373] 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 303/373] =?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 304/373] 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 305/373] 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 cff5eec3825f6158f8296eb194c2b1d53d36cad8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 3 Feb 2018 17:06:13 +0100 Subject: [PATCH 306/373] 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 5dbaf18b6930dbd9d73d5f39392a447c03f5b927 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 17 Oct 2017 18:22:46 +0000 Subject: [PATCH 307/373] 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 308/373] 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 309/373] 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 310/373] 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 3d74ccf5e8f9d6ac32a3104a1598203c008dc227 Mon Sep 17 00:00:00 2001 From: Venkateswara Rao Mandela Date: Fri, 2 Feb 2018 13:27:51 +0530 Subject: [PATCH 311/373] 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 d750b1a00822221cb58292371d8582d84b75d592 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 4 Feb 2018 03:11:47 +0800 Subject: [PATCH 312/373] 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 313/373] 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 314/373] 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 315/373] 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 316/373] 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 317/373] 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 318/373] 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 319/373] 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 320/373] 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 321/373] 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 322/373] 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 113b04ae28983b319b0385ae49739c014f39e633 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 3 Feb 2018 17:58:39 -0600 Subject: [PATCH 323/373] 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 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 324/373] 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 d6d4ef658032fc716bb1a9f73596da306fad83a0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 3 Feb 2018 20:27:04 -0500 Subject: [PATCH 325/373] 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 326/373] 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 327/373] 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 328/373] 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 329/373] 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 330/373] 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 c00cc986e8e7ca1b95dd1c6f81032521957d591d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 4 Feb 2018 11:50:58 +0800 Subject: [PATCH 331/373] 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 332/373] 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 333/373] 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 d6e1c7bd945c26120365a4f3816b6d76ca4eb0b8 Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Sun, 4 Feb 2018 04:50:30 -0500 Subject: [PATCH 334/373] 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 335/373] 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 336/373] 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 337/373] 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 718552eca4196dcc9d20bd2c24a7f1e2857e6518 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sun, 4 Feb 2018 10:13:06 +0100 Subject: [PATCH 338/373] 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 339/373] 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 340/373] 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 341/373] 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 342/373] 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 343/373] 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 344/373] 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 345/373] 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 346/373] 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 8c8e8823bb46c5851aa74f6ff124f7adf60de474 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 4 Feb 2018 17:43:36 +0100 Subject: [PATCH 347/373] 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 348/373] 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 349/373] 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 350/373] 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 351/373] 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 352/373] 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 353/373] =?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 354/373] 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 355/373] 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 356/373] 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 357/373] 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 358/373] 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 359/373] 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 360/373] 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 5d2b4a5dc85fe0dfe488be124ff18c043a66a6f6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 5 Feb 2018 01:02:24 +0200 Subject: [PATCH 361/373] 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 362/373] 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 363/373] 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 364/373] 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 365/373] 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 366/373] 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 367/373] 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 368/373] 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 369/373] 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 8243d2b96f1f52bb6a7cf9fdf7a350b956d463a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Feb 2018 11:52:42 +0100 Subject: [PATCH 370/373] 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 371/373] 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 372/373] 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 373/373] 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;